Commit Graph

844 Commits

Author SHA1 Message Date
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
Emma Broman b07320d1da Add missing documentation for NonUniformStaticScale 2021-02-23 10:12:26 +01:00
Malin Ejdbo 4b6a61354d Add deprecation warning when using several model files for one model 2021-02-17 10:03:54 +01:00
Alexander Bock afd484044d Better support for colors in dictionaries (closes #1489)
- Add a new Color3Verifier and Color4Verifier that checks components to be in [0,1]
 - Update codegen to add a new attribute [[codegen::color()]] to mark a vec3/vec4 to be a color value
 - Update RenderableTrail to use the new verion
2021-02-12 12:59:00 +01:00
elon 8ea0f245d3 submodule update 2021-02-11 12:38:07 -05:00
Alexander Bock 88122d1dbb Adapt to new Ghoul; fix previously undetected errors in uniform setting 2021-02-11 14:44:13 +01:00
elon 92529fa6d4 merging master, conflicts 2021-02-10 11:33:01 -05:00
Malin Ejdbo c3e96c2ec5 Further address OpenSpace PR comments 2021-02-09 17:46:52 +01:00
Alexander Bock 6d821d4f91 Feature/codegen (#1480)
* Add the ability to automatically generate code to extract values out of a Dictionary (see https://github.com/openspace/codegen for more information on how to use this)
* Applied this technique to a large number of cases in the codebase
* Don't add _codegen files to the repository

Co-authored-by: Emma Broman <emma.broman@liu.se>
2021-02-09 09:12:43 +01:00
Malin Ejdbo 51f02dc738 Small fix and update ghoul 2021-02-08 13:32:38 +01:00
Malin Ejdbo f65eaaba4d Address OpenSpace PR comments 2021-02-05 14:14:13 +01:00
Malin Ejdbo 08e2c3fb41 Address Ghoul PR comments 2021-02-05 11:17:33 +01:00
Malin Ejdbo 1502e75c43 Fix warning that texture1 cannot be found 2021-02-03 11:02:49 +01:00
Emma Broman 91612f4bfd Merge pull request #1468 from OpenSpace/issue/1438
Add habitable zone for our Sun and some useful generic classes
2021-02-03 08:39:12 +01:00
Emma Broman f2eb81a450 Merge branch 'master' into issue/1438 2021-02-01 13:16:18 +01:00
Malin Ejdbo 73fd118ee2 Merge branch 'master' into feature/multitexturing
* Resolve conflicts
2021-02-01 11:57:31 +01:00
Emma Broman ef091a1044 Adress review comments 2021-02-01 11:01:14 +01:00
Alexander Bock 5ef4bc610e Fix issue with the item velocity not showing up correctly and with varying lengths 2021-01-31 23:59:21 +01:00
Emma Broman 19e5960020 Small grid renderable updates/fixes (#1473)
* Make sure we have examples for all grid types

* Fix problems with blending when rendering transparent grids

* Rename 'GridColor' to 'Color' for better consistenty among renderables

* Fix issue with resizing box grid

* Avoid problems with line width on Mac
2021-01-28 09:22:50 +01:00
Emma Broman e90b52af93 Add wrapping mode to texture component 2021-01-26 15:09:24 +01:00
Emma Broman d693dd0bbe Add rendering of optimistic vs conservative HZ boundaries 2021-01-26 15:09:23 +01:00
Emma Broman 10d615cdc8 Update disc rendering to not conflict with atmosphere 2021-01-26 15:09:23 +01:00
Emma Broman 6380e5b307 Change plane size to radius rather than diameter 2021-01-26 15:09:22 +01:00
Emma Broman fd835688b5 Add a habitable zone renderable 2021-01-26 15:09:15 +01:00
Emma Broman 37aa7c6ab4 Tiny cleanup 2021-01-26 15:08:38 +01:00
Emma Broman 72ebeb7f6f Add generic texture component for renderables 2021-01-26 15:08:37 +01:00
Emma Broman c075dbcdeb Add simple plane geometry class 2021-01-26 15:08:37 +01:00
Emma Broman 76d599d284 Add a basic disc renderable 2021-01-26 15:08:37 +01:00
Malin Ejdbo 22d0c947c7 Remove numbering of textures in model shader and update ghoul 2021-01-12 16:24:40 +01:00
Emma Broman cc825143a3 Bring back fading of sphere with only fade out threshold specified
Without this, the milkyway sphere does not fade out at all
2021-01-11 10:41:13 +01:00
Alexander Bock 29a76c7d33 Coding style pass on shader code 2021-01-02 21:11:13 +01:00