Commit Graph

7086 Commits

Author SHA1 Message Date
Jonathas Costa f0c397d6be Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet). 2020-08-20 15:34:40 -04:00
Jonathas Costa b7886ab463 Updated Ghoul and removed unused code. 2020-08-20 11:53:10 -04:00
Jonathas Costa 3d87a6b76a One less call to the cache. 2020-08-10 16:27:07 -04:00
Jonathas Costa d9e03f402d Added missing files. 2020-07-31 16:01:29 -04:00
Jonathas Costa 393fbdca3d OpenGL State Caching. 2020-07-31 15:59:28 -04:00
Alexander Bock 11f537e2e2 Fix issue with constellation art that left merge conflict annotations behind 2020-07-09 13:01:32 +02:00
Alexander Bock 254edd0490 Small indentation fix 2020-07-09 00:40:48 +02:00
Emma Broman a7a72b1cc2 Merge pull request #1229 from OpenSpace/issue/733
Issue/733 - Add ability to create grids using a specialized renderable
2020-07-08 15:35:32 +02:00
Emma Broman a7ea25d311 Merge branch 'master' into issue/733 2020-07-08 15:33:39 +02:00
Emma Broman 9b58782771 Clean up rotation matrices in DU grids 2020-07-08 15:07:31 +02:00
Alexander Bock ad5907f602 Add missing meta test case for profiles
Fix double Meta section error message
2020-07-08 11:11:27 +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 19b8ea48f8 Merge pull request #1158 from OpenSpace/feature/profiles
Merging it Profiles that replace the previous `scene` specification
2020-07-07 13:00:44 +02:00
Alexander Bock 96b775d939 Merge branch 'master' into feature/profiles
# Conflicts:
#	data/assets/asteroids.scene
2020-07-07 12:59:52 +02:00
Alexander Bock bad2acb260 Update submodules 2020-07-06 15:55:00 +02:00
Alexander Bock 4f97cec83f Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-07-02 16:38:47 +02:00
Alexander Bock ea95054bd2 Add the ability to render out the current recording time during a session recording 2020-07-02 16:37:11 +02:00
Jonathas Costa b60c6cd116 Added scaling properties to eclipses. 2020-07-01 13:13:04 -04:00
Jonathas Costa 1269aded1d Updated git ignore file. 2020-07-01 09:26:41 -04:00
Alexander Bock cae025f530 Merge pull request #1230 from OpenSpace/issue/1217
Issue/1217
2020-06-30 21:16:04 +02:00
Jonathas Costa 8c15767d53 updated Radio Sphere's orientation. 2020-06-30 13:17:28 -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
Alexander Bock 7f38a4e987 Merge pull request #1224 from OpenSpace/issue/1223
Fixed ISS' normals transformation.
2020-06-29 13:22:34 +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 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
Emma Broman 85b33b34ca Remove Unix EOL in editorconfig to avoid mixed line endings issues in VS 2020-06-29 09:52:36 +02:00
Jonathas Costa 071bea6b25 Fixed ISS' normals transformation. 2020-06-28 13:08:07 -04:00
Emma Broman 6c57e395e7 Call correct function when adding cartesian axes 2020-06-26 11:06:50 +02:00
Micah 076a96e651 updated assets and guihash to hide hidden items 2020-06-26 00:05:51 -04:00
Micah e9bfcb4c07 fixing release string 2020-06-25 19:22:23 -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
GPayne 7e143cec31 Adding C/2019 Y4 comet to asteroids scene (issue #1201) 2020-06-25 14:45:59 -06:00
Alexander Bock 8f090cfeab Added property for line width to the renderable contellation bounds (closes #1214) 2020-06-24 11:06:14 +02:00
Micah 841b7f1543 du size updates with carter 2020-06-23 16:46:27 -04: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 3e1cf6b2e3 Intermediate commit for meta information 2020-06-23 10:32:51 +02:00
Alexander Bock 89f1835994 Add the option to add vertical offset to the on-screen log
Set the default vertical offset when using the user interface
2020-06-22 22:15:34 +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
Alexander Bock f0b74fe799 Adding the GHRSST L4 MUR Sea Surface temperature as a replacement for the L4 G1SST that is no longer serving data (closes #1204) 2020-06-22 21:40:45 +02:00
Micah aefb5fd48e updated asteroid colors with carter 2020-06-22 13:10:15 -04:00