Commit Graph

285 Commits

Author SHA1 Message Date
Erik Broberg
abbede263f Enabling toggling rendering of bounding Chunk volumes from GUI 2016-06-14 23:19:28 -04:00
Kalle Bladin
b5f1a09b8c Cache uniform IDs upon recompiling of shader programs. Renaming of uniforms in shader code. 2016-06-13 18:57:18 -04:00
Erik Broberg
f64998b517 Fix CMake and add MultiLevelTile 2016-06-09 19:58:54 -04:00
Erik Broberg
0ef0343efd Toggle show chunk edges from gui and calculate level weights only once per vertex 2016-06-09 17:14:46 -04:00
Erik Broberg
25d02086a1 Use separate function for getting level weights 2016-06-09 14:18:39 -04:00
Erik Broberg
7ac8e37807 Rename TextureTile to Tile in shader for better correspondance with its CPU counterpart 2016-06-09 13:22:44 -04:00
Erik Broberg
bc19a826bf Factor out tile texture sampling 2016-06-09 12:44:16 -04:00
Kalle Bladin
ebdcfcfa44 Update water rendering. 2016-06-08 22:38:43 -04:00
Kalle Bladin
bd5b0de144 fix crash bug for local rendering. 2016-06-08 21:43:36 -04:00
Kalle Bladin
3980aeff57 Add the layer types water mask, nighttexture, and overlay as well as the option to toggle atmosphere. 2016-06-08 21:30:19 -04:00
Kalle Bladin
5e9fb5b05b Commented away use of border overlay. 2016-06-08 17:41:58 -04:00
Kalle Bladin
869be5dc44 Add glsl function to calculate intersection of ellipsoid. 2016-06-08 12:50:33 -04:00
Erik Broberg
7377d098cc Solve merge conflict 2016-06-08 00:36:35 -04:00
Kalle Bladin
dce89545d3 Remove option to toggle use of height map and color texture and fix related crash bug. 2016-06-07 18:36:01 -04:00
Erik Broberg
2c37ac07a0 Select CachingTileProvider or TemporalTileProvider based on input XML 2016-06-06 12:26:23 -04:00
Kalle Bladin
82d375373d Make it possible to activate and deactivate layer types and blending. 2016-06-05 18:38:19 -04:00
Kalle Bladin
9d59c25310 Failed experiment with anisotropic filtering. 2016-06-05 12:55:00 -04:00
Kalle Bladin
c891cc8d85 Change sampling of textures from array to be fixed. 2016-06-02 17:42:58 -04:00
Kalle Bladin
718a8a1431 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-02 11:53:25 -04:00
Kalle Bladin
14eb1c0563 Clean up chunked lod patch shaders. 2016-06-02 11:16:10 -04:00
Erik Broberg
ebb24f47f0 Merge 2016-06-01 21:48:23 -04:00
Erik Broberg
785a72ab98 Remove all unused clipmap related code 2016-06-01 20:52:12 -04:00
Kalle Bladin
c241448007 Enable blending between ties of different levels to avoid some of the poping artifacts. 2016-06-01 20:47:07 -04:00
Kalle Bladin
aa5e64c31b Change length of skirts to be relative the size of the patches. 2016-05-31 12:49:08 -04:00
Kalle Bladin
096c19e49f Change definition of for loop statements in shader preprocessor to include both max and min. 2016-05-31 12:17:40 -04:00
Kalle Bladin
7df7df6610 Implement skirts. 2016-05-27 16:48:23 -04:00
Kalle Bladin
039c5293c2 Render several texture layers on top of each other with more datasets. 2016-05-17 16:54:21 -04:00
Kalle Bladin
8f394a2b80 Add local scopes to for loops in shaders. 2016-05-17 13:18:56 -04:00
Kalle Bladin
daf1b5873e Rendering using many layers. 2016-05-16 20:48:23 -04:00
Kalle Bladin
fecfcc5bd8 Fix problems for compiling and running on OSX. 2016-05-16 10:27:20 -04:00
Kalle Bladin
6601282402 Fix rendering bugs and commented a TODO in layeredtextureshaderprovider.cpp 2016-05-13 18:19:29 -04:00
Kalle Bladin
6c13686229 Layered texture shader provider used to get shaders up to date. Not everything implemented yet. 2016-05-13 17:32:14 -04:00
Kalle Bladin
edf08d2b3d Use datastructure TextureTile for tiles in shader. 2016-05-12 13:15:50 -04:00
Kalle Bladin
4e95aaab82 Using scaling and offset for heightmap based on dataset. 2016-05-12 11:06:49 -04:00
Kalle Bladin
41865bdc92 Chunked lod patches can be rendered in camera space. 2016-05-11 15:47:29 -04:00
Erik Broberg
bc99692192 Merge 2016-05-10 15:57:24 -04:00
Kalle Bladin
2b2c3166e4 Height mapping for chunked lod globe. 2016-05-10 13:29:07 -04:00
Erik Broberg
f8d257b5bc TileProvider serves tiles with highest available resolution and a corresponding translation and scaling, given a tileIndex 2016-05-09 22:12:19 -04:00
Erik Broberg
acfda284c9 Convenience methods in GeodeticTileIndex 2016-05-09 18:15:26 -04:00
Erik Broberg
b63f427cff Fixed bug in GdalDataConverter<T>::geodeticToPixel which caused some tile texture data to be read and displayed incorrectly 2016-05-07 00:10:23 -04:00
Kalle Bladin
004f7c6185 Temporary solution to problem with too small tiles. 2016-05-05 19:32:59 -04:00
Kalle Bladin
338dfcfe4c Fix problem with edges between tiles in clipmap rendering. 2016-05-04 21:42:51 -04:00
Kalle Bladin
47ea06ca94 Render patches locally (camera space). 2016-05-04 15:52:36 -04:00
Kalle Bladin
6de208721d Separate shader files. 2016-05-04 13:19:46 -04:00
Kalle Bladin
d16c6a96d0 Color is separate from height map. 2016-05-04 12:49:17 -04:00
Kalle Bladin
e6e656f088 Changed rendering to a more pleasant color for debugging. 2016-05-03 21:27:17 -04:00
Kalle Bladin
360c0a8837 Fix bug with missaligned textures. 2016-05-03 21:10:51 -04:00
Kalle Bladin
b5cee62792 Set preferred size of tiles for tile provider. 2016-05-03 16:58:21 -04:00
Kalle Bladin
c18e05821c Fix bug in latlon spheremapping program. 2016-05-03 16:29:53 -04:00
Kalle Bladin
a3221dd5e7 Include ellipsoid.hglsl as an include file for use in ellipsoidal mapping. 2016-05-03 16:26:00 -04:00