Commit Graph

51 Commits

Author SHA1 Message Date
Alexander Bock 6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock 328f57fb20 Fix error with pow being undefined when newValue becomes negative
Add wms.itn.liu.se as main server for CTX and Mola for Mars
2016-11-24 21:07:19 +01: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 a050a58981 Solve merge conflicts 2016-10-25 19:05:37 +02:00
Erik Broberg 0bdb22cc3a Refactor: CPU to GPU mapping of all Layer data 2016-10-24 12:22:23 +02:00
Erik Broberg 1df163a3b9 Intermediate commit: Mapping ChunkTilePiles between CPU and GPU. Height not working 2016-10-21 13:49:44 +02:00
Emil Axelsson b87539f678 Fix const-correctness in shaders and add texture init data 2016-10-20 09:39:49 +02:00
Erik Broberg 612980974e GSLS TextureLayerSettings supports signed data 2016-10-17 15:33:16 +02:00
kalbl ba8066c3ed Fiddle with shaded rendering of globes 2016-10-13 21:12:12 +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 619048e3b9 Add texture category GrayScaleTexture for textures with one channel. 2016-09-30 01:39:43 +02:00
kalbl fae89a12a0 Clean up and enable shading without night texture. 2016-09-30 00:58:11 +02:00
Kalle Bladin 7a22763143 Remove texture cateory HeightMapOverlays 2016-09-14 20:08:33 -04:00
Kalle Bladin 82618bfd99 Improve temporary atmosphere rendering 2016-09-06 20:32:49 -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 1d9aab6e63 Remove datasets from debugglobe.mod 2016-07-15 18:57:03 -04:00
Kalle Bladin 403ecd8209 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-15 17:13:05 -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
Kalle Bladin 4a9d03c54f Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-15 13:57:33 -04:00
Erik Broberg c25d1cdc88 Enable GUI toggling of visualization of heightmap resolution and intensities 2016-07-14 17:09:35 -04:00
Kalle Bladin 2e0bc756cb Solve bug with black texture data between grayscale overlays. 2016-07-13 23:33:00 -04:00
Erik Broberg 1d94dfeb1b Prep presentation 2016-07-11 16:53:02 -04:00
Kalle 36531a42af Solve merge conflict from previous filter. 2016-07-08 19:26:29 -04:00
Kalle 8ec942d87a Solve bug by removing unnecessary assert in IODescription cut. 2016-07-08 13:19:41 -04:00
Kalle fb96679042 Merge commit '2264a37327786f31392486be4658a643a92f45e8' into feature/globebrowsing 2016-07-08 12:43:23 -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
Kalle fd05a88419 Create new layer category heightmap overlay used for local datasets with alpha channel. 2016-07-07 20:59:02 -04:00
Erik Broberg b6237387d5 Use HSV for grayscale overlay. Add method TileDataset::pixelToGeodetic 2016-07-06 16:51:50 -04:00
Erik Broberg 2264a37327 Use HSV for grayscale overlay. Add method TileDataset::pixelToGeodetic 2016-07-06 16:51:50 -04:00
Erik Broberg 7ebd4f55b6 No-overview datasets use virtual overview to downsample write region. Ensure tiles have even number of pixels 2016-07-06 11:57:20 -04:00
Erik Broberg 060a22242d No-overview datasets use virtual overview to downsample write region. Ensure tiles have even number of pixels 2016-07-06 11:57:20 -04:00
Erik Broberg 3e2166e145 Add moon height and color WMS 2016-07-05 21:44:05 -04:00
Erik Broberg a868864354 Add moon height and color WMS 2016-07-05 21:44:05 -04:00
Erik Broberg d9d97b2dbd Correctly visualize texture tile resolution and pixel positions 2016-06-30 13:25:22 -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 626350b0dd Add GLSL function to compensate for GDAL sampling offset 2016-06-28 21:35:33 -04:00
Erik Broberg 3e53ff45b0 Visualize grid resolution when base layers are disabled 2016-06-28 19:28:54 -04:00
Kalle Bladin ce72f57183 Minimum camera height above surface is now configurable. 2016-06-27 18:46:35 -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 db675d3993 Add Mars datasets. 2016-06-20 19:33:20 -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 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 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 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