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
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
Malin Ejdbo
1f96920b83
Merge master into jwst branch
2021-05-03 10:03:50 +02:00
Alexander Bock
05942fb284
Remove property names and dictionary keys from FixedRotation that are unfriendly to Lua syntax
2021-04-30 14:53:11 +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
Malin Ejdbo
e91d833c65
Optimize model rendering
...
* Don't render when too far away, same as RenderableGlobe
2021-03-31 14:19:27 +02:00
Malin Ejdbo
1596bbb813
Add possibility to give model scale as a number
2021-03-30 17:13:38 +02:00
Malin Ejdbo
c825916d60
Merge branch 'master' into feature/model-animation
...
* Resolve conflicts
2021-03-30 16:31:25 +02:00
Alexander Bock
612b9bbc7f
Moving more documentation to use codegen ( #1549 )
...
- Make use of more codegen in more classes
- Fix verifier for Color4Verifier
2021-03-29 21:50:26 +02:00
Malin Ejdbo
2feff86181
Clean up
2021-03-29 11:37:23 +02:00
Alexander Bock
e88650f22c
Tiny coding style fixups
2021-03-27 23:49:02 +01:00
Malin Ejdbo
bc9fc63719
Merge branch 'master' into feature/model-animation
...
* Resolve conflicts
2021-03-25 13:54:51 +01:00
Alexander Bock
a6bb8cdecb
Split DashboardTextItem from DashboardItem
2021-03-24 17:46:13 +01:00
Malin Ejdbo
1bfa7bf5f5
Remove support to combine several geometries
...
* And make use of file verifier for the model file
2021-03-24 17:05:18 +01:00
Malin Ejdbo
2873cdb826
Use convertTime for time scale of animation
2021-03-24 12:06:34 +01:00
Malin Ejdbo
3a976ba0b0
Add model scale that can be set in asset file for each model
...
* Add cm and dm as units in DistanceUnits
* Scale the model according to the set unit
2021-03-24 10:47:40 +01:00
Malin Ejdbo
aa5394e88c
Add info message when an animation exists for a model
2021-03-23 18:02:06 +01:00
Malin Ejdbo
7ae3922132
Add BounceFromStart and BounceInfinitely animation modes
2021-03-23 13:42:05 +01:00
