Commit Graph

126 Commits

Author SHA1 Message Date
Erik Broberg
244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Alexander Bock
06a5336961 Fix debugging with Clang
Removed include of vertex operations in fragment shader
2016-08-02 11:39:57 +02:00
Alexander Bock
67e8608581 Use the include paths to search for gdal_priv.h 2016-07-26 17:00:29 +02:00
Alexander Bock
0062276d45 Fix case for TileProviderManager 2016-07-26 16:05:03 +02:00
Erik Broberg
f4fa144606 Use shorter struct name. Previous name caused linker error LNK1179 2016-07-21 16:57:48 -04:00
Erik Broberg
7568912a7d Bounding chunk heights considers multiple heightmaps and handles missing data 2016-07-15 18:56:03 -04:00
Erik Broberg
d06c470636 Fix bounding heights (used for culling) for chunks with heightmap overlays 2016-07-15 13:48:00 -04:00
Erik Broberg
61928e83cd Make ChunkedLodGlobes able to fully reset their data sets 2016-07-14 01:13:26 -04:00
Erik Broberg
7e2e2cf2f4 Enable selecting highest resolution tile from a TileProviderGroup 2016-07-14 01:00:21 -04:00
nusic
f8bcd71bf4 Factor out creation of plain tiles to static method in Tile 2016-07-13 18:26:19 -04:00
nusic
5f2d692230 Fix: last commit did not consider the updated FontRenderer interface 2016-07-13 14:22:36 -04:00
nusic
c2488b6d8a Add ChunkIndexTileProvider to dynamically render chunk indices on tiles 2016-07-13 13:43:12 -04:00
Erik Broberg
f1d8e42dff Add TileProviderGroup and use to represent tile provides in same category 2016-07-12 14:59:35 -04:00
Erik Broberg
edf114cda2 Enable resetting tile providers from GUI, i.e. reloading tiles 2016-07-12 11:20:57 -04:00
Erik Broberg
bb344a57af Increase default tile provider cache size 2016-07-10 19:49:08 -04:00
Erik Broberg
5f0a5c2274 Merge 2016-07-09 17:38:57 -04:00
Erik Broberg
de3d76a30b Add PixelRegion methods 2016-07-09 17:37:36 -04:00
Kalle
36531a42af Solve merge conflict from previous filter. 2016-07-08 19:26:29 -04:00
Kalle
7bfdbedcd1 Change ordering of layer categories 2016-07-08 13:45:59 -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
60ca7db7a1 Merge commit 'eb34ad7aedf4450cdd59c1c6fcb5d66ed9e4eab0' into feature/globebrowsing 2016-07-08 13:00:03 -04:00
Kalle
6cb1eca56e Merge commit 'f4bb21d56b85f7ae00a6374ff731556e33315b69' into feature/globebrowsing 2016-07-08 12:53:05 -04:00
Kalle
c4de82ef6b Merge commit '87299a178e175a7bbc5bc88912a6fdb9342bfa58' into feature/globebrowsing 2016-07-08 12:49:33 -04:00
Erik Broberg
dd507d79dc Lazy init default tiles. Make TemporalTileProviders only use one default tile 2016-07-08 12:46:46 -04:00
Erik Broberg
35347b2d8d Lazy init default tiles. Make TemporalTileProviders only use one default tile 2016-07-08 12:46:46 -04:00
Kalle
b66c597930 Merge commit '4298677f776393f9eb1444b6a35a93cc38f59e10' into feature/globebrowsing 2016-07-08 12:46:10 -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
a5030ee664 Add method to create empty tile 2016-07-07 19:45:00 -04:00
Erik Broberg
67a18c723d Add method to create empty tile 2016-07-07 19:45:00 -04:00
Erik Broberg
958a4fac8a Prevent program crash when unable to open dataset 2016-07-07 17:17:12 -04:00
Erik Broberg
0399795d42 Prevent program crash when unable to open dataset 2016-07-07 17:17:12 -04:00
Erik Broberg
9327a34621 Handle repeated read where read and write regions have different sizes 2016-07-07 14:45:00 -04:00
Erik Broberg
eb34ad7aed Handle repeated read where read and write regions have different sizes 2016-07-07 14:45:00 -04:00
Erik Broberg
79ad4a15cb TileDatasets are created with a const Configuration 2016-07-07 13:56:03 -04:00
Erik Broberg
f4bb21d56b TileDatasets are created with a const Configuration 2016-07-07 13:56:03 -04:00
Erik Broberg
a14e91c8db Clarify cached members in TileDataset 2016-07-07 13:11:10 -04:00
Erik Broberg
87299a178e Clarify cached members in TileDataset 2016-07-07 13:11:10 -04:00
Erik Broberg
2923b4a698 Clean up initialization of TileDataset 2016-07-07 12:58:03 -04:00
Erik Broberg
4298677f77 Clean up initialization of TileDataset 2016-07-07 12:58:03 -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
927dc531eb Remove IODescription implementation from h file, and add comment to PixelRegion 2016-07-05 17:17:40 -04:00
Erik Broberg
687364b394 Remove IODescription implementation from h file, and add comment to PixelRegion 2016-07-05 17:17:40 -04:00