Commit Graph

512 Commits

Author SHA1 Message Date
Alexander Bock
db472030de GCC warnings (#1725) 2021-08-21 11:42:44 +02:00
Alexander Bock
4fea3d8019 Explicitly request the Qt version 2021-08-20 16:30:27 +02:00
Malin E
e0312d32e8 Add support for Qt6 2021-08-20 15:41:01 +02:00
Alexander Bock
34985f64a6 Feature/keybindings (#1708)
* Add action manager to handle actions in replacement of keyboard shortcuts
* Implement new Action concept
* Remove the shortcutscomponent as it is no longer needed
* Update profile version from 1.0 to 1.1
* Add action dialog
* Restructure of key specification in keys.h
* Remove solid field-of-view keybind from the newhorizons profile as the setting no longer exists
2021-08-18 10:58:20 +02:00
Emma Broman
bfe25c311b Merge branch 'master' into thesis/2019/camera-paths
# Conflicts:
#	src/rendering/abufferrenderer.cpp
2021-08-09 15:21:08 +02:00
Micah
88708e3bf4 fixed an issue when loading specified SGCT config files; issue/1624 2021-08-03 15:44:03 -04:00
Gene Payne
d7d3ad93c8 Merge pull request #1698 from OpenSpace/issue/1461
Added warning to keybinding editor for duplicate assignments
2021-07-30 14:42:18 -06:00
GPayne
f035ba57f8 Added casts to prevent conversion warnings 2021-07-30 14:37:49 -06:00
GPayne
e2c13b399d Added warning to keybinding editor for duplicate assignments 2021-07-28 23:41:24 -06:00
Alexander Bock
5f139b8144 Tune the look of the asset dialog 2021-07-27 14:14:19 +02:00
Alexander Bock
05c577bd3d Filter out non-image files from the launcher collection (closes #1693) 2021-07-22 21:19:35 +02:00
Emma Broman
fb690e87ee Add a missing include needed for building 2021-06-23 17:24:35 +02:00
Emma Broman
8063b54fb8 Merge branch 'master' into thesis/2019/camera-paths
# Conflicts:
#	src/navigation/navigationhandler.cpp
2021-06-23 16:31:14 +02:00
Emma Broman
77bdfaefd6 Move camera path code into core and refactor navigation code a bit 2021-06-23 09:12:36 +02:00
Alexander Bock
ff920f73b7 Fix issue that would prevent opening of the first distributed profile in the editor 2021-06-17 09:47:27 +02:00
Alexander Bock
404fc3f9bf Fix issue with not being able to include sgct anymore with Visual Studio 16.10 2021-05-31 15:46:05 +02:00
Micah Acinapura
48f3f14e8a fix for user customized SGCTConfig in .cfg file 2021-05-30 20:27:01 -04:00
Malin Ejdbo
a36ac1ee2f Prevent Add and Remove button to be disabled when selecting an item in list
in Launcher UI
2021-05-28 15:15:27 +02:00
Alexander Bock
6cf6e450fb Address MacOS compile issues, make ISS model scene graph node visible 2021-05-25 17:50:31 +02:00
Alexander Bock
b9a8ec93de Update Ghoul version 2021-05-18 14:19:54 +02:00
Alexander Bock
92432caed2 Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string 2021-05-17 00:23:15 +02:00
Alexander Bock
ccdc5a5dc3 Feature/filesystem cleanup (#1587)
* Adapting to the changes in Ghoul
* First step of moving filesystem functions to std
* Remove persistence flag from cachemanager
2021-05-16 20:26:49 +02:00
Alexander Bock
f74bf97513 Update SGCT repository (closes #1437), VAO hygiene for RenderablePlane 2021-05-08 16:57:08 +02:00
Alexander Bock
b016317fc2 Add a scriptlog dialog field to the additional scripts box 2021-04-27 09:58:25 +02:00
Alexander Bock
fd17f51959 Fix Taskrunner compile error (closes #1554) 2021-04-16 13:11:33 +02:00
Alexander Bock
d9a1a0233b Remove apple clang warnings 2021-03-30 22:12:53 +02:00
Alexander Bock
4b25f5c074 Move default_dashboard asset from util folder to new dashboard folder that also includes the individual dashboard items 2021-03-24 09:57:27 +01:00
Alexander Bock
0d82e1848f Feature/configuration codegen (#1544)
Convert configuration document over to codegen
2021-03-23 15:22:29 +01:00
Micah Acinapura
48e2f35aa1 added dialog for choosing scripts from the script log (#1539)
* added dialog for choosing scripts from the script log
2021-03-23 08:56:23 -04:00
Alexander Bock
c7f77e3286 Add property to determine whether the date should be added to the screenshot folder (#1535)
closes #1528
2021-03-22 15:49:30 +01:00
Alexander Bock
615fc82b51 Update submodules
- SGCT:  Fixed an issue that lead to a crash in debug mode
 - Ghoul: Fixed an issue that prevented CEF locales to be copied in a fresh install
2021-03-15 14:50:39 +01:00
Micah
2158dd585c creating user directories if not existing; 2021-03-04 16:00:34 -05:00
Emma Broman
b1e03c2b3b Revert "Fix problem with launcher not working..." as it did not actually solve the problem
This reverts commit f4cbadd822.
2021-03-03 08:20:02 +01:00
Emma Broman
f4cbadd822 Fix problem with launcher not working if user profile folder doesn't exist 2021-03-02 08:52:37 +01:00
Micah Acinapura
eec6b15781 Feature/user profiles assets (#1496)
* added user profile/asset tokens to config, launcher and profile editor


* creating one user directory for data, config, screenshots, recordings
2021-03-02 01:36:32 -05:00
Alexander Bock
cf3a8cd9b5 Fix crash in TaskRunner and Wormhole due to missing initialization of the LogManager 2021-02-23 09:51:46 +01:00
Alexander Bock
23f24c50fe Update Ghoul and remove explicit generation of ConsoleLog 2021-02-13 18:33:28 +01:00
Alexander Bock
548d673e8b Add drag and drop support for images and assets (#1497) 2021-02-11 13:43:36 +01:00
Alexander Bock
6d821d4f91 Feature/codegen (#1480)
* Add the ability to automatically generate code to extract values out of a Dictionary (see https://github.com/openspace/codegen for more information on how to use this)
* Applied this technique to a large number of cases in the codebase
* Don't add _codegen files to the repository

Co-authored-by: Emma Broman <emma.broman@liu.se>
2021-02-09 09:12:43 +01:00
Alexander Bock
43a333f48e Bring Tracy back to live (currently, the Launcher has to be bypassed because Qt is doing something strange 2021-02-05 10:12:51 +01:00
Alexander Bock
595d23ec75 Fix issue where the CEF libraries would not be copied to the bin folder 2021-01-12 11:26:00 +01:00
Alexander Bock
7004c02b86 Happy new year 2021-01-02 15:26:51 +01:00
Alexander Bock
7bf7a25401 Updated submodules (#1444)
* Update submodules
 - Ghoul
   - assimp (5.0.0 -> 5.0.1)
   - catch2 (2.11.1 -> 2.13.3)
   - fmt (7.0.3 -> 7.1.3)
   - freetype2 (2.10.1 -> 2.10.4)
   - glbinding (3.1 -> 3.2)
   - glm (0.9.9.5 -> 0.9.9.8)
   - websocketpp (0.7.x -> 0.8.2)
 - SGCT
   - fmt (7.0.3 -> 7.1.3)
   - freetype (2.9.1 -> 2.10.4)
   - GLM (0.9.9.6 -> 0.9.9.8)
* Update to new include external definition
* Remove warning about no eof newline
2020-12-29 13:44:57 +01:00
Alexander Bock
ad8af3ffeb Feature/CMake (#1443)
General CMake cleanup/overhaul
* Enable precompiled headers for all projects
* Move specifications itto separate CMakeLists files
  * Add openspace-core as a subdirectory
  * Move handle_modules functionality into modules/CMakeLists.txt
  * Move handleapplications logic into apps/CMakeLists.txt
* Introduce openspace-module-collection interface library to simplify inclusion of modules in applications
* Turn module initialization into a two-step process to adapt to the new minimal dependency scenario
* Compile time speedup
  * Remove circular dependencies between modules and core preventing multithreaded compilation on MSVC
  * Build Spice multithreaded and as static library
  * Remove dependency from core to module-webbrowser
  * Remove unused dependency from kameleon
  * Remove additional unnecessary dependencies
  * Cleanup volume/kameleon/kameleonvolume modules
  * Fix visibility issues. Restrict include paths
  * Compile kameleon in parallel
* Other cleanup
  * Only copy CEF files from one target (hard-coded to OpenSpace right now)
  * Remove unused instrumentation code
  * Remove the ability to render AABB for globes as it caused a circular dependency between GlobeBrowsing and Debugging
  * Removing compiler and cppcheck warnings
  * Turn almost all includes into non-system includes
  * Don't warn on deprecrated copy
* Updated submodules
2020-12-28 18:26:57 +01:00
Alexander Bock
184d940944 A bit more code cleanup 2020-12-08 16:37:25 +01:00
Alexander Bock
86bb19d81c Feature/warnings (#1425)
* Remove MSVC, GCC, Clang compiler warnings
* Remove cppcheck warnings
2020-12-07 23:43:05 +01:00
Alexander Bock
51470c0a0d Issue/1355 (#1424)
* Move glfw init after macOS window is ready
* MacOS fixes for BigSur
* Compile fixs
* Rename hirise.asset since linux filenames are case-sensitive
* Modified globals DataStorage method to make Linux and Mac happy
* Switched to unsecure http URLs for satellites due to httprequest problem
* Keep the QApplication around on Mac because of some reason otherwise the keyboard handler crashes
* Add comment explaining the madness
* Apply same techniques to the globalscallback file

Co-authored-by: Micah Acinapura <micahnyc@gmail.com>
Co-authored-by: Gene Payne <payne.gene@gmail.com>
2020-12-07 23:41:20 +01:00
Alexander Bock
f4831b0c03 Feature/jenkins (#1419)
* Add ability to toggle operating system builds on Jenkins via environment variables
* Update ghoul repository
* Update SGCT repository
* Reduce chattiness of the Jenkins log file
* Build native and ninja builds in parallel
* Disable ninja build on Windows as it fails with the OpenSpace Helper
2020-12-02 21:11:46 +01:00
Alexander Bock
60e3ed2170 General pass for coding style 2020-11-28 22:31:06 +01:00
Alexander Bock
c39b57378b Adapt the taskrunner to the new global mechanism (closes #1404) 2020-11-25 16:51:59 +01:00