Alexander Bock
0d03177d43
Feature/globebrowsingcleanup ( #230 )
...
* Initial restructuring of the Globebrowsing branch
* Update Ghoul repository
Fix include guards
* More cleanup
* Split texttileprovider subclasses into separate files
* Move TileProviders into namespace
* Convert static class methods into free functions
* Splitting tile subclasses into their own files
Remove `using namespace` from header file
* Split TileDataSet subclass into separate file
Update SGCT reference
* Move shader preprocessing data into internal class
* More Globebrowsing cleanup
* More cleanup
Remove unused Convexhull class
2017-02-15 21:20:05 +01:00
Alexander Bock
8456087cf5
Add a style check that checks whether the correct GLM header is used
...
Adapted files to use the correct GLM headers
2017-02-14 13:12:59 -05:00
Alexander Bock
6d9dc2bfeb
Fixed include guards
...
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
Alexander Bock
94e3e11188
Update copyright header to 2017
...
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock
8da0684ae2
More cleanup for newhorizons and globebrowsing module
2016-12-07 21:56:59 +01:00
Alexander Bock
ab6a952193
Some more code cleanup
2016-12-04 11:23:41 +01:00
Alexander Bock
dc3ded891b
Started with code cleanup of Globebrowsing
2016-12-04 10:34:25 +01:00
Alexander Bock
341bc8b105
Merge branch 'develop' into feature/globebrowsing
...
# Conflicts:
# modules/globebrowsing/chunk/chunkrenderer.cpp
# modules/globebrowsing/globes/renderableglobe.cpp
# modules/globebrowsing/globes/renderableglobe.h
2016-12-03 01:32:23 +01:00
Alexander Bock
b00595af40
Replacing const std::string with const char* to reduce binary size and initialization costs
2016-11-23 23:52:16 +01:00
Erik Broberg
2646e2dcbb
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing
2016-11-23 13:37:09 +01:00
Erik Broberg
edfd4c6693
Fix missing includes
2016-11-23 13:10:05 +01:00
kalbl
5a6b076507
Solve compilation error
2016-11-23 13:01:44 +01:00
Erik Broberg
88fd08ef96
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing
2016-11-23 12:26:15 +01:00
Erik Broberg
36e3f62508
Add enabling of stats collection for ChunkedLODGlobe in GUI
2016-11-23 12:23:38 +01:00
Alexander Bock
92676c107f
Remove wrong type of whitespace
...
Remove circular header dependency
Increase the time setting of the GUI
2016-11-12 11:16:15 +01:00
kalbl
a411ba4347
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing
2016-11-07 22:38:24 +01:00
Erik Broberg
ae6d27e474
TileIOResult -> RawTile, PreprocessData -> TileMetaData
2016-11-07 17:03:06 +01:00
kalbl
96ccb550d5
Update Documentation for culling.
2016-11-01 17:50:31 +01:00
kalbl
33618cc5c9
Add documentation to culling
2016-10-27 21:53:54 +02:00
kalbl
708ddd8400
Clean up and document Chunk code
2016-10-27 21:51:03 +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
6104b1fb58
Change ColorTextures to ColorLayers etc
2016-10-26 18:49:51 +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
Erik Broberg
1b2291484f
Small DRY refactor
2016-10-25 19:47:31 +02:00
kalbl
d2539b7ac5
Solve bug that caused chunk splitting to not match up with layer blending.
2016-10-25 19:39:29 +02:00
Erik Broberg
8d639f8c1a
Fix tile level blending bug
2016-10-25 19:24:51 +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
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
0930eca567
Make sure horizon culling uses closest point on patch
2016-10-17 14:37:25 +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
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
