mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Consistent allocation of callback vectors

Browse Source
This commit is contained in:
Emma Broman
2022-08-26 09:13:02 +02:00
parent c7bf728be8
commit 01eabd1b02
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/engine/globalscallbacks.cpp
View File

@@ -66,75 +66,75 @@ void create() {
#endif // WIN32
#ifdef WIN32
initialize = new (currentPos) std::vector<std::function<void()>>;
initialize = new (currentPos) std::vector<std::function<void()>>();
ghoul_assert(initialize, "No initialize");
currentPos += sizeof(std::vector<std::function<void()>>);
#else // ^^^ WIN32 / !WIN32 vvv
initialize = new std::vector<std::function<void()>>;
initialize = new std::vector<std::function<void()>>();
#endif // WIN32
#ifdef WIN32
deinitialize = new (currentPos) std::vector<std::function<void()>>;
deinitialize = new (currentPos) std::vector<std::function<void()>>();
ghoul_assert(deinitialize, "No deinitialize");
currentPos += sizeof(std::vector<std::function<void()>>);
#else // ^^^ WIN32 / !WIN32 vvv
deinitialize = new std::vector<std::function<void()>>;
deinitialize = new std::vector<std::function<void()>>();
#endif // WIN32
#ifdef WIN32
initializeGL = new (currentPos) std::vector<std::function<void()>>;
initializeGL = new (currentPos) std::vector<std::function<void()>>();
ghoul_assert(initializeGL, "No initializeGL");
currentPos += sizeof(std::vector<std::function<void()>>);
#else // ^^^ WIN32 / !WIN32 vvv
initializeGL = new std::vector<std::function<void()>>;
initializeGL = new std::vector<std::function<void()>();
#endif // WIN32
#ifdef WIN32
deinitializeGL = new (currentPos) std::vector<std::function<void()>>;
deinitializeGL = new (currentPos) std::vector<std::function<void()>>();
ghoul_assert(deinitializeGL, "No deinitializeGL");
currentPos += sizeof(std::vector<std::function<void()>>);
#else // ^^^ WIN32 / !WIN32 vvv
deinitializeGL = new std::vector<std::function<void()>>;
deinitializeGL = new std::vector<std::function<void()>>();
#endif // WIN32
#ifdef WIN32
preSync = new (currentPos) std::vector<std::function<void()>>;
preSync = new (currentPos) std::vector<std::function<void()>>();
ghoul_assert(preSync, "No preSync");
currentPos += sizeof(std::vector<std::function<void()>>);
#else // ^^^ WIN32 / !WIN32 vvv
preSync = new std::vector<std::function<void()>>;
preSync = new std::vector<std::function<void()>>();
#endif // WIN32
#ifdef WIN32
postSyncPreDraw = new (currentPos) std::vector<std::function<void()>>;
postSyncPreDraw = new (currentPos) std::vector<std::function<void()>>();
ghoul_assert(postSyncPreDraw, "No postSyncPreDraw");
currentPos += sizeof(std::vector<std::function<void()>>);
#else // ^^^ WIN32 / !WIN32 vvv
postSyncPreDraw = new std::vector<std::function<void()>>;
postSyncPreDraw = new std::vector<std::function<void()>>();
#endif // WIN32
#ifdef WIN32
render = new (currentPos) std::vector<std::function<void()>>;
render = new (currentPos) std::vector<std::function<void()>>();
ghoul_assert(render, "No render");
currentPos += sizeof(std::vector<std::function<void()>>);
#else // ^^^ WIN32 / !WIN32 vvv
render = new std::vector<std::function<void()>>;
render = new std::vector<std::function<void()>>();
#endif // WIN32
#ifdef WIN32
draw2D = new (currentPos) std::vector<std::function<void()>>;
draw2D = new (currentPos) std::vector<std::function<void()>>();
ghoul_assert(draw2D, "No draw2D");
currentPos += sizeof(std::vector<std::function<void()>>);
#else // ^^^ WIN32 / !WIN32 vvv
draw2D = new std::vector<std::function<void()>>;
draw2D = new std::vector<std::function<void()>>();
#endif // WIN32
#ifdef WIN32
postDraw = new (currentPos) std::vector<std::function<void()>>;
postDraw = new (currentPos) std::vector<std::function<void()>>();
ghoul_assert(postDraw, "No postDraw");
currentPos += sizeof(std::vector<std::function<void()>>);
#else // ^^^ WIN32 / !WIN32 vvv
postDraw = new std::vector<std::function<void()>>;
postDraw = new std::vector<std::function<void()>>();
#endif // WIN32
#ifdef WIN32
@@ -142,64 +142,64 @@ void create() {
ghoul_assert(keyboard, "No keyboard");
currentPos += sizeof(std::vector<KeyboardCallback>);
#else // ^^^ WIN32 / !WIN32 vvv
keyboard = new std::vector<KeyboardCallback>;
keyboard = new std::vector<KeyboardCallback>();
#endif // WIN32
#ifdef WIN32
character = new (currentPos) std::vector<CharacterCallback>;
character = new (currentPos) std::vector<CharacterCallback>();
ghoul_assert(character, "No character");
currentPos += sizeof(std::vector<CharacterCallback>);
#else // ^^^ WIN32 / !WIN32 vvv
character = new std::vector<CharacterCallback>;
character = new std::vector<CharacterCallback>();
#endif // WIN32
#ifdef WIN32
mouseButton = new (currentPos) std::vector<MouseButtonCallback>;
mouseButton = new (currentPos) std::vector<MouseButtonCallback>();
ghoul_assert(mouseButton, "No mouseButton");
currentPos += sizeof(std::vector<MouseButtonCallback>);
#else // ^^^ WIN32 / !WIN32 vvv
mouseButton = new std::vector<MouseButtonCallback>;
mouseButton = new std::vector<MouseButtonCallback>();
#endif // WIN32
#ifdef WIN32
mousePosition =
new (currentPos) std::vector<MousePositionCallback>;
new (currentPos) std::vector<MousePositionCallback>();
ghoul_assert(mousePosition, "No mousePosition");
currentPos += sizeof(std::vector<MousePositionCallback>);
#else // ^^^ WIN32 / !WIN32 vvv
mousePosition = new std::vector<MousePositionCallback>;
mousePosition = new std::vector<MousePositionCallback>();
#endif // WIN32
#ifdef WIN32
mouseScrollWheel = new (currentPos) std::vector<MouseScrollWheelCallback>;
mouseScrollWheel = new (currentPos) std::vector<MouseScrollWheelCallback>();
ghoul_assert(mouseScrollWheel, "No mouseScrollWheel");
currentPos += sizeof(std::vector<MouseScrollWheelCallback>);
#else // ^^^ WIN32 / !WIN32 vvv
mouseScrollWheel = new std::vector<MouseScrollWheelCallback>;
mouseScrollWheel = new std::vector<MouseScrollWheelCallback>();
#endif // WIN32
#ifdef WIN32
touchDetected = new (currentPos) std::vector<std::function<bool(TouchInput)>>;
touchDetected = new (currentPos) std::vector<std::function<bool(TouchInput)>>();
ghoul_assert(touchDetected, "No touchDetected");
currentPos += sizeof(std::vector<std::function<bool(TouchInput)>>);
#else // ^^^ WIN32 / !WIN32 vvv
touchDetected = new std::vector<std::function<bool(TouchInput)>>;
touchDetected = new std::vector<std::function<bool(TouchInput)>>();
#endif // WIN32
#ifdef WIN32
touchUpdated = new (currentPos) std::vector<std::function<bool(TouchInput)>>;
touchUpdated = new (currentPos) std::vector<std::function<bool(TouchInput)>>();
ghoul_assert(touchUpdated, "No touchUpdated");
currentPos += sizeof(std::vector<std::function<bool(TouchInput)>>);
#else // ^^^ WIN32 / !WIN32 vvv
touchUpdated = new std::vector<std::function<bool(TouchInput)>>;
touchUpdated = new std::vector<std::function<bool(TouchInput)>>();
#endif // WIN32
#ifdef WIN32
touchExit = new (currentPos) std::vector<std::function<void(TouchInput)>>;
touchExit = new (currentPos) std::vector<std::function<void(TouchInput)>>();
ghoul_assert(touchExit, "No touchExit");
//currentPos += sizeof(std::vector<std::function<void(TouchInput)>>);
#else // ^^^ WIN32 / !WIN32 vvv
touchExit = new std::vector<std::function<void(TouchInput)>>;
touchExit = new std::vector<std::function<void(TouchInput)>>();
#endif // WIN32
}