Commit Graph

5214 Commits

Author SHA1 Message Date
Malin E a70e058eda WIP use libmpv instead of ffmpeg to render video tiles 2022-12-19 13:26:45 +01:00
Ylva Selling 90840001d9 Testing to read the video with libmpv and rendering it to OpenGL. Currently not working 2022-12-13 14:57:55 -05:00
Ylva Selling f233043f98 Working naive example 2022-12-12 16:00:01 -05:00
Ylva Selling 33c4180e96 Add libmpv and create some functions to test that the linking works 2022-12-12 15:07:24 -05:00
Malin E a132d5f48b Remove bounce mode for video playback 2022-11-28 15:48:30 +01:00
Malin E adbd1362a2 Rework frame index calculation + Debug checks 2022-11-28 15:41:27 +01:00
Malin E 2f07d5d3f9 Merge branch 'master' into feature/video-on-globe 2022-11-28 13:09:38 +01:00
Alexander Bock 44e5b17ec9 Global pass over the code to remove trailing spaces 2022-11-22 21:06:52 +01:00
Ylva Selling cf35d78eaa Create first draft of animation modes 2022-11-11 15:35:52 -05:00
Malin E 89ae484fbe Speed up decoding of video (hopefully) 2022-11-08 14:33:35 +01:00
Ylva Selling 7b85209dfc Mark functions in header file as const as well 2022-11-07 16:06:34 -05:00
Ylva Selling 2dc6ecb1ae Mark functions as const as adressed in PR comment 2022-11-07 13:00:24 -05:00
Ylva Selling bab3c78cf2 Add target node id to skybrowser topic 2022-11-07 12:53:30 -05:00
Ylva Selling e04ccdd15d Merge remote-tracking branch 'origin/master' into issue/2093 2022-11-07 12:37:35 -05:00
Alexander Bock 12bb47c71e Recalculate chunk bounding boxes when the settings of a heightlayer change (closes #2096)
* Correctly calculate Offset when negative numbers are involved
* Adds tile index layer for the Moon
* Remove empty spaces
2022-11-07 15:45:54 +01:00
Alexander Bock 5cedb26336 Build fix for CMake 3.24.3 2022-11-07 13:46:45 +01:00
Malin E e561694eca Add Tracy zones 2022-11-07 11:53:53 +01:00
Malin E fd27b63f4b Disable touch interaction while in a Camrea path or Session recording 2022-11-04 14:03:26 +01:00
Malin E 715022a278 Add property to dissable zoom and roll interaction for touch 2022-11-04 13:57:43 +01:00
Ylva Selling fb539b953e Create another mode for target dragging to work in dome 2022-11-01 14:36:19 -04:00
Emma Broman 81634ed996 Provide GDAL error message when failing to load dataset for layer 2022-11-01 11:32:27 +01:00
Alexander Bock 6249fa6d89 Collection of a number of changes (#2286)
* Cleanup Property code
* Remove NOLINT statements
* Return Property class types as string_view
* Remove getStringValue function
* Simplify string value retrieval
* Ensure that image paths in the ImageSequenceTileProvider are sorted (closes #2205)
* Some cleanup of OpenSpaceEngine
* Cleanup documentation
* Some more cleanup of engine classes
* Some more cleanup
* Update SGCT repository
* Use new Jenkins node identifiers as the old method broke with update
2022-10-30 12:54:14 +01:00
Ylva Selling ed20e394f5 Stretch video between start and end times 2022-10-28 16:58:44 -04:00
Ylva Selling 88ca62981c Merge branch 'feature/video-on-globe' of https://github.com/OpenSpace/OpenSpace into feature/video-on-globe 2022-10-28 14:13:08 -04:00
Ylva Selling 68ea36e08d Use renderable target vectors to calculate translation 2022-10-28 14:03:41 -04:00
Ylva Selling f1ff3c2db3 Cleanup 2022-10-27 17:15:53 -04:00
Ylva Selling cd92ea31dd First draft of using equatorial coordinates for dragging 2022-10-27 17:09:22 -04:00
Ylva Selling 70bfeb12ed Fix comments on PR 2022-10-27 14:07:39 -04:00
Ylva Selling 2d566b02ee Merge remote-tracking branch 'origin/master' into issue/2266 2022-10-27 13:58:41 -04:00
Malin E d369e63e12 Bind in gmae time to the video time 2022-10-17 11:10:05 +02:00
Alexander Bock aeb366ae61 Add new dashboard item to show elapsed times (closes #2234). Cleanup handling of TimeConversion and add unit testing 2022-10-15 00:08:22 +02:00
Ylva Selling c7da2d28ad Merge branch 'feature/video-on-globe' of https://github.com/OpenSpace/OpenSpace into feature/video-on-globe 2022-10-14 15:22:14 -04:00
Ylva Selling 4a8e4a35bc Create timer that allows the browser to reload before changing the border radius 2022-10-12 11:08:24 -04:00
Emma Broman e12500812f Fix a typo 2022-10-12 15:54:17 +02:00
Ylva Selling 0f55616a3e Merge branch 'master' into issue/2093
# Conflicts:
#	modules/skybrowser/src/targetbrowserpair.cpp
2022-10-12 09:14:41 -04:00
Ylva Selling fbf1fa125e Traverse over full tile texture 2022-10-12 08:56:19 -04:00
Malin E cff3d3c4f1 WIP find corresponding frameindex in video depending on in game time 2022-10-12 13:44:56 +02:00
Ylva Selling c710aa3a34 Ensure browser is initialized properly before executing javascript 2022-10-07 16:20:43 -04:00
Ylva Selling 59209928e6 Clamp user input 2022-10-07 16:08:51 -04:00
Ylva Selling 49da498ee3 Fix bug of sending set radius message too early 2022-10-07 16:08:34 -04:00
Ylva Selling cfb3859bb5 Merge remote-tracking branch 'origin/feature/skybrowser-reload' into issue/2029
# Conflicts:
#	modules/skybrowser/include/renderableskytarget.h
#	modules/skybrowser/include/wwtcommunicator.h
#	modules/skybrowser/skybrowsermodule.cpp
2022-10-06 15:33:40 -04:00
Ylva Selling 41b45de1fb Merge remote-tracking branch 'origin/master' into issue/2029 2022-10-06 15:13:01 -04:00
Malin E f81e911a22 Add PBO for async texture upload 2022-10-05 16:17:19 +02:00
Malin E 8a3079519a Enable caching for each video frame to increase FPS 2022-10-05 11:29:07 +02:00
Micah Acinapura 90f2ad0cbe telling browser to reload collection on reload 2022-10-04 14:12:00 -04:00
Ylva Selling f876f05202 Merge remote-tracking branch 'origin/master' into feature/video-on-globe 2022-10-04 12:08:51 -04:00
Ylva Selling a3e048232e Make reset button work (it restarts the video from the beginning) 2022-10-04 12:07:20 -04:00
Ylva Selling fa30188e44 Fix bug with rendering video layer 2022-10-04 12:06:08 -04:00
Ylva Selling 03a8e58955 Move intialization from constructor to internalInitialize and create a member variable that keeps track of initialization 2022-10-03 17:05:17 -04:00
Ylva Selling 2737679da2 Play video with correct fps 2022-10-03 16:15:08 -04:00