Commit Graph

543 Commits

Author SHA1 Message Date
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
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
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
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
Malin Ejdbo
aebe6c1217 Add codegen for renderablemodel 2021-03-12 09:55:23 +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
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
Alexander Bock
88122d1dbb Adapt to new Ghoul; fix previously undetected errors in uniform setting 2021-02-11 14:44:13 +01: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
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
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