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

More work on SceneGraphLoader

Browse Source 
Renamed SceneGraph to Scene
Added new class SceneGraph to handle scenegraph related tasks
This commit is contained in:
Alexander Bock
2015-04-09 21:43:13 +02:00
parent 5a2c1b8c73
commit 79f3052887
25 changed files with 352 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/engine/openspaceengine.cpp
View File

@@ -37,7 +37,7 @@
#include <openspace/interaction/mousecontroller.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scripting/scriptengine.h>
#include <openspace/scenegraph/scenegraph.h>
#include <openspace/scene/Scene.h>
#include <openspace/util/time.h>
#include <openspace/util/spicemanager.h>
#include <openspace/util/factorymanager.h>
@@ -272,7 +272,7 @@ bool OpenSpaceEngine::initialize() {
// Register Lua script functions
LDEBUG("Registering Lua libraries");
_scriptEngine->addLibrary(RenderEngine::luaLibrary());
_scriptEngine->addLibrary(SceneGraph::luaLibrary());
_scriptEngine->addLibrary(Scene::luaLibrary());
_scriptEngine->addLibrary(Time::luaLibrary());
_scriptEngine->addLibrary(interaction::InteractionHandler::luaLibrary());
_scriptEngine->addLibrary(LuaConsole::luaLibrary());
@@ -303,7 +303,7 @@ bool OpenSpaceEngine::initialize() {
// Load scenegraph
SceneGraph* sceneGraph = new SceneGraph;
Scene* sceneGraph = new Scene;
_renderEngine->setSceneGraph(sceneGraph);
// initialize the RenderEngine