mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,700 Commits 99 Branches 46 Tags
feature/streaming
Commit Graph

724 Commits

Author SHA1 Message Date
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
60e3ed2170 General pass for coding style 2020-11-28 22:31:06 +01: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
Emma Broman
7e34e1b1d8 Resolve merge conflict 2020-10-12 09:30:51 +02:00
Emma Broman
bf49ad76f2 Cleanup 2020-10-12 09:15:07 +02:00
Emma Broman
887fe5572d Merge pull request #1302 from OpenSpace/issue/1285 
Issue/1285 - Add delta time steps to profiles and generate keybindings for number keys
 2020-10-12 08:35:36 +02:00
Micah
d524ecf803 Merge branch 'master' into feature/profile-gui 2020-10-09 19:40:46 -04:00
Alexander Bock
de97a5520a Merge branch 'master' into feature/session-recording-improvements 
# Conflicts:
#	include/openspace/network/messagestructures.h
#	src/interaction/sessionrecording.cpp
 2020-10-09 22:10:40 +02:00
Emma Broman
f168e97796 Add delta times to new defualt profile (json) 2020-10-09 19:02:49 +02:00
Emma Broman
ec1fbb09f8 Warn if multiple keys are bound to a key on removal 2020-10-09 18:52:38 +02:00
Emma Broman
37c45a10b6 Cleanup 2020-10-09 18:16:48 +02:00
Emma Broman
4d6fb59ea5 Add helper function to convert from ICRS to galactic coords 
Also includes creating a util file for coordinate conversions
 2020-10-09 12:48:16 +02:00
GPayne
fff9a32d97 Merge branch 'master' into feature/profile-gui 2020-10-01 21:07:46 -06:00
Emma Broman
193923e33b Merge branch 'master' into thesis/2018/exoplanets 2020-09-23 09:56:41 +02:00
Emma Broman
07520cd270 Clean up includes 2020-09-21 13:49:36 +02:00
Emma Broman
64a09b50c3 Reset keybindings when delta times are changed 2020-09-21 13:37:31 +02:00
Emma Broman
5d895dd266 Add keybindings for delta time steps 2020-09-21 13:37:25 +02:00
Alexander Bock
98bfee301d Various Xcode compile fixes 2020-09-14 10:38:46 +02:00
GPayne
3a25ae79bc Changes to replace temp structs with openspace lib structs 2020-09-11 15:06:12 -06:00
Emma Broman
2aa31abe45 Merge branch 'master' into thesis/2018/exoplanets 2020-09-11 13:43:01 +02:00
Jonathas Costa
9b8f2a8efc Added missing header to fix compilation on Linux. 2020-09-08 11:07:51 -04:00
Alexander Bock
af6e15da40 Merge remote-tracking branch 'origin/master' into feature/openglstatecache 
# Conflicts:
#	ext/ghoul
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	src/util/screenlog.cpp
 2020-09-04 14:02:17 +02:00
Emma Broman
99720d95ca Helper file for exoplanet data structure and replace magic numbers with constants 2020-08-28 16:31:48 +02:00
Alexander Bock
2cca451898 Coding style adaptations 
Adapt to changes in Ghoul
 2020-08-25 13:47:03 +02:00
Jonathas Costa
25cd3fdc0b Merged master again. 2020-08-24 13:44:26 -04:00
Alexander Bock
95db615dab Merge branch 'master' into feature/general-performance 2020-08-24 15:09:45 +02:00
Emma Broman
f8a31d11cc Cleanup 2020-08-24 11:32:32 +02:00
Emma Broman
a636faeaac Add option to immediately set delta time step, without interpolation 2020-08-24 11:32:32 +02:00
Emma Broman
4293fad3e9 Add server topic for delta times and send data to GUI 2020-08-24 11:32:31 +02:00
Emma Broman
457dabe9b7 Add list of delta time steps, stepping functions and keybindings 2020-08-24 11:32:31 +02:00
Alexander Bock
f1b05c23e7 Prevent Stack corruption 2020-08-21 15:40:52 +02:00
Jonathas Costa
f0c397d6be Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet). 2020-08-20 15:34:40 -04:00
Alexander Bock
1547609dad Remove dynamic memory allocations from the quantize function 2020-08-20 14:15:13 +02:00
Alexander Bock
dc63946fef Expose the const char* functionality for Spice to prevent unnecessary string creation 2020-08-20 11:08:49 +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
2621e16ec4 Pass the format string for the ephemeris conversion as a string_view to prevent an extra memory allocation 2020-08-19 11:12:45 +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
5091fa7ddb Using a fixed number of chunktiles in the chunktilepile as they number has to be 1 or 3 2020-08-13 17:50:22 +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
38eac377e8 Introduce the date library 2020-08-13 10:47:30 +02:00
Alexander Bock
b78d1dd033 Merge branch 'master' into feature/memory-allocations 
# Conflicts:
#	include/openspace/scene/scenegraphnode.h
#	modules/imgui/include/gui.h
 2020-08-05 19:06:04 +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
696bc31861 Moving over more allocations to the memory pool 2020-08-05 11:19:09 +02:00
Alexander Bock
25247c7a37 Create SceneGraphNodes in memory pool 2020-08-05 10:46:16 +02:00
Alexander Bock
e783807d66 Next step towards enabling a managed memory version of templatefactory 2020-08-04 21:56:39 +02:00
Alexander Bock
c3cb10453b Intermediate commit 2020-08-04 01:11:00 +02:00
GPayne
1c108f99d3 Merged master into branch 2020-06-30 16:22:15 -06:00
Alexander Bock
3a1bec6e7d Merge branch 'master' into feature/license 2020-06-12 17:36:31 +02:00
Alexander Bock
f7170a9506 Turn the scaling transformation into providing three scaling factors (x, y, z) 
Add NonUniformStaticScale class to provide independent scaling factors (closes #1151)
 2020-05-12 15:27:24 +02:00