Commit Graph

5545 Commits

Author SHA1 Message Date
Ylva Selling e51bd4b337 Get fps from video and set the seek threshold dynamically with that value 2023-02-09 12:02:42 -05:00
Ylva Selling 6f440c0ada Set default resolution for our opengl fbo to a higher value 2023-02-09 12:02:08 -05:00
Ylva Selling ee22b75da8 Seek to video time if video duration is updated 2023-02-08 17:50:43 -05:00
Ylva Selling ec7b564d1c Add a comment for seeking 2023-02-08 17:43:33 -05:00
Ylva Selling 079cf50beb Make video loop only for realtime loop mode 2023-02-08 17:43:20 -05:00
Ylva Selling e67fe569ae Map to simulation time with frame stepping instead of video stretching. Remove resolution and duration as properties 2023-02-08 17:22:18 -05:00
Ylva Selling 7e8962efa0 Clean up getting properties and command handling 2023-02-08 17:18:22 -05:00
Ylva Selling 3207131838 Get video duration 2023-02-08 15:05:07 -05:00
Ylva Selling a792f5022c Set stretching of time async 2023-02-08 15:04:09 -05:00
Adam Rohdin 90250d7099 Fixed bug where default value for 'element' was seen as invalid. 2023-02-08 17:35:38 +01:00
Malin E 7d2f781603 Only render with a two pass solution if the model is not opague 2023-02-08 14:14:59 +01:00
Ylva Selling 33326e29f5 Make wakeup function class specific 2023-02-07 11:39:27 -05:00
Alexander Bock be122a5a73 No longer trigger an assert when binding a key to an action that does not exist (closes #2485) 2023-02-06 23:17:16 +01:00
Alexander Bock f7ff2e33da Properly report an error when an .info file is missing the identifier, preventing the addition of a layer without one (closes #2490) 2023-02-06 23:07:21 +01:00
Alexander Bock 79ad5776cc CMake cleanup (#2489)
* CMake Cleanup
* Warning suppression with CEF
* Use SGCT tinyxml in skybrowser for now
* Disable warnings about missing field initializers
2023-02-05 23:24:12 +01:00
Ylva Selling 938ae6ffe1 Merge remote-tracking branch 'origin/master' into issue/2403
# Conflicts:
#	ext/ghoul
2023-02-02 16:39:29 -05:00
Ylva Selling 12398c4b1e Add two new assets for the two different types 2023-02-02 16:30:17 -05:00
Ylva Selling d7eec159fc Merge pull request #2426 from OpenSpace/issue/2425
Fix bug that channels in cluster don't set the field of view to the same value after animating
2023-02-02 16:17:06 -05:00
Ylva Selling 47193d7f7f Make video duration optional as it only applies if the animation mode is map to simulation time 2023-02-02 14:15:02 -05:00
Ylva Selling c3a94577e8 Create cache for the tiles so we don't have to recreate them each frame 2023-02-02 12:38:33 -05:00
Ylva Selling 4e9fcbbd8d Restructrure header file to make it more readable and make duration and resolution properties 2023-02-02 12:29:25 -05:00
Ylva Selling d42d7da38e Cleanup - removal of unnecessary variables 2023-02-02 11:33:46 -05:00
Ylva Selling 95233f6c40 Remove tile cache 2023-02-02 11:33:33 -05:00
Ylva Selling 2534c4a604 Add animationmode realtime looping 2023-02-02 11:18:29 -05:00
Ylva Selling ea3f9149c3 Make video stretching work 2023-02-01 17:55:59 -05:00
Emma Broman 7e94c4c284 Remove unintentional default value for skybrowser/exoplanet module enabled property (closes #2464) 2023-02-01 18:53:06 +01:00
Malin E 14edda9e61 Remove problematic manual depth test code 2023-02-01 16:25:19 +01:00
Malin E 00e80139a2 Solve one more conflict 2023-02-01 16:07:42 +01:00
Malin E 4d9983a867 Solve 1 more conflict 2023-02-01 14:57:31 +01:00
Malin E f490fccee6 Merge branch 'master' into feature/model-opacity
* Solve conflicts in ghoul, renderablemodel.cpp and iss.asset
2023-02-01 14:52:33 +01:00
Emma Broman a0f9e88432 Feature/touch fixes (#2463)
* Add Ceres to touch interaction list (Forgotten in previous commit. OBS! This list will be removed)

* Small code updates (Logical ordering of functions, code standard)

* Fix compilation issue when using debug define

* Make touch navigation abort idle behavior

* Make reset a trigger property

* Fix some broken property sliders (the default step size was too big)

* Update interaction monitor state on touch interaction with WebGui

* Add some documentation of what "LM" means, and make unit test a developer property
2023-02-01 12:44:34 +01:00
Alexander Bock 8445a48f71 Also apply the RenderableTravelSpeed changes to the fadeLength parameter 2023-01-31 23:42:32 +01:00
Alexander Bock 5a6d26f45a Make the travel indicator take floating point length values smaller than 1 (closes #2459) 2023-01-30 23:46:54 +01:00
Ylva Selling d4f6e4fbcd Update asset 2023-01-30 15:57:42 -05:00
Ylva Selling 4bb161cbc3 Add better comments for libmpv flags and do some cleanup 2023-01-30 14:46:18 -05:00
Ylva Selling 73fe0d6a00 Add missing enum property 2023-01-30 10:31:25 -05:00
Alexander Bock 3d95554222 Sort actions based on their name or their identifier if the names don't exist 2023-01-29 20:37:43 +01:00
Alexander Bock a73edcc0af Merge branch 'master' into issue/2425 2023-01-28 19:50:47 +01:00
Ylva Selling b7ca19dff7 Address comments on PR 2023-01-27 17:06:22 -05:00
Ylva Selling a46fe2e514 Merge pull request #2455 from OpenSpace/issue/2280
Fix bug for screenspace sky browser scale crash
2023-01-27 16:08:57 -05:00
Alexander Bock 2fcf4617c9 Correctly swizzle the textures for ScreenSpaceImage types to allow for 8 bit grayscale images (closes #2330) 2023-01-27 21:29:12 +01:00
Alexander Bock eba9d000e6 Don't render RenderableTrailTrajectory if the time is _exactly_ the start time (closes #2314) 2023-01-27 21:02:27 +01:00
Alexander Bock 3ce6443cff Add missing include 2023-01-27 20:55:25 +01:00
Ylva Selling 471317aef8 Make point space craft a bool property that when enabled points the space crafts when an image is selected 2023-01-27 14:24:46 -05:00
Ylva Selling 7ac8faea39 Set default texture quality to 1 as it seems that OS can handle it 2023-01-27 13:49:28 -05:00
Ylva Selling f781dfcd9c Fix bug with screenspaceskybrowser scale crashing OpenSpace 2023-01-27 13:49:12 -05:00
Ylva Selling 9499fcc207 Address comments on PR 2023-01-27 12:07:41 -05:00
Alexander Bock 4c8f568861 Add option to HttpSynchronization to automatically unzip downloaded files (closes #1852) 2023-01-27 16:32:49 +01:00
Ylva Selling 4b3a518f49 Seek the correct time before rendering 2023-01-27 09:39:13 -05:00
Alexander Bock b3fcfc75ec No longer do recursive lookups of Dictionarys when keys have dots in them (closes #2302) 2023-01-26 22:51:44 +01:00