Commit Graph

743 Commits

Author SHA1 Message Date
Emma Broman 16173d7afe Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts
# Conflicts:
#	modules/globebrowsing/globebrowsingmodule.cpp
#	modules/globebrowsing/globebrowsingmodule_lua.inl
2021-07-09 15:43:17 +02:00
Alexander Bock 724ad5b553 Reduce fontsize of shutdown warning and center it instead with a dimming of the rendering (#1675)
* Reduce fontsize of shutdown warning and center it instead with a dimming of the rendering
2021-07-03 19:00:12 +02:00
Alexander Bock 87da9a27ab Feature/path normalization (#1674)
* Path normalization (making sure there are fewer cases of '"..."'
* Using more std::filesystem::path instead of std::string
* Update Ghoul
2021-07-01 23:46:22 +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 741ed2ac05 Remove remnant of scriptlogtype in log message 2021-06-18 09:16:15 +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 4c80577d4b Rename PerSceneCache to PerProfileCache and make it work again (closes #1577)
Breaking change in openspace.cfg file:   PerSceneCache -> PerProfileCache
2021-05-05 16:14:00 +02:00
Alexander Bock 2aa540a112 Feature/interactionsphere (#1561)
* Add ability to render the bounding sphere as a debug option
* Separate boundingsphere and interactionspheres
* Correctly compute BoundingSpheres for more renderables (RenderablePlanesCloud, RenderableOrbitalKepler)
2021-04-26 13:13:36 +02:00
Alexander Bock dfc42e9467 Rename createSingeColorImage -> createSingleColorImage 2021-03-22 23:17:42 +01:00
Micah 2158dd585c creating user directories if not existing; 2021-03-04 16:00:34 -05: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 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
Emma Broman 0b9b42e0bf Rename single color image function 2021-02-03 08:33:55 +01:00
Emma Broman 4834851320 Merge branch 'master' into issue/1395 and resolve conflict 2021-01-07 11:01:20 +01:00
Alexander Bock 7004c02b86 Happy new year 2021-01-02 15:26:51 +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
Emma Broman e525c55ecf Update data files and generate habitable zone texture on demand 2020-12-14 18:46:28 +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 60e3ed2170 General pass for coding style 2020-11-28 22:31:06 +01:00
Alexander Bock 8d7300a242 Add the ability to change the screenshot folder at runtime (#1172) 2020-11-16 14:22:56 +01:00
Alexander Bock efffc25ce0 Feature/globals handling (#1352)
* Cleaner handling of global state
* Prevent Lua memory corruption (closes #982)
* Initialize glfw first thing to prevent weird joystick loading bug during startup
2020-10-21 22:30:05 +02:00
Alexander Bock c6a0f07567 Reintroduce second update function (closes #1296) 2020-10-09 19:26:26 +02:00
Alexander Bock 50a456b87f Issue/1299 (#1312)
Change profile file format from a custom one to JSON
2020-10-09 17:32:30 +02:00
Alexander Bock 00a00c9cc8 Merge branch 'master' into feature/general-performance
# Conflicts:
#	apps/OpenSpace/main.cpp
#	modules/server/src/topics/timetopic.cpp
2020-09-04 13:49:00 +02:00
Alexander Bock d0508be631 First commit 2020-08-30 22:00:13 +02:00
Alexander Bock 15e6b5519f Making the documentation generation a bit more performant
Outsource the file writing to a second thread to start the rendering earlier
2020-08-21 14:10:33 +02:00
Alexander Bock 1f2a97d7fd Merge branch 'master' into feature/general-performance 2020-08-20 15:20:05 +02:00
Alexander Bock 8ea467b6a2 Actually remove VLD 2020-08-20 15:18:38 +02:00
Alexander Bock e93f1833be Make more use of temporary string objects in the TimeQuantizer
Add GPU markers to the rendering
2020-08-19 18:26:11 +02:00
Alexander Bock 6ac5d536fa Update Ghoul repository
Adapt to Ghoul changes in MemoryPool
2020-08-19 16:19:25 +02:00
Alexander Bock b16ee5b35a Adapt to changes in Ghoul regarding string_view
Fix compile error if Trace logging is not enabled
Limit the number of threads to a maximum of 4 for asset initialization
2020-08-18 10:07:38 +02:00
Alexander Bock cabb962f6a Use temporary memory arena to create unsorted list of tiles, preventing dynamic memory allocations 2020-08-13 16:48:18 +02:00
Alexander Bock d97c96d144 Don't update the scene twice on the master 2020-08-11 11:44:02 +02:00
Alexander Bock 6e9db78f40 Remove performance measurements that have been supersceded by using Tracy 2020-08-05 18:28:08 +02:00
Alexander Bock 96b775d939 Merge branch 'master' into feature/profiles
# Conflicts:
#	data/assets/asteroids.scene
2020-07-07 12:59:52 +02:00
Alexander Bock ea95054bd2 Add the ability to render out the current recording time during a session recording 2020-07-02 16:37:11 +02:00
Alexander Bock fbd903b4ff Move profiles to their own folder 2020-06-22 09:33:00 +02:00
Alexander Bock 4c9555425b Cleanup of asset handling and move more functionality to the Profile 2020-06-18 23:09:26 +02:00
Alexander Bock b59b6cc2d2 Yet more cleanup 2020-06-18 19:40:16 +02:00
Alexander Bock 5bad314b0c Removing the last remnants of ProfileFile 2020-06-18 14:29:36 +02:00
Alexander Bock e00a51d822 Removing some more global state 2020-06-18 10:59:22 +02:00
Alexander Bock 1e9df1cb4b Merge branch 'master' into feature/profiles
# Conflicts:
#	include/openspace/scene/assetloader.h
#	src/scene/assetloader.cpp
2020-06-14 17:54:25 +02:00
Alexander Bock 3a1bec6e7d Merge branch 'master' into feature/license 2020-06-12 17:36:31 +02:00
Alexander Bock 433d96bbb4 SGCT compile fix
First pass for pull request
2020-06-11 00:24:58 +02:00
GPayne 0f06f9d233 Merge branch 'master' into feature/profiles 2020-05-14 19:31:19 -06:00
GPayne dfb61097b2 Finished testing new save-settings-to-profile feature 2020-05-14 13:20:05 -06:00
Alexander Bock 3b427bfd15 Cleaning up window delegate 2020-05-10 15:17:51 +02:00