Commit Graph

6617 Commits

Author SHA1 Message Date
eriksunden 9a1a3e397b PointCloud data rendered and location for volume and pc seems to be correct (need some cleanup). PSFtexture for billboards next thing. 2019-08-14 14:59:58 +02: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
eriksunden 9892adca36 Merge branch 'master' into feature/milkyway-galaxy 2019-08-05 12:09:13 +02:00
eriksunden 320a213a7b Minor shader compile fix 2019-08-05 12:05:28 +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
Alexander Bock 87ce1925b9 Fixing issue displaying negative numbers when download sizes are bigger than 2 GB (closes #925) 2019-07-31 11:46:20 +02:00
Alexander Bock c7c8375ca0 Coding style fixes 2019-07-31 11:13:29 +02:00
Alexander Bock f2a0cb18b0 Feature/websocketnavigation (#882)
* Upgrade JSON Library
* Added support for navigation based on websocket communication
2019-07-31 11:07:25 +02:00
Alexander Bock 0e1bc9950d Update SGCT to fix contrast/brightness issue 2019-07-31 10:12:33 +02:00
Alexander Bock 566fe7f434 Adding documentation to RenderableGlobe and layers (closes #651)
Fix mars after detecting that identifiers were missing
2019-07-30 17:48:43 +02:00
Alexander Bock 0426367572 Allow the user to abort the loading screen through ESC (closes #668) 2019-07-30 15:22:31 +02:00
Alexander Bock fbeec151db Set correct interaction sensitivity factor when adjusting joystick sensitivity (closes #815) 2019-07-30 15:01:34 +02:00
Alexander Bock 4a070c939f Add the ability to query and rearrange globebrowsing layers at runtime 2019-07-30 14:28:23 +02:00
Alexander Bock f7fafa5255 Add scripts to manipulate the camera
Add example asset using the new scripts for an IPAC
2019-07-29 13:13:16 +02:00
Jonathas Costa 77bc2d4e6d Improved Mars illumination. 2019-07-24 15:52:27 -04:00
Jonathas Costa 4360246863 Fixed small issues. 2019-07-23 15:37:42 -04:00
Elon 029e67797f merging 2019-07-22 16:25:47 -06:00
Elon 46c22488d7 wrapping up thesis project 2019 space debris 2019-07-22 16:16:21 -06:00
Jonathas Costa 67ba8a14dc Fixed problems after merging master into this branch. 2019-07-22 17:52:30 -04:00
Jonathas Costa a6b90991b2 Merging Master 2019-07-22 16:47:58 -04:00
Jonathas Costa 20d24764e7 Cleaned code and removed unused features. 2019-07-22 16:05:00 -04:00
Jonathas Costa df6c90b1ee Separated filters and cache from HDR. 2019-07-22 10:25:44 -04:00
Alexander Bock c45e5de33a Update copyright header
Update Ghoul
2019-07-22 14:19:11 +02:00
Alexander Bock 8f112fa219 Compile and runtime fixes when running in Debug
Do not crash if ScreenSpaceLocalImage does not exist
Add ability to specify identifier/name when adding screenspace items in the UI
2019-07-22 14:14:12 +02:00
Emil Axelsson ce15381fb2 Fix browser mask bug introduced when flipping y axis 2019-07-19 22:16:13 +02:00
Jonathan Fransson a3b511c7a7 Final Merge 2019-07-19 10:12:02 -06:00
Jonathan Fransson e3378bc615 Final Merge 2019-07-19 10:09:03 -06:00
Emil Axelsson 14d9bbe58b Fix crash related to deinitialization of screenspacebrowser 2019-07-19 16:52:23 +02:00
Emil Axelsson 5079f3fc60 Feature/multiple endpoints (#938)
* Add support for multiple endpoints for webserver
* Add support for a default endpoint (redirect) in webgui
* Always serve prod gui
* Update webgui deps
2019-07-19 16:49:54 +02:00
Emil Axelsson 134468b0d5 Add missing asset file 2019-07-19 11:31:58 +02:00
Emil Axelsson 9934fc03b9 Fix scaling issue with screenspace renderables (#939) 2019-07-19 11:09:04 +02:00
Alexander Bock 852115e309 Compile fix if instrumentation is disabled 2019-07-19 11:08:07 +02:00
Alexander Bock fc28b98db9 Add basic instrumentation options to the renderengine and globebrowsing module
Instrumentation is disabled on default, but can be enabled in CMake
2019-07-19 09:55:41 +02:00
Emil Axelsson 2a30b499d8 Update Apollo assets 2019-07-18 17:06:00 +02:00
Alexander Bock 2fca9a2a2c Remove torrent-based synchronization 2019-07-18 12:10:49 +02:00
Alexander Bock 66cd0413dd Cleanup of Wormhole application
Updated Ghoul to fix commandline argument extraction bug
2019-07-18 11:52:09 +02:00
Jonathas Costa dc1ab017c6 Adding back in the right buffer. 2019-07-17 18:28:06 -04:00
Alexander Bock 277aee5c0c Make constructor of Time explicit
Module breaking change
2019-07-17 15:39:43 +02:00
Emil Axelsson c97d5126ec Feature/timeline translation (#931)
* Work on timeline translations
* Add Apollo 11 Descent data
* Ability to display negative altitudes
* Expose globe translation properties
* Added timeline rotation, and some scene updates. 
* Cleaning up apollo_sites scene; fixing boulder 1 in place to adress heightmap issue
* Use quaternion slerp instaet of linear interpolation + Cleanup
* Change to old lem model while waiting for new version to be pushed to data repo
* Small fixes
2019-07-17 15:21:13 +02:00