Commit Graph

556 Commits

Author SHA1 Message Date
Micah 9be53ef77f adding bounding sphere to renderabeltrailtrajectory 2020-01-26 16:31:44 -05:00
Alexander Bock b73b4270ed Merge pull request #1026 from OpenSpace/feature/AALines2
Feature/aa lines2
2020-01-24 21:41:24 +01:00
Alexander Bock 4cef2be366 Small cleanup 2020-01-24 21:40:09 +01:00
Alexander Bock 9901d2b6fc Merge pull request #1048 from OpenSpace/feature/distancelabels
Feature/distancelabels
2020-01-24 21:09:16 +01:00
Alexander Bock 87805f1db8 Coding style fixes 2020-01-24 21:08:54 +01:00
Jonathas Costa 8ae8d53629 Fixed blinking (precision) problems. 2020-01-22 11:33:19 -05:00
Lovisa Hassler b99bcf9490 Adding validation check for _start and _end 2020-01-10 00:22:49 +01:00
Lovisa Hassler 07cc8d4a4f Working distance label 2020-01-09 12:19:59 +01:00
Lovisa Hassler 4ffc5595d9 WIP inheriting from renderablelabels 2020-01-09 09:59:38 +01:00
Jonathas Costa a4352edcf2 Merge branch 'master' into feature/AALines2 2020-01-06 09:43:04 -05:00
Alexander Bock 207db3c824 Remove PowerScaledCoordinates and rename PowerScaledSphere to Sphere (closes #4) 2019-12-27 23:29:28 +01:00
Alexander Bock a51cee1f36 Add a method for creating a unique name for screenspace renderable (closes #652) 2019-12-27 21:25:22 +01:00
Lovisa Hassler b2861183ae Distance label hack, needs cleanup and replacement 2019-12-20 10:15:12 +01:00
Eric Söderman 2d0eb703a4 fix case sensitive include file for linux compile 2019-12-20 08:07:28 +01:00
Alexander Bock dfa25b28e6 Disable labels on default
Some small code cleanup
2019-12-16 10:26:42 +01:00
Jonathas Costa 5509fb0a6b Added more units to refine fading controls. Updated Sun fading values. 2019-12-11 15:38:11 -05:00
Jonathas Costa 140de3d808 Added automatic documentation and Sun's label. 2019-12-10 12:55:58 -05:00
Jonathas Costa 8d186fbdfc Merged master. 2019-12-08 18:52:16 -05:00
Jonathas Costa 6432f484c4 Changed to accpet text label updating. Added super-fine controls for fading effects. 2019-12-08 18:44:08 -05:00
Jonathas Costa 63470f03ec Merge branch 'master' into feature/planetlabels 2019-12-08 14:51:39 -05:00
liuloppan 386ce8bec6 Feature/nodelines (#1013)
* Setup line render between Mars and Earth

* Updating property handling

* Precision fix

* Cleanup and making functions and variables private

* Adding linewidth property

* Using opacity property for line color

* Cleanup from review
2019-12-02 15:10:11 +01:00
Jonathas Costa dfb08b98e5 Removed unused code. 2019-11-25 13:15:31 -05:00
Jonathas Costa c6b460ab74 Added planet label rendering. Added Earth's label. 2019-11-22 18:11:49 -05: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
Jonathas Costa 5708bf8416 New fast AA for lines is working. 2019-08-23 16:56:30 -04:00
Jonathas Costa ac24a1bb56 Merged master. 2019-08-23 16:29:32 -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
Jonathas Costa 805401c409 Testing... 2019-08-22 11:18:21 -04: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
Jonathas Costa df40581bf0 Merge branch 'feature/FXAA' into feature/AALines2 2019-08-21 11:26:56 -04:00
Jonathas Costa b51eb799a5 Clean up and re-nameing. 2019-08-21 11:25:38 -04:00
Jonathas Costa 5c65801bd9 Testing new AA algorithm for current lines. 2019-08-20 23:03:49 -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