Commit Graph

58 Commits

Author SHA1 Message Date
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
Ylva Selling
e2fdb74f6a Fix indentation 2023-02-21 18:05:37 -05:00
Ylva Selling
46016a19f5 Create maps to map keys with data in order to validate which formats and commands are usable with which keys 2023-02-21 18:05:24 -05:00
Ylva Selling
c0794ef498 Add video player as property subowner instead of doing it in renderable classes 2023-02-21 14:14:26 -05:00
Ylva Selling
a68c8891ea Make renderable video sphere derive from renderable and copy code from renderablesphere 2023-02-16 14:21:59 -05:00
Ylva Selling
7154b6c4fa Move video stretching into video player 2023-02-16 12:04:13 -05:00
Ylva Selling
8d79e348b3 Move video properties to video player out of renderables 2023-02-16 11:48:43 -05:00
Ylva Selling
3f3b5dd229 Remove unnecessary printout 2023-02-16 11:48:26 -05:00
Ylva Selling
f4c216d673 Move properties from renderable to video player class 2023-02-16 11:41:25 -05:00
Ylva Selling
871733be1e Change File to Video to better describe both paths and urls 2023-02-16 11:41:06 -05:00
Ylva Selling
bb15f0efe0 Add functionality to mute video in video player and add properties in video player 2023-02-16 11:31:14 -05:00
Ylva Selling
56473c77e0 Change path into string since we can play youtube videos too 2023-02-15 17:59:27 -05:00
Ylva Selling
ce565a7002 Add reset to screen space video and renderable video sphere to be able to recover when it doesn't play 2023-02-15 15:55:06 -05:00
Ylva Selling
04c89fe887 Add video sphere 2023-02-15 15:45:14 -05:00
Ylva Selling
a257c813b3 Add screenspace video 2023-02-15 15:45:00 -05:00
Ylva Selling
7a29aaa3ea Remove unnecessary comment 2023-02-15 14:46:55 -05:00
Ylva Selling
4a119d8a99 Change error message to an info message as it is printed every time and there is no problem 2023-02-15 14:41:44 -05:00