mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 17:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,091 Commits 82 Branches 46 Tags
535d00a186125666987d7d01102a9659071377c2
Commit Graph

1310 Commits

Author SHA1 Message Date
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
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
Alexander Bock
c206da4a98 Coding style adaptations 2022-04-10 23:25:37 +02:00
Micah Acinapura
5917ac598a Feature/location measure (#1987) 
* wip commit for measuring

* wip;fixing for codegene change

* adding asset file

* clean up comments

* pr comment cleanup
 2022-04-08 14:13:23 -04:00
Alexander Bock
02adcf570e Add a hidden "Fade" property that modifies the effective opacity to enable other functionality (closes #1970) 2022-04-05 23:53:33 +02:00
Malin E
07429694a4 Prevent exception when outside data range 2022-03-31 14:48:29 +02:00
Alexander Bock
acfb5d76ef Fix error introduced in the Lua function codegen update that accidentally changed some function names 2022-03-29 17:31:48 +02:00
Alexander Bock
3844df20c9 Feature/codegen lua (#1906) 
Adapting Lua functions to new codegen functionality
Improve the documentation itself
Add some styling to generated documentation
Have parameter names for Lua-defined Lua function documentation

Co-authored-by: Emma Broman <emma.broman@liu.se>
 2022-03-21 09:05:37 +01:00
Alexander Bock
6a708b1f18 Implement new Spout input methods to Tileproviders and new Renderables (#1901) 
* Implement new Spout input methods to Tileproviders and new Renderables

Co-authored-by: Marco Silva <marco@elumenati.com>
 2022-03-03 23:47:09 +01:00
Alexander Bock
37f2e017ec Remove Fallback layers (closes #1819) 2022-02-25 14:16:44 +01:00
Emma Broman
d0fcec569c Address stability problems for camera paths and make them more useful in general 
* Change spline curve parameter interval from [0,1] to [0,nSegments], for slightly increased precision
* Use linear paths whenever precision isn't enough/paths are too long (and traverse linear paths differently, to make them less depending on the distance)
* Remove OrbitalNavigator.LinearFlight and instead add "Zoom to" helper functions (closes #1837 )
* Add check to prevent triggering awkward short paths, for example when flying to the current target or to the same geo position twice
* Refactor speed code and handle speed when path is shorter than start+closeup distance
* Add easing to speed dampening
* Add topic for engine mode (to be used for UI later)
* Cleaner log when creating paths (some previous info messages are now debug messages)

Related PR: OpenSpace/OpenSpace-WebGuiFrontend#70
 2022-02-25 08:49:19 +01:00