mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-16 17:00:59 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,757 Commits 81 Branches 46 Tags
3dfbb4e6bf3b7a568efc66cc1da9f7575fa376fd
Commit Graph

56 Commits

Author SHA1 Message Date
Erik Broberg
3dfbb4e6bf Add GPULayerManager and remove LayeredTextureShaderUniformIdHandler 2016-10-25 18:20:59 +02:00
Erik Broberg
ac3b67e3bb cleanup and rename Layer isActive to enabled 2016-10-25 17:00:01 +02:00
Erik Broberg
92ae076c51 Refactor CPU and GPU layer rendering settings 2016-10-25 16:35:49 +02:00
Erik Broberg
d03093d1e9 Layers have LayerRenderingSetting which syncs to GPU automatically 2016-10-24 20:17:05 +02:00
Erik Broberg
0bdb22cc3a Refactor: CPU to GPU mapping of all Layer data 2016-10-24 12:22:23 +02:00
Erik Broberg
bfbd331cdf Intermediate commit: Pre gpu layer refactorization 2016-10-21 15:19:59 +02:00
Erik Broberg
1df163a3b9 Intermediate commit: Mapping ChunkTilePiles between CPU and GPU. Height not working 2016-10-21 13:49:44 +02:00
Erik Broberg
fd6dd16417 Intermediate commit: pre shader refactorization 2016-10-20 18:54:44 +02:00
Erik Broberg
2af1731583 Simple mapping of structs on CPU to GPU. See gpuChunkTilePile 2016-10-20 10:17:40 +02:00
Erik Broberg
ee9bb36a06 TileProviderManager -> LayerManager. Fix shader recompilation bug 2016-10-19 16:10:56 +02:00
Erik Broberg
0d02844982 Clearify iteraction 2016-10-19 15:17:41 +02:00
Erik Broberg
331191bf03 Renaming Layer, LayerGroup. Cache activeLayers 2016-10-19 14:44:09 +02:00
Erik Broberg
69a0c58c32 TileProviderManager caches active providers 2016-10-19 13:35:42 +02:00
Erik Broberg
974fc6bb52 Rename TileAndTransform to ChunkTile 2016-10-19 12:18:38 +02:00
kalbl
7f62bd7206 Create namespace globebrowsing. 2016-10-18 15:40:27 +02:00
kalbl
0f452b8f8b Comment and document code. 2016-10-17 16:16:50 +02:00
kalbl
670497c16d Update file structure in globebrowsing 2016-10-15 13:22:22 +02:00
kalbl
2f13b9e9f4 Simplify the ability to add more per layer settings and move layered rendering src files to separate folder. 2016-10-15 03:04:09 +02:00
Erik Broberg
cdf954d2aa Rename: ChunkIndex -> TileIndex 2016-10-05 21:06:03 +02:00
kalbl
da947cab7e Add the settings properties gamma and multiplier to RenderableGlobe textures. 2016-10-04 00:52:18 +02:00
kalbl
bacd189d8c Add per layer settings for shading. Includes opacity. 2016-10-03 12:29:50 +02:00
kalbl
423c55ba38 Update structure of properties for renderable globes. 2016-10-02 21:30:26 +02:00
kalbl
fae89a12a0 Clean up and enable shading without night texture. 2016-09-30 00:58:11 +02:00
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
b6a13fa097 Compile fix 2016-09-20 14:10:11 +02:00
Alexander Bock
6637ae2849 Update Ghoul 2016-09-19 22:45:45 +02:00
Kalle Bladin
7a22763143 Remove texture cateory HeightMapOverlays 2016-09-14 20:08:33 -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
850ccb6d3c Update rendering of shadow texture and water mask in RenderableGlobe. 2016-08-25 00:00:22 -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
2ec2c95cd7 Add forgotten updates for last commit 2016-07-15 17:16:48 -04:00
Erik Broberg
a2cd9bc19d Add static const CHUNK::DEFAULT_HEIGHT to avoid magic numbers in code 2016-07-15 14:21:29 -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
f1d8e42dff Add TileProviderGroup and use to represent tile provides in same category 2016-07-12 14:59:35 -04:00
Kalle
6c10e89ec0 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-08 13:20:19 -04:00
Kalle
3985dea808 Height map overlay working but needs to be used for height sampling on cpu. 2016-07-08 12:42:41 -04:00
Erik Broberg
cb78456739 Enable getting a default tile from TileProviders. Used e.g. when no tiles are in memory 2016-07-08 12:30:19 -04:00
Kalle
fd05a88419 Create new layer category heightmap overlay used for local datasets with alpha channel. 2016-07-07 20:59:02 -04:00
Kalle
83881e33b2 GlobeBrowsingInteractionMode makes camera follow rotation of the globe and make globebrowsing work with spice kernels 2016-07-01 17:42:49 -04:00
Erik Broberg
992c828cce Render vertex and heightmap resolution. Fix offsetted pixel read bug in TileDataset 2016-06-29 00:32:25 -04:00
Erik Broberg
516e6b36ba Use std::make_shared instead of new 2016-06-22 21:07:47 -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
953d8554dc Move commonly used GUI debug options to separate struct 2016-06-21 19:24:25 -04:00
Erik Broberg
427cc0cc2b Reduce local chunk rendering code by use of loops 2016-06-21 17:21:00 -04:00
Erik Broberg
badb4e8a73 Iterate over layer categories by loops istead od hard coded indices 2016-06-21 16:50:58 -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
Kalle Bladin
c4251d603f Fix bug that causes disabling blending to write warnings. 2016-06-20 20:15:14 -04:00
Kalle Bladin
db675d3993 Add Mars datasets. 2016-06-20 19:33:20 -04:00