mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-01 17:20:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove constants.h file

Browse Source 
Reenable LuaConsole rendering
This commit is contained in:
Alexander Bock
2015-12-14 17:21:22 -08:00
parent c99666e75a
commit c92fc923f9
17 changed files with 83 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/base/rendering/renderablemodel.cpp
View File

@@ -34,6 +34,7 @@
#include <ghoul/io/texture/texturereader.h>
#include <ghoul/opengl/textureunit.h>
#include <ghoul/filesystem/filesystem.h>
#include <openspace/scene/scenegraphnode.h>
#include <openspace/util/time.h>
#include <openspace/util/spicemanager.h>
@@ -72,13 +73,13 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
, _frameCount(0)
{
std::string name;
bool success = dictionary.getValue(constants::scenegraphnode::keyName, name);
bool success = dictionary.getValue(SceneGraphNode::KeyName, name);
ghoul_assert(success, "Name was not passed to RenderableModel");
ghoul::Dictionary geometryDictionary;
success = dictionary.getValue(keyGeometry, geometryDictionary);
if (success) {
geometryDictionary.setValue(constants::scenegraphnode::keyName, name);
geometryDictionary.setValue(SceneGraphNode::KeyName, name);
_geometry = modelgeometry::ModelGeometry::createFromDictionary(geometryDictionary);
}