Commit Graph

690 Commits

Author SHA1 Message Date
elon
8ea0f245d3 submodule update 2021-02-11 12:38:07 -05:00
elon
2d32434e5c adding latest ghoul 2021-02-10 15:57:22 -05:00
elon
92529fa6d4 merging master, conflicts 2021-02-10 11:33:01 -05:00
elon
0c005c05d1 an ok working state 2021-02-09 09:24:02 -05:00
Emma Broman
4a80b83df8 Update Ghoul repository 2021-02-09 13:37:25 +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
Emma Broman
57bc3f2222 Update ghoul repository 2021-02-04 13:25:17 +01:00
Alexander Bock
ff39e2630e Update Ghoul repository (closes #1471) 2021-02-01 14:20:55 +01:00
Alexander Bock
e50ca7aded Try a fix against random crashes at startup when loading configuration 2021-02-01 13:31:28 +01:00
Gene Payne
0b510edffd Updated ext/json to 3.9.1 to fix gcc10 build (#1456) 2021-01-19 10:37:16 +01:00
Alexander Bock
d23cfd1d03 Update Ghoul repository 2021-01-12 15:42:48 +01:00
Jonathas Costa
65803e134d Issue/1447 (#1451)
* Fixed missing calls to OpenGL cache system.
2021-01-12 10:28:49 +01:00
Alexander Bock
439808e259 Remove glm_cols and glm_rows function calls in favor of built-in GLM functions 2021-01-02 23:04:33 +01:00
Alexander Bock
1b46f2d429 Update Ghoul repository
- Fixes issue with Dictionary
 - Remove accidentally pushed screenshot folder
2021-01-02 21:10:54 +01:00
Alexander Bock
7004c02b86 Happy new year 2021-01-02 15:26:51 +01:00
Alexander Bock
067c0f4b27 Introduction of new Dictionary class (#1446)
* Adapting to introduction of new Dictionary class in Ghoul
 * Mainly replacing usage of float instead of doubles as expected
 * Adjust to the lack of the hasKeyAndValue function
2021-01-02 15:07:11 +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
86bb19d81c Feature/warnings (#1425)
* Remove MSVC, GCC, Clang compiler warnings
* Remove cppcheck warnings
2020-12-07 23:43:05 +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
33e7561122 Updated Ghoul repository 2020-11-16 15:59:15 +01:00
Alexander Bock
ef081d27aa Try to get the location of the sync folder from the OPENSPACE_SYNC environment variable first, before using the ${BASE}/sync
Update SGCT repository
2020-11-16 10:43:08 +01:00
Alexander Bock
1525a0490d Update SGCT and Ghoul repositories for bug fixes 2020-10-21 22:28:58 +02:00
Alexander Bock
9d3e181d38 Fix issue that makes swiftshader folder to appear over and over again 2020-10-20 22:54:05 +02:00
GPayne
37ac1466b4 Fix for crash if screenspace image load fails 2020-10-18 14:13:27 -06:00
Alexander Bock
0779c54a07 Provide correct error message if the ProfileName is empty
Don't include Voyager and Pioneer in the base asset as it takes too long to load
Ensure that the webgui asset can load without the dashboard
Fix scripting issue in Rosetta scene with trails
Fix issue with Dashboards that would actually render one line too far down causing trouble with multiline text
Set the render option for renderablebillboards to view direction by default as the normal mode has some issues (see #1342)
Set more sensible maximum value for RenderablePlanesCloud
Correctly show the number of significant digits in the altitude
Replace setPropertyValue with setPropertyValueSingle when clicking on the friction "buttons" on screen
Add a new script function hasProperty to check whether a property exits
2020-10-17 20:10:15 +02:00
Jonathas Costa
823bd872c2 Update Ghoul. 2020-10-16 09:28:28 -04:00
Alexander Bock
d0aaaeb090 Merge remote-tracking branch 'origin/master' into feature/profile-gui
# Conflicts:
#	data/profiles/apollo8.profile
#	data/profiles/apollo_sites.profile
#	data/profiles/asteroids.profile
#	data/profiles/dawn.profile
#	data/profiles/default.profile
#	data/profiles/default_full.profile
#	data/profiles/gaia.profile
#	data/profiles/insight.profile
#	data/profiles/juno.profile
#	data/profiles/mars.profile
#	data/profiles/messenger.profile
#	data/profiles/newhorizons.profile
#	data/profiles/osirisrex.profile
#	data/profiles/rosetta.profile
#	data/profiles/touch.profile
#	data/profiles/voyager.profile
2020-10-13 16:32:58 +02:00
Alexander Bock
9a030bd7db Update GLFW to 3.03
Remove some warnings
2020-10-10 16:29:12 +02:00
Alexander Bock
5b7679bab1 Feature/jenkins (#1317)
* Update Jenkinsfile
* Update submodules
2020-10-10 16:22:43 +02:00
Alexander Bock
e33498f8a6 Linux fixes clang (#1313)
* Changes to work on Linux.
* Bring back AA Trail Lines on Linux.
* Included new branch with correction in cfitsio library linking.
* Updated SGCT
* Changes to compile in Clang on Linux.

Authored-by: Jonathas <jon.costa@gmail.com>
Authored-by: Tom Schober <tom@tomschober.com>
2020-10-09 18:43:10 +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
98bfee301d Various Xcode compile fixes 2020-09-14 10:38:46 +02:00
Alexander Bock
5f0b00da8a Update Ghoul repository 2020-09-13 19:15:26 +02:00
Alexander Bock
a070a2ad8f Update Ghoul repository 2020-09-13 19:08:35 +02:00
Alexander Bock
463bb6b868 Update ghoul repository 2020-09-04 14:03:22 +02:00
Alexander Bock
b99a4c7390 Update submodules 2020-09-04 13:47:26 +02:00
Alexander Bock
83622ce339 Add some more profilng code
Update Ghoul repository
2020-08-21 11:16:37 +02:00
Alexander Bock
5aa2db2831 One more usecase of not creating a temporary std::string 2020-08-20 15:27:52 +02:00
Alexander Bock
015168f651 update submodules
No longer show log levels in log messages from SGCT twice
2020-08-20 14:52:27 +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
88b6fdd9fe Add more Tracy markers in different renderables 2020-08-18 12:58:40 +02:00
Alexander Bock
71415e3cdb Update Ghoul repository 2020-08-18 10:09:28 +02:00
Alexander Bock
4d9dda9a73 Merge remote-tracking branch 'origin/master' into feature/general-performance 2020-08-18 08:56:30 +02:00
Alexander Bock
f5eec4e97f Update Ghoul repository (closes #1278) 2020-08-17 22:28:17 +02:00
Alexander Bock
0f71f7b654 Update submodules 2020-08-17 21:35:22 +02:00
Alexander Bock
4f68f99c9d Remove dynamic memory allocation from TileMetaData 2020-08-13 15:37:00 +02:00
Alexander Bock
38eac377e8 Introduce the date library 2020-08-13 10:47:30 +02:00