mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-16 08:51:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/interactionhandler' into develop

Browse Source 
Conflicts:
	include/openspace/engine/openspaceengine.h
	include/openspace/interaction/interactionhandler.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
This commit is contained in:
Alexander Bock
2014-11-18 15:46:26 +01:00
parent 4069680662 86efb3573b
commit 6b40cb18fb
18 changed files with 2081 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/engine/openspaceengine.cpp
View File

@@ -25,9 +25,11 @@
#include <openspace/engine/openspaceengine.h>
// openspace
#include <openspace/interaction/deviceidentifier.h>
#include <openspace/interaction/interactionhandler.h>
#include <openspace/interaction/luaconsole.h>
#include <openspace/interaction/interactionhandler.h>
#include <openspace/interaction/keyboardcontroller.h>
#include <openspace/interaction/mousecontroller.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scripting/scriptengine.h>
#include <openspace/scenegraph/scenegraph.h>
@@ -88,7 +90,7 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName)
// initialize OpenSpace helpers
SpiceManager::initialize();
Time::initialize();
DeviceIdentifier::init();
//DeviceIdentifier::init();
FactoryManager::initialize();
ghoul::systemcapabilities::SystemCapabilities::initialize();
}
@@ -99,9 +101,13 @@ OpenSpaceEngine::~OpenSpaceEngine() {
ghoul::systemcapabilities::SystemCapabilities::deinitialize();
FactoryManager::deinitialize();
DeviceIdentifier::deinit();
//DeviceIdentifier::deinit();
Time::deinitialize();
SpiceManager::deinitialize();
Time::deinitialize();
//DeviceIdentifier::deinit();
FileSystem::deinitialize();
LogManager::deinitialize();
}
OpenSpaceEngine& OpenSpaceEngine::ref() {
@@ -336,18 +342,17 @@ bool OpenSpaceEngine::initialize() {
if (!success)
return false;
// Initialize the script engine
_scriptEngine.initialize();
// Register Lua script functions
LDEBUG("Registering Lua libraries");
_scriptEngine.addLibrary(RenderEngine::luaLibrary());
_scriptEngine.addLibrary(SceneGraph::luaLibrary());
_scriptEngine.addLibrary(Time::luaLibrary());
_scriptEngine.addLibrary(InteractionHandler::luaLibrary());
_scriptEngine.addLibrary(interaction::InteractionHandler::luaLibrary());
// TODO: Maybe move all scenegraph and renderengine stuff to initializeGL
// Load scenegraph
scriptEngine().initialize();
// Load scenegraph
SceneGraph* sceneGraph = new SceneGraph;
_renderEngine.setSceneGraph(sceneGraph);
@@ -362,8 +367,12 @@ bool OpenSpaceEngine::initialize() {
sceneGraph->scheduleLoadSceneFile(sceneDescriptionPath);
// Initialize OpenSpace input devices
DeviceIdentifier::ref().scanDevices();
_interactionHandler.connectDevices();
//DeviceIdentifier::init();
//DeviceIdentifier::ref().scanDevices();
//_interactionHandler.setKeyboardController(new interaction::KeyboardControllerFixed);
_interactionHandler.setKeyboardController(new interaction::KeyboardControllerLua);
_interactionHandler.setMouseController(new interaction::TrackballMouseController);
// Run start up scripts
runStartupScripts();
@@ -378,7 +387,7 @@ ConfigurationManager& OpenSpaceEngine::configurationManager() {
return _configurationManager;
}
InteractionHandler& OpenSpaceEngine::interactionHandler() {
interaction::InteractionHandler& OpenSpaceEngine::interactionHandler() {
return _interactionHandler;
}