mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-21 18:38:20 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,695 Commits 83 Branches 47 Tags
5e2ea10bcd2ae0b4a26a4aa2992de4b8820c2da4
Commit Graph

155 Commits

Author SHA1 Message Date
Alexander Bock 329986c0c6 Merge branch 'develop' into feature/globebrowsing 
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
 2016-09-20 15:52:01 +02:00
Alexander Bock 6637ae2849 Update Ghoul 2016-09-19 22:45:45 +02:00
Kalle Bladin 7416d7ca69 Update mod files for osirisrex 2016-09-06 22:57:29 -04:00
Erik Broberg 5cf1a4fbe1 Enable per frame toggling of RenderableGlobes for multi node sync debugging 2016-09-01 15:31:38 -04:00
Kalle Bladin 84834f230d Merge branch 'develop' into feature/osirisrex 2016-08-29 13:01:28 -04:00
Alexander Bock dfa0709b11 More work into removing gdal dependency to libOpenspace 2016-08-29 02:12:33 +02:00
Kalle Bladin 14aad40e6c Fix bug that caused crash when switching on and off night textures and water masks for RenderableGlobe 2016-08-25 13:50:46 -04:00
Kalle Bladin ae1f8e457b Update RenderableGlobe to use transformation from SceneGraphnNode and fix bug in SpiceRotation. 2016-08-18 14:21:20 -04:00
Erik Broberg 5bddbcd683 Init lodScaleFactor to better reflect full screen resolution 2016-08-15 12:39:20 -04:00
Erik Broberg 42dc2da6f1 Each TileProvider has its own files located in tile/tileprovider/ 2016-08-12 00:14:13 -04:00
Erik Broberg 1dd569a3e1 Solve merge conflicts and fix bug in LayeredTextureUniformProvider 2016-08-11 17:05:14 -04:00
Alexander Bock 662e25963b Move ThreadPool class from OpenSpace into Ghoul 2016-08-03 10:58:53 +02:00
Erik Broberg dd01953f7c Enable disabling rendering of RenderableGlobe 2016-07-21 17:13:55 -04:00
Erik Broberg c25d1cdc88 Enable GUI toggling of visualization of heightmap resolution and intensities 2016-07-14 17:09:35 -04:00
Erik Broberg 828ec96251 Remove debugoption limitedByAvailableData from GUI 2016-07-12 15:46:41 -04:00
Erik Broberg f1d8e42dff Add TileProviderGroup and use to represent tile provides in same category 2016-07-12 14:59:35 -04:00
Erik Broberg edf114cda2 Enable resetting tile providers from GUI, i.e. reloading tiles 2016-07-12 11:20:57 -04:00
Kalle Bladin 5651e5bb24 Fix clang build errors. 2016-07-01 20:54:22 -04:00
Kalle dd7abd355a GlobeBrowsingInteractionMode makes camera follow rotation of the globe and make globebrowsing work with spice kernels 2016-07-01 17:42:49 -04:00
Kalle 3c7d1e22fc Globe browsing interaction mode follows the rotation of the globe. 2016-07-01 12:46:16 -04:00
Kalle Bladin ce72f57183 Minimum camera height above surface is now configurable. 2016-06-27 18:46:35 -04:00
Erik Broberg 0c935e5b59 Use current - instead of maximum - chunk level height tiles in ground collision test 2016-06-23 20:23:08 -04:00
Erik Broberg 6d11ba2946 Move blending bools from ChunkLodGlobe to TileProviderManager and init them to true 2016-06-22 20:51:28 -04:00
Erik Broberg d7c45fcf60 Change prerender() to update() in TileProvider and related classes 2016-06-22 19:11:14 -04:00
Kalle Bladin e8fc2250d5 Clean up in interaction mode abd push camera to the surface of the heightmap. 2016-06-22 17:48:59 -04:00
Kalle Bladin cb4b6dbdf3 Clean up in code that clamps camera position to height map. 2016-06-22 13:55:02 -04:00
Kalle Bladin 9e80baa792 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-21 22:57:38 -04:00
Kalle Bladin 5e8018b715 Limit camera to not go below the ground in globebrowsing interaction mode. 2016-06-21 22:57:12 -04:00
Erik Broberg 953d8554dc Move commonly used GUI debug options to separate struct 2016-06-21 19:24:25 -04:00
Erik Broberg 14ea82d929 Remove unused GUI properties 2016-06-21 18:28:29 -04:00
Erik Broberg c7ff3a4730 Remove unused GUI property chunkHeight 2016-06-21 17:21:37 -04:00
Erik Broberg 9df878e237 Use smart pointers in ChunkLodGlobe and RenderableGlobe 2016-06-21 16:26:38 -04:00
Erik Broberg c24b768397 Clean up GUI code managing layer categories 2016-06-21 16:01:18 -04:00
Erik Broberg 974d5fdaec Solve merge conflict 2016-06-21 14:04:33 -04:00
Erik Broberg 57700da843 Add ReferencedBoolSelection to abstract away a lot of boilare plate code in GUI bool properties 2016-06-21 14:01:29 -04:00
Erik Broberg db6793f762 Make DebugRendering have its own SelectionProperty in GUI 2016-06-21 12:49:54 -04:00
Kalle Bladin 1ab25d5845 Add new layer category grayscale overlay and use it for mars ctx global map. 2016-06-21 12:26:52 -04:00
Erik Broberg 2360b9faf8 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-17 15:59:21 -04:00
Erik Broberg a5aa5ec1a8 Add mode CacheHitOnly for DiskCachedLoadJob and go back to use old TileLoadJob 2016-06-17 15:59:08 -04:00
Kalle Bladin 101795aa00 Group layer categories in gui. 2016-06-17 10:52:44 -04:00
Erik Broberg bfd2441eaa Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-14 23:19:45 -04:00
Erik Broberg abbede263f Enabling toggling rendering of bounding Chunk volumes from GUI 2016-06-14 23:19:28 -04:00
Kalle Bladin 69c0d7f464 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-14 14:00:33 -04:00
Kalle Bladin 627b8e635b Activated texture layers can be set from mod file. 2016-06-14 14:00:21 -04:00
Erik Broberg 5025e09d77 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-14 10:32:16 -04:00
Erik Broberg 53870a7ef0 Add depth first search chunk iteration std::function as argument 2016-06-14 00:34:14 -04:00
Kalle Bladin 88555a1e1b Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-14 00:20:55 -04:00
Kalle Bladin 0b7ce79e80 Collapse layer category rendering code in to for loop. 2016-06-14 00:20:37 -04:00
Kalle Bladin 164e133ce9 Update tileprovidermanager to loop through texture categories. 2016-06-13 22:17:15 -04:00
Erik Broberg 8eb3621e03 Make limiting chunk level by available height data togglable from GUI 2016-06-13 21:40:14 -04:00