Commit Graph

3486 Commits

Author SHA1 Message Date
Emma Broman ef0eef842d Add opacity for text labels and fix constellation label opacity 2020-07-10 11:25:26 +02:00
Emma Broman bdb6e626ba Color values specified with vec3 instead of vec4 2020-07-10 11:25:26 +02:00
Emma Broman 66719c0881 Rename 'transparency' to 'colorFilter' in the ring classes
to avoid confusion with opacity name change. Also, the 'transparency'
used in the rings had a diffrent meaning than for the rest of the
rendered objects. It affects the filtering of the color values.
2020-07-10 11:25:18 +02:00
Emma Broman 1a0eaf2df0 Use opacity instead of transparency in TouchMarker 2020-07-08 15:54:12 +02:00
Emma Broman b14eba72f8 Change properties and variables to opacity instead of transparency 2020-07-08 15:54:12 +02:00
Emma Broman a7ea25d311 Merge branch 'master' into issue/733 2020-07-08 15:33:39 +02:00
Emma Broman bdc7f7b637 Add example assets and cleanup code 2020-07-08 09:39:21 +02:00
Alexander Bock a700c33bdc Merge pull request #1231 from OpenSpace/issue/1160
Added scaling properties to eclipses.
2020-07-07 13:19:26 +02:00
Alexander Bock fb69d81a7a Coding style fixes 2020-07-07 13:18:41 +02:00
Alexander Bock 96b775d939 Merge branch 'master' into feature/profiles
# Conflicts:
#	data/assets/asteroids.scene
2020-07-07 12:59:52 +02:00
Jonathas Costa b60c6cd116 Added scaling properties to eclipses. 2020-07-01 13:13:04 -04:00
Jonathas Costa d138bd97a9 Removed commented code. 2020-06-30 12:08:03 -04:00
Jonathas Costa 607a13da31 Added new Renderbin PostDeferredTransparency and PreDeferredTransparency. Fixed trails definitions when needed and satellites too. 2020-06-30 12:05:07 -04:00
Emma Broman f7b8061601 Cleanup: remove gridMatrix property from sphericalgrid
It is sufficient to use a Transform
2020-06-30 15:06:54 +02:00
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
Jonathas Costa e64f557bb4 Proposed solution. 2020-06-29 15:58:04 -04: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 68b3d5a26e Add forgotten documentation 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
Jonathas Costa 071bea6b25 Fixed ISS' normals transformation. 2020-06-28 13:08:07 -04: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
Alexander Bock 8f090cfeab Added property for line width to the renderable contellation bounds (closes #1214) 2020-06-24 11:06:14 +02:00
Alexander Bock 66a2ba5c0c Merge pull request #1210 from OpenSpace/issue/1199-multi-monitor
fixed reading config files, single_gui.xml, and updating webmodules 
closes 1199
2020-06-23 15:22:22 +02:00
Alexander Bock f138708fd9 Update SGCT to not require the specification of projection planes if 3D rendering in not required
Remove comments as it is the preferred way of handling the web gui
2020-06-23 15:18:25 +02:00
Alexander Bock 2a7932ecc2 Add checks for missing node name and directory parameters to the openspace.globebrowsing.addBlendingLayersFromDirectory function (closes #1101) 2020-06-22 22:03:29 +02:00
Micah Acinapura 621772dbb8 starting up webgui even if now window with guitag available 2020-06-22 11:58:38 -04:00
Micah Acinapura 386e7d9312 fixed reading config files, single_gui.xml, and updating webmodules for sgct init changes 2020-06-22 10:23:04 -04:00
Alexander Bock b12b28f454 Merge branch 'master' into feature/profiles
# Conflicts:
#	data/assets/scene/milkyway/constellations/constellation_art.asset
2020-06-22 12:57:07 +02:00
Alexander Bock 96940bac86 * Fixed GUI labeling of Uranus label
* Fixed spelling error in CTX blended label on Mars
 * Removed now-unused debug layers on RenderableGlobes
2020-06-22 10:32:48 +02:00
Emma Broman 768d7d71bf Solve bug: default StaticRotation matrix not updated on change 2020-06-18 11:33:06 +02:00
Emma Broman 136cd75adc Update documentation string and remove unused include 2020-06-16 16:16:10 +02:00
Emma Broman c2a5855653 Update gaia filtering scripts with functioning renderables 2020-06-16 16:15:36 +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
Alexander Bock 7f0c92430f 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
2020-06-15 16:07:16 +02:00
Alexander Bock 1e9df1cb4b Merge branch 'master' into feature/profiles
# Conflicts:
#	include/openspace/scene/assetloader.h
#	src/scene/assetloader.cpp
2020-06-14 17:54:25 +02:00
Micah 703296fc27 added globe labels back into renderloop 2020-06-13 12:52:33 -04: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
Alexander Bock f5e45992b6 Add new non-inertial reference frame to correctly place Apollo 8 trail
Remove unused dedicated launch trail asset file
2020-06-13 01:35:55 +02:00
Alexander Bock d2fbfdbf22 Remove unused globebrowsing instrumentation 2020-06-12 21:50:05 +02:00
Alexander Bock 3a1bec6e7d Merge branch 'master' into feature/license 2020-06-12 17:36:31 +02:00
Alexander Bock 433d96bbb4 SGCT compile fix
First pass for pull request
2020-06-11 00:24:58 +02:00
Alexander Bock 5461155043 Merge pull request #1164 from OpenSpace/issue/1103
Enabled back the disable/enable of fade in/out effects
2020-06-09 15:20:56 +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
Micah f82a0d14ad aded time range to voyager rotations; disabled spice exceptions by default; updated space module to read spiceexpection value; 2020-06-05 16:42:31 -04:00
Jonathas Costa ea72753ea3 Small changes. 2020-06-05 15:51:56 -04:00
Jonathas Costa fbd83c9e84 Removed hack and fixed SGCT. 2020-06-05 17:15:54 -04:00