Commit Graph

441 Commits

Author SHA1 Message Date
Emma Broman 6b4c329a29 Refactor 2020-06-30 14:00:32 +02:00
Emma Broman f247b714bd Add a radial grid 2020-06-30 13:48:50 +02:00
Emma Broman 86c9810c95 Clean up RenderableBoxGrid
Remove unused properties, matrix passed to shaders with float precision and reset blending state after rendering.
2020-06-29 12:52:47 +02:00
Emma Broman 7ba5c05388 Move grid renderables to their own folder 2020-06-29 12:52:47 +02:00
Emma Broman 8122d767b5 Create a new grid renderable 2020-06-29 12:52:34 +02:00
Micah Acinapura 6db7d503a3 Linux fixes clang (#1216)
* Changes to work on Linux.

* Multiple small fixes for Linux.

* Changes to have trails working on Linux again.

* Bring back AA Trail Lines on Linux.

* Included new branch with correction in cfitsio library linking.

* Updated SGCT.

* Changes to work on Linux.

* Remove extra #endif

* Changes to compile in Clang on Linux.

* Other fixes.

* Bring back some of the changes lost and updated clang building commands.

* requiring 10.15 for sgct, upadating sgct

Co-authored-by: Jonathas <jon.costa@gmail.com>
Co-authored-by: Tom Schober <tom@tomschober.com>
Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2020-06-25 18:55:20 -04:00
Emma Broman 136cd75adc Update documentation string and remove unused include 2020-06-16 16:16:10 +02:00
Emma Broman 6a8babe995 Update RenderableBoxGrid to match the existing grid shaders 2020-06-16 15:43:19 +02:00
Alexander Bock e5719952b1 Add the ability to load images lazily for RenderablePlanes
Add ability to purge textures from RAM if they are read-only
Make use of both for constellation images to reduce the memory footprint

(cherry picked from commit 7f0c92430f)
2020-06-15 16:08:28 +02:00
Jonathas Costa b83d41026f Merge branch 'master' into issue/1102 2020-06-13 09:50:37 -04:00
Alexander Bock da955a6c29 General cleanup of Apollo scenes 2020-06-13 13:08:47 +02:00
Jonathas Costa 4c49cc0fdf Removed 4-tuple color in favor of 3-tulpe color plus opacity. Changed abs to fabs when needed. 2020-06-08 13:47:47 -04:00
Jonathas Costa ea72753ea3 Small changes. 2020-06-05 15:51:56 -04:00
Jonathas Costa c0ae26e83e Fixed issue. 2020-05-28 17:13:45 -04:00
Jonathas Costa 2c1035f05d Temporary solution for precision problems in spherical grids. 2020-05-28 17:01:08 -04:00
Alexander Bock 5a94c486f0 Removing warnings 2020-04-14 22:32:26 +02:00
Alexander Bock f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
stefanseibert 38d0f46ca6 Added a way to customize renderable distance labels unit 2020-03-06 10:49:20 +01:00
Alexander Bock 5e29145395 Coding style cleanup 2020-02-14 19:37:06 +01:00
Alexander Bock 9cb1169d58 Merge pull request #1063 from OpenSpace/bug/macosbuild
macos compile and build (still needs ring shader const fix)
2020-02-10 23:39:39 +01:00
Micah Acinapura faccb3d948 conditional uniform set for macos 2020-02-10 16:55:21 -05:00
Alexander Bock d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Alexander Bock 3c88ee5de3 Merge pull request #1068 from OpenSpace/issue/1065
Issue/1065
2020-02-10 14:54:03 +01:00
Alexander Bock 9491f73803 More GLM initialization fixes 2020-02-10 01:18:27 +01:00
Alexander Bock 24ce773da9 Update GLM version
Correctly initialize all values as they are no longer default-initialized
2020-02-10 00:09:31 +01:00
Jonathas Costa e23efd61ad Updated shader file name on Apple. 2020-02-03 13:00:04 -05:00
Jonathas Costa d2e442203d Added new shaders and code for Apple's trails lines. 2020-02-03 12:59:29 -05:00
Alexander Bock b545ab5c5b Merge pull request #1050 from OpenSpace/issue/1049
Fixed issue 1049 and 554 (multiple viewport problems and lua console scales)
2020-01-27 17:32:56 +01:00
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
eriksunden e3b3aec1ed Fixed issue 1049(using first viewport size as framebuffer size) and 554(loading and ending screen will be visible on the first viewport only). Also fixed such that Lua Console adapts to window size and not framebuffer size. 2020-01-24 15:53:29 +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