mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-15 10:09:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,819 Commits 82 Branches 46 Tags
ef62fdca30b16a870d0ef18cd53ccc8549e481ec
Commit Graph

214 Commits

Author SHA1 Message Date
kalbl
6e68472c66 Remove unused data struct TileProviderInitData and clean up. 2016-10-27 11:31:43 +02:00
Erik Broberg
9f7e1e05b2 Merge in feature/globebrowsing 2016-10-26 19:16:37 +02:00
Erik Broberg
c4bdd12e0a Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-10-26 19:09:19 +02:00
Erik Broberg
9f65907579 Refactor chunk rendering related class names and file structure 2016-10-26 18:15:31 +02:00
Erik Broberg
21b41e3ec0 Clean up and remove unused code 2016-10-26 14:40:35 +02:00
kalbl
c3eae0347c Add default geo transform for global maps if it is not specified. 2016-10-25 23:32:08 +02:00
Erik Broberg
baba1f02d0 layers in LayerGroup are private 2016-10-25 19:56:11 +02:00
Erik Broberg
1b2291484f Small DRY refactor 2016-10-25 19:47:31 +02:00
Erik Broberg
8d639f8c1a Fix tile level blending bug 2016-10-25 19:24:51 +02:00
Erik Broberg
a050a58981 Solve merge conflicts 2016-10-25 19:05:37 +02:00
Erik Broberg
9eb805a39d Merge 2016-10-25 18:30:15 +02:00
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
kalbl
4ff3823a26 Solve bug that caused incorrect height for no data values. 2016-10-20 15:04:59 +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
c555a96a09 Remove use of init data for textures. 2016-10-18 18:02:14 +02:00
kalbl
8e972ff7d6 Account for tile pixel start offset and size difference when calculating height on globe. 2016-10-18 17:21:05 +02:00
Erik Broberg
5077e9d247 Separate TileAndTransform from Tile 2016-10-18 17:10:49 +02:00
Erik Broberg
c9ea6066ff Merge 2016-10-18 15:58:04 +02:00
Erik Broberg
e46782f2b5 Move TileAndTransform to Tile 2016-10-18 15:49:47 +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
Erik Broberg
5b954c4321 Clearify bit range comment 2016-10-17 12:48:23 +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
kalbl
c516dc5b25 Solve conflict in scripts/common.lua 2016-10-11 17:51:57 +02:00
Emil Axelsson
5e2ea10bcd Add http proxy support for GDAL 2016-10-07 20:42:32 +02:00
Erik Broberg
0056c64b35 Optimally utilize tile hash key bits 2016-10-07 16:31:22 +02:00
Erik Broberg
dc410c213e Remove old files chunkindex.* and rename ChunkIndexTileProvider 2016-10-05 22:16:05 +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
619048e3b9 Add texture category GrayScaleTexture for textures with one channel. 2016-09-30 01:39:43 +02:00
kalbl
cf331dd523 Solve mac OSX errors. 2016-09-22 14:49:56 +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
d3f7139f5e Merge branch 'feature/globebrowsing' into syncing 
Conflicts:
	modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
 2016-09-20 14:48:28 +02:00
Alexander Bock
1b4b0f49b6 Update SGCT 2016-09-20 10:11:59 +02:00
Kalle Bladin
80a9dfd431 Document LayeredTextureShaderProvider 2016-09-15 15:22:39 -04:00
Kalle Bladin
f9e88fb40c Fix bug that caused black screen when unable to load gdal dataset. 2016-09-15 12:49:34 -04:00