mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-20 03:49:31 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,632 Commits 86 Branches 46 Tags
60e3ed2170ad993f0b86450874eb89ecaa18d9e0
Commit Graph

631 Commits

Author SHA1 Message Date
Alexander Bock
60e3ed2170 General pass for coding style 2020-11-28 22:31:06 +01:00
Jonathas Costa
3fbefa5324 Feature/orion changes (#1359) 
* Changed RenderableModel to allow user-control depth and blending.
* Updated RenderableModel to correctly handle the Orion Nebula model.
Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
 2020-11-04 13:11:25 +01:00
Jonathas Costa
db4f16f75f Issue/1223 (#1358) 2020-11-04 12:59:42 +01:00
Alexander Bock
efffc25ce0 Feature/globals handling (#1352) 
* Cleaner handling of global state
* Prevent Lua memory corruption (closes #982)
* Initialize glfw first thing to prevent weird joystick loading bug during startup
 2020-10-21 22:30:05 +02:00
Alexander Bock
87f10ea12d Merge pull request #1349 from OpenSpace/issue/1337 
Fix for crash if screenspace image load fails
 2020-10-19 17:52:36 +02:00
Alexander Bock
811a84df0f Fix issue where Wormhole server's script messages could not be decoded 
Fix issue where dashboard item for parallel peer would not report line number correctly
Closes #1011
 2020-10-19 17:48:16 +02:00
GPayne
37ac1466b4 Fix for crash if screenspace image load fails 2020-10-18 14:13:27 -06:00
Alexander Bock
0779c54a07 Provide correct error message if the ProfileName is empty 
Don't include Voyager and Pioneer in the base asset as it takes too long to load
Ensure that the webgui asset can load without the dashboard
Fix scripting issue in Rosetta scene with trails
Fix issue with Dashboards that would actually render one line too far down causing trouble with multiline text
Set the render option for renderablebillboards to view direction by default as the normal mode has some issues (see #1342)
Set more sensible maximum value for RenderablePlanesCloud
Correctly show the number of significant digits in the altitude
Replace setPropertyValue with setPropertyValueSingle when clicking on the friction "buttons" on screen
Add a new script function hasProperty to check whether a property exits
 2020-10-17 20:10:15 +02:00
Alexander Bock
9a030bd7db Update GLFW to 3.03 
Remove some warnings
 2020-10-10 16:29:12 +02:00
Lovisa Hassler
ceb5c85e5c Removed duplicated documentation for vec4 color 2020-09-28 16:02:39 +02:00
Alexander Bock
af6e15da40 Merge remote-tracking branch 'origin/master' into feature/openglstatecache 
# Conflicts:
#	ext/ghoul
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	src/util/screenlog.cpp
 2020-09-04 14:02:17 +02:00
Alexander Bock
2cca451898 Coding style adaptations 
Adapt to changes in Ghoul
 2020-08-25 13:47:03 +02:00
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
Alexander Bock
89af15126b Use global memory block for the models 2020-08-19 10:27:21 +02:00
Alexander Bock
7603edf906 Add the ability to add multiple ModelGeometry's for a RenderableModel to show models with multiple OBJ files without needing to create multiple scene graph nodes 2020-08-18 16:34:54 +02:00
Alexander Bock
d4291163ba Move ColorTexture from RenderableModel to ModelGeometry 2020-08-18 16:00:32 +02:00
Alexander Bock
4f2d612abe Only create RenderData if we actually want to render the Renderable 2020-08-18 13:43:51 +02:00
Alexander Bock
88b6fdd9fe Add more Tracy markers in different renderables 2020-08-18 12:58:40 +02:00
Alexander Bock
2b6d95057b Don't keep the majority of textures in RAM if they are not needed, further reducing the memory footprint 2020-08-18 10:48:56 +02:00
Alexander Bock
97811d82d0 Fix error with time quantizer string conversion 
Fix error with uninitialized memory in GlobeBrowsing
Remove dynamic memory allocation from on-screen rendering
 2020-08-14 14:10:54 +02:00
Alexander Bock
e3699a43a8 Update Ghoul and SGCT 
Adapt to changes by using more string_view
 2020-08-09 20:11:40 +02:00
Alexander Bock
d93be0f78d Small improvements in time conversion 2020-08-07 10:54:35 +02:00
Alexander Bock
d39d4a91ec Move error message hack outside of scene render loop 
Use std::string_view instead of std::string in more places
 2020-08-06 16:02:45 +02:00
Alexander Bock
0e3539bb23 Remove dynamic allocation in RenderableTrail 2020-08-06 11:39:33 +02:00
Alexander Bock
b78d1dd033 Merge branch 'master' into feature/memory-allocations 
# Conflicts:
#	include/openspace/scene/scenegraphnode.h
#	modules/imgui/include/gui.h
 2020-08-05 19:06:04 +02:00
Alexander Bock
6e9db78f40 Remove performance measurements that have been supersceded by using Tracy 2020-08-05 18:28:08 +02:00
Alexander Bock
696bc31861 Moving over more allocations to the memory pool 2020-08-05 11:19:09 +02:00
Alexander Bock
e783807d66 Next step towards enabling a managed memory version of templatefactory 2020-08-04 21:56:39 +02:00
Jonathas Costa
393fbdca3d OpenGL State Caching. 2020-07-31 15:59:28 -04:00
Emma Broman
41d5a6db5f Merge pull request #1240 from OpenSpace/issue/1196 
Issue/1196 - Unify usage of color, transparency/opacity
 2020-07-13 12:23:33 +02:00
Lovisa Hassler
bfbff84cfe Make LabelText an optional property issue #1237 2020-07-10 16:31:05 +02:00
Emma Broman
cb19f730df Mixed cleanup 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
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
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
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
6a8babe995 Update RenderableBoxGrid to match the existing grid shaders 2020-06-16 15:43:19 +02:00