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

Merge branch 'master' into feature/model-opacity

Browse Source 
* Solve conflict in iss.asset
This commit is contained in:
Malin E
2023-02-16 12:07:12 +01:00
parent 108123704b 9dc008ad12
commit 05252b8258
239 changed files with 3820 additions and 7906 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+363 -363
View File
@@ -22,378 +22,378 @@
# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #
##########################################################################################
include(${OPENSPACE_CMAKE_EXT_DIR}/set_openspace_compile_settings.cmake)
include(${PROJECT_SOURCE_DIR}/support/cmake/set_openspace_compile_settings.cmake)
set(OPENSPACE_SOURCE
${OPENSPACE_BASE_DIR}/src/openspace.cpp
${OPENSPACE_BASE_DIR}/src/camera/camera.cpp
${OPENSPACE_BASE_DIR}/src/documentation/core_registration.cpp
${OPENSPACE_BASE_DIR}/src/documentation/documentation.cpp
${OPENSPACE_BASE_DIR}/src/documentation/documentationengine.cpp
${OPENSPACE_BASE_DIR}/src/documentation/documentationgenerator.cpp
${OPENSPACE_BASE_DIR}/src/documentation/verifier.cpp
${OPENSPACE_BASE_DIR}/src/engine/configuration.cpp
${OPENSPACE_BASE_DIR}/src/engine/downloadmanager.cpp
${OPENSPACE_BASE_DIR}/src/engine/globals.cpp
${OPENSPACE_BASE_DIR}/src/engine/globalscallbacks.cpp
${OPENSPACE_BASE_DIR}/src/engine/logfactory.cpp
${OPENSPACE_BASE_DIR}/src/engine/moduleengine.cpp
${OPENSPACE_BASE_DIR}/src/engine/moduleengine_lua.inl
${OPENSPACE_BASE_DIR}/src/engine/openspaceengine.cpp
${OPENSPACE_BASE_DIR}/src/engine/openspaceengine_lua.inl
${OPENSPACE_BASE_DIR}/src/engine/syncengine.cpp
${OPENSPACE_BASE_DIR}/src/events/event.cpp
${OPENSPACE_BASE_DIR}/src/events/eventengine.cpp
${OPENSPACE_BASE_DIR}/src/events/eventengine_lua.inl
${OPENSPACE_BASE_DIR}/src/interaction/actionmanager.cpp
${OPENSPACE_BASE_DIR}/src/interaction/actionmanager_lua.inl
${OPENSPACE_BASE_DIR}/src/interaction/camerainteractionstates.cpp
${OPENSPACE_BASE_DIR}/src/interaction/interactionmonitor.cpp
${OPENSPACE_BASE_DIR}/src/interaction/mouseinputstate.cpp
${OPENSPACE_BASE_DIR}/src/interaction/joystickinputstate.cpp
${OPENSPACE_BASE_DIR}/src/interaction/joystickcamerastates.cpp
${OPENSPACE_BASE_DIR}/src/interaction/keybindingmanager.cpp
${OPENSPACE_BASE_DIR}/src/interaction/keybindingmanager_lua.inl
${OPENSPACE_BASE_DIR}/src/interaction/keyboardinputstate.cpp
${OPENSPACE_BASE_DIR}/src/interaction/mousecamerastates.cpp
${OPENSPACE_BASE_DIR}/src/interaction/scriptcamerastates.cpp
${OPENSPACE_BASE_DIR}/src/interaction/sessionrecording.cpp
${OPENSPACE_BASE_DIR}/src/interaction/sessionrecording_lua.inl
${OPENSPACE_BASE_DIR}/src/interaction/websocketinputstate.cpp
${OPENSPACE_BASE_DIR}/src/interaction/websocketcamerastates.cpp
${OPENSPACE_BASE_DIR}/src/interaction/tasks/convertrecfileversiontask.cpp
${OPENSPACE_BASE_DIR}/src/interaction/tasks/convertrecformattask.cpp
${OPENSPACE_BASE_DIR}/src/mission/mission.cpp
${OPENSPACE_BASE_DIR}/src/mission/missionmanager.cpp
${OPENSPACE_BASE_DIR}/src/mission/missionmanager_lua.inl
${OPENSPACE_BASE_DIR}/src/navigation/pathcurves/avoidcollisioncurve.cpp
${OPENSPACE_BASE_DIR}/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
${OPENSPACE_BASE_DIR}/src/navigation/keyframenavigator.cpp
${OPENSPACE_BASE_DIR}/src/navigation/navigationhandler.cpp
${OPENSPACE_BASE_DIR}/src/navigation/navigationhandler_lua.inl
${OPENSPACE_BASE_DIR}/src/navigation/navigationstate.cpp
${OPENSPACE_BASE_DIR}/src/navigation/orbitalnavigator.cpp
${OPENSPACE_BASE_DIR}/src/navigation/path.cpp
${OPENSPACE_BASE_DIR}/src/navigation/pathcurve.cpp
${OPENSPACE_BASE_DIR}/src/navigation/pathnavigator.cpp
${OPENSPACE_BASE_DIR}/src/navigation/pathnavigator_lua.inl
${OPENSPACE_BASE_DIR}/src/navigation/waypoint.cpp
${OPENSPACE_BASE_DIR}/src/network/messagestructureshelper.cpp
${OPENSPACE_BASE_DIR}/src/network/parallelconnection.cpp
${OPENSPACE_BASE_DIR}/src/network/parallelpeer.cpp
${OPENSPACE_BASE_DIR}/src/network/parallelpeer_lua.inl
${OPENSPACE_BASE_DIR}/src/properties/optionproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/property.cpp
${OPENSPACE_BASE_DIR}/src/properties/propertyowner.cpp
${OPENSPACE_BASE_DIR}/src/properties/selectionproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/stringproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/triggerproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/list/doublelistproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/list/intlistproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/list/stringlistproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat2property.cpp
${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat3property.cpp
${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat4property.cpp
${OPENSPACE_BASE_DIR}/src/properties/matrix/mat2property.cpp
${OPENSPACE_BASE_DIR}/src/properties/matrix/mat3property.cpp
${OPENSPACE_BASE_DIR}/src/properties/matrix/mat4property.cpp
${OPENSPACE_BASE_DIR}/src/properties/scalar/boolproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/scalar/doubleproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/scalar/floatproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/scalar/intproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/scalar/longproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/scalar/shortproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/scalar/uintproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/scalar/ulongproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/scalar/ushortproperty.cpp
${OPENSPACE_BASE_DIR}/src/properties/vector/dvec2property.cpp
${OPENSPACE_BASE_DIR}/src/properties/vector/dvec3property.cpp
${OPENSPACE_BASE_DIR}/src/properties/vector/dvec4property.cpp
${OPENSPACE_BASE_DIR}/src/properties/vector/ivec2property.cpp
${OPENSPACE_BASE_DIR}/src/properties/vector/ivec3property.cpp
${OPENSPACE_BASE_DIR}/src/properties/vector/ivec4property.cpp
${OPENSPACE_BASE_DIR}/src/properties/vector/uvec2property.cpp
${OPENSPACE_BASE_DIR}/src/properties/vector/uvec3property.cpp
${OPENSPACE_BASE_DIR}/src/properties/vector/uvec4property.cpp
${OPENSPACE_BASE_DIR}/src/properties/vector/vec2property.cpp
${OPENSPACE_BASE_DIR}/src/properties/vector/vec3property.cpp
${OPENSPACE_BASE_DIR}/src/properties/vector/vec4property.cpp
${OPENSPACE_BASE_DIR}/src/query/query.cpp
${OPENSPACE_BASE_DIR}/src/rendering/dashboard.cpp
${OPENSPACE_BASE_DIR}/src/rendering/dashboard_lua.inl
${OPENSPACE_BASE_DIR}/src/rendering/dashboarditem.cpp
${OPENSPACE_BASE_DIR}/src/rendering/dashboardtextitem.cpp
${OPENSPACE_BASE_DIR}/src/rendering/framebufferrenderer.cpp
${OPENSPACE_BASE_DIR}/src/rendering/deferredcastermanager.cpp
${OPENSPACE_BASE_DIR}/src/rendering/helper.cpp
${OPENSPACE_BASE_DIR}/src/rendering/loadingscreen.cpp
${OPENSPACE_BASE_DIR}/src/rendering/luaconsole.cpp
${OPENSPACE_BASE_DIR}/src/rendering/raycastermanager.cpp
${OPENSPACE_BASE_DIR}/src/rendering/renderable.cpp
${OPENSPACE_BASE_DIR}/src/rendering/renderengine.cpp
${OPENSPACE_BASE_DIR}/src/rendering/renderengine_lua.inl
${OPENSPACE_BASE_DIR}/src/rendering/screenspacerenderable.cpp
${OPENSPACE_BASE_DIR}/src/rendering/texturecomponent.cpp
${OPENSPACE_BASE_DIR}/src/rendering/transferfunction.cpp
${OPENSPACE_BASE_DIR}/src/rendering/volumeraycaster.cpp
${OPENSPACE_BASE_DIR}/src/scene/asset.cpp
${OPENSPACE_BASE_DIR}/src/scene/assetmanager.cpp
${OPENSPACE_BASE_DIR}/src/scene/assetmanager_lua.inl
${OPENSPACE_BASE_DIR}/src/scene/lightsource.cpp
${OPENSPACE_BASE_DIR}/src/scene/profile.cpp
${OPENSPACE_BASE_DIR}/src/scene/profile_lua.inl
${OPENSPACE_BASE_DIR}/src/scene/rotation.cpp
${OPENSPACE_BASE_DIR}/src/scene/scale.cpp
${OPENSPACE_BASE_DIR}/src/scene/scene.cpp
${OPENSPACE_BASE_DIR}/src/scene/scene_lua.inl
${OPENSPACE_BASE_DIR}/src/scene/sceneinitializer.cpp
${OPENSPACE_BASE_DIR}/src/scene/scenelicensewriter.cpp
${OPENSPACE_BASE_DIR}/src/scene/scenegraphnode.cpp
${OPENSPACE_BASE_DIR}/src/scene/timeframe.cpp
${OPENSPACE_BASE_DIR}/src/scene/translation.cpp
${OPENSPACE_BASE_DIR}/src/scripting/lualibrary.cpp
${OPENSPACE_BASE_DIR}/src/scripting/scriptengine.cpp
${OPENSPACE_BASE_DIR}/src/scripting/scriptengine_lua.inl
${OPENSPACE_BASE_DIR}/src/scripting/scriptscheduler.cpp
${OPENSPACE_BASE_DIR}/src/scripting/scriptscheduler_lua.inl
${OPENSPACE_BASE_DIR}/src/scripting/systemcapabilitiesbinding.cpp
${OPENSPACE_BASE_DIR}/src/scripting/systemcapabilitiesbinding_lua.inl
${OPENSPACE_BASE_DIR}/src/util/blockplaneintersectiongeometry.cpp
${OPENSPACE_BASE_DIR}/src/util/boxgeometry.cpp
${OPENSPACE_BASE_DIR}/src/util/collisionhelper.cpp
${OPENSPACE_BASE_DIR}/src/util/coordinateconversion.cpp
${OPENSPACE_BASE_DIR}/src/util/distanceconversion.cpp
${OPENSPACE_BASE_DIR}/src/util/factorymanager.cpp
${OPENSPACE_BASE_DIR}/src/util/httprequest.cpp
${OPENSPACE_BASE_DIR}/src/util/json_helper.cpp
${OPENSPACE_BASE_DIR}/src/util/keys.cpp
${OPENSPACE_BASE_DIR}/src/util/openspacemodule.cpp
${OPENSPACE_BASE_DIR}/src/util/planegeometry.cpp
${OPENSPACE_BASE_DIR}/src/util/progressbar.cpp
${OPENSPACE_BASE_DIR}/src/util/resourcesynchronization.cpp
${OPENSPACE_BASE_DIR}/src/util/screenlog.cpp
${OPENSPACE_BASE_DIR}/src/util/sphere.cpp
${OPENSPACE_BASE_DIR}/src/util/spicemanager.cpp
${OPENSPACE_BASE_DIR}/src/util/spicemanager_lua.inl
${OPENSPACE_BASE_DIR}/src/util/syncbuffer.cpp
${OPENSPACE_BASE_DIR}/src/util/tstring.cpp
${OPENSPACE_BASE_DIR}/src/util/histogram.cpp
${OPENSPACE_BASE_DIR}/src/util/task.cpp
${OPENSPACE_BASE_DIR}/src/util/taskloader.cpp
${OPENSPACE_BASE_DIR}/src/util/threadpool.cpp
${OPENSPACE_BASE_DIR}/src/util/time.cpp
${OPENSPACE_BASE_DIR}/src/util/timeconversion.cpp
${OPENSPACE_BASE_DIR}/src/util/timeline.cpp
${OPENSPACE_BASE_DIR}/src/util/timemanager.cpp
${OPENSPACE_BASE_DIR}/src/util/time_lua.inl
${OPENSPACE_BASE_DIR}/src/util/timerange.cpp
${OPENSPACE_BASE_DIR}/src/util/touch.cpp
${OPENSPACE_BASE_DIR}/src/util/transformationmanager.cpp
${OPENSPACE_BASE_DIR}/src/util/universalhelpers.cpp
${OPENSPACE_BASE_DIR}/src/util/versionchecker.cpp
openspace.cpp
camera/camera.cpp
documentation/core_registration.cpp
documentation/documentation.cpp
documentation/documentationengine.cpp
documentation/documentationgenerator.cpp
documentation/verifier.cpp
engine/configuration.cpp
engine/downloadmanager.cpp
engine/globals.cpp
engine/globalscallbacks.cpp
engine/logfactory.cpp
engine/moduleengine.cpp
engine/moduleengine_lua.inl
engine/openspaceengine.cpp
engine/openspaceengine_lua.inl
engine/syncengine.cpp
events/event.cpp
events/eventengine.cpp
events/eventengine_lua.inl
interaction/actionmanager.cpp
interaction/actionmanager_lua.inl
interaction/camerainteractionstates.cpp
interaction/interactionmonitor.cpp
interaction/mouseinputstate.cpp
interaction/joystickinputstate.cpp
interaction/joystickcamerastates.cpp
interaction/keybindingmanager.cpp
interaction/keybindingmanager_lua.inl
interaction/keyboardinputstate.cpp
interaction/mousecamerastates.cpp
interaction/scriptcamerastates.cpp
interaction/sessionrecording.cpp
interaction/sessionrecording_lua.inl
interaction/websocketinputstate.cpp
interaction/websocketcamerastates.cpp
interaction/tasks/convertrecfileversiontask.cpp
interaction/tasks/convertrecformattask.cpp
mission/mission.cpp
mission/missionmanager.cpp
mission/missionmanager_lua.inl
navigation/pathcurves/avoidcollisioncurve.cpp
navigation/pathcurves/zoomoutoverviewcurve.cpp
navigation/keyframenavigator.cpp
navigation/navigationhandler.cpp
navigation/navigationhandler_lua.inl
navigation/navigationstate.cpp
navigation/orbitalnavigator.cpp
navigation/path.cpp
navigation/pathcurve.cpp
navigation/pathnavigator.cpp
navigation/pathnavigator_lua.inl
navigation/waypoint.cpp
network/messagestructureshelper.cpp
network/parallelconnection.cpp
network/parallelpeer.cpp
network/parallelpeer_lua.inl
properties/optionproperty.cpp
properties/property.cpp
properties/propertyowner.cpp
properties/selectionproperty.cpp
properties/stringproperty.cpp
properties/triggerproperty.cpp
properties/list/doublelistproperty.cpp
properties/list/intlistproperty.cpp
properties/list/stringlistproperty.cpp
properties/matrix/dmat2property.cpp
properties/matrix/dmat3property.cpp
properties/matrix/dmat4property.cpp
properties/matrix/mat2property.cpp
properties/matrix/mat3property.cpp
properties/matrix/mat4property.cpp
properties/scalar/boolproperty.cpp
properties/scalar/doubleproperty.cpp
properties/scalar/floatproperty.cpp
properties/scalar/intproperty.cpp
properties/scalar/longproperty.cpp
properties/scalar/shortproperty.cpp
properties/scalar/uintproperty.cpp
properties/scalar/ulongproperty.cpp
properties/scalar/ushortproperty.cpp
properties/vector/dvec2property.cpp
properties/vector/dvec3property.cpp
properties/vector/dvec4property.cpp
properties/vector/ivec2property.cpp
properties/vector/ivec3property.cpp
properties/vector/ivec4property.cpp
properties/vector/uvec2property.cpp
properties/vector/uvec3property.cpp
properties/vector/uvec4property.cpp
properties/vector/vec2property.cpp
properties/vector/vec3property.cpp
properties/vector/vec4property.cpp
query/query.cpp
rendering/dashboard.cpp
rendering/dashboard_lua.inl
rendering/dashboarditem.cpp
rendering/dashboardtextitem.cpp
rendering/framebufferrenderer.cpp
rendering/deferredcastermanager.cpp
rendering/helper.cpp
rendering/loadingscreen.cpp
rendering/luaconsole.cpp
rendering/raycastermanager.cpp
rendering/renderable.cpp
rendering/renderengine.cpp
rendering/renderengine_lua.inl
rendering/screenspacerenderable.cpp
rendering/texturecomponent.cpp
rendering/transferfunction.cpp
rendering/volumeraycaster.cpp
scene/asset.cpp
scene/assetmanager.cpp
scene/assetmanager_lua.inl
scene/lightsource.cpp
scene/profile.cpp
scene/profile_lua.inl
scene/rotation.cpp
scene/scale.cpp
scene/scene.cpp
scene/scene_lua.inl
scene/sceneinitializer.cpp
scene/scenelicensewriter.cpp
scene/scenegraphnode.cpp
scene/timeframe.cpp
scene/translation.cpp
scripting/lualibrary.cpp
scripting/scriptengine.cpp
scripting/scriptengine_lua.inl
scripting/scriptscheduler.cpp
scripting/scriptscheduler_lua.inl
scripting/systemcapabilitiesbinding.cpp
scripting/systemcapabilitiesbinding_lua.inl
util/blockplaneintersectiongeometry.cpp
util/boxgeometry.cpp
util/collisionhelper.cpp
util/coordinateconversion.cpp
util/distanceconversion.cpp
util/factorymanager.cpp
util/httprequest.cpp
util/json_helper.cpp
util/keys.cpp
util/openspacemodule.cpp
util/planegeometry.cpp
util/progressbar.cpp
util/resourcesynchronization.cpp
util/screenlog.cpp
util/sphere.cpp
util/spicemanager.cpp
util/spicemanager_lua.inl
util/syncbuffer.cpp
util/tstring.cpp
util/histogram.cpp
util/task.cpp
util/taskloader.cpp
util/threadpool.cpp
util/time.cpp
util/timeconversion.cpp
util/timeline.cpp
util/timemanager.cpp
util/time_lua.inl
util/timerange.cpp
util/touch.cpp
util/transformationmanager.cpp
util/universalhelpers.cpp
util/versionchecker.cpp
)
if (APPLE)
set(OPENSPACE_SOURCE
${OPENSPACE_SOURCE}
${OPENSPACE_BASE_DIR}/src/interaction/touchbar.mm
interaction/touchbar.mm
)
set_source_files_properties(
${OPENSPACE_BASE_DIR}/src/interaction/touchbar.mm
interaction/touchbar.mm
PROPERTIES SKIP_PRECOMPILE_HEADERS ON
)
endif ()
set(OPENSPACE_HEADER
${OPENSPACE_BASE_DIR}/include/openspace/json.h
${OPENSPACE_BASE_DIR}/include/openspace/camera/camera.h
${OPENSPACE_BASE_DIR}/include/openspace/camera/camerapose.h
${OPENSPACE_BASE_DIR}/include/openspace/documentation/core_registration.h
${OPENSPACE_BASE_DIR}/include/openspace/documentation/documentation.h
${OPENSPACE_BASE_DIR}/include/openspace/documentation/documentationengine.h
${OPENSPACE_BASE_DIR}/include/openspace/documentation/documentationgenerator.h
${OPENSPACE_BASE_DIR}/include/openspace/documentation/verifier.h
${OPENSPACE_BASE_DIR}/include/openspace/documentation/verifier.inl
${OPENSPACE_BASE_DIR}/include/openspace/engine/configuration.h
${OPENSPACE_BASE_DIR}/include/openspace/engine/downloadmanager.h
${OPENSPACE_BASE_DIR}/include/openspace/engine/globals.h
${OPENSPACE_BASE_DIR}/include/openspace/engine/globalscallbacks.h
${OPENSPACE_BASE_DIR}/include/openspace/engine/logfactory.h
${OPENSPACE_BASE_DIR}/include/openspace/engine/moduleengine.h
${OPENSPACE_BASE_DIR}/include/openspace/engine/moduleengine.inl
${OPENSPACE_BASE_DIR}/include/openspace/engine/openspaceengine.h
${OPENSPACE_BASE_DIR}/include/openspace/engine/syncengine.h
${OPENSPACE_BASE_DIR}/include/openspace/engine/windowdelegate.h
${OPENSPACE_BASE_DIR}/include/openspace/events/event.h
${OPENSPACE_BASE_DIR}/include/openspace/events/eventengine.h
${OPENSPACE_BASE_DIR}/include/openspace/events/eventengine.inl
${OPENSPACE_BASE_DIR}/include/openspace/interaction/action.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/actionmanager.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/delayedvariable.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/delayedvariable.inl
${OPENSPACE_BASE_DIR}/include/openspace/interaction/camerainteractionstates.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/mouseinputstate.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/interactionmonitor.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/interpolator.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/interpolator.inl
${OPENSPACE_BASE_DIR}/include/openspace/interaction/joystickinputstate.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/joystickcamerastates.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/keybindingmanager.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/keyboardinputstate.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/mousecamerastates.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/scriptcamerastates.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/sessionrecording.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/sessionrecording.inl
${OPENSPACE_BASE_DIR}/include/openspace/interaction/websocketinputstate.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/websocketcamerastates.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/tasks/convertrecfileversiontask.h
${OPENSPACE_BASE_DIR}/include/openspace/interaction/tasks/convertrecformattask.h
${OPENSPACE_BASE_DIR}/include/openspace/mission/mission.h
${OPENSPACE_BASE_DIR}/include/openspace/mission/missionmanager.h
${OPENSPACE_BASE_DIR}/include/openspace/navigation/pathcurves/avoidcollisioncurve.h
${OPENSPACE_BASE_DIR}/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h
${OPENSPACE_BASE_DIR}/include/openspace/navigation/keyframenavigator.h
${OPENSPACE_BASE_DIR}/include/openspace/navigation/navigationhandler.h
${OPENSPACE_BASE_DIR}/include/openspace/navigation/navigationstate.h
${OPENSPACE_BASE_DIR}/include/openspace/navigation/orbitalnavigator.h
${OPENSPACE_BASE_DIR}/include/openspace/navigation/path.h
${OPENSPACE_BASE_DIR}/include/openspace/navigation/pathcurve.h
${OPENSPACE_BASE_DIR}/include/openspace/navigation/pathnavigator.h
${OPENSPACE_BASE_DIR}/include/openspace/navigation/waypoint.h
${OPENSPACE_BASE_DIR}/include/openspace/network/parallelconnection.h
${OPENSPACE_BASE_DIR}/include/openspace/network/parallelpeer.h
${OPENSPACE_BASE_DIR}/include/openspace/network/messagestructures.h
${OPENSPACE_BASE_DIR}/include/openspace/network/messagestructureshelper.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/listproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/listproperty.inl
${OPENSPACE_BASE_DIR}/include/openspace/properties/numericalproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/numericalproperty.inl
${OPENSPACE_BASE_DIR}/include/openspace/properties/optionproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/propertyowner.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/selectionproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/stringproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/templateproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/templateproperty.inl
${OPENSPACE_BASE_DIR}/include/openspace/properties/triggerproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/list/doublelistproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/list/intlistproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/list/stringlistproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat2property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat3property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat4property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat2property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat3property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat4property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/boolproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/doubleproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/floatproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/intproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/longproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/shortproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/uintproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ulongproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ushortproperty.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec2property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec3property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec4property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/ivec2property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/ivec3property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/ivec4property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/uvec2property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/uvec3property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/uvec4property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec2property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec3property.h
${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec4property.h
${OPENSPACE_BASE_DIR}/include/openspace/query/query.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboard.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboarditem.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboardtextitem.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/framebufferrenderer.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcaster.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcasterlistener.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcastermanager.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/loadingscreen.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/luaconsole.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/helper.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/raycasterlistener.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/raycastermanager.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderable.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderengine.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/screenspacerenderable.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/texturecomponent.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/transferfunction.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/volume.h
${OPENSPACE_BASE_DIR}/include/openspace/rendering/volumeraycaster.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/asset.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/assetmanager.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/lightsource.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/profile.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/rotation.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/scale.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/scene.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/sceneinitializer.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/scenelicensewriter.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/scenegraphnode.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/timeframe.h
${OPENSPACE_BASE_DIR}/include/openspace/scene/translation.h
${OPENSPACE_BASE_DIR}/include/openspace/scripting/lualibrary.h
${OPENSPACE_BASE_DIR}/include/openspace/scripting/scriptengine.h
${OPENSPACE_BASE_DIR}/include/openspace/scripting/scriptscheduler.h
${OPENSPACE_BASE_DIR}/include/openspace/scripting/systemcapabilitiesbinding.h
${OPENSPACE_BASE_DIR}/include/openspace/util/blockplaneintersectiongeometry.h
${OPENSPACE_BASE_DIR}/include/openspace/util/boxgeometry.h
${OPENSPACE_BASE_DIR}/include/openspace/util/collisionhelper.h
${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentjobmanager.h
${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentjobmanager.inl
${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentqueue.h
${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentqueue.inl
${OPENSPACE_BASE_DIR}/include/openspace/util/coordinateconversion.h
${OPENSPACE_BASE_DIR}/include/openspace/util/distanceconstants.h
${OPENSPACE_BASE_DIR}/include/openspace/util/distanceconversion.h
${OPENSPACE_BASE_DIR}/include/openspace/util/factorymanager.h
${OPENSPACE_BASE_DIR}/include/openspace/util/factorymanager.inl
${OPENSPACE_BASE_DIR}/include/openspace/util/httprequest.h
${OPENSPACE_BASE_DIR}/include/openspace/util/job.h
${OPENSPACE_BASE_DIR}/include/openspace/util/json_helper.h
${OPENSPACE_BASE_DIR}/include/openspace/util/json_helper.inl
${OPENSPACE_BASE_DIR}/include/openspace/util/keys.h
${OPENSPACE_BASE_DIR}/include/openspace/util/memorymanager.h
${OPENSPACE_BASE_DIR}/include/openspace/util/mouse.h
${OPENSPACE_BASE_DIR}/include/openspace/util/openspacemodule.h
${OPENSPACE_BASE_DIR}/include/openspace/util/planegeometry.h
${OPENSPACE_BASE_DIR}/include/openspace/util/progressbar.h
${OPENSPACE_BASE_DIR}/include/openspace/util/resourcesynchronization.h
${OPENSPACE_BASE_DIR}/include/openspace/util/screenlog.h
${OPENSPACE_BASE_DIR}/include/openspace/util/sphere.h
${OPENSPACE_BASE_DIR}/include/openspace/util/spicemanager.h
${OPENSPACE_BASE_DIR}/include/openspace/util/syncable.h
${OPENSPACE_BASE_DIR}/include/openspace/util/syncbuffer.h
${OPENSPACE_BASE_DIR}/include/openspace/util/syncbuffer.inl
${OPENSPACE_BASE_DIR}/include/openspace/util/syncdata.h
${OPENSPACE_BASE_DIR}/include/openspace/util/syncdata.inl
${OPENSPACE_BASE_DIR}/include/openspace/util/task.h
${OPENSPACE_BASE_DIR}/include/openspace/util/taskloader.h
${OPENSPACE_BASE_DIR}/include/openspace/util/time.h
${OPENSPACE_BASE_DIR}/include/openspace/util/timeconversion.h
${OPENSPACE_BASE_DIR}/include/openspace/util/timeline.h
${OPENSPACE_BASE_DIR}/include/openspace/util/timeline.inl
${OPENSPACE_BASE_DIR}/include/openspace/util/timemanager.h
${OPENSPACE_BASE_DIR}/include/openspace/util/timerange.h
${OPENSPACE_BASE_DIR}/include/openspace/util/touch.h
${OPENSPACE_BASE_DIR}/include/openspace/util/tstring.h
${OPENSPACE_BASE_DIR}/include/openspace/util/universalhelpers.h
${OPENSPACE_BASE_DIR}/include/openspace/util/updatestructures.h
${OPENSPACE_BASE_DIR}/include/openspace/util/versionchecker.h
${OPENSPACE_BASE_DIR}/include/openspace/util/transformationmanager.h
${OPENSPACE_BASE_DIR}/include/openspace/util/threadpool.h
${OPENSPACE_BASE_DIR}/include/openspace/util/histogram.h
${PROJECT_SOURCE_DIR}/include/openspace/json.h
${PROJECT_SOURCE_DIR}/include/openspace/camera/camera.h
${PROJECT_SOURCE_DIR}/include/openspace/camera/camerapose.h
${PROJECT_SOURCE_DIR}/include/openspace/documentation/core_registration.h
${PROJECT_SOURCE_DIR}/include/openspace/documentation/documentation.h
${PROJECT_SOURCE_DIR}/include/openspace/documentation/documentationengine.h
${PROJECT_SOURCE_DIR}/include/openspace/documentation/documentationgenerator.h
${PROJECT_SOURCE_DIR}/include/openspace/documentation/verifier.h
${PROJECT_SOURCE_DIR}/include/openspace/documentation/verifier.inl
${PROJECT_SOURCE_DIR}/include/openspace/engine/configuration.h
${PROJECT_SOURCE_DIR}/include/openspace/engine/downloadmanager.h
${PROJECT_SOURCE_DIR}/include/openspace/engine/globals.h
${PROJECT_SOURCE_DIR}/include/openspace/engine/globalscallbacks.h
${PROJECT_SOURCE_DIR}/include/openspace/engine/logfactory.h
${PROJECT_SOURCE_DIR}/include/openspace/engine/moduleengine.h
${PROJECT_SOURCE_DIR}/include/openspace/engine/moduleengine.inl
${PROJECT_SOURCE_DIR}/include/openspace/engine/openspaceengine.h
${PROJECT_SOURCE_DIR}/include/openspace/engine/syncengine.h
${PROJECT_SOURCE_DIR}/include/openspace/engine/windowdelegate.h
${PROJECT_SOURCE_DIR}/include/openspace/events/event.h
${PROJECT_SOURCE_DIR}/include/openspace/events/eventengine.h
${PROJECT_SOURCE_DIR}/include/openspace/events/eventengine.inl
${PROJECT_SOURCE_DIR}/include/openspace/interaction/action.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/actionmanager.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/delayedvariable.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/delayedvariable.inl
${PROJECT_SOURCE_DIR}/include/openspace/interaction/camerainteractionstates.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/mouseinputstate.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/interactionmonitor.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/interpolator.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/interpolator.inl
${PROJECT_SOURCE_DIR}/include/openspace/interaction/joystickinputstate.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/joystickcamerastates.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/keybindingmanager.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/keyboardinputstate.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/mousecamerastates.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/scriptcamerastates.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/sessionrecording.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/sessionrecording.inl
${PROJECT_SOURCE_DIR}/include/openspace/interaction/websocketinputstate.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/websocketcamerastates.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/tasks/convertrecfileversiontask.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/tasks/convertrecformattask.h
${PROJECT_SOURCE_DIR}/include/openspace/mission/mission.h
${PROJECT_SOURCE_DIR}/include/openspace/mission/missionmanager.h
${PROJECT_SOURCE_DIR}/include/openspace/navigation/pathcurves/avoidcollisioncurve.h
${PROJECT_SOURCE_DIR}/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h
${PROJECT_SOURCE_DIR}/include/openspace/navigation/keyframenavigator.h
${PROJECT_SOURCE_DIR}/include/openspace/navigation/navigationhandler.h
${PROJECT_SOURCE_DIR}/include/openspace/navigation/navigationstate.h
${PROJECT_SOURCE_DIR}/include/openspace/navigation/orbitalnavigator.h
${PROJECT_SOURCE_DIR}/include/openspace/navigation/path.h
${PROJECT_SOURCE_DIR}/include/openspace/navigation/pathcurve.h
${PROJECT_SOURCE_DIR}/include/openspace/navigation/pathnavigator.h
${PROJECT_SOURCE_DIR}/include/openspace/navigation/waypoint.h
${PROJECT_SOURCE_DIR}/include/openspace/network/parallelconnection.h
${PROJECT_SOURCE_DIR}/include/openspace/network/parallelpeer.h
${PROJECT_SOURCE_DIR}/include/openspace/network/messagestructures.h
${PROJECT_SOURCE_DIR}/include/openspace/network/messagestructureshelper.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/listproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/listproperty.inl
${PROJECT_SOURCE_DIR}/include/openspace/properties/numericalproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/numericalproperty.inl
${PROJECT_SOURCE_DIR}/include/openspace/properties/optionproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/propertyowner.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/selectionproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/stringproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/templateproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/templateproperty.inl
${PROJECT_SOURCE_DIR}/include/openspace/properties/triggerproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/list/doublelistproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/list/intlistproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/list/stringlistproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/matrix/dmat2property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/matrix/dmat3property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/matrix/dmat4property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/matrix/mat2property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/matrix/mat3property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/matrix/mat4property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/boolproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/doubleproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/floatproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/intproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/longproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/shortproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/uintproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/ulongproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/ushortproperty.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/dvec2property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/dvec3property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/dvec4property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/ivec2property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/ivec3property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/ivec4property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/uvec2property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/uvec3property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/uvec4property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/vec2property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/vec3property.h
${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/vec4property.h
${PROJECT_SOURCE_DIR}/include/openspace/query/query.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/dashboard.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/dashboarditem.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/dashboardtextitem.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/framebufferrenderer.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/deferredcaster.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/deferredcasterlistener.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/deferredcastermanager.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/loadingscreen.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/luaconsole.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/helper.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/raycasterlistener.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/raycastermanager.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/renderable.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/renderengine.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/screenspacerenderable.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/texturecomponent.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/transferfunction.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/volume.h
${PROJECT_SOURCE_DIR}/include/openspace/rendering/volumeraycaster.h
${PROJECT_SOURCE_DIR}/include/openspace/scene/asset.h
${PROJECT_SOURCE_DIR}/include/openspace/scene/assetmanager.h
${PROJECT_SOURCE_DIR}/include/openspace/scene/lightsource.h
${PROJECT_SOURCE_DIR}/include/openspace/scene/profile.h
${PROJECT_SOURCE_DIR}/include/openspace/scene/rotation.h
${PROJECT_SOURCE_DIR}/include/openspace/scene/scale.h
${PROJECT_SOURCE_DIR}/include/openspace/scene/scene.h
${PROJECT_SOURCE_DIR}/include/openspace/scene/sceneinitializer.h
${PROJECT_SOURCE_DIR}/include/openspace/scene/scenelicensewriter.h
${PROJECT_SOURCE_DIR}/include/openspace/scene/scenegraphnode.h
${PROJECT_SOURCE_DIR}/include/openspace/scene/timeframe.h
${PROJECT_SOURCE_DIR}/include/openspace/scene/translation.h
${PROJECT_SOURCE_DIR}/include/openspace/scripting/lualibrary.h
${PROJECT_SOURCE_DIR}/include/openspace/scripting/scriptengine.h
${PROJECT_SOURCE_DIR}/include/openspace/scripting/scriptscheduler.h
${PROJECT_SOURCE_DIR}/include/openspace/scripting/systemcapabilitiesbinding.h
${PROJECT_SOURCE_DIR}/include/openspace/util/blockplaneintersectiongeometry.h
${PROJECT_SOURCE_DIR}/include/openspace/util/boxgeometry.h
${PROJECT_SOURCE_DIR}/include/openspace/util/collisionhelper.h
${PROJECT_SOURCE_DIR}/include/openspace/util/concurrentjobmanager.h
${PROJECT_SOURCE_DIR}/include/openspace/util/concurrentjobmanager.inl
${PROJECT_SOURCE_DIR}/include/openspace/util/concurrentqueue.h
${PROJECT_SOURCE_DIR}/include/openspace/util/concurrentqueue.inl
${PROJECT_SOURCE_DIR}/include/openspace/util/coordinateconversion.h
${PROJECT_SOURCE_DIR}/include/openspace/util/distanceconstants.h
${PROJECT_SOURCE_DIR}/include/openspace/util/distanceconversion.h
${PROJECT_SOURCE_DIR}/include/openspace/util/factorymanager.h
${PROJECT_SOURCE_DIR}/include/openspace/util/factorymanager.inl
${PROJECT_SOURCE_DIR}/include/openspace/util/httprequest.h
${PROJECT_SOURCE_DIR}/include/openspace/util/job.h
${PROJECT_SOURCE_DIR}/include/openspace/util/json_helper.h
${PROJECT_SOURCE_DIR}/include/openspace/util/json_helper.inl
${PROJECT_SOURCE_DIR}/include/openspace/util/keys.h
${PROJECT_SOURCE_DIR}/include/openspace/util/memorymanager.h
${PROJECT_SOURCE_DIR}/include/openspace/util/mouse.h
${PROJECT_SOURCE_DIR}/include/openspace/util/openspacemodule.h
${PROJECT_SOURCE_DIR}/include/openspace/util/planegeometry.h
${PROJECT_SOURCE_DIR}/include/openspace/util/progressbar.h
${PROJECT_SOURCE_DIR}/include/openspace/util/resourcesynchronization.h
${PROJECT_SOURCE_DIR}/include/openspace/util/screenlog.h
${PROJECT_SOURCE_DIR}/include/openspace/util/sphere.h
${PROJECT_SOURCE_DIR}/include/openspace/util/spicemanager.h
${PROJECT_SOURCE_DIR}/include/openspace/util/syncable.h
${PROJECT_SOURCE_DIR}/include/openspace/util/syncbuffer.h
${PROJECT_SOURCE_DIR}/include/openspace/util/syncbuffer.inl
${PROJECT_SOURCE_DIR}/include/openspace/util/syncdata.h
${PROJECT_SOURCE_DIR}/include/openspace/util/syncdata.inl
${PROJECT_SOURCE_DIR}/include/openspace/util/task.h
${PROJECT_SOURCE_DIR}/include/openspace/util/taskloader.h
${PROJECT_SOURCE_DIR}/include/openspace/util/time.h
${PROJECT_SOURCE_DIR}/include/openspace/util/timeconversion.h
${PROJECT_SOURCE_DIR}/include/openspace/util/timeline.h
${PROJECT_SOURCE_DIR}/include/openspace/util/timeline.inl
${PROJECT_SOURCE_DIR}/include/openspace/util/timemanager.h
${PROJECT_SOURCE_DIR}/include/openspace/util/timerange.h
${PROJECT_SOURCE_DIR}/include/openspace/util/touch.h
${PROJECT_SOURCE_DIR}/include/openspace/util/tstring.h
${PROJECT_SOURCE_DIR}/include/openspace/util/universalhelpers.h
${PROJECT_SOURCE_DIR}/include/openspace/util/updatestructures.h
${PROJECT_SOURCE_DIR}/include/openspace/util/versionchecker.h
${PROJECT_SOURCE_DIR}/include/openspace/util/transformationmanager.h
${PROJECT_SOURCE_DIR}/include/openspace/util/threadpool.h
${PROJECT_SOURCE_DIR}/include/openspace/util/histogram.h
)
if (APPLE)
set(OPENSPACE_HEADER
${OPENSPACE_HEADER}
${OPENSPACE_BASE_DIR}/include/openspace/interaction/touchbar.h
${PROJECT_SOURCE_DIR}/include/openspace/interaction/touchbar.h
)
endif ()
@@ -401,8 +401,8 @@ endif ()
foreach (file ${OPENSPACE_SOURCE} ${OPENSPACE_HEADER})
# Remove prefixes from the files
set(original_file ${file})
string(REPLACE "${OPENSPACE_BASE_DIR}/src/" "" file ${file})
string(REPLACE "${OPENSPACE_BASE_DIR}/include/openspace/" "" file ${file})
string(REPLACE "${PROJECT_SOURCE_DIR}/src/" "" file ${file})
string(REPLACE "${PROJECT_SOURCE_DIR}/include/openspace/" "" file ${file})
get_filename_component(directory ${file} DIRECTORY)
if (NOT directory STREQUAL "")
# Visual Studio wants '\' for the path separator
@@ -427,22 +427,22 @@ add_library(openspace-core STATIC ${OPENSPACE_HEADER} ${OPENSPACE_SOURCE})
target_include_directories(openspace-core SYSTEM
PUBLIC
# In order to use the date library
${OPENSPACE_BASE_DIR}/ext/date/include
${PROJECT_SOURCE_DIR}/ext/date/include
# In order to use the nlohmann JSON library
${OPENSPACE_BASE_DIR}/ext
${PROJECT_SOURCE_DIR}/ext
)
target_include_directories(openspace-core
PUBLIC
# In order to be able to include openspace-core files
${OPENSPACE_BASE_DIR}/include
${PROJECT_SOURCE_DIR}/include
# In order to be able to include the module_registration file
${CMAKE_BINARY_DIR}/_generated/include
PRIVATE
# In order to be able to include module files. This is a temporary fix as this
# introduces a dependency from the opnspace-core onto the modules
${OPENSPACE_BASE_DIR}
${PROJECT_SOURCE_DIR}
)
target_precompile_headers(openspace-core PRIVATE
@@ -474,14 +474,14 @@ target_precompile_headers(openspace-core PRIVATE
add_dependencies(openspace-core run_codegen)
configure_file(
${OPENSPACE_CMAKE_EXT_DIR}/openspace_header.template
${PROJECT_SOURCE_DIR}/support/cmake/openspace_header.template
${CMAKE_BINARY_DIR}/_generated/include/openspace/openspace.h
@ONLY IMMEDIATE
)
configure_file(
${OPENSPACE_CMAKE_EXT_DIR}/commit.template
${OPENSPACE_BASE_DIR}/COMMIT.md
${PROJECT_SOURCE_DIR}/support/cmake/commit.template
${PROJECT_SOURCE_DIR}/COMMIT.md
@ONLY IMMEDIATE
)
src/documentation/documentation.cpp
+24
View File
@@ -147,6 +147,30 @@ SpecificationError::SpecificationError(TestResult res, std::string comp)
ghoul_assert(!result.success, "Result's success must be false");
}
void logError(const SpecificationError& error, std::string component) {
if (error.result.success) {
// Nothing to print if we succeeded
return;
}
if (component.empty()) {
LERRORC(error.component, error.message);
}
else {
LERRORC(fmt::format("{}: {}", component, error.component), error.message);
}
for (const documentation::TestResult::Offense& o : error.result.offenses) {
LERRORC(
o.offender,
fmt::format("{}: {}", ghoul::to_string(o.reason), o.explanation)
);
}
for (const documentation::TestResult::Warning& w : error.result.warnings) {
LWARNINGC(w.offender, ghoul::to_string(w.reason));
}
}
DocumentationEntry::DocumentationEntry(std::string k, std::shared_ptr<Verifier> v,
Optional opt, std::string doc)
: key(std::move(k))
src/engine/moduleengine.cpp
+1 -6
View File
@@ -82,12 +82,7 @@ void ModuleEngine::initialize(
m->initialize(configuration);
}
catch (const documentation::SpecificationError& e) {
for (const documentation::TestResult::Offense& o : e.result.offenses) {
LERRORC(e.component, o.offender + ": " + ghoul::to_string(o.reason));
}
for (const documentation::TestResult::Warning& w : e.result.warnings) {
LWARNINGC(e.component, w.offender + ": " + ghoul::to_string(w.reason));
}
logError(e);
throw;
}
src/engine/openspaceengine.cpp
+2 -6
View File
@@ -265,12 +265,7 @@ void OpenSpaceEngine::initialize() {
}
catch (const documentation::SpecificationError& e) {
LERROR("Failed loading of log");
for (const documentation::TestResult::Offense& o : e.result.offenses) {
LERRORC(o.offender, ghoul::to_string(o.reason));
}
for (const documentation::TestResult::Warning& w : e.result.warnings) {
LWARNINGC(w.offender, ghoul::to_string(w.reason));
}
logError(e);
throw;
}
}
@@ -1371,6 +1366,7 @@ void OpenSpaceEngine::keyboardCallback(Key key, KeyModifier mod, KeyAction actio
global::eventEngine->publishEvent<events::EventApplicationShutdown>(
events::EventApplicationShutdown::State::Aborted
);
return;
}
using F = global::callback::KeyboardCallback;
src/interaction/joystickcamerastates.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ void JoystickCameraStates::updateStateFromInput(
int nAxes = joystickInputStates.numAxes(joystickInputState.name);
for (int i = 0;
i < std::min(static_cast<size_t>(nAxes), joystick->axisMapping.size());
i < std::min(nAxes, static_cast<int>(joystick->axisMapping.size()));
++i)
{
AxisInformation t = joystick->axisMapping[i];
src/interaction/keybindingmanager.cpp
+5 -4
View File
@@ -55,10 +55,11 @@ void KeybindingManager::keyboardCallback(Key key, KeyModifier modifier, KeyActio
auto ret = _keyLua.equal_range({ key, modifier });
for (auto it = ret.first; it != ret.second; ++it) {
ghoul_assert(!it->second.empty(), "Action must not be empty");
ghoul_assert(
global::actionManager->hasAction(it->second),
"Action must be registered"
);
if (!global::actionManager->hasAction(it->second)) {
// Silently ignoring the unknown action as the user might have intended to
// bind a key to multiple actions, only one of which could be defined
continue;
}
global::actionManager->triggerAction(it->second, ghoul::Dictionary());
}
}
src/interaction/mousecamerastates.cpp
+3 -3
View File
@@ -52,11 +52,11 @@ void MouseCameraStates::updateStateFromInput(const MouseInputState& mouseinputSt
bool primaryPressed = mouseinputState.isMouseButtonPressed(primary);
bool secondaryPressed = mouseinputState.isMouseButtonPressed(secondary);
bool button3Pressed = mouseinputState.isMouseButtonPressed(MouseButton::Button3);
bool keyCtrlPressed = keyboardinputState.isKeyPressed(Key::LeftControl) |
bool keyCtrlPressed = keyboardinputState.isKeyPressed(Key::LeftControl) ||
keyboardinputState.isKeyPressed(Key::RightControl);
bool keyShiftPressed = keyboardinputState.isKeyPressed(Key::LeftShift) |
bool keyShiftPressed = keyboardinputState.isKeyPressed(Key::LeftShift) ||
keyboardinputState.isKeyPressed(Key::RightShift);
bool keyAltPressed = keyboardinputState.isKeyPressed(Key::LeftAlt) |
bool keyAltPressed = keyboardinputState.isKeyPressed(Key::LeftAlt) ||
keyboardinputState.isKeyPressed(Key::RightAlt);
// Update the mouse states
src/navigation/orbitalnavigator.cpp
+21 -5
View File
@@ -539,6 +539,20 @@ glm::quat OrbitalNavigator::anchorNodeToCameraRotation() const {
return glm::quat(invWorldRotation) * glm::quat(_camera->rotationQuaternion());
}
glm::dvec3 OrbitalNavigator::pushToSurfaceOfAnchor(
const glm::dvec3& cameraPosition) const
{
const SurfacePositionHandle posHandle =
calculateSurfacePositionHandle(*_anchorNode, cameraPosition);
return pushToSurface(
cameraPosition,
_anchorNode->worldPosition(),
posHandle
);
}
void OrbitalNavigator::resetVelocities() {
_mouseStates.resetVelocities();
_joystickStates.resetVelocities();
@@ -703,7 +717,6 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) {
// Perform the vertical movements based on user input
pose.position = translateVertically(deltaTime, pose.position, anchorPos, posHandle);
pose.position = pushToSurface(
_minimumAllowedDistance,
pose.position,
anchorPos,
posHandle
@@ -992,6 +1005,10 @@ bool OrbitalNavigator::hasRollFriction() const {
return _friction.roll;
}
double OrbitalNavigator::minAllowedDistance() const {
return _minimumAllowedDistance;
}
OrbitalNavigator::CameraRotationDecomposition
OrbitalNavigator::decomposeCameraRotationSurface(CameraPose cameraPose,
const SceneGraphNode& reference)
@@ -1473,8 +1490,7 @@ glm::dquat OrbitalNavigator::rotateHorizontally(double deltaTime,
return mouseCameraRollRotation * globalCameraRotation;
}
glm::dvec3 OrbitalNavigator::pushToSurface(double minHeightAboveGround,
const glm::dvec3& cameraPosition,
glm::dvec3 OrbitalNavigator::pushToSurface(const glm::dvec3& cameraPosition,
const glm::dvec3& objectPosition,
const SurfacePositionHandle& positionHandle) const
{
@@ -1495,7 +1511,7 @@ glm::dvec3 OrbitalNavigator::pushToSurface(double minHeightAboveGround,
glm::sign(dot(actualSurfaceToCamera, referenceSurfaceOutDirection));
return cameraPosition + referenceSurfaceOutDirection *
glm::max(minHeightAboveGround - surfaceToCameraSigned, 0.0);
glm::max(_minimumAllowedDistance - surfaceToCameraSigned, 0.0);
}
glm::dquat OrbitalNavigator::interpolateRotationDifferential(double deltaTime,
@@ -1520,7 +1536,7 @@ glm::dquat OrbitalNavigator::interpolateRotationDifferential(double deltaTime,
SurfacePositionHandle OrbitalNavigator::calculateSurfacePositionHandle(
const SceneGraphNode& node,
const glm::dvec3 cameraPositionWorldSpace)
const glm::dvec3& cameraPositionWorldSpace) const
{
ghoul_assert(
glm::length(cameraPositionWorldSpace) > 0.0,
src/navigation/pathnavigator.cpp
+1 -6
View File
@@ -274,12 +274,7 @@ void PathNavigator::createPath(const ghoul::Dictionary& dictionary) {
}
catch (const documentation::SpecificationError& e) {
LERROR("Could not create camera path");
for (const documentation::TestResult::Offense& o : e.result.offenses) {
LERRORC(o.offender, ghoul::to_string(o.reason));
}
for (const documentation::TestResult::Warning& w : e.result.warnings) {
LWARNINGC(w.offender, ghoul::to_string(w.reason));
}
logError(e);
}
catch (const PathCurve::TooShortPathError&) {
// Do nothing
src/navigation/pathnavigator_lua.inl
+1 -1
View File
@@ -172,7 +172,7 @@ namespace {
);
}
catch (const documentation::SpecificationError& e) {
LERRORC("flyToNavigationState", ghoul::to_string(e.result));
logError(e, "flyToNavigationState");
throw ghoul::lua::LuaError(fmt::format("Unable to create a path: {}", e.what()));
}
src/properties/property.cpp
-2
View File
@@ -40,8 +40,6 @@ namespace {
constexpr std::string_view IdentifierKey = "Identifier";
constexpr std::string_view NameKey = "Name";
constexpr std::string_view TypeKey = "Type";
constexpr std::string_view DescriptionKey = "Description";
constexpr std::string_view JsonValueKey = "Value";
constexpr std::string_view MetaDataKey = "MetaData";
constexpr std::string_view AdditionalDataKey = "AdditionalData";
} // namespace
src/rendering/dashboarditem.cpp
+6 -3
View File
@@ -46,6 +46,8 @@ namespace {
std::string identifier;
std::optional<std::string> guiName;
std::optional<bool> enabled;
};
#include "dashboarditem_codegen.cpp"
} // namespace
@@ -71,7 +73,7 @@ std::unique_ptr<DashboardItem> DashboardItem::createFromDictionary(
DashboardItem::DashboardItem(const ghoul::Dictionary& dictionary)
: properties::PropertyOwner({ "", "" })
, _isEnabled(EnabledInfo, true)
, _enabled(EnabledInfo, true)
{
const Parameters p = codegen::bake<Parameters>(dictionary);
@@ -80,11 +82,12 @@ DashboardItem::DashboardItem(const ghoul::Dictionary& dictionary)
setGuiName(*p.guiName);
}
addProperty(_isEnabled);
_enabled = p.enabled.value_or(_enabled);
addProperty(_enabled);
}
bool DashboardItem::isEnabled() const {
return _isEnabled;
return _enabled;
}
} // namespace openspace
src/rendering/renderable.cpp
+4
View File
@@ -240,6 +240,10 @@ double Renderable::interactionSphere() const {
return _interactionSphere;
}
std::string_view Renderable::typeAsString() const {
return _renderableType;
}
SurfacePositionHandle Renderable::calculateSurfacePositionHandle(
const glm::dvec3& targetModelSpace) const
{
src/scene/scene.cpp
+1 -1
View File
@@ -469,7 +469,7 @@ void Scene::addPropertyInterpolation(properties::Property* prop, float durationS
if (info.prop == prop) {
info.beginTime = now;
info.durationSeconds = durationSeconds;
info.postScript = std::move(postScript),
info.postScript = std::move(postScript);
info.easingFunction = func;
// If we found it, we can break since we make sure that each property is only
// represented once in this
src/scene/scene_lua.inl
+1 -1
View File
@@ -603,7 +603,7 @@ namespace {
node.hasValue<std::string>("Identifier") ?
node.value<std::string>("Identifier") :
"Scene";
LERRORC(cat, ghoul::to_string(e.result));
logError(e, cat);
throw ghoul::lua::LuaError(
fmt::format("Error loading scene graph node: {}", e.what())
src/scene/scenegraphnode.cpp
+41 -16
View File
@@ -160,25 +160,40 @@ namespace {
openspace::properties::Property::Visibility::Developer
};
constexpr openspace::properties::Property::PropertyInfo
SupportsDirectInteractionInfo =
{
"SupportsDirectInteraction",
"Supports Direct Interaction",
"Only relevant when using touch interaction. If true, the \'direct "
"manipulation\' scheme will be used when interacting with this scene graph "
"node, meaning that the positions on the interaction sphere that intersects "
"with the touch points will directly follow the motion of the touch points. "
"Works best for objects that have an interaction sphere of about the same size "
"as the bounding sphere, and that are somewhat spherical. Note that using this "
"feature might significalty reduce the performance.",
openspace::properties::Property::Visibility::AdvancedUser
};
struct [[codegen::Dictionary(SceneGraphNode)]] Parameters {
// The identifier of this scenegraph node. This name must be unique among all
// The identifier of this scene graph node. This name must be unique among all
// scene graph nodes that are loaded in a specific scene. If a duplicate is
// detected the loading of the node will fail, as will all childing that depend on
// the node. The identifier must not contain any whitespaces or '.'
std::string identifier;
// This names the parent of the currently specified scenegraph node. The parent
// This names the parent of the currently specified scene graph node. The parent
// must already exist in the scene graph. If not specified, the node will be
// attached to the root of the scenegraph
// attached to the root of the scene graph
std::optional<std::string> parent
[[codegen::annotation(
"If specified, this must be a name for another scenegraph node"
"If specified, this must be a name for another scene graph node"
)]];
// The renderable that is to be created for this scenegraph node. A renderable is
// a component of a scenegraph node that will lead to some visual result on the
// The renderable that is to be created for this scene graph node. A renderable is
// a component of a scene graph node that will lead to some visual result on the
// screen. The specifics heavily depend on the 'Type' of the renderable. If no
// Renderable is specified, this scenegraph node is an internal node and can be
// Renderable is specified, this scene graph node is an internal node and can be
// used for either group children, or apply common transformations to a group of
// children
std::optional<ghoul::Dictionary> renderable [[codegen::reference("renderable")]];
@@ -189,27 +204,30 @@ namespace {
// [[codegen::verbatim(InteractionSphereInfo.description)]]
std::optional<double> interactionSphere;
// [[codegen::verbatim(SupportsDirectInteractionInfo.description)]]
std::optional<bool> supportsDirectInteraction;
struct Transform {
// This node describes a translation that is applied to the scenegraph node
// This node describes a translation that is applied to the scene graph node
// and all its children. Depending on the 'Type' of the translation, this can
// either be a static translation or a time-varying one
std::optional<ghoul::Dictionary> translation
[[codegen::reference("core_transform_translation")]];
// This nodes describes a rotation that is applied to the scenegraph node and
// This nodes describes a rotation that is applied to the scene graph node and
// all its children. Depending on the 'Type' of the rotation, this can either
// be a static rotation or a time-varying one
std::optional<ghoul::Dictionary> rotation
[[codegen::reference("core_transform_rotation")]];
// This node describes a scaling that is applied to the scenegraph node and
// This node describes a scaling that is applied to the scene graph node and
// all its children. Depending on the 'Type' of the scaling, this can either
// be a static scaling or a time-varying one
std::optional<ghoul::Dictionary> scale
[[codegen::reference("core_transform_scaling")]];
};
// This describes a set of transformations that are applied to this scenegraph
// This describes a set of transformations that are applied to this scene graph
// node and all of its children. There are only three possible values
// corresponding to a 'Translation', a 'Rotation', and a 'Scale'
std::optional<Transform> transform;
@@ -248,7 +266,7 @@ namespace {
std::optional<ghoul::Dictionary> timeFrame
[[codegen::reference("core_time_frame")]];
// A tag or list of tags that can be used to reference to a group of scenegraph
// A tag or list of tags that can be used to reference to a group of scene graph
// nodes.
std::optional<std::variant<std::string, std::vector<std::string>>> tag;
@@ -258,7 +276,7 @@ namespace {
std::optional<std::string> name;
// If this value is specified, this '/' separated URI specifies the location
// of this scenegraph node in a GUI representation, for instance
// of this scene graph node in a GUI representation, for instance
// '/SolarSystem/Earth/Moon'
std::optional<std::string> path;
@@ -266,12 +284,12 @@ namespace {
std::optional<std::string> description;
// If this value is specified, GUI applications are incouraged to ignore this
// scenegraph node. This is most useful to trim collective lists of nodes and
// scene graph node. This is most useful to trim collective lists of nodes and
// not display, for example, barycenters
std::optional<bool> hidden;
};
// Additional information that is passed to GUI applications. These are all hints
// and do not have any impact on the actual function of the scenegraph node
// and do not have any impact on the actual function of the scene graph node
std::optional<Gui> gui [[codegen::key("GUI")]];
};
#include "scenegraphnode_codegen.cpp"
@@ -487,7 +505,7 @@ ghoul::opengl::ProgramObject* SceneGraphNode::_debugSphereProgram = nullptr;
SceneGraphNode::SceneGraphNode()
: properties::PropertyOwner({ "" })
, _guiHidden(GuiHiddenInfo)
, _guiHidden(GuiHiddenInfo, false)
, _guiPath(GuiPathInfo, "/")
, _guiDisplayName(GuiNameInfo)
, _guiDescription(GuiDescriptionInfo)
@@ -513,6 +531,7 @@ SceneGraphNode::SceneGraphNode()
, _screenSizeRadius(ScreenSizeRadiusInfo, 0)
, _visibilityDistance(VisibilityDistanceInfo, 6e10f)
, _showDebugSphere(ShowDebugSphereInfo, false)
, _supportsDirectInteraction(SupportsDirectInteractionInfo, false)
{
addProperty(_computeScreenSpaceValues);
addProperty(_screenSpacePosition);
@@ -552,6 +571,8 @@ SceneGraphNode::SceneGraphNode()
addProperty(_approachFactor);
addProperty(_showDebugSphere);
addProperty(_supportsDirectInteraction);
}
SceneGraphNode::~SceneGraphNode() {}
@@ -1207,6 +1228,10 @@ double SceneGraphNode::approachFactor() const {
return _approachFactor;
}
bool SceneGraphNode::supportsDirectInteraction() const {
return _supportsDirectInteraction;
}
const Renderable* SceneGraphNode::renderable() const {
return _renderable.get();
}
src/scripting/scriptengine.cpp
+21 -21
View File
@@ -445,12 +445,7 @@ void ScriptEngine::addLibraryFunctions(lua_State* state, LuaLibrary& library,
library.documentations.push_back(std::move(func));
}
catch (const documentation::SpecificationError& e) {
for (const documentation::TestResult::Offense& o : e.result.offenses) {
LERRORC(o.offender, ghoul::to_string(o.reason));
}
for (const documentation::TestResult::Warning& w : e.result.warnings) {
LWARNINGC(w.offender, ghoul::to_string(w.reason));
}
logError(e);
}
lua_pop(state, 1);
}
@@ -576,26 +571,31 @@ void ScriptEngine::writeLog(const std::string& script) {
void ScriptEngine::preSync(bool isMaster) {
ZoneScoped
if (!isMaster) {
return;
}
std::lock_guard guard(_clientScriptsMutex);
while (!_incomingScripts.empty()) {
QueueItem item = std::move(_incomingScripts.front());
_incomingScripts.pop();
if (isMaster) {
while (!_incomingScripts.empty()) {
QueueItem item = std::move(_incomingScripts.front());
_incomingScripts.pop();
_scriptsToSync.push_back(item.script);
const bool remoteScripting = item.remoteScripting;
_scriptsToSync.push_back(item.script);
const bool remoteScripting = item.remoteScripting;
// Not really a received script but the master also needs to run the script...
_masterScriptQueue.push(item);
// Not really a received script but the master also needs to run the script...
_masterScriptQueue.push(item);
if (global::parallelPeer->isHost() && remoteScripting) {
global::parallelPeer->sendScript(item.script);
if (global::parallelPeer->isHost() && remoteScripting) {
global::parallelPeer->sendScript(item.script);
}
if (global::sessionRecording->isRecording()) {
global::sessionRecording->saveScriptKeyframeToTimeline(item.script);
}
}
if (global::sessionRecording->isRecording()) {
global::sessionRecording->saveScriptKeyframeToTimeline(item.script);
}
else {
while (!_incomingScripts.empty()) {
QueueItem item = std::move(_incomingScripts.front());
_incomingScripts.pop();
_clientScriptQueue.push(item.script);
}
}
}
src/util/coordinateconversion.cpp
+1 -1
View File
@@ -301,7 +301,7 @@ std::pair<std::string, std::string> decimalDegreesToIcrs(double ra, double dec)
// Calculate Dec
int decDegrees = static_cast<int>(std::trunc(decDeg));
double decMinutesFull = (abs(decDeg) - abs(decDegrees)) * 60.0;
double decMinutesFull = (std::abs(decDeg) - std::abs(decDegrees)) * 60.0;
int decMinutes = static_cast<int>(std::trunc(decMinutesFull));
double decSeconds = (decMinutesFull - decMinutes) * 60.0;
src/util/taskloader.cpp
+1 -6
View File
@@ -92,12 +92,7 @@ std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromFile(const std::string&
}
catch (const documentation::SpecificationError& e) {
LERROR(fmt::format("Could not load tasks file {}. {}", absTasksFile, e.what()));
for (const documentation::TestResult::Offense& o : e.result.offenses) {
LERROR(ghoul::to_string(o));
}
for (const documentation::TestResult::Warning& w : e.result.warnings) {
LWARNING(ghoul::to_string(w));
}
logError(e);
return std::vector<std::unique_ptr<Task>>();
}