Commit Graph

543 Commits

Author SHA1 Message Date
Emma Broman
e90b52af93 Add wrapping mode to texture component 2021-01-26 15:09:24 +01:00
Emma Broman
d693dd0bbe Add rendering of optimistic vs conservative HZ boundaries 2021-01-26 15:09:23 +01:00
Emma Broman
10d615cdc8 Update disc rendering to not conflict with atmosphere 2021-01-26 15:09:23 +01:00
Emma Broman
6380e5b307 Change plane size to radius rather than diameter 2021-01-26 15:09:22 +01:00
Emma Broman
fd835688b5 Add a habitable zone renderable 2021-01-26 15:09:15 +01:00
Emma Broman
37aa7c6ab4 Tiny cleanup 2021-01-26 15:08:38 +01:00
Emma Broman
72ebeb7f6f Add generic texture component for renderables 2021-01-26 15:08:37 +01:00
Emma Broman
c075dbcdeb Add simple plane geometry class 2021-01-26 15:08:37 +01:00
Emma Broman
76d599d284 Add a basic disc renderable 2021-01-26 15:08:37 +01:00
Emma Broman
cc825143a3 Bring back fading of sphere with only fade out threshold specified
Without this, the milkyway sphere does not fade out at all
2021-01-11 10:41:13 +01:00
Alexander Bock
7004c02b86 Happy new year 2021-01-02 15:26:51 +01:00
Alexander Bock
067c0f4b27 Introduction of new Dictionary class (#1446)
* Adapting to introduction of new Dictionary class in Ghoul
 * Mainly replacing usage of float instead of doubles as expected
 * Adjust to the lack of the hasKeyAndValue function
2021-01-02 15:07:11 +01:00
Alexander Bock
ad8af3ffeb Feature/CMake (#1443)
General CMake cleanup/overhaul
* Enable precompiled headers for all projects
* Move specifications itto separate CMakeLists files
  * Add openspace-core as a subdirectory
  * Move handle_modules functionality into modules/CMakeLists.txt
  * Move handleapplications logic into apps/CMakeLists.txt
* Introduce openspace-module-collection interface library to simplify inclusion of modules in applications
* Turn module initialization into a two-step process to adapt to the new minimal dependency scenario
* Compile time speedup
  * Remove circular dependencies between modules and core preventing multithreaded compilation on MSVC
  * Build Spice multithreaded and as static library
  * Remove dependency from core to module-webbrowser
  * Remove unused dependency from kameleon
  * Remove additional unnecessary dependencies
  * Cleanup volume/kameleon/kameleonvolume modules
  * Fix visibility issues. Restrict include paths
  * Compile kameleon in parallel
* Other cleanup
  * Only copy CEF files from one target (hard-coded to OpenSpace right now)
  * Remove unused instrumentation code
  * Remove the ability to render AABB for globes as it caused a circular dependency between GlobeBrowsing and Debugging
  * Removing compiler and cppcheck warnings
  * Turn almost all includes into non-system includes
  * Don't warn on deprecrated copy
* Updated submodules
2020-12-28 18:26:57 +01:00
Malin Ejdbo
8aac7d6400 Adjust to the new structure when loading list of models
* Update Ghoul
2020-12-22 14:49:07 +01:00
Alexander Bock
86bb19d81c Feature/warnings (#1425)
* Remove MSVC, GCC, Clang compiler warnings
* Remove cppcheck warnings
2020-12-07 23:43:05 +01:00
Alexander Bock
f4831b0c03 Feature/jenkins (#1419)
* Add ability to toggle operating system builds on Jenkins via environment variables
* Update ghoul repository
* Update SGCT repository
* Reduce chattiness of the Jenkins log file
* Build native and ninja builds in parallel
* Disable ninja build on Windows as it fails with the OpenSpace Helper
2020-12-02 21:11:46 +01:00
Alexander Bock
60e3ed2170 General pass for coding style 2020-11-28 22:31:06 +01:00
Malin Ejdbo
fbc8e584d8 Add support for list of model files in asset files
* Load either one or several model files in asset files

* In the case of several model files, combine all models into one single ModelGeometry
2020-11-05 15:52:07 +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
Malin Ejdbo
6eef29c423 Update Ghoul and add possiblity to force invivible meshes to render
* Update Ghoul

* Add setting in asset file to specify if invisible meshes should be
  forced to render or not

* Change model shader to work with updated ghoul with embedded materials
  and textures

* In shader, render forced invisible meshes with procedural pink and
  green chessboard pattern
2020-10-26 11:16:56 +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
Malin Ejdbo
6df1667583 Add multi model format support with Assimp
* Update submodule Ghoul to point to branch feature/multitexturing

* Remove old datastructure for ModelGeometry (moved to ghoul)

* Change RenderableModel to work with new ModelGeomtry structure in
  ghoul

* Work in progress: Textures
2020-10-20 10:32:12 +02:00
GPayne
37ac1466b4 Fix for crash if screenspace image load fails 2020-10-18 14:13:27 -06: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
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
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