 nusic
|
0958babaae
|
Refactor out common frag shader code between between local and global rendering
|
2016-07-13 19:49:29 -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
|
6c10e89ec0
|
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-07-08 13:20:19 -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 |
|
|
Erik Broberg
|
3bc91bdf16
|
Enable getting a default tile from TileProviders. Used e.g. when no tiles are in memory
|
2016-07-08 12:30:19 -04:00 |
|
|
Erik Broberg
|
cb78456739
|
Enable getting a default tile from TileProviders. Used e.g. when no tiles are in memory
|
2016-07-08 12:30:19 -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
|
cf37999128
|
Use texture tile padding
|
2016-07-05 13:35:14 -04:00 |
|
|
Erik Broberg
|
bc77baeb02
|
Use texture tile padding
|
2016-07-05 13:35:14 -04:00 |
|
|
Kalle
|
4b3b6e8a76
|
Fix invisible earth.
|
2016-07-01 17:55:56 -04:00 |
|
|
Kalle
|
a47241b11f
|
Fix invisible earth.
|
2016-07-01 17:55:56 -04:00 |
|
|
Erik Broberg
|
0f1d014b0e
|
Handle GDAL flipped Y axis in rasterIO call. Add alternate readImageData method
|
2016-07-01 01:06:58 -04:00 |
|
|
Erik Broberg
|
0bd8329e93
|
Handle GDAL flipped Y axis in rasterIO call. Add alternate readImageData method
|
2016-07-01 01:06:58 -04:00 |
|
|
Erik Broberg
|
d9d97b2dbd
|
Correctly visualize texture tile resolution and pixel positions
|
2016-06-30 13:25:22 -04:00 |
|
|
Erik Broberg
|
5896d7eb71
|
Dont read padded texture tiles atm..
|
2016-06-29 13:45:36 -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
|
b573c6104a
|
Use anisotropic filtering for tiles.
|
2016-06-22 19:18:58 -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 |
|
|
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 |
|