Commit Graph

7235 Commits

Author SHA1 Message Date
Emma Broman cef3fb69f4 Some more cleanup 2020-08-28 16:59:23 +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
Emma Broman 08e5c42d24 Remove discovery methods code 2020-08-28 08:29:18 +02:00
Emma Broman 00814d07b1 Simplify shader and increase readability 2020-08-27 16:31:05 +02:00
Emma Broman 9e5251630a Clean up code and get it to run (using correct data files) 2020-08-27 16:30:03 +02:00
Emma Broman 9fac7fbd83 Untabify and start cleanup 2020-08-25 16:19:43 +02:00
Emma Broman 993be1b504 Make branch run with new master 2020-08-25 15:26:40 +02:00
Emma Broman 0ebe523bce Merge branch 'master' into thesis/2018/exoplanets 2020-08-25 13:40:33 +02:00
Emma Broman 19c110a4c2 Update gui hash 2020-08-25 13:08:54 +02:00
Emma Broman 329798fa74 Merge pull request #1289 from OpenSpace/issue/1174
Delta time steps server code cleanup
2020-08-25 11:06:55 +02:00
Emma Broman 63a61b3cba Tiny cleanup (const is good) 2020-08-25 11:04:14 +02:00
Emma Broman fe13ff7e48 Some cleanup 2020-08-25 10:42:41 +02:00
Emma Broman 64b23e172a Include delta time steps in time topic
In case anyone wants to create a GUI that contains the delta time steps
2020-08-25 10:11:58 +02:00
Emma Broman 157df5ff93 Clean-up: Include delta time steps in time topic 2020-08-25 08:55:30 +02:00
Alexander Bock 3b786c0bb8 Merge pull request #1282 from OpenSpace/issue/1174
Issue/1174 - step between delta time steps using GUI or keybindings
2020-08-24 14:17:30 +02:00
Alexander Bock 96625b8467 Merge pull request #1286 from OpenSpace/issue/1189
Add text to the render window if Tracy is enabled
2020-08-24 13:58:58 +02:00
Alexander Bock dad5b8fb10 Merge branch 'master' into issue/1189
# Conflicts:
#	CMakeLists.txt
2020-08-24 13:58:42 +02:00
Alexander Bock a95b332441 Merge pull request #1280 from OpenSpace/feature/remove-asset-request
Feature/remove asset request
2020-08-24 13:54:04 +02:00
Emma Broman 08b42f32de Add a couple of test cases for delta time steps in profile 2020-08-24 11:32:32 +02:00
Emma Broman f8a31d11cc Cleanup 2020-08-24 11:32:32 +02:00
Emma Broman 6475b1154d Update some documentation for interpolating functions 2020-08-24 11:32:32 +02:00
Emma Broman 43a628e321 Add negative versions of the time steps per default and remove duplicates 2020-08-24 11:32:32 +02:00
Emma Broman 7692180bad Verify values on input and save delta times to profile when saving settings 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
Gene Payne 0756bcb3c8 Fixed a missing tab in jupiter-family_comet asset entry 2020-08-21 09:20:11 -06:00
Emma Broman 0b34e32ba7 Fix bug with marked interesting nodes not showing up in GUI 2020-08-21 14:30:13 +02:00
Alexander Bock 8ea467b6a2 Actually remove VLD 2020-08-20 15:18:38 +02:00
Alexander Bock 8730b721f4 Remove unused vTune code
Remove unused VLD code
2020-08-20 15:17:12 +02:00
Alexander Bock 7f6e4a3447 Add text to the render window if Tracy is enabled 2020-08-18 01:01:25 +02:00
Alexander Bock 0068ae111d No longer expose the request function on the asset object but still retain it for the add functionality 2020-08-18 00:30:12 +02:00
Alexander Bock df803af68a Replace request and requestAll with require and requireAll 2020-08-18 00:19:01 +02:00
Alexander Bock 52a2442f06 Merge pull request #1276 from OpenSpace/feature/continuous-orbital-navigation
adding option to not reset velocity on anchor change
2020-08-17 22:50:54 +02:00
Alexander Bock a6d8d0e735 Small coding style fixes 2020-08-17 22:50:27 +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
Micah edb7d9ba1d adding option to not reset velocity on anchor change 2020-08-13 20:16:46 -04:00
Alexander Bock db65ef0363 Merge pull request #1271 from OpenSpace/feature/stringview
Feature/stringview
2020-08-10 15:59:24 +02:00
Alexander Bock e04fd0e132 Update SGCT repository 2020-08-10 15:58:59 +02:00
Alexander Bock e3699a43a8 Update Ghoul and SGCT
Adapt to changes by using more string_view
2020-08-09 20:11:40 +02:00
Alexander Bock 968080abc4 Compile fix for Visual Studio 2019.7 2020-08-09 11:47:37 +02:00
Alexander Bock dc5e2fb3a6 Merge pull request #1270 from OpenSpace/feature/memory-allocations
* Add MemoryManager to handle centralized memory
 * Create SceneGraphNodes, Renderable, and transformations in the new MemoryPool
 * Remove dynamic memory allocations throughout the codebase
 * Move the error message hack outside the scene render loop
2020-08-07 15:48:25 +02:00
Alexander Bock a553f3eeff Remove optimization pragma 2020-08-07 15:46:34 +02:00
Alexander Bock ca728a2f35 Remove some dynamic memory allocation from deferred atmosphere caster 2020-08-07 15:03:27 +02:00
Alexander Bock d93be0f78d Small improvements in time conversion 2020-08-07 10:54:35 +02:00
Micah 7ecf77dc38 fix a bug in rawtilereader causing less map layers to be read 2020-08-06 16:58:40 -04:00
Alexander Bock d39d4a91ec Move error message hack outside of scene render loop
Use std::string_view instead of std::string in more places
2020-08-06 16:02:45 +02:00
Alexander Bock 65546d9863 Merge remote-tracking branch 'origin/master' into feature/memory-allocations 2020-08-06 13:59:35 +02:00
aniisaaden 17702c2129 Fixed include for Visual Studio Version 16.7.0 2020-08-06 13:36:08 +02:00