mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-17 17:31:10 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,678 Commits 81 Branches 46 Tags
570455be8208efae02ba2ff5382762db39104f09
Commit Graph

583 Commits

Author SHA1 Message Date
Emil Axelsson
60cdf97d3c Merge branch 'thesis/2019/spaceweather-stream' of github.com:OpenSpace/OpenSpace into feature/spaceweather-stream 2019-09-26 11:32:42 +02:00
Emil Axelsson
8f27ade568 Cleanup 2019-09-26 11:32:16 +02:00
Sovanny Huy
9765d810c4 sun is now RenderableTimeVaryingSphere 2019-09-25 12:28:28 +02:00
Emil Axelsson
b4c170648a Minor cleanup 2019-09-24 11:18:59 +02:00
Emil Axelsson
0f4c993090 Remove extra indentation 2019-09-20 16:59:21 +02:00
Emil Axelsson
0f9fea99fd Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/spaceweather-stream 2019-09-20 16:52:19 +02:00
liuloppan
78eb673611 Feature/gui for touch (#967) 
Merging in feature gui for touch. Enable touch module to run.
Currently only run on development mode with the "touch" scene.
 2019-09-18 23:49:51 +02:00
Alexander Bock
febe62e4d6 Correctly set render bin for RenderableSphere to prevent flickering of atmosphere 2019-09-16 22:19:59 +02:00
Kollberg
b27399128c Added possibility to go to now, without program freezing, and improved lifecycle with already downloaded field lines 2019-09-12 16:15:56 -04:00
Sovanny Huy
2b5aace213 Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream 2019-09-09 15:11:14 -04:00
Sovanny Huy
ae5707dae5 quick fix for demo magnetogram 2019-09-09 15:11:06 -04:00
Kollberg
eb53d41cc2 Added keycommands for wow-room demo 2019-09-09 09:01:34 -04:00
Kollberg
4ec00dc977 Merge branch 'thesis/2019/spaceweather-stream' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceweather-stream 2019-09-06 08:15:21 -04:00
Kollberg
3c35c8d246 Merged with master branch, date of master branch 4/9/2019 2019-09-06 08:14:55 -04:00
Sovanny Huy
58b93cda23 change polarity fl colors and add option (in comments) for white and gray texture 2019-09-04 15:48:02 -04:00
Sovanny Huy
7e5b0ca105 variablename 2019-09-04 14:35:42 -04:00
Sovanny Huy
067fca0ff1 suntexture manager now takes wsa and makes it black, blue and red 2019-09-04 14:34:54 -04:00
Sovanny Huy
d45c167b95 Auto stash before merge of "thesis/2019/spaceweather-stream" and "origin/thesis/2019/spaceweather-stream" 2019-08-28 16:37:25 -04:00
Sovanny Huy
19d99c6332 Auto stash before merge of "thesis/2019/spaceweather-stream" and "origin/thesis/2019/spaceweather-stream" 2019-08-28 16:29:43 -04:00
Sovanny Huy
14d3372932 Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream 2019-08-28 15:38:12 -04:00
Alexander Bock
157c653afc Moved the volume.asset from customization to scene/milkyway/milkyway/volume.asset 
Make the Galaxy volume a default
Small changes here and there
 2019-08-23 16:36:43 +02:00
Jonathas Costa
ae58cdc093 Merged 2019-08-22 17:35:19 -04:00
Alexander Bock
7064c02738 Merge branch 'feature/FXAA' into integration/FXAA_Vol_Milkway 2019-08-22 17:45:43 +02:00
Alexander Bock
071d4af9dc Remove warnings duplicating property initialization for renderabletrails 2019-08-22 16:09:54 +02:00
Alexander Bock
21d799dd29 Force an even number of vertices for the RenderableSpheres (closes #957) 2019-08-22 09:31:07 +02:00
Kollberg
8e76c5648b Added check to suntexturemanager, to see if the server is online(has to be made general in the future, currently specific with the local server) 2019-08-21 13:01:27 -04:00
Jonathas Costa
b51eb799a5 Clean up and re-nameing. 2019-08-21 11:25:38 -04:00
Jonathas Costa
33ce712e3a Fixed Model rendering to work with the new HDR. 2019-08-20 15:34:48 -04: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
GPayne
c01e59635c Restored ability to change trail colors in satellite asset files. 2019-08-15 08:51:18 -06: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
ba07837865 Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes 2019-08-13 09:56:51 -06: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
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
c7c8375ca0 Coding style fixes 2019-07-31 11:13:29 +02: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
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
Jonathan Fransson
e3378bc615 Final Merge 2019-07-19 10:09:03 -06:00
Emil Axelsson
9934fc03b9 Fix scaling issue with screenspace renderables (#939) 2019-07-19 11:09:04 +02: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
Jonathas Costa
0f09c36aa2 Bring back changes for transparency and added new error protection for big components. 2019-07-15 10:31:08 -04:00
Alexander Bock
e9fdd31c56 Feature/flying fixes (#924) 
* Removing various warnings
 * Fix the rendering of the touchbar on Mac
 * More warnings
 * Add ghoul deinitialize
 * Update SGCT repository
 2019-07-04 09:28:42 +02:00
Sovanny Huy
8764ff9c0c downloads initial dataset 2019-07-01 16:25:10 -04:00