Commit Graph

7882 Commits

Author SHA1 Message Date
Malin Ejdbo 4a97a21297 Address PR comments 2021-04-14 17:12:46 +02:00
Malin Ejdbo 2b1c0c567d Update ISS model scale 2021-04-08 17:15:58 +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 4ca82fff19 Remove warnings on Apple clang 2021-03-29 23:16:15 +02:00
Alexander Bock 0bfe3f6d72 MacOS compile fix 2021-03-29 21:56:01 +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
Alexander Bock a49c1f435f Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2021-03-29 14:58:24 +02:00
Alexander Bock 797ddf7daf Fix some warnings on AppleClang 2021-03-29 14:58:19 +02:00
Malin Ejdbo 2feff86181 Clean up 2021-03-29 11:37:23 +02:00
Gene Payne dd11bfd2f8 Missed a spot with the linux gcc CMake compile options fix 2021-03-28 20:52:33 -06:00
Gene Payne 1f65046127 Updated linux gcc CMake compile options 2021-03-28 20:47:52 -06:00
Alexander Bock e88650f22c Tiny coding style fixups 2021-03-27 23:49:02 +01:00
Alexander Bock 6aad31000f Don't produce OpenGL performance warning on Intel chips 2021-03-27 22:16:08 +01:00
Alexander Bock f47d62a5ee Fix verifier for Color4Verifier 2021-03-27 22:16:04 +01:00
Malin Ejdbo 1f89cc370c Add cross conversion tests for distance conversions 2021-03-26 10:42:58 +01:00
Malin Ejdbo bc9fc63719 Merge branch 'master' into feature/model-animation
* Resolve conflicts
2021-03-25 13:54:51 +01:00
Malin Ejdbo a7ef1d5f16 Switch to numerical numbers in distances test 2021-03-25 13:18:21 +01:00
Malin Ejdbo 9bfc87958b Add tests for distance conversion 2021-03-25 11:19:54 +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
Emma Broman 38f5a12c24 Avoid crash in RenderEngine if screenshot token has not been registered
This is the case in for example the test application
2021-03-24 14:02:05 +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
Alexander Bock 4b25f5c074 Move default_dashboard asset from util folder to new dashboard folder that also includes the individual dashboard items 2021-03-24 09:57:27 +01:00
Malin Ejdbo aa5394e88c Add info message when an animation exists for a model 2021-03-23 18:02:06 +01:00
Alexander Bock 0d82e1848f Feature/configuration codegen (#1544)
Convert configuration document over to codegen
2021-03-23 15:22:29 +01:00
Micah Acinapura 48e2f35aa1 added dialog for choosing scripts from the script log (#1539)
* added dialog for choosing scripts from the script log
2021-03-23 08:56:23 -04: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
Emma Broman 97c1066149 Fix labels not facing the camera due to static rotation (closes #1542)
Bring back old transformation matrices
2021-03-23 11:27:55 +01:00
Alexander Bock 196a98b0c6 Add ability to StringVerifier to test for non-emptiness 2021-03-23 00:13:52 +01:00
Alexander Bock 45b2d0e014 Update Ghoul with an update to AssImp to fix FBX loading bug 2021-03-23 00:08:35 +01:00
Alexander Bock 2f36c7d88c Use codegen in LogFactory 2021-03-22 23:40:47 +01:00
Alexander Bock dfc42e9467 Rename createSingeColorImage -> createSingleColorImage 2021-03-22 23:17:42 +01:00
Alexander Bock c7f77e3286 Add property to determine whether the date should be added to the screenshot folder (#1535)
closes #1528
2021-03-22 15:49:30 +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 b57c4e336c Merge branch 'master' into feature/model-animation
* Resolve conflicts
2021-03-17 13:19:04 +01:00
Alexander Bock 07389bd6bf Update codegen repository 2021-03-17 00:21:00 +01:00