Commit Graph

8322 Commits

Author SHA1 Message Date
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 2ca7101b6c Actually make use of the model matrix in the atmosphere radius calculation for determining whether it should be culled (closes #1465) 2021-05-08 21:25:35 +02:00
Alexander Bock 9b1f733deb Fix issue that prevented default-constructed transformations from being registered as PropertyOwners 2021-05-08 20:18:18 +02:00
Alexander Bock abd084c0a9 Only use the adaptive level-of-detail when actually rendering out frames in a session recording (closes #1292); Remove OpenGL performance warning messages when writing frames due to expected GPU-CPU sync 2021-05-08 19:53:40 +02:00
Alexander Bock e3af4a9f09 Add the ability to specifiy a specific time for a TemporalTileProvider (closes #1171) 2021-05-08 19:17:00 +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
Alexander Bock 54fc94bfaf Remove unused parameters and document the remaining properties of RenderableGlobe (closes #1470) 2021-05-08 01:18:50 +02:00
Alexander Bock 139d2c6c6d Apply more codegen checks (#1579)
* Apply more codegen checks
2021-05-08 00:44:23 +02:00
Malin Ejdbo b909888b19 Merge branch 'master' into feature/jwst 2021-05-07 16:54:43 +02:00
Malin Ejdbo 19c845b422 Add initial version of RenderablePrism 2021-05-07 16:53:13 +02:00
Malin Ejdbo 006395f4aa Enable JWST animation at start 2021-05-07 15:27:42 +02:00
Emma Broman 3d824f970e Fix misspelled function that prevented grids example asset from loading 2021-05-07 14:43:05 +02:00
Emma Broman d7bd50362e Fix interaction sphere UI bug 2021-05-06 17:04:56 +02:00
Emma Broman e6a7225028 Fix missed perSceneCache rename in test file 2021-05-06 15:24:35 +02:00
Alexander Bock 4c80577d4b Rename PerSceneCache to PerProfileCache and make it work again (closes #1577)
Breaking change in openspace.cfg file:   PerSceneCache -> PerProfileCache
2021-05-05 16:14:00 +02:00
Malin Ejdbo 25b56cb4c6 Add keybind to enable/disable Hubble image and lagrangian points 2021-05-05 13:41:52 +02:00
Malin Ejdbo 298c14336d Make Hubble image a screenspace renderable 2021-05-05 13:39:24 +02:00
Gene Payne 9166abab45 Fixed a typo which caused a build error 2021-05-04 10:50:28 -06:00
Emma Broman 804444e267 Simplify Property code (#1575)
* Remove the PropertyDelegate

* Remove some unused and redundant property types

* Use helper functions for Lua/Json conversion

* Solve a bug in SelectionProperty that occurred when re-setting options

* General simplification and refactoring of the code
2021-05-04 09:32:29 +02:00
GPayne d47ac2f248 Added month of day limit for yearly increment 2021-05-03 15:18:16 -06:00
GPayne 6fc1d608e9 Fix that allows all days of month except monthly increment still at 1-28 2021-05-03 15:18:16 -06:00
Malin Ejdbo d145a04d35 Update profile start time and place to match launch 2021-05-03 16:19:38 +02:00
Malin Ejdbo cfc8eb209e Add initial version of jwst profile 2021-05-03 14:32:47 +02:00
Malin Ejdbo b07c319551 Add the other Lagrangian points (L1, L4, L5) 2021-05-03 14:30:09 +02:00
Emma Broman b762ccad98 Disable root finding for now, as it leads to motion discontinuities
- Includes an attempt to enhance the root finding result using Bisection for the initial guess
- Also remove scaling of parameter intervals to match segment lengths, as this messes up the precision for short segments
2021-05-03 10:58:02 +02:00
Malin Ejdbo f71be4d0dc Extend L2 line to Sun 2021-05-03 10:26:11 +02:00
Malin Ejdbo e844f95a4a Update local JWST model 2021-05-03 10:17:24 +02:00
Emma Broman c6ebb51293 Fix cast warning 2021-05-03 10:12:01 +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
Alexander Bock 863a861944 Feature/galaxy (#1576)
* Some cleanup of the galaxy renderer
* Remove translation from renderablegalaxy
* Apply additive blending when compositing downsampled volume;  Use star distance as alpha for transparency (closes #1208)
2021-04-30 14:31:12 +02:00
Emma Broman 26978ea1b1 Make randering of path work again 2021-04-30 13:46:43 +02:00
Emma Broman 1bbba17a69 Fix problems with loading textures 2021-04-29 16:47:37 +02:00
Emma Broman 1ae3509d87 Merge branch 'master' into thesis/2019/camera-paths
# Conflicts:
#	data/assets/scene/solarsystem/planets/earth/moon/moon.asset
2021-04-29 15:26:46 +02:00
Emma Broman 7b966b9378 Give globes an interaction sphere 2021-04-29 15:23:34 +02:00
Alexander Bock 261f3d9fe8 Add Titan atmosphere, increase scale height for Venus (closes #922) 2021-04-29 14:14:52 +02:00
Emma Broman 1025c6fec6 Make the code compile with changes from master 2021-04-29 13:52:41 +02:00
Emma Broman d95a5524b2 Merge branch 'master' into thesis/2019/camera-paths 2021-04-29 13:37:53 +02:00
Alexander Bock fb8e80ea80 Adjust tab width for asset and task files 2021-04-28 19:19:51 +02:00
Malin E f77074757b Merge pull request #1574 from OpenSpace/feature/os-model
Merge OS-model reader into JWST branch
2021-04-28 11:45:37 +02:00
Malin Ejdbo 7866dc0b0e Merge branch 'master' into feature/jwst 2021-04-28 11:42:15 +02:00
Malin Ejdbo a92c25216d Merge branch 'master' into feature/os-model
* Resolve conflicts
2021-04-28 11:39:40 +02:00
Emma Broman 33a9dd2f09 Avoid problems with comment ending in backslash 2021-04-27 11:19:18 +02:00
Alexander Bock b016317fc2 Add a scriptlog dialog field to the additional scripts box 2021-04-27 09:58:25 +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
GPayne e95ca6c3e8 Fixed minor timing bugs while running full test of record/playback 2021-04-26 21:29:52 -06:00