 Ylva Selling
|
56e8574197
|
Fix bug with play function and handle property replies more excplicitly again
|
2023-02-10 13:42:53 -05:00 |
|
|
Ylva Selling
|
71169eef6e
|
Update some assets
|
2023-02-09 15:34:14 -05:00 |
|
|
Ylva Selling
|
b1ed46797f
|
Remove unnecessary ffmpeg library
|
2023-02-09 15:32:15 -05:00 |
|
|
Ylva Selling
|
f65c89b088
|
Fix seeking with map to simulation time to be more exact
|
2023-02-09 13:23:28 -05:00 |
|
|
Ylva Selling
|
aa4e42bcae
|
Fix bug with resizing fbo
|
2023-02-09 13:22:53 -05:00 |
|
|
Ylva Selling
|
70fd239418
|
Merge remote-tracking branch 'origin/master' into feature/video-on-globe
# Conflicts:
# modules/globebrowsing/src/layergroupid.h
# modules/globebrowsing/src/tileprovider/tileprovider.cpp
|
2023-02-09 12:55:08 -05:00 |
|
|
Ylva Selling
|
6935cc571f
|
Update assets to new properties
|
2023-02-09 12:44:11 -05:00 |
|
|
Ylva Selling
|
c3d265c12b
|
Make code to get properties on change more compact
|
2023-02-09 12:35:01 -05:00 |
|
|
Ylva Selling
|
13762fa4d3
|
Cleanup, add comments and rename AnimationMode to PlaybackMode
|
2023-02-09 12:29:25 -05:00 |
|
|
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 |
|
|
Ylva Selling
|
33326e29f5
|
Make wakeup function class specific
|
2023-02-07 11:39:27 -05: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
|
12398c4b1e
|
Add two new assets for the two different types
|
2023-02-02 16:30:17 -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 |
|
|
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 |
|
|
Ylva Selling
|
4b3a518f49
|
Seek the correct time before rendering
|
2023-01-27 09:39:13 -05:00 |
|
|
Ylva Selling
|
043a4280ca
|
Decouple frame time from libmpv and frame time from OpenSpace. Play back video at 24 fps
|
2023-01-25 18:44:17 -05:00 |
|
|
Alexander Bock
|
d52c5dd0d9
|
Cleanup code with designated initializer lists
|
2023-01-22 23:01:32 +01:00 |
|
|
Alexander Bock
|
43dbed24c1
|
Make DashboardItemGlobeLocation derive from DashboardTextItem instead
|
2023-01-21 22:22:00 +01:00 |
|
|
Alexander Bock
|
db361b4a48
|
Add the ability to move globe layers based on their name (closes #2411)
|
2023-01-21 19:12:29 +01:00 |
|
|
Ylva Selling
|
374af5669d
|
Tiny cleanup
|
2023-01-20 11:45:44 -05:00 |
|
|
Ylva Selling
|
05970745d2
|
Fix issues with deadlocks with libmpv and flickering
Commented out the stretching of the video for now
|
2023-01-20 11:44:23 -05:00 |
|
|
Ylva Selling
|
d75b63686b
|
Rename FfmpegTileProvider to VideoTileProvider
|
2023-01-19 11:19:05 -05:00 |
|
|
Ylva Selling
|
8167d47421
|
Fix small bug
|
2023-01-18 18:11:23 -05:00 |
|
|
Ylva Selling
|
da83acdef5
|
Remove unnecessary member variables
|
2023-01-18 18:08:42 -05:00 |
|
|
Ylva Selling
|
e3c7d782bd
|
Make tiles get correct part of texture for ffmpegtileprovider
|
2023-01-18 18:08:18 -05:00 |
|
|
Ylva Selling
|
cf95a9f35f
|
Split chunkTile function in two in tileprovider and make it virtual
|
2023-01-18 18:05:28 -05:00 |
|
|
Ylva Selling
|
90a0c3b131
|
Cleanup & remove unneccesary class variables
|
2023-01-18 18:04:43 -05:00 |
|
|
Ylva Selling
|
ff40138e9b
|
Update asset
|
2023-01-17 11:19:17 -05:00 |
|
|
Ylva Selling
|
f11e1469b4
|
Merge branch 'feature/video-on-globe' of https://github.com/OpenSpace/OpenSpace into feature/video-on-globe
|
2023-01-17 10:13:11 -05:00 |
|
|
Malin E
|
2d78909ea2
|
Use mpv_get_property_async instead of the non async version
|
2023-01-17 10:13:02 +01:00 |
|
|
Ylva Selling
|
b709c96627
|
Update video asset
|
2023-01-13 12:41:25 -05:00 |
|
|
Ylva Selling
|
61824c1f7d
|
Add some initialization values, print meta data and get resolution of video
|
2023-01-13 12:16:28 -05:00 |
|