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

removed all references to remotecontroller

Browse Source
This commit is contained in:
Joakim Kilby
2015-06-17 08:39:02 +02:00
parent f35ec6f8d4
commit cce351af69
3 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/openspace/interaction/interactionhandler.h
View File

@@ -76,7 +76,6 @@
#include <openspace/interaction/keyboardcontroller.h>
#include <openspace/interaction/mousecontroller.h>
#include <openspace/interaction/remotecontroller.h>
#include <mutex>
@@ -95,7 +94,6 @@ public:
void setKeyboardController(KeyboardController* controller);
void setMouseController(MouseController* controller);
void setRemoteController(RemoteController* controller);
void addController(Controller* controller);
void lockControls();
@@ -173,7 +171,6 @@ private:
KeyboardController* _keyboardController;
MouseController* _mouseController;
RemoteController* _remoteController;
std::vector<Controller*> _controllers;
};

3
src/engine/openspaceengine.cpp
View File

@@ -353,9 +353,6 @@ bool OpenSpaceEngine::initialize() {
//_interactionHandler.setMouseController(new interaction::TrackballMouseController);
_interactionHandler->setMouseController(new interaction::OrbitalMouseController);
//@TODO fix this -JK
_interactionHandler->setRemoteController(new interaction::RemoteController);
// Run start up scripts
runStartupScripts();

9
src/interaction/interactionhandler.cpp
View File

@@ -253,7 +253,6 @@ InteractionHandler::InteractionHandler()
, _invertRotation(false)
, _keyboardController(nullptr)
, _mouseController(nullptr)
, _remoteController(nullptr)
{
}
@@ -278,13 +277,6 @@ void InteractionHandler::setMouseController(MouseController* controller) {
_mouseController->setHandler(this);
}
void InteractionHandler::setRemoteController(RemoteController* controller) {
assert(controller);
delete _remoteController;
_remoteController = controller;
_remoteController->setHandler(this);
}
void InteractionHandler::addController(Controller* controller) {
assert(controller);
_controllers.push_back(controller);
@@ -355,7 +347,6 @@ void InteractionHandler::unlockControls() {
void InteractionHandler::update(double deltaTime) {
_deltaTime = deltaTime;
_mouseController->update(deltaTime);
_remoteController->update(deltaTime);
}
void InteractionHandler::setFocusNode(SceneGraphNode* node) {