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

remove duplicates of keyframerecording definitions

Browse Source
This commit is contained in:
Joakim Kilby
2024-09-04 07:21:26 +02:00
parent e886796a18
commit 574b26c3ea
3 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/documentation/core_registration.cpp
-2
View File
@@ -34,7 +34,6 @@
#include <openspace/interaction/keybindingmanager.h>
#include <openspace/interaction/keyframerecording.h>
#include <openspace/interaction/sessionrecording.h>
#include <openspace/interaction/keyframerecording.h>
#include <openspace/mission/mission.h>
#include <openspace/mission/missionmanager.h>
#include <openspace/navigation/navigationhandler.h>
@@ -108,7 +107,6 @@ void registerCoreClasses(scripting::ScriptEngine& engine) {
engine.addLibrary(Time::luaLibrary());
engine.addLibrary(interaction::ActionManager::luaLibrary());
engine.addLibrary(interaction::KeybindingManager::luaLibrary());
engine.addLibrary(interaction::KeyframeRecording::luaLibrary());
engine.addLibrary(interaction::NavigationHandler::luaLibrary());
engine.addLibrary(interaction::OrbitalNavigator::luaLibrary());
engine.addLibrary(interaction::PathNavigator::luaLibrary());
src/engine/globals.cpp
-18
View File
@@ -39,7 +39,6 @@
#include <openspace/interaction/joystickinputstate.h>
#include <openspace/interaction/websocketinputstate.h>
#include <openspace/interaction/sessionrecording.h>
#include <openspace/interaction/keyframerecording.h>
#include <openspace/mission/missionmanager.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/network/parallelpeer.h>
@@ -97,7 +96,6 @@ namespace {
sizeof(interaction::JoystickInputStates) +
sizeof(interaction::WebsocketInputStates) +
sizeof(interaction::KeybindingManager) +
sizeof(interaction::KeyframeRecording) +
sizeof(interaction::NavigationHandler) +
sizeof(interaction::SessionRecording) +
sizeof(interaction::KeyframeRecording) +
@@ -342,14 +340,6 @@ void create() {
sessionRecording = new interaction::SessionRecording(true);
#endif // WIN32
#ifdef WIN32
keyframeRecording = new (currentPos) interaction::KeyframeRecording;
ghoul_assert(keyframeRecording, "No keyframeRecording");
currentPos += sizeof(interaction::KeyframeRecording);
#else // ^^^ WIN32 / !WIN32 vvv
keyframeRecording = new interaction::KeyframeRecording;
#endif // WIN32
#ifdef WIN32
rootPropertyOwner = new (currentPos) properties::PropertyOwner({ "" });
ghoul_assert(rootPropertyOwner, "No rootPropertyOwner");
@@ -407,7 +397,6 @@ void initialize() {
// New property subowners also have to be added to the ImGuiModule callback!
rootPropertyOwner->addPropertySubOwner(global::navigationHandler);
rootPropertyOwner->addPropertySubOwner(global::keyframeRecording);
rootPropertyOwner->addPropertySubOwner(global::interactionMonitor);
rootPropertyOwner->addPropertySubOwner(global::sessionRecording);
rootPropertyOwner->addPropertySubOwner(global::keyframeRecording);
@@ -488,13 +477,6 @@ void destroy() {
delete navigationHandler;
#endif // WIN32
LDEBUGC("Globals", "Destroying 'KeyframeRecording'");
#ifdef WIN32
keyframeRecording->~KeyframeRecording();
#else // ^^^ WIN32 / !WIN32 vvv
delete keyframeRecording;
#endif // WIN32
LDEBUGC("Globals", "Destroying 'KeybindingManager'");
#ifdef WIN32
keybindingManager->~KeybindingManager();
src/engine/openspaceengine.cpp
-1
View File
@@ -42,7 +42,6 @@
#include <openspace/interaction/keybindingmanager.h>
#include <openspace/interaction/keyframerecording.h>
#include <openspace/interaction/sessionrecording.h>
#include <openspace/interaction/keyframerecording.h>
#include <openspace/json.h>
#include <openspace/navigation/navigationhandler.h>
#include <openspace/navigation/orbitalnavigator.h>