Malin E
fc4c3f1cfa
Merge branch 'master' into feature/animation-fixes
...
* Resolve conflicts in scene.cpp
2021-10-14 14:23:24 +02:00
Alexander Bock
4a860fb01d
Some code facelifting
2021-10-14 10:31:46 +02:00
Malin E
1f0b44959f
Clean up TimelineTranslation position calculation
2021-10-12 08:58:18 +02:00
Alexander Bock
76dd45e5ce
Event System ( #1741 )
...
* Add implementation of the EventEngine to handle global event chains
* Add properties to SceneGraphNodes to determine two distance radii for camera-based events
2021-10-11 21:53:00 +02:00
Malin E
48597ec222
Merge branch 'master' into feature/animation-fixes
2021-10-08 16:22:18 +02:00
Malin E
992778bd50
Make JWSTPosition to a TimelineTranslation
...
* Switches from being parented to Earth to being parented to L2 at 2018
NOV 01 00:00:00
* JWSTPosition depends on two horizons files that have different
observers (Earth and L2)
2021-10-06 18:00:10 +02:00
Emma Broman
821e746c1a
Fix RenderablePlaneImageOnline not updating size on property change
2021-10-04 10:23:11 +02:00
Gene Payne
1c0b7c347a
String-to-path fix for linux build
2021-09-14 15:45:39 -06:00
Alexander Bock
b649509bf0
Feature/model shader ( #1723 )
...
* Add support for RenderableModel to take custom shader code
* Added example to highlight usage
2021-08-24 10:45:19 +02:00
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
3d4c83cd9a
Prevent NaN values in StaticTranslation by limiting min and max size
...
Also disable exponential slider for now, as they are not working well with this kind of range
2021-06-24 13:51: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
Alexander Bock
c3ba532bdb
Feature/cleanup ( #1608 )
...
* Revert screenlog back to showing Info and above messages
* Various code cleanup
2021-05-25 14:08:33 +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