mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-30 16:08:44 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,495 Commits 83 Branches 46 Tags
ae58cdc0935e2f76cf023f3f7142e9e47a4f17c9
Commit Graph

1200 Commits

Author SHA1 Message Date
Jonathas Costa
766051c837 Changes to correct orient the Milky Way. 2019-08-22 16:01:04 -04:00
Alexander Bock
e68de29ec6 Merge branch 'master' into integration/FXAA_Vol_Milkway 2019-08-22 17:45:20 +02:00
Emil Axelsson
3fd6cd5ae6 Update webgui 2019-08-22 13:55:06 +02:00
Alexander Bock
dfd85fddb6 Merge branch 'feature/FXAA' into integration/FXAA_Vol_Milkway 2019-08-20 14:49:31 +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
Jonathas Costa
e1ef84fb16 Merge branch 'feature/milkyway-galaxy' into integration/FXAA_Vol_Milkway 2019-08-19 15:41:54 -04:00
Jonathas Costa
d5615f089f Removed ToyVolume asset loading. 2019-08-19 15:13:12 -04:00
Jonathas Costa
53fee40937 Merge branch 'master' into feature/FXAA 2019-08-19 14:57:37 -04:00
Jonathas Costa
15d6586e06 Get rid of MSAA GUI and updated framebuffer volume rendering (need more tests here). 2019-08-19 14:31:28 -04:00
eriksunden
a9fd242386 Fixed boundary artifacts in general for volume rendering. Look and feel of rendering is now very nice. Also the stars fade nicely now. 2019-08-19 14:16:36 +02:00
Alexander Bock
d825b3d008 Restore original colors for the satellites 2019-08-19 11:34:17 +02:00
eriksunden
61157cb2e6 Data moved to sync folder. Did set higher absorption/emission on the volume rendering as well. 2019-08-19 11:05:03 +02:00
eriksunden
0f00bff444 Merge branch 'feature/hdrOS' of https://github.com/OpenSpace/OpenSpace into feature/milkyway-galaxy 2019-08-16 13:40:21 +02:00
eriksunden
db230431df Merge branch 'master' into feature/milkyway-galaxy 2019-08-16 13:38:48 +02: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
17d43d4c93 Removed unsused TMOs. Removed unused sliders and adjusted to default position others. 2019-08-15 14:23:14 -04: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
eriksunden
a966457641 Star rendering with halo texture implemented. 2019-08-15 14:48:19 +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
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
GPayne
ba07837865 Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes 2019-08-13 09:56:51 -06: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
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
Jonathas Costa
482631aa54 Fixed failed merging of master. 2019-07-31 15:05:52 -04: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
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
a6b90991b2 Merging Master 2019-07-22 16:47:58 -04:00
Jonathas Costa
df6c90b1ee Separated filters and cache from HDR. 2019-07-22 10:25:44 -04: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
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
2a30b499d8 Update Apollo assets 2019-07-18 17:06:00 +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
Alexander Bock
87df4a11a9 Use correct identifier for Vesta 2019-07-17 14:30:01 +02:00
Emil Axelsson
6d725a7d50 Revive screen space browser and add example (#932) 
* Revive screen space browser and add example
* Add reload triggerproperty and change autoplay policy
 2019-07-16 13:29:21 +02:00
Emil Axelsson
f43bcadee3 Feature/navigation state (#930) 
* Replace setCameraState with setNavigationState + equivalents
* Add documentation and verification of NavigationState-related interfaces
* Documentation and verification fixes
* Change reference frame behavior
* Scene fixes
* Replace earthrise recording with navigation state and time
 2019-07-16 13:13:33 +02:00
Jonathas Costa
0f09c36aa2 Bring back changes for transparency and added new error protection for big components. 2019-07-15 10:31:08 -04:00
Jonathas Costa
2e751d0c66 Improved final image quality. Enabled automatic bloom. Fixed inverse HDR. 2019-07-14 18:01:49 -04:00