Commit Graph

8344 Commits

Author SHA1 Message Date
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
Micah 4353741c54 fix downloadFile function with waiting for complete 2021-04-26 10:07:31 -04:00
Alexander Bock 676e83fe4e Make the iswa module compile again 2021-04-26 14:29:06 +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
GPayne 7ceb4850c6 Fix for ascii-to-binary in conversion task 2021-04-25 21:47:04 -06:00
Malin Ejdbo b9441cc618 Correct PS4Controller mapping 2021-04-23 15:45:24 +02:00
Malin Ejdbo d93d367e74 Add roll axis for SpaceMouse 2021-04-23 11:33:14 +02:00
Malin Ejdbo 08118ba7bb Add initial support for SpaceMouse as joystick input 2021-04-23 10:52:31 +02:00
GPayne 7371c5bd09 Fixes for tracking nodes that are used in a recording 2021-04-22 21:58:18 -06:00
Malin Ejdbo c4fad58f3b Register new OpenSpace model reader 2021-04-22 17:17:16 +02:00
Malin Ejdbo 32b6a69900 Update ghoul yet again 2021-04-22 11:27:49 +02:00
GPayne fc33a99b23 Added all image-comparison test files 2021-04-21 15:19:16 -06:00
Malin Ejdbo 64bd51d073 Update Ghoul.. again 2021-04-21 18:36:20 +02:00
Emma Broman 9a51a76088 Update the gui hash
Add SelectionProperty and ListProperties UI and some bug fixes
2021-04-21 17:57:43 +02:00
Malin Ejdbo 54b92f9be8 Merge branch 'master' into feature/jwst 2021-04-21 14:31:39 +02:00
Malin Ejdbo 667de99f9f Update Ghoul again 2021-04-21 14:30:38 +02:00
Malin Ejdbo 1514c83826 Merge branch 'master' into feature/jwst 2021-04-21 13:47:12 +02:00
Malin Ejdbo 7223ea90bd Update Ghoul 2021-04-21 13:43:27 +02:00
Emma Broman 385a2a2be1 Avoid mistaking a nil/null value for an empty object or array in setpropertytopic 2021-04-21 11:24:09 +02:00
Malin Ejdbo 2b74a04415 Adjust model bounding sphere 2021-04-21 11:04:42 +02:00
Malin E db539ab360 Merge pull request #1552 from OpenSpace/feature/model-animation
Feature/model animation
2021-04-21 10:40:36 +02:00
Malin Ejdbo 1267874a06 Update Ghoul and codegen 2021-04-21 10:39:19 +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
Alexander Bock 01d7a57eef Add GlobeTranslation Documentation to exported documentations (closes #1566) 2021-04-21 09:34:20 +02:00
GPayne d012ee2fbb Added preprocessing to reject recording if used scenegraphnodes are not loaded 2021-04-20 16:22:01 -06:00
Emma Broman 91387d8401 ListProperties and SelectionProperty (#1558)
* Reimplement stringlistproperty with a listproperty parent class

* Add string list property tests and structure test files

* Reimplement SelectionProperty and add tests

* Some TemplateProperty documentation updates

* Read full constellation name and not just first word for ConstallationSelection

* Remove support for setting property value from string (unused)

* Add IntListProperty, DoubleListProperty

* Bug fix: SetProperty topic now support empty json objects

* Imgui renderings for list properties and pass SelectionProperty  info to WebGui
2021-04-19 16:10:36 +02:00
GPayne 6b1be04b3c Merge branch 'master' into feature/session-recording-addons 2021-04-16 14:29:24 -06:00
Alexander Bock b00fcb78df Enable setting of opacity for RenderableGlobe (closes #1449) 2021-04-16 17:31:55 +02:00
Alexander Bock 94d2db7376 Fix an issue that prevented the spheres from being rendered 2021-04-16 17:24:41 +02:00