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
Ylva Selling
66b32c2b3d
Add test code to ffmpegtileprovider update function
2022-09-07 03:49:01 -04:00
Ylva Selling
c1c35e0f2a
Update CmakeLists.txt with new try
2022-09-07 03:48:39 -04:00
Ylva Selling
be0aa8592a
Add ffmpegtileprovider to the module factory so it can be created like the other tileproviders
2022-09-07 00:24:31 -04:00
Malin E
ac58e5374e
Start unpacking frames with ffmpeg
2022-09-06 09:17:10 +02:00
Malin E
a76518e225
Add loading of video with ffmpeg
2022-09-05 16:47:48 +02:00
Malin E
92f0458dd6
Add ffmpeg library and a base for the new tileprovider
2022-09-05 14:29:27 +02:00
Alexander Bock
664eb60f4f
Increase the compile times by including more precompiled headers ( #2217 )
...
* Define WIN32_LEAN_AND_MEAN and VC_EXTRALEAN globally
* Use forked version of TUIO, some more work on precompiled headers
* Improvements for the Kameleon module
2022-08-26 16:32:21 +02:00
Alexander Bock
163ac4dcef
Cleanup of mostly asset files
...
- Fixes for all files
- constexpr cleanup
- Cosmetic changes
- Remove punctuation from the end of messages
2022-07-28 17:21:59 +02:00
Alexander Bock
0494343a58
Compile fix in Debug mode
2022-07-27 16:21:46 +02:00
Alexander Bock
edb8bc2fdc
Cleanup of the globebrowsing support code
2022-07-27 15:57:21 +02:00
Alexander Bock
c1252902c7
More Code Cleanup ( #2192 )
...
* Harmonizing ( and ) in function calls
* static const -> constexpr
* Fix compile issue
* Unify shader tab size
* Add _fs and _vs to shaders
* Harmonize spacing
2022-07-26 11:22:41 +02:00
Alexander Bock
9cc4c595a8
Code Cleanup ( #2191 )
...
* constexpr const -> constexpr
* const char* -> std::string_view
2022-07-25 15:57:45 +02:00
Ylva Selling
7ec6c247cc
Fix comments on PR
2022-07-21 12:38:59 -04:00
Ylva Selling
787e91a892
Merge remote-tracking branch 'origin/master' into feature/getting-started-tour
2022-07-21 12:26:20 -04:00
Alexander Bock
1a052f3c8c
Update to C++20
2022-07-19 15:42:31 +02:00
Ylva Selling
b6e4f6dcaf
Merge branch 'master' into feature/getting-started-tour
...
# Conflicts:
# modules/skybrowser/skybrowsermodule.cpp
2022-06-29 05:21:45 -04:00
Alexander Bock
9b1143f02f
Ubuntu 22.04 and GCC11 fixes ( #2163 )
...
* Update CEF version
* Update Ghoul
* Update SGCT
* Update codegen
* Remove warnings happening on Ubuntu 22.04 with GCC 11
* AppleClang warning fixes
* Compile fix for Ubuntu and MacOS
* Add Qt 6.2.3 to the CMAKE_PREFIX_PATH
2022-06-28 00:46:01 +02:00
Ylva Selling
dbb3b65927
Move calculation of camera geo position from DashboardItemGlobeLocation to a function in GlobeBrowsingModule
2022-06-01 15:07:45 -04:00
Malin E
9babbb7014
Address PR comments
2022-04-22 15:07:23 +02:00
Malin E
497314668a
Apply color map also outside data range
2022-04-21 11:30:06 +02:00
Malin E
6ec1a56c6a
Merge branch 'master' into issue/1964
2022-04-21 09:03:28 +02:00
Alexander Bock
5751fe26d3
Cleanup handling of warnings ( #2030 )
2022-04-16 20:57:29 +02:00
Alexander Bock
99d2bddf7c
Address coding style and remove compiler warnings in many places
2022-04-11 18:31:45 +02:00
