mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 19:29:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into NewAtmosphere.

Browse Source
This commit is contained in:
Jonathas Costa
2017-12-12 13:43:40 -05:00
parent 57abd18c80 91c7395a09
commit 952f8e8e13
94 changed files with 350 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/digitaluniverse/rendering/renderableplanescloud.cpp
+12 -12
View File
@@ -49,19 +49,19 @@
#include <string>
namespace {
const char* _loggerCat = "RenderablePlanesCloud";
const char* KeyFile = "File";
const char* keyUnit = "Unit";
const char* MeterUnit = "m";
const char* KilometerUnit = "Km";
const char* ParsecUnit = "pc";
const char* KiloparsecUnit = "Kpc";
const char* MegaparsecUnit = "Mpc";
const char* GigaparsecUnit = "Gpc";
const char* GigalightyearUnit = "Gly";
constexpr const char* _loggerCat = "RenderablePlanesCloud";
constexpr const char* KeyFile = "File";
constexpr const char* keyUnit = "Unit";
constexpr const char* MeterUnit = "m";
constexpr const char* KilometerUnit = "Km";
constexpr const char* ParsecUnit = "pc";
constexpr const char* KiloparsecUnit = "Kpc";
constexpr const char* MegaparsecUnit = "Mpc";
constexpr const char* GigaparsecUnit = "Gpc";
constexpr const char* GigalightyearUnit = "Gly";
const int8_t CurrentCacheVersion = 2;
const float PARSEC = 0.308567756E17f;
constexpr int8_t CurrentCacheVersion = 2;
constexpr float PARSEC = 0.308567756E17f;
enum BlendMode {
BlendModeNormal = 0,