Commit Graph

581 Commits

Author SHA1 Message Date
Alexander Bock
db472030de GCC warnings (#1725) 2021-08-21 11:42:44 +02:00
Alexander Bock
b2d12476dd Correctly specify the model size of the Apollo capsules (closes #1718) 2021-08-20 12:43:47 +02:00
Alexander Bock
af617d1d10 Feature/lua function cleanup (#1719)
General cleanup of Lua functions and handling of variable extract from a Lua state
2021-08-19 16:02:14 +02:00
Emma Broman
bfe25c311b Merge branch 'master' into thesis/2019/camera-paths
# Conflicts:
#	src/rendering/abufferrenderer.cpp
2021-08-09 15:21:08 +02:00
Alexander Bock
c96764aa1c Remove Clang warnings 2021-07-30 14:56:55 +02:00
Alexander Bock
c4bddacfeb Remove nonfunctioning ABufferRenderer from RenderEngine 2021-07-30 12:01:07 +02:00
Alexander Bock
309bce2e30 Fix DebugAxis helper; Increase the sensitivity to prevent loss of color in debug axis (closes #1560) 2021-07-28 14:49:29 +02:00
Emma Broman
16173d7afe Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts
# Conflicts:
#	modules/globebrowsing/globebrowsingmodule.cpp
#	modules/globebrowsing/globebrowsingmodule_lua.inl
2021-07-09 15:43:17 +02:00
Emma Broman
85e7c6a146 A few exponential slider updates
* Add exponent to RenderableTrail period and resolution
* Lower exponent of stereoscopic depth slider, to give better control
2021-07-07 14:29:38 +02:00
Alexander Bock
87da9a27ab Feature/path normalization (#1674)
* Path normalization (making sure there are fewer cases of '"..."'
* Using more std::filesystem::path instead of std::string
* Update Ghoul
2021-07-01 23:46:22 +02:00
Emma Broman
8063b54fb8 Merge branch 'master' into thesis/2019/camera-paths
# Conflicts:
#	src/navigation/navigationhandler.cpp
2021-06-23 16:31:14 +02:00
Emma Broman
77bdfaefd6 Move camera path code into core and refactor navigation code a bit 2021-06-23 09:12:36 +02:00
Alexander Bock
a69b636dea Global sweep to cleanup the handling of floating point numbers and glm default initialization 2021-06-16 23:09:49 +02:00
Alexander Bock
3272bc4ebc Fix issue with compiling on Debug 2021-06-14 15:34:29 +02:00
Malin Ejdbo
573ebe5ed5 Add boundingSphere for RenderablePrism 2021-06-11 09:39:32 +02:00
Malin Ejdbo
257d3f8538 Update model bounding sphere to account for parent scale, closes #1630 2021-06-04 10:16:48 +02:00
Malin Ejdbo
59b3048c87 Remove posincrement 2021-05-31 16:26:51 +02:00
Malin Ejdbo
23abfa5ee3 Adjust labels 2021-05-31 16:19:25 +02:00
Malin Ejdbo
9f7b8aa32b Merge branch 'master' into feature/jwst
* Resolve conflict
2021-05-31 15:45:10 +02:00
Malin Ejdbo
31b834dbb2 Address PR comments 2021-05-31 15:34:54 +02:00
Emma Broman
a40e110fe9 Reduce risk of font rendering errors from user interaction (#1206 hotfix) (#1616)
* Allways load all glyphs immediately for GlobeLabelsComponent, to avoid errors on font loading
* Unify used font sizes, to avoid filling font atlas (especially for globes, as we now load all glyphs immediately)
* Make font size properties read-only, to prevent users from triggering these errors during runtime
2021-05-31 10:46:21 +02:00
Alexander Bock
744ba0dc9b Feature/side by side (#1613)
* Make atmosphere, raycasting, and trails work with side_by_side stereo
2021-05-28 23:31:10 +02:00
Emma Broman
1695937749 Feature/numeric slider updates (#1609)
* Remove Logarithmic ViewOption and instead always use exponent of NumericalProperty + set exponent of some renderables' properties

* Add MinMaxRange ViewOption for Vec2 properties

* Add MinMaxRange viewoption to some existing vec2 properties and combine some other related properties to be able to utilize it. For example Min and Max label sizes, fade in/out distances, inner and outer radius. OBS! Includes renaming several properties (**breaking change**)

* Refactor and document labels code. OBS! Includes renaming several properties (**breaking change**)

* Add comments for some assets that have labels that are not working correctly


Renderables with rename properties: RenderableLabels , GlobeLabelsComponent, RenderableBillboardsCloud, RenderableDUMeshes, RenderableRadialGrid )
2021-05-28 17:00:55 +02:00
Malin Ejdbo
0a1c842345 Some clean up 2021-05-28 13:26:47 +02:00
Malin Ejdbo
b17952628c Adjust RenderablePrism to recent codegen change 2021-05-26 16:04:47 +02:00
Malin Ejdbo
4202b21ebc Merge branch 'master' into feature/jwst
* Resolve conflicts
2021-05-26 14:21:10 +02:00
Alexander Bock
63cbf270ee Adapt to changes in codegen that require specifying the identifier in the codegen::doc function 2021-05-25 23:10:12 +02:00
Alexander Bock
cb17bd7570 Remove warnings 2021-05-25 22:06:49 +02:00
Alexander Bock
6cf6e450fb Address MacOS compile issues, make ISS model scene graph node visible 2021-05-25 17:50:31 +02:00
Malin Ejdbo
52a9e23fa9 Add Lua function that returns the worldPosition of a scenegraph node 2021-05-19 11:41:05 +02:00
Alexander Bock
205d4c9db1 Feature/speck loader (#1585)
* Implement a shared speckfile loader
* Apply new speck loader to RenderableBillboardsCloud, RenderablePlanesCloud, RenderablePoints
2021-05-17 13:59:54 +02:00
Alexander Bock
92432caed2 Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string 2021-05-17 00:23:15 +02:00
Alexander Bock
ccdc5a5dc3 Feature/filesystem cleanup (#1587)
* Adapting to the changes in Ghoul
* First step of moving filesystem functions to std
* Remove persistence flag from cachemanager
2021-05-16 20:26:49 +02:00
Malin Ejdbo
3e2a1c98fb Add property to change the number of lines connecting the prism shape 2021-05-12 16:29:00 +02:00
Malin Ejdbo
9efb95ce78 Correct RenderablePrism rendering 2021-05-12 15:15:45 +02:00
Malin Ejdbo
0ae8849adf Merge branch 'master' into feature/jwst 2021-05-12 09:34:52 +02:00
Malin Ejdbo
16d38962c8 Add option to invert ModelScale
* Scale the JWST to correct size

* Add non standard units as option for ModelScale

* Add boolean option to invert the ModelScale of a RenderableModel

* Update JWST prism to correct size and matching rotation of JWST
2021-05-12 09:27:14 +02:00
Malin Ejdbo
085f2ecf60 Fix rendering of RenderablePrism 2021-05-10 13:54:19 +02:00
Alexander Bock
09e28ff49e Enable Screenspace renderable to have a multiplicative color; Add new asset to show a target marker (closes #85); Fix bug with wrong documentation shown in RenderablePlane 2021-05-08 18:08:56 +02:00
Alexander Bock
f74bf97513 Update SGCT repository (closes #1437), VAO hygiene for RenderablePlane 2021-05-08 16:57:08 +02:00
Malin Ejdbo
19c845b422 Add initial version of RenderablePrism 2021-05-07 16:53:13 +02:00
Emma Broman
33a9dd2f09 Avoid problems with comment ending in backslash 2021-04-27 11:19:18 +02:00
Emma Broman
8a30dc570e Add Logarithmic sliders and Color picker (#1564)
* Pass ViewOptions meta data to WebUi

* Add Color ViewOption

* Add Logarithmic ViewOption

* Update gui hash to get slider and color picker UI features
2021-04-27 09:24:36 +02:00
Alexander Bock
2aa540a112 Feature/interactionsphere (#1561)
* Add ability to render the bounding sphere as a debug option
* Separate boundingsphere and interactionspheres
* Correctly compute BoundingSpheres for more renderables (RenderablePlanesCloud, RenderableOrbitalKepler)
2021-04-26 13:13:36 +02:00
Malin Ejdbo
2b74a04415 Adjust model bounding sphere 2021-04-21 11:04:42 +02:00
Malin Ejdbo
16bd1d3265 Merge branch 'master' into feature/model-animation
* Resolve conflicts

* Master has error with changing focus
2021-04-21 10:23:10 +02:00
Emma Broman
fdee3d4faf Prevent setting zero line width from UI 2021-04-16 16:14:02 +02:00
Malin Ejdbo
a541721d33 Address PR comments and tweak animation mode Once 2021-04-16 15:51:31 +02:00
Malin Ejdbo
4a97a21297 Address PR comments 2021-04-14 17:12:46 +02:00
Malin Ejdbo
3ec01fa25e Address PR comments 2021-04-07 17:25:58 +02:00