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

Merge branch 'master' into feature/grids-update

Browse Source
This commit is contained in:
Malin E
2022-08-29 13:22:57 +02:00
parent d1259c83a2 3cf80e0fdc
commit 4b88c5d308
54 changed files with 294 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/CMakeLists.txt
View File

@@ -446,6 +446,8 @@ target_include_directories(openspace-core
)
target_precompile_headers(openspace-core PRIVATE
<openspace/json.h>
<openspace/properties/numericalproperty.h>
[["ghoul/fmt.h"]]
[["ghoul/glm.h"]]
[["ghoul/misc/assert.h"]]
@@ -453,12 +455,19 @@ target_precompile_headers(openspace-core PRIVATE
[["ghoul/misc/exception.h"]]
[["ghoul/misc/invariants.h"]]
[["ghoul/misc/profiling.h"]]
[["ghoul/opengl/ghoul_gl.h"]]
<algorithm>
<any>
<array>
<deque>
<filesystem>
<fstream>
<future>
<map>
<memory>
<string>
<utility>
<variant>
<vector>
)

1
src/engine/downloadmanager.cpp
View File

@@ -33,6 +33,7 @@
#include <curl/curl.h>
#include <chrono>
#include <filesystem>
#include <sstream>
#include <thread>
namespace {

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
}

5
src/engine/openspaceengine.cpp
View File

@@ -82,6 +82,7 @@
#include <ghoul/misc/profiling.h>
#include <ghoul/misc/stacktrace.h>
#include <ghoul/misc/stringconversion.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/opengl/debugcontext.h>
#include <ghoul/opengl/shaderpreprocessor.h>
#include <ghoul/opengl/texture.h>
@@ -94,6 +95,10 @@
#include <numeric>
#include <sstream>
#ifdef WIN32
#include <Windows.h>
#endif // WIN32
#ifdef __APPLE__
#include <openspace/interaction/touchbar.h>
#endif // __APPLE__

2
src/interaction/sessionrecording.cpp
View File

@@ -55,7 +55,7 @@
#include <iomanip>
#ifdef WIN32
#include <windows.h>
#include <Windows.h>
#endif // WIN32
#include "sessionrecording_lua.inl"

1
src/rendering/helper.cpp
View File

@@ -29,6 +29,7 @@
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/misc/assert.h>
#include <ghoul/misc/profiling.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/opengl/texture.h>
#include <ghoul/opengl/textureunit.h>
#include <algorithm>

1
src/rendering/loadingscreen.cpp
View File

@@ -36,6 +36,7 @@
#include <ghoul/logging/logmanager.h>
#include <ghoul/misc/profiling.h>
#include <ghoul/misc/stringconversion.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/texture.h>
#include <ghoul/opengl/textureunit.h>

1
src/rendering/luaconsole.cpp
View File

@@ -37,6 +37,7 @@
#include <ghoul/misc/clipboard.h>
#include <ghoul/misc/profiling.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/opengl/programobject.h>
#include <filesystem>
#include <fstream>

1
src/rendering/renderengine.cpp
View File

@@ -63,6 +63,7 @@
#include <ghoul/misc/easing.h>
#include <ghoul/misc/profiling.h>
#include <ghoul/misc/stringconversion.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/openglstatecache.h>
#include <ghoul/systemcapabilities/openglcapabilitiescomponent.h>

1
src/rendering/screenspacerenderable.cpp
View File

@@ -36,6 +36,7 @@
#include <openspace/util/factorymanager.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/misc/profiling.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/textureunit.h>
#include <optional>

1
src/rendering/transferfunction.cpp
View File

@@ -33,6 +33,7 @@
#include <iterator>
#include <filesystem>
#include <fstream>
#include <sstream>
#include <string>
namespace {

1
src/scene/scene.cpp
View File

@@ -51,6 +51,7 @@
#include <ghoul/misc/easing.h>
#include <ghoul/misc/misc.h>
#include <ghoul/misc/profiling.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <string>
#include <stack>

1
src/util/blockplaneintersectiongeometry.cpp
View File

@@ -25,6 +25,7 @@
#include <openspace/util/blockplaneintersectiongeometry.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <algorithm>
namespace {

1
src/util/boxgeometry.cpp
View File

@@ -25,6 +25,7 @@
#include <openspace/util/boxgeometry.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <string>
namespace {

1
src/util/planegeometry.cpp
View File

@@ -25,6 +25,7 @@
#include <openspace/util/planegeometry.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <string>
namespace openspace {

1
src/util/sphere.cpp
View File

@@ -25,6 +25,7 @@
#include <openspace/util/sphere.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <cstring>
namespace {