Commit Graph

1342 Commits

Author SHA1 Message Date
Malin E a2bbc44410 WIP something renders on the globe! 2022-12-20 17:31:15 +01:00
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
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
Malin E e561694eca Add Tracy zones 2022-11-07 11:53:53 +01: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
Malin E d369e63e12 Bind in gmae time to the video time 2022-10-17 11:10:05 +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 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
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
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
Ylva Selling 9040fb106f Scale all videos to 2048 * 1024 pixels 2022-09-29 12:28:14 -04:00
Ylva Selling d84738b0db Cleanup - remove unnecessary dynamic allocation of memory and unused texture 2022-09-29 12:12:20 -04:00
Malin E 866b37fac3 Expose ambient intensity value for globes as a property 2022-09-28 12:03:41 +02:00
Ylva Selling 535d00a186 Move allocation of tile memory to constructor and destructor to optimize rendering 2022-09-28 05:53:55 -04:00
Ylva Selling 301dfafabf Change the traversal of texture so the full image is displayed correctly on the globe 2022-09-28 05:52:59 -04:00
Ylva Selling aec2baf7d1 Add caching for tiles 2022-09-28 05:12:52 -04:00
Malin E 80a0ae8f09 Split image into tiles when requested 2022-09-26 13:59:50 +02:00
Malin E 73fb5e5476 Only create tiles when they are requested 2022-09-22 11:16:34 +02:00
Alexander Bock f502922338 CMake cleanup (#2246)
* Simplification of the DLL copying mechanism on Windows
* Only deploy Qt on Windows
* Use set_target_properties function
2022-09-21 10:52:05 +02:00
Ylva Selling 33c0fb7eb6 Fix some bugs so that the texture is showing again 2022-09-20 12:18:11 -04:00
Ylva Selling fbdf9acf37 Fix crash of sw_scale and change code so that the texture only changes its data, and is not created unique every frame 2022-09-20 12:04:51 -04:00
Malin E a0455bca70 Fix texture crashing 2022-09-20 14:04:38 +02:00
Malin E e04e06492f Try to create texture from a frame
* NOTE: It doesn't work yet
2022-09-16 14:44:39 +02:00
Ylva Selling c705e5336f Add a first attempt to make the avFrame a ghoul texture 2022-09-09 08:20:44 -04:00
Ylva Selling ae1dd8aa52 Make sure that the loading of video works and add test function to print the individual frames as images to files 2022-09-09 07:14:19 -04:00
Ylva Selling 406d58a02a Add check for dereferencing nullptr 2022-09-08 07:26:52 -04:00
Ylva Selling 81520c8ca1 Add videotilelayer to gpulayergroup 2022-09-08 07:26:23 -04:00
Ylva Selling 329de4f449 Add VideoTileLayer to the layer groups and the layers 2022-09-08 06:46:32 -04:00
Ylva Selling d4b1067d79 Merge branch 'feature/video-on-globe' of https://github.com/OpenSpace/OpenSpace into feature/video-on-globe 2022-09-08 03:45:19 -04:00
Ylva Selling 0ab35af535 Add test asset for video 2022-09-08 03:45:08 -04:00
Ylva Selling 27edca27f9 Move include directories to properties for more consistency 2022-09-08 03:40:07 -04:00
Malin E 3d5185ff5a Fix linker issues with ffmpeg 2022-09-07 16:09:43 +02:00