Started changes for InteractionManager

This commit is contained in:
Alexander Bock
2014-10-12 23:51:33 +02:00
parent b50a11297c
commit d67c9ffe8d
14 changed files with 1004 additions and 548 deletions

View File

@@ -307,7 +307,7 @@ bool OpenSpaceEngine::initialize() {
// Initialize OpenSpace input devices
DeviceIdentifier::init();
DeviceIdentifier::ref().scanDevices();
_interactionHandler.connectDevices();
//_interactionHandler.connectDevices();
// Run start up scripts
ghoul::Dictionary scripts;
@@ -341,7 +341,7 @@ ghoul::opencl::CLContext& OpenSpaceEngine::clContext() {
return _context;
}
InteractionHandler& OpenSpaceEngine::interactionHandler() {
interaction::InteractionHandler& OpenSpaceEngine::interactionHandler() {
return _interactionHandler;
}