3dfbb4e6bf
Add GPULayerManager and remove LayeredTextureShaderUniformIdHandler
2016-10-25 18:20:59 +02:00
ac3b67e3bb
cleanup and rename Layer isActive to enabled
2016-10-25 17:00:01 +02:00
92ae076c51
Refactor CPU and GPU layer rendering settings
2016-10-25 16:35:49 +02:00
d03093d1e9
Layers have LayerRenderingSetting which syncs to GPU automatically
2016-10-24 20:17:05 +02:00
0bdb22cc3a
Refactor: CPU to GPU mapping of all Layer data
2016-10-24 12:22:23 +02:00
bfbd331cdf
Intermediate commit: Pre gpu layer refactorization
2016-10-21 15:19:59 +02:00
1df163a3b9
Intermediate commit: Mapping ChunkTilePiles between CPU and GPU. Height not working
2016-10-21 13:49:44 +02:00
fd6dd16417
Intermediate commit: pre shader refactorization
2016-10-20 18:54:44 +02:00
2af1731583
Simple mapping of structs on CPU to GPU. See gpuChunkTilePile
2016-10-20 10:17:40 +02:00
ee9bb36a06
TileProviderManager -> LayerManager. Fix shader recompilation bug
2016-10-19 16:10:56 +02:00
0d02844982
Clearify iteraction
2016-10-19 15:17:41 +02:00
331191bf03
Renaming Layer, LayerGroup. Cache activeLayers
2016-10-19 14:44:09 +02:00
69a0c58c32
TileProviderManager caches active providers
2016-10-19 13:35:42 +02:00
974fc6bb52
Rename TileAndTransform to ChunkTile
2016-10-19 12:18:38 +02:00
5077e9d247
Separate TileAndTransform from Tile
2016-10-18 17:10:49 +02:00
c9ea6066ff
Merge
2016-10-18 15:58:04 +02:00
e46782f2b5
Move TileAndTransform to Tile
2016-10-18 15:49:47 +02:00
7f62bd7206
Create namespace globebrowsing.
2016-10-18 15:40:27 +02:00
0f452b8f8b
Comment and document code.
2016-10-17 16:16:50 +02:00
5b954c4321
Clearify bit range comment
2016-10-17 12:48:23 +02:00
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
c516dc5b25
Solve conflict in scripts/common.lua
2016-10-11 17:51:57 +02:00
5e2ea10bcd
Add http proxy support for GDAL
2016-10-07 20:42:32 +02:00
0056c64b35
Optimally utilize tile hash key bits
2016-10-07 16:31:22 +02:00
dc410c213e
Remove old files chunkindex.* and rename ChunkIndexTileProvider
2016-10-05 22:16:05 +02:00
cdf954d2aa
Rename: ChunkIndex -> TileIndex
2016-10-05 21:06:03 +02:00
da947cab7e
Add the settings properties gamma and multiplier to RenderableGlobe textures.
2016-10-04 00:52:18 +02:00
bacd189d8c
Add per layer settings for shading. Includes opacity.
2016-10-03 12:29:50 +02:00
423c55ba38
Update structure of properties for renderable globes.
2016-10-02 21:30:26 +02:00
619048e3b9
Add texture category GrayScaleTexture for textures with one channel.
2016-09-30 01:39:43 +02:00
cf331dd523
Solve mac OSX errors.
2016-09-22 14:49:56 +02:00
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
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
1b4b0f49b6
Update SGCT
2016-09-20 10:11:59 +02:00
80a9dfd431
Document LayeredTextureShaderProvider
2016-09-15 15:22:39 -04:00
f9e88fb40c
Fix bug that caused black screen when unable to load gdal dataset.
2016-09-15 12:49:34 -04:00
a11f16a0b3
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing
2016-09-14 21:17:19 -04:00
2c5c29ce9c
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing
2016-09-14 20:08:46 -04:00
7a22763143
Remove texture cateory HeightMapOverlays
2016-09-14 20:08:33 -04:00
c08299ea58
Add Doxygen comments for TextTileProviders
2016-09-14 19:35:55 -04:00
5e801f04f0
Replace start and end time in TemporalTileProvider with TimeRange
2016-09-14 19:26:45 -04:00
775088dc4d
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing
2016-09-14 18:57:59 -04:00
f7567839ad
Clean up and add Doxygen documentation for TemporalTileProvider
2016-09-14 18:57:46 -04:00
db18bc0c1a
Update error message in TileProvider::createFromDictionary.
2016-09-14 14:01:42 -04:00
5583ad5a7a
Add doxygen for grid and cleanup.
2016-09-14 13:46:47 -04:00
42ef18447f
Clean up in tile providers
2016-09-14 12:11:10 -04:00
9a34761e25
Clean up and add some doxygen comments for CachingTileProvider
2016-09-13 22:02:13 -04:00
bb9bebf558
Add doxygen comments for struct Tile
2016-09-13 21:12:11 -04:00
2fe3ecf72d
Add Doxygen documentation for TileProvider
2016-09-13 20:24:13 -04:00
c20cd80eaa
Merge globebrowsing, resolve conflicts
...
Reduce SizeReference font size - TextureAtlas threw InvalidRegionException
Use Mars and Earth Barycenter and not center of mass
Use name Mars instead of LodMars, same for Earth
Move init of font manager to be done prior to scene init
Debug log what modules are added
Debug log when creating SceneGraphNode from dictionary
2016-09-07 17:37:27 -04:00
Erik Broberg