mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-10 23:38:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,161 Commits 82 Branches 46 Tags
f876f052021bd3ebbb56d957109e5992db182eea
Commit Graph

5155 Commits

Author SHA1 Message Date
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
Malin E
8129762524 Add loggercat for labelscomponent 2022-09-28 11:14:07 +02:00
Ylva Selling
aec2baf7d1 Add caching for tiles 2022-09-28 05:12:52 -04:00
Malin E
7883311740 Merge branch 'master' into feature/grid-labels 2022-09-28 10:51:11 +02:00
Malin E
80a0ae8f09 Split image into tiles when requested 2022-09-26 13:59:50 +02:00
Malin E
71a2cf685a Remove not needed initialization 2022-09-23 15:35:29 +02:00
Malin E
ac79e4dc07 Start addressing PR comments 2022-09-22 12:01:01 +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
Gene Payne
ae84f1b120 Renderable prop change updates buffers without reinitializing GL (#2241) 2022-09-20 15:40:12 -06: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
34aa515f16 Fix issue with grid for different x and y values 
* Also adjust grid example asset to showcase the highlight feature
 2022-09-19 14:37:42 +02:00
Malin E
e215e9f2a7 Add labels to the other grid classes too 2022-09-19 12:07:59 +02:00
Malin E
69790882b9 Merge branch 'master' into feature/grid-labels 2022-09-19 09:38:40 +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
Emma Broman
57dc7dd6b8 Add some missing includes 2022-09-16 08:18:54 +02:00
Malin E
dcdfbf028f Add font size and face camera property 2022-09-14 13:25:45 +02:00
Malin E
533b1965c7 Enable depth test for the grids 2022-09-14 11:18:39 +02:00
Malin E
1c3dd8080c Merge branch 'master' into feature/grid-labels 2022-09-14 10:42:56 +02:00
Gene Payne
7946a93ee5 Fix for linux crashing when reading OMM files 
Linux doesn't use the '\r' line ending, so it doesn't recognize a line with only '\r' as being empty.
 2022-09-13 16:10:03 -06: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
Malin E
9667db22c9 Small fixes 2022-09-09 10:27:17 +02:00
Malin E
4415e840a8 Use new label class for the new grids 2022-09-08 14:54:15 +02: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
Malin E
40e7d0a9bd Merge branch 'master' into feature/grid-labels 
* Solve conflict in renderablegrid.h
 2022-09-08 11:31:35 +02:00
Malin E
91eb006d4e Add labels to RenderableGrid class 2022-09-08 11:28:12 +02:00
Malin E
0d6f4ecac0 Change name from SpeckLabels to LabelsComponent 2022-09-08 10:08:39 +02: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
Malin E
75fd08246c Switch from floats to doubles for the grids 
* Avoids jittering problems when close to SSB
 2022-09-08 09:41:00 +02:00
Ylva Selling
27edca27f9 Move include directories to properties for more consistency 2022-09-08 03:40:07 -04:00
Malin E
0055d331f2 Merge branch 'master' into feature/grids-update 2022-09-07 16:22:39 +02: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