Commit Graph

6446 Commits

Author SHA1 Message Date
Alexander Bock
8ce9fde91b Enable the user to specify a custom temporary folder to keep the OS's temp folder clean
Change the configuration file to point the temp folder into the OpenSpace folder
Update Ghoul to not overwrite default font files (closes #944)
2019-08-22 15:37:08 +02:00
Alexander Bock
d32b4d9f1f Update Ghoul to fix the commandline parsing (closes #950) 2019-08-22 14:34:45 +02:00
Emil Axelsson
3fd6cd5ae6 Update webgui 2019-08-22 13:55:06 +02:00
Emil Axelsson
13cb950480 Fix bug with camera following anchor node 2019-08-22 10:29:03 +02:00
Alexander Bock
0f36cf0dd4 Always add transformation property owners, even if the defaults are not overwritten 2019-08-22 09:52:35 +02:00
Alexander Bock
5675a495b0 GCC compile fix 2019-08-22 09:39:01 +02:00
Alexander Bock
21d799dd29 Force an even number of vertices for the RenderableSpheres (closes #957) 2019-08-22 09:31:07 +02:00
Alexander Bock
dd76a9bd7b Improve information presented for current frame number in stereo mode and when swap groups are used 2019-08-21 15:57:29 +02:00
Alexander Bock
2806935c64 Merge pull request #943 from OpenSpace/feature/hdrOS
HDR Rendering Branch
2019-08-20 02:05:42 -06:00
Alexander Bock
ed6082aace Some smaller fixes 2019-08-20 10:04:20 +02:00
Alexander Bock
223d6a8903 Hide error in webgui deinitialization 2019-08-20 09:31:07 +02:00
Alexander Bock
f09f79f6c9 Upload "fix" for globebrowsing stuttering 2019-08-19 17:53:49 +02:00
Alexander Bock
194db41b81 Merge pull request #949 from OpenSpace/feature/cancel-rotation-interpolation
Cancel follow anchor node rotation interpolation when the anchor is changed
2019-08-19 03:47:44 -06:00
Alexander Bock
3097ea28a8 Small coding style fix 2019-08-19 11:47:34 +02:00
Alexander Bock
d8ae62dfa3 Merge pull request #951 from OpenSpace/feature/satellitesgroupednodes
Pull code from 2019 space debris thesis into Master
2019-08-19 03:45:30 -06:00
Alexander Bock
ac867c4e9e Some rudimentary cleanup 2019-08-19 11:35:48 +02:00
Alexander Bock
d825b3d008 Restore original colors for the satellites 2019-08-19 11:34:17 +02:00
Gene Payne
1fbeb00646 Change AssetLoader unloadAsset to clear init/deinitialization functions for only one asset. (#953) 2019-08-19 02:01:32 -06:00
Jonathas Costa
701afc7daf Fixed bug causing atm leaking. 2019-08-18 11:50:22 -04:00
GPayne
ab873cd699 Merge branch 'feature/satellitesgroupednodes' of https://github.com/OpenSpace/OpenSpace into feature/satellitesgroupednodes 2019-08-16 17:32:59 -06:00
GPayne
bb335d37b4 Fix for crashing when removing the final satellite asset 2019-08-16 17:22:50 -06:00
Gene Payne
b7d12bb6d4 Fixed indents 2019-08-15 16:17:46 -06:00
GPayne
7e6a9b71fa Changed to standard position method for renderablesatellites 2019-08-15 16:13:41 -06:00
Jonathas Costa
a1bc6d585d Disable GL checking. 2019-08-15 17:09:45 -04:00
Jonathas Costa
f69545a4d7 Added HDR bypass. 2019-08-15 17:07:25 -04:00
Jonathas Costa
c0f48664dc Merge branch 'master' into feature/hdrOS 2019-08-15 16:28:15 -04:00
Jonathas Costa
93e4500211 Added back files removed. 2019-08-15 16:27:54 -04:00
Jonathas Costa
19a321e9a8 Move back to old glare texture for the Sun. 2019-08-15 16:18:17 -04:00
Jonathas Costa
a713403a09 Removed interpolation from ATM. 2019-08-15 16:15:32 -04:00
Jonathas Costa
8a66c0d3ee Added flag for disable LDR to HDR for true HDR color values. 2019-08-15 14:46:44 -04:00
Jonathas Costa
312cbab3b5 Fixed scale for hue. 2019-08-15 14:36:04 -04:00
Jonathas Costa
17d43d4c93 Removed unsused TMOs. Removed unused sliders and adjusted to default position others. 2019-08-15 14:23:14 -04:00
GPayne
e60c77b415 Added graceful exit and logging for case of missing or corrupt TLE file, and removed some commented-out code. 2019-08-15 10:21:57 -06:00
GPayne
c01e59635c Restored ability to change trail colors in satellite asset files. 2019-08-15 08:51:18 -06:00
GPayne
da890474ee Changing default trail color in satellite asset files. 2019-08-15 08:43:01 -06:00
Emil Axelsson
729bb18975 Fix typo leading to strange (currently unused) rotation value 2019-08-15 11:32:24 +02:00
GPayne
b99389ae30 Fixed problem with satellite trails rendered at a time prior to TLE epoch. Also debris added shader files to CMake file for space module. 2019-08-14 16:07:14 -06:00
GPayne
b87370c1e5 Corrected syntax in satellites scene file. 2019-08-13 16:15:13 -06:00
GPayne
39f4dc33cb Initial pass of merging satellite debris into master and switching satellites to use grouped scenegraphnodes. 2019-08-13 15:39:06 -06:00
Emil Axelsson
e06993332c Cancel follow anchor node rotation interpolation when the anchor is changed 2019-08-13 18:35:22 +02:00
GPayne
ba07837865 Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes 2019-08-13 09:56:51 -06:00
Emil Axelsson
188dffc63c Fix rendering bugs: White displaying as black. Overlay bin rendering invisible if odd numbers of atmospheres are rendered. 2019-08-13 15:10:28 +02:00
Emil Axelsson
1cba7e1d88 Render trails last 2019-08-13 11:57:08 +02:00
Emil Axelsson
904811f60d Small cleanup 2019-08-13 11:28:33 +02:00
Emil Axelsson
137e012cd1 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/hdrOS 2019-08-13 08:52:07 +02:00
Emil Axelsson
4ab094e681 Fix camera jump when switching anchor when time is progressing 2019-08-13 08:50:58 +02:00
Gene Payne
dc45be045b Added a check to prevent buffer sync buffer overflow, and expand buff… (#937)
* Added a check to prevent buffer sync buffer overflow, and expand buffer size if needed.

* Removed unnecessary asserts and added sync buffer overflow check to encode template
2019-08-12 13:25:56 -06:00
Emil Axelsson
798ba573cf Quick fix for startup issue on mac 2019-08-12 18:07:44 +02:00
Jonathas Costa
3a0b5f0c15 Changed rendering order back for orbits and other improvements. 2019-08-01 12:20:36 -04:00
Jonathas Costa
482631aa54 Fixed failed merging of master. 2019-07-31 15:05:52 -04:00