Commit Graph

824 Commits

Author SHA1 Message Date
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
Malin Ejdbo 0a9af8f0ed Add error handling 2021-03-22 10:01:16 +01:00
Malin Ejdbo f1d66b1a74 Add animation mode bounce 2021-03-19 09:55:50 +01:00
Malin Ejdbo fb4cb67ef6 Add property to enable/disable animation 2021-03-19 09:54:47 +01:00
Malin Ejdbo 4eb7c8abce Add animation mode to infinetly loop 2021-03-18 16:08:38 +01:00
Malin Ejdbo 205374fee2 Use codegen in ModelProjection and make use of new dictionary 2021-03-18 15:20:23 +01:00
Malin Ejdbo c1fb7d39e7 Remove "" from codegen comments 2021-03-18 09:40:30 +01:00
Malin Ejdbo 3201be5cd6 Add loop from start mode for animation 2021-03-18 09:34:38 +01:00
Malin Ejdbo c253060b25 Merge branch 'master' into feature/model-animation
* Resolve conflicts
2021-03-18 08:33:43 +01:00
Alexander Bock e2c1414ba6 Update to newest codegen, replace std::monostate with ghoul::Dictionary 2021-03-17 21:26:57 +01:00
Malin Ejdbo 323e9b2fb5 Update ghoul and add model animation 2021-03-16 09:05:32 +01:00
ElonOlsson cbc6825b9f Merge remote-tracking branch 'origin/master' into thesis/2020/radiation 2021-03-12 15:15:58 -05:00
ElonOlsson 4f67a649b9 mirror backside parameter of renderableplane, renamed renderabletimevaryingplaneimagelocal to renderableplanetimevaryingimage. mm. 2021-03-12 12:27:01 -05:00
Malin Ejdbo aebe6c1217 Add codegen for renderablemodel 2021-03-12 09:55:23 +01:00
Malin Ejdbo 775d9751dd Apply mesh transform in shader including normals and tangents
* Update Ghoul

* Loading several models have not yet been updated and will not work with
this commit
2021-03-09 11:26:37 +01:00
Malin Ejdbo 4fb8a36952 Merge branch 'master' into feature/multitexturing
* Resolve conflicts
2021-03-02 15:49:39 +01:00
Emma Broman 97144df4da Add a colored glare to exoplanet stars (#1511)
* Add possibility to multiply color to an image plane

* Add a colored glare to exoplanet stars (issue #1305)
2021-03-02 09:30:03 +01:00
Emma Broman 29e77534c7 Make use of new verifiers (Color and File) (#1510)
* Use codegen for renderable discs

* Utilize color and file verifier

* Add missing property assignment in exoplanets module
2021-03-02 08:11:49 +01:00
Emma Broman a901594907 Generate docs for RenderablePlaneImages 2021-02-25 13:47:49 +01:00