mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-05 19:19:39 -06:00
e3f5b83f74
* Remove Escape keybind; move gui keybind to F2 * Clear up keybinds properly * Workaround for CEF focus bug * Add TODO comment * Guard against null ptr dereferencing * Remove shift tab * add additional keyboard mapping from glfw to cef * Change dashboards to make prototype for first user test * add mission added/removed event, disptached when a mission has been loaded/unloaded * send missions as map instaed of array, rename missionName -> name * Set keybind for toggling overlays to shift+f2 * Remove property for showing the title in the gui skybrowser module * Remove default setting for skybrowser * First implementation of setting the ui panel visibility from the launcher * Add profile topic * Coding style adjustment * Add markNodes to the profiletopic * Change format of additional data of options in engine * Address PR comments * map escape key from glfw to cef correctly * fix issue with "Enter" key not working on buttons and other input fields in CEF * Add test for new profile version * Send skybrowser data although we are outside the solar system * Update webgui to new ui * Add name to profile topic * Add cef variable to javascript context for when browser is in cef * Use camelcase for cef variable * Rewrite shortcuts topic to ActionKeybind and pass data in a better way (#3590) * Rewrite shortcuts topic to ActionKeybind and pass data in a better way * Fix strange error with file structure * Address PR comments * Address PR comments * Address PR comments * Make numbers in asset file prettier * Rename name to identifier for missions event * Clean up browser code * Update UI hash (to fix the actions panel not working) And update outdated comment. The backend is not part of this * Feature/notify meta data change (#3605) * Add notifyMetaDataChangeListener to topic * First round of clean up the data passing * Convert from string to json for metadata * Update additional data to json * Use nlohmann::json for additional data * Pass meta data in new structure to topics * Remove meta data method * Fix mistake in merge * Update src/properties/property.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * remove TODO comment that will be fixed by this PR * Address PR comments --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Emma Broman <emma.broman@liu.se> * Address PR comment * Remove function for setting the endpoint * Update frontend hash * Remove enabled property from exoplanets module * Remove enabled property from skybrowser module * Update default UI panels json * Remove setting of enabled properties for skybrowser and exoplanets * Update gui hash * Auto format json --------- Co-authored-by: Andreas Engberg <adde.engberg@gmail.com> Co-authored-by: Emma Broman <emma.broman@liu.se> Co-authored-by: Alexander Bock <alexander.bock@liu.se> Co-authored-by: Alexander Bock <mail@alexanderbock.eu> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
102 lines
4.2 KiB
CMake
102 lines
4.2 KiB
CMake
##########################################################################################
|
|
# #
|
|
# OpenSpace #
|
|
# #
|
|
# Copyright (c) 2014-2025 #
|
|
# #
|
|
# Permission is hereby granted, free of charge, to any person obtaining a copy of this #
|
|
# software and associated documentation files (the "Software"), to deal in the Software #
|
|
# without restriction, including without limitation the rights to use, copy, modify, #
|
|
# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to #
|
|
# permit persons to whom the Software is furnished to do so, subject to the following #
|
|
# conditions: #
|
|
# #
|
|
# The above copyright notice and this permission notice shall be included in all copies #
|
|
# or substantial portions of the Software. #
|
|
# #
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, #
|
|
# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A #
|
|
# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT #
|
|
# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF #
|
|
# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE #
|
|
# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #
|
|
##########################################################################################
|
|
|
|
include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
|
set(HEADER_FILES
|
|
servermodule.h
|
|
include/connection.h
|
|
include/connectionpool.h
|
|
include/jsonconverters.h
|
|
include/serverinterface.h
|
|
include/topics/actionkeybindtopic.h
|
|
include/topics/authorizationtopic.h
|
|
include/topics/bouncetopic.h
|
|
include/topics/camerapathtopic.h
|
|
include/topics/cameratopic.h
|
|
include/topics/documentationtopic.h
|
|
include/topics/enginemodetopic.h
|
|
include/topics/errorlogtopic.h
|
|
include/topics/eventtopic.h
|
|
include/topics/flightcontrollertopic.h
|
|
include/topics/getpropertytopic.h
|
|
include/topics/luascripttopic.h
|
|
include/topics/missiontopic.h
|
|
include/topics/profiletopic.h
|
|
include/topics/sessionrecordingtopic.h
|
|
include/topics/setpropertytopic.h
|
|
include/topics/subscriptiontopic.h
|
|
include/topics/timetopic.h
|
|
include/topics/skybrowsertopic.h
|
|
include/topics/topic.h
|
|
include/topics/triggerpropertytopic.h
|
|
include/topics/versiontopic.h
|
|
)
|
|
source_group("Header Files" FILES ${HEADER_FILES})
|
|
|
|
set(SOURCE_FILES
|
|
servermodule.cpp
|
|
src/connection.cpp
|
|
src/connectionpool.cpp
|
|
src/jsonconverters.cpp
|
|
src/serverinterface.cpp
|
|
src/topics/actionkeybindtopic.cpp
|
|
src/topics/authorizationtopic.cpp
|
|
src/topics/bouncetopic.cpp
|
|
src/topics/camerapathtopic.cpp
|
|
src/topics/cameratopic.cpp
|
|
src/topics/documentationtopic.cpp
|
|
src/topics/enginemodetopic.cpp
|
|
src/topics/errorlogtopic.cpp
|
|
src/topics/eventtopic.cpp
|
|
src/topics/flightcontrollertopic.cpp
|
|
src/topics/getpropertytopic.cpp
|
|
src/topics/luascripttopic.cpp
|
|
src/topics/missiontopic.cpp
|
|
src/topics/profiletopic.cpp
|
|
src/topics/sessionrecordingtopic.cpp
|
|
src/topics/setpropertytopic.cpp
|
|
src/topics/subscriptiontopic.cpp
|
|
src/topics/timetopic.cpp
|
|
src/topics/skybrowsertopic.cpp
|
|
src/topics/topic.cpp
|
|
src/topics/triggerpropertytopic.cpp
|
|
src/topics/versiontopic.cpp
|
|
)
|
|
source_group("Source Files" FILES ${SOURCE_FILES})
|
|
|
|
create_new_module(
|
|
"Server"
|
|
server_module
|
|
${HEADER_FILES} ${SOURCE_FILES}
|
|
)
|
|
|
|
target_precompile_headers(${server_module} PRIVATE
|
|
<modules/server/include/connection.h>
|
|
<modules/server/include/topics/topic.h>
|
|
<openspace/json.h>
|
|
<ghoul/misc/templatefactory.h>
|
|
)
|