mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-25 06:19:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove serialize() and deserialize() from InteractionHandler and InteractionMode

Browse Source
This commit is contained in:
Erik Broberg
2016-09-06 13:53:31 -04:00
parent aada13a656
commit 047e754369
3 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,9 +176,6 @@ public:
void updateCamera();
void updateInputStates(double timeSinceLastUpdate);
void serialize(SyncBuffer* syncBuffer);
void deserialize(SyncBuffer* syncBuffer);
// Accessors
ghoul::Dictionary getCameraStateDictionary();
SceneGraphNode* const focusNode() const;

10
include/openspace/interaction/interactionmode.h
View File

@@ -97,9 +97,6 @@ public:
virtual void updateMouseStatesFromInput(const InputState& inputState, double deltaTime) = 0;
virtual void updateCameraStateFromMouseStates(Camera& camera) = 0;
virtual void serialize(SyncBuffer* syncBuffer) = 0;
virtual void deserialize(SyncBuffer* syncBuffer) = 0;
protected:
/**
Inner class that acts as a smoothing filter to a variable. The filter has a step
@@ -170,10 +167,6 @@ public:
virtual void updateMouseStatesFromInput(const InputState& inputState, double deltaTime);
virtual void updateCameraStateFromMouseStates(Camera& camera);
// Need implementation
virtual void serialize(SyncBuffer* syncBuffer) {};
virtual void deserialize(SyncBuffer* syncBuffer) {};
private:
double _currentKeyframeTime;
};
@@ -218,9 +211,6 @@ public:
OrbitalInteractionMode(std::shared_ptr<MouseStates> mouseStates);
~OrbitalInteractionMode();
virtual void serialize(SyncBuffer* syncBuffer) {};
virtual void deserialize(SyncBuffer* syncBuffer) {};
//virtual void update(Camera& camera, const InputState& inputState, double deltaTime);
virtual void updateMouseStatesFromInput(const InputState& inputState, double deltaTime);

13
src/interaction/interactionhandler.cpp
View File

@@ -1005,19 +1005,6 @@ void InteractionHandler::clearKeyframes() {
_inputState->clearKeyframes();
}
void InteractionHandler::serialize(SyncBuffer* syncBuffer) {
for each (auto var in _interactionModes)
{
var.second->serialize(syncBuffer);
}
}
void InteractionHandler::deserialize(SyncBuffer* syncBuffer) {
for each (auto var in _interactionModes)
{
var.second->deserialize(syncBuffer);
}
}
#endif // USE_OLD_INTERACTIONHANDLER