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
Emma Broman
0ea0e781da
Prevent crash when reloading renderable that only has labels and no data
...
Occurred when unchecking and rechecking the "Draw elements" property for example the "Eclipltic Sphere Labels"
2021-03-23 11:40:34 +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
d534b7dbaf
Apply transforms to ModelProjection
2021-03-18 15:21:45 +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
91f9576784
Merge branch 'master' into feature/model-animation
...
* Resolve conflicts
2021-03-16 12:22:30 +01:00
Malin Ejdbo
323e9b2fb5
Update ghoul and add model animation
2021-03-16 09:05:32 +01:00
Emma Broman
20519d007b
Remove hardcoded path to B-V colormap ( #1531 )
...
Also prevent future problems in reading the file (e.g. if number of lines of comments would change)
2021-03-15 13:22:41 +01: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 E
6a59e009ad
Merge pull request #1517 from OpenSpace/issue/1516
...
Issue 1516
2021-03-03 10:06:39 +01:00
Malin Ejdbo
4fb8a36952
Merge branch 'master' into feature/multitexturing
...
* Resolve conflicts
2021-03-02 15:49:39 +01:00
Malin Ejdbo
f7a1a24acc
Only add eclipse properties if globe has data for eclipse
2021-03-02 11:23:23 +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
63fa95504c
Expose ImGui external to other modules
...
And update demo function name to match new version
2021-03-02 08:48:25 +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
157ffff25b
Update imgui external
2021-03-01 13:24:28 +01:00
GPayne
35b96967af
Switched kameleon module ref to commit with linux build fixes
2021-02-26 16:07:14 -07: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
Jonathas Costa
dd40cf8198
Merge branch 'master' into issue/1099
2021-02-22 11:51:30 -05:00
Emma Broman
b381bd83d3
Add module property for exoplanet habitable zone opacity
2021-02-22 09:38:59 +01:00
Alexander Bock
8ae817f233
Fix coding style issues
2021-02-19 13:48:23 +01:00
Jonathas Costa
ea42de503a
Removed test color left by mistake.
2021-02-18 17:37:50 -05:00
Alexander Bock
cb5929972a
Don't call RenderableOrbitalKeplers's initializeGL only once
2021-02-18 22:42:17 +01:00
Jonathas Costa
10634a5a0e
Merge branch 'master' into issue/1099
2021-02-18 11:53:57 -05:00
Jonathas Costa
c21752f93b
Fixed the forward/backward scattering effects.
2021-02-17 21:31:42 -05:00
Jonathas Costa
dfd60dfeec
Changed to full texture control as Carter wanted.
2021-02-17 20:53:51 -05:00
Jonathas Costa
0307d94983
Added old rendering method for rings texture as an option.
2021-02-17 16:02:14 -05:00
Gene Payne
f4e7d01aa7
Fixes for Issue #1409 ( #1501 )
...
* Fixed renderablesmallbody selective rendering props to accept asset file settings
* Set to only show selective rendering log info msg if render size is 1
* Mirrored selective rendering behavior from smallbody to satellites
* Added property coupling of values to satellite/asteroid render settings for size, start index, upperlimit
* Fix for selective rendering with synced render settings
* Removed redundant property definitions for codegen compliance
* Improvements to documentation and handling values spec'd in asset file
* Fix for satellites: selective rendering settings specified from assets
2021-02-17 12:41:05 -07:00
Alexander Bock
6837bad5b0
Tiny cleanups
2021-02-17 16:18:08 +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
dfa223abef
Make use of std::filesystem::path and cleanup specification error messages
2021-02-13 12:00:26 +01:00
Emma Broman
e21edaa13e
Expose exoplanet creation settings to user as module properties ( #1499 )
...
* Expose exoplanet creation settings to user as module properties
* Set default textures from asset to avoid explicit paths to sync folder
2021-02-12 14:32:37 +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
Emma Broman
9eb9095c12
Tiny cleanup
2021-02-10 10:54:33 +01:00
