Ylva Selling
f9b7270910
Merge branch 'feature/video-module' of https://github.com/OpenSpace/OpenSpace into feature/video-module
2023-02-15 14:08:17 -05:00
Ylva Selling
2ac910bfd6
Make stretching work again and fix some bugs with destroying mpv and format for pause
2023-02-15 14:08:08 -05:00
Ylva Selling
c01487458c
Split videotileprovider and videoplayer into two classes
2023-02-15 10:55:23 -05:00
Alexander Bock
6468964f68
Improve the reporting of specification errors
2023-02-15 15:26:23 +01:00
Ylva Selling
a61d98c268
Create video player class
2023-02-14 16:07:21 -05:00
Ylva Selling
8cb5bbf49a
Move videotileprovider to video module
2023-02-14 15:38:47 -05:00
Ylva Selling
eccb98dd24
Create module for video
2023-02-14 15:20:29 -05:00
Ylva Selling
ec8d5beb75
Update cmake file to copy the libpenh264 dll to bin after building
2023-02-14 12:50:55 -05:00
Emma Broman
352c9dd5ec
Touch module code cleanup ( #2465 )
...
* Remove unused feature that allowed us to "pick" nodes using touch (it didn't really work and had some nasty hardcoded and costly implementation). Fixes Touch interaction picking refactor #1041
* General refactoring of code and removing redundant code
* Make touch markers prettier (change default color and smoothen edges)
* Add module property to control which renderable types are "directly touchable"
* Add SGN property to control which individual nodes are "directly touchable" ("SupportsDirectInteraction")
* Fix stuttering when zooming in closer than the orbitalnavigator allows
2023-02-14 13:55:24 +01:00
Emma Broman
9d53b1f62d
Add option to specify an offset distance for RenderableNodeLine ( #2483 )
2023-02-14 13:07:05 +01:00
Alexander Bock
c242104baf
Improve the reporting of specification errors
2023-02-13 22:16:23 +01:00
Ylva Selling
e924b41bf0
Merge pull request #2359 from OpenSpace/issue/2313
...
Issue/2313: Ensure all nodes in a cluster loads the image collection in the sky browser
2023-02-13 12:55:08 -05:00
Ylva Selling
488dfe2603
Address comment on PR
2023-02-13 12:52:51 -05:00
Ylva Selling
c03a9ae360
Address comments on PR: use Spacecraft instead of Spacecraft etc
2023-02-13 12:46:08 -05:00
Ylva Selling
5144fd8f02
Merge remote-tracking branch 'origin/master' into feature/video-on-globe
2023-02-13 10:59:01 -05:00
Ylva Selling
f7c871743e
Change to proper format (double) for input argument to libmpv
2023-02-10 15:41:51 -05:00
Ylva Selling
bb85fd25ec
Set flag for when mpv context is being destroyed
2023-02-10 15:41:18 -05:00
Ylva Selling
51385cf208
Fix bug that libmpv sometimes thinks an address to a boolean is true
2023-02-10 15:40:51 -05:00
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
f9692f8f22
Change delimiter to correct character
2023-02-10 13:06:52 -05:00
Ylva Selling
0ee565027e
Merge remote-tracking branch 'origin/master' into issue/2313
...
# Conflicts:
# modules/skybrowser/skybrowsermodule_lua.inl
2023-02-10 13:06:38 -05:00
Ylva Selling
fb3628b684
Merge remote-tracking branch 'origin/master' into issue/2409
2023-02-10 10:20:05 -05:00
Alexander Bock
e37a9ed213
Linux compile fix
2023-02-10 08:59:40 +01:00
Ylva Selling
2f96e54c8e
Merge remote-tracking branch 'origin/master' into issue/2403
...
# Conflicts:
# modules/skybrowser/include/wwtcommunicator.h
# modules/skybrowser/src/wwtcommunicator.cpp
2023-02-09 16:20:42 -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
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
