Commit Graph

74 Commits

Author SHA1 Message Date
Alexander Bock 7483b912e0 Update submodules to fix compilation error on newer Clang and GCC (#2890)
* Update submodules

* Update Ghoul
2023-09-13 09:51:30 +02:00
Alexander Bock 455ee9335a Add a proper blackout to the ScreenSpaceRenderables and a property and codegen option to toggle that behavior (#2868) 2023-08-31 18:19:37 +02:00
Alexander Bock bd153b3f4f Use correct error type in geojsoncomponent; Check for (0,0,0) camera vectors in navigator; Fix issue with non-ASCII characters when making identifiers 2023-08-17 02:00:18 +02:00
Malin E 786c2887da Sphere maintenance (#2800)
* Split RenderableSphere class into a local and online sphere

* Make the video sphere derive from the regular sphere

* Make RenderableTimeVaryingSphere derive from RenderableSphere

* Some clean up

* Address PR comments
2023-08-07 11:47:32 +02:00
Alexander Bock 1593ab50aa Rename TileLayer to TileProvider classes (closes #2767).
Breaking change in assets that load Layers:
 - DefaultTileLayer -> DefaultTileProvider
 - SingleImageTileLayer -> SingleImageProvider
 - ImageSequenceTileLayer -> ImageSequenceTileProvider
 - SpoutImageTileLayer -> SpoutImageProvider
 - TemporalTileLayer -> TemporalTileProvider
 - TileIndexTileLayer -> TileIndexTileProvider
 - SizeReferenceTileLayer -> SizeReferenceTileProvider
 - ByLevelTileLayer -> TileProviderByLevel
 - ByIndexTileLayer -> TileProviderByIndex
2023-08-03 21:50:25 +02:00
Emma Broman 2b3226d18d FIx aspect ratio issue for RenderableVideoPlane (closes #2815) 2023-08-03 16:51:13 +02:00
Ylva Selling 67b7330229 Allow transparency for movies. Closes #2792 2023-06-26 11:43:02 -04:00
Ylva Selling 641c747f94 Rename the property in the video player to reload instead of reset, and add some more explanation 2023-06-14 10:52:33 -04:00
Alexander Bock bb9a3e375d Add documentation for Video classes (closes #2732) 2023-06-09 11:25:52 +02:00
Malin E ff805d334f Fix issue with atmosphere rendering on top of spheres 2023-05-26 16:34:38 +02:00
Alexander Bock bde840ad03 Remove a bunch of compiler warnings
* Remove compile warnings
* Coding style fix
2023-05-16 11:59:28 +02:00
Joakim Kilby f8d7d5386a terminate ZoneScoped calls (required after Tracy update) 2023-05-16 11:07:01 +02:00
Alexander Bock a5b8368b50 Fix bugs in videoplayer (#2678)
Remove from syncable list after destruction; only use one fbo; remove code no longer used

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
2023-05-09 20:04:15 +02:00
Ylva Selling 142aba3684 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2023-04-27 11:30:38 -04:00
Ylva Selling b5d6ddc25a Only show properties that are valid for real time playback when real time playback is selected 2023-04-27 11:30:34 -04:00
Ylva Selling d827d0a3c2 Add property for toggling looping of video 2023-04-27 11:29:49 -04:00
Alexander Bock 6dfd0cd3a8 Remove warnings on MSVC 2023-04-26 23:51:16 +02:00
Alexander Bock 8a62752434 Jenkins fix for LibMPV on Ubuntu (#2621)
* Correctly add non-Windows dependencies
* Make libraries depend on the correct OpenSpace module
* Add missing destructor
2023-04-16 23:15:57 +02:00
Alexander Bock 8c7beea8a4 Reprivatize the registerUpdateRenderBinFromOpacity function 2023-04-15 10:20:39 +02:00
Ylva Selling 9e20326c25 Fix bugs that appeared when addressing comments in PR 2023-04-14 17:53:30 -04:00
Ylva Selling 89b0fadf16 Add some example assets and fix issue in videoplayer.cpp 2023-04-14 16:47:27 -04:00
Ylva Selling 5789d86dab Address comments on PR 2023-04-14 16:29:42 -04:00
Malin E f77a028153 Add property to RenderablePlanes to rescale depending on content 2023-04-13 19:01:31 +02:00
Alexander Bock 811d099fdc Make CMake download the prebuilt version of libmpv from our server; Add example asset that downloads its video on include 2023-04-12 13:59:23 +02:00
Ylva Selling a91a578945 Sync time of playback between nodes 2023-03-31 14:27:08 -04:00
Ylva Selling 7c69ced203 Merge branch 'feature/video-module' of https://github.com/OpenSpace/OpenSpace into feature/video-module 2023-03-31 13:14:56 -04:00
Malin E 6ce5a170c0 Make RenderablePlane able to be rectangular 2023-03-28 11:53:09 +02:00
Ylva Selling 7618c28838 Merge branch 'feature/video-module' of https://github.com/OpenSpace/OpenSpace into feature/video-module 2023-03-24 13:36:06 -04:00
Malin E 21c677dfc3 Make sure plane rescales when property is changed 2023-03-23 09:17:27 +01:00
Malin E c1e1b8b693 Add RenderableVideoPlane class 2023-03-22 16:09:06 +01:00
Ylva Selling e74e0e4fe8 Merge branch 'feature/video-module' of https://github.com/OpenSpace/OpenSpace into feature/video-module 2023-03-21 10:50:47 -04:00
Malin E b0c0ea81ab Make sure video player is initialized for each video renderable 2023-03-21 15:29:11 +01:00
Malin E f62d0bb677 Make sure openGL state is reset after rendering globes 2023-03-21 13:53:05 +01:00
Ylva Selling 6d9f80a9db Update aurora asset 2023-03-20 11:28:06 -04:00
Ylva Selling 8a973ab3a7 Remove swap buffers call as it apparently is optional 2023-03-20 10:29:20 -04:00
Malin E 7f1da2173d Bind back the deafulat fbo after libmpv has rendered 2023-03-14 10:04:24 +01:00
Ylva Selling d342cdbc2b Merge branch 'feature/video-module' of https://github.com/OpenSpace/OpenSpace into feature/video-module 2023-02-28 10:45:00 -05:00
Ylva Selling 080af4bb0b Start video in paused state 2023-02-28 10:35:22 -05:00
Ylva Selling afc9a0c1c7 Make seeking use set property with time-pos instead of command 2023-02-28 10:35:10 -05:00
Ylva Selling 4a617aa9eb Add set property function for doubles 2023-02-28 10:05:52 -05:00
Ylva Selling cc4e92e7fb Move libmpv render function to update function 2023-02-27 11:22:05 -05:00
Ylva Selling e18c8d1408 Merge branch 'feature/video-module' of https://github.com/OpenSpace/OpenSpace into feature/video-module 2023-02-24 15:24:23 -05:00
Ylva Selling a6827ae8e6 Add syncable to syncengine & improve synchronization 2023-02-23 16:10:10 -05:00
Ylva Selling ce95fedf0f Fix pause variable to be correct 2023-02-22 15:08:48 -05:00
Ylva Selling 6f0b7fbb53 Add synchronization between nodes for videoplayer 2023-02-22 14:56:14 -05:00
Ylva Selling 5ac1bb89e1 Cleanup 2023-02-21 18:53:49 -05:00
Ylva Selling 64b16e3545 Fix indentation for switch 2023-02-21 18:38:54 -05:00
Ylva Selling b890218716 Add functions to set properties 2023-02-21 18:38:42 -05:00
Ylva Selling bb819fb4b9 Change static casts to reinterpret casts 2023-02-21 18:38:21 -05:00
Ylva Selling c15535a5f7 Cleanup 2023-02-21 18:23:44 -05:00