mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-06 11:29:55 -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/space/rendering/renderableplanet.cpp
+6 -11
View File
@@ -49,18 +49,13 @@
#include <math.h>
namespace {
const char* KeyGeometry = "Geometry";
const char* KeyRadius = "Radius";
const char* KeyColorTexture = "Textures.Color";
const char* KeyNightTexture = "Textures.Night";
const char* KeyHeightTexture = "Textures.Height";
const char* KeyShading = "PerformShading";
constexpr const char* KeyGeometry = "Geometry";
constexpr const char* KeyRadius = "Radius";
constexpr const char* _loggerCat = "RenderablePlanet";
static const char* _loggerCat = "RenderablePlanet";
const char* keyShadowGroup = "Shadow_Group";
const char* keyShadowSource = "Source";
const char* keyShadowCaster = "Caster";
constexpr const char* keyShadowGroup = "Shadow_Group";
constexpr const char* keyShadowSource = "Source";
constexpr const char* keyShadowCaster = "Caster";
static const openspace::properties::Property::PropertyInfo ColorTextureInfo = {
"ColorTexture",