Commit Graph

248 Commits

Author SHA1 Message Date
Erik Broberg
5030465bb8 Add a local test texture and a new TileProvider severing a single tile 2016-06-29 15:18:25 -04:00
Erik Broberg
1d856151ed Implement and use factory pattern for TileProvider instantiation 2016-06-29 13:47:11 -04:00
Erik Broberg
5896d7eb71 Dont read padded texture tiles atm.. 2016-06-29 13:45:36 -04:00
Erik Broberg
072a97ee10 Make TileProviders default to disabled if unspecified in mode file 2016-06-29 12:41:36 -04:00
Erik Broberg
fd95871825 Improve TileProvider interface by removing getAsyncReader() 2016-06-29 11:31:50 -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
cdc3daedca Clear up some code in TileDataset 2016-06-28 18:35:35 -04:00
Erik Broberg
dd8bdc69b7 Move tile datatype related stuff to separate file 2016-06-28 11:59:19 -04:00
Erik Broberg
81676ed98f Move TileIOResult to separate file 2016-06-28 11:18:57 -04:00
Kalle Bladin
ce72f57183 Minimum camera height above surface is now configurable. 2016-06-27 18:46:35 -04:00
Kalle Bladin
627f00faba Generalize tile fetching to consider datasets without overviews. 2016-06-27 16:17:10 -04:00
Erik Broberg
6d11ba2946 Move blending bools from ChunkLodGlobe to TileProviderManager and init them to true 2016-06-22 20:51:28 -04:00
Erik Broberg
87c1fdc4de Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-22 20:25:50 -04:00
Erik Broberg
3ed227df11 Rename HashKey to ChunkHashKey and define it as uint64_t 2016-06-22 20:25:39 -04:00
Kalle Bladin
38e774882a Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-22 19:19:05 -04:00
Kalle Bladin
b573c6104a Use anisotropic filtering for tiles. 2016-06-22 19:18:58 -04:00
Erik Broberg
d7c45fcf60 Change prerender() to update() in TileProvider and related classes 2016-06-22 19:11:14 -04:00
Kalle Bladin
cb4b6dbdf3 Clean up in code that clamps camera position to height map. 2016-06-22 13:55:02 -04:00
Alexander Bock
37e18441dc Support GDAL on non-Windows platforms
Fix compile fix with TileProviderManager
Fix projection error on PlanetProjection
2016-06-22 08:51:58 +02:00
Kalle Bladin
7ff909c1fa Solve bug that caused wrong sampling of tile data on CPU. 2016-06-21 23:37:25 -04:00
Kalle Bladin
4d57c7d8e4 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-21 23:20:28 -04:00
Erik Broberg
623cc8ccc0 Quick fix of bug causing height tiles with missing data to be ignored and rendered as usual 2016-06-21 23:15:13 -04:00
Kalle Bladin
9e80baa792 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-21 22:57:38 -04:00
Kalle Bladin
5e8018b715 Limit camera to not go below the ground in globebrowsing interaction mode. 2016-06-21 22:57:12 -04:00
Erik Broberg
751a157f86 Use smart pointers and std::make_shared in TileProviders 2016-06-21 18:25:50 -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
323e3c2b45 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-20 19:33:32 -04:00
Kalle Bladin
db675d3993 Add Mars datasets. 2016-06-20 19:33:20 -04:00
Erik Broberg
8075c6e449 Fix bug that caused tileRequestQueue to not get flushed correctly 2016-06-20 12:06:28 -04:00
Erik Broberg
df2b68042e Better variable names in DiskCache 2016-06-20 11:13:47 -04:00
Erik Broberg
2360b9faf8 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-17 15:59:21 -04:00
Erik Broberg
a5aa5ec1a8 Add mode CacheHitOnly for DiskCachedLoadJob and go back to use old TileLoadJob 2016-06-17 15:59:08 -04:00
Erik Broberg
553131c407 Enabling a simple black default tileIOResult for debugging 2016-06-17 15:55:00 -04:00
Kalle Bladin
dd70733c2a Add gdal_data folder and pointing to it using CPLSetConfigOption to remove need of setting environment variable. 2016-06-17 15:52:32 -04:00
Kalle Bladin
153d239790 Catch exceptions when not able to read a GDAL dataset. 2016-06-17 13:07:15 -04:00
Erik Broberg
ef228c7a5e Add basic class for disc caching of tile data 2016-06-17 00:50:20 -04:00
Erik Broberg
6107e245bc Implement serialization of TileIOResults 2016-06-16 21:04:39 -04:00
Erik Broberg
5dcddfe5e9 Separate tile selection from tile provision 2016-06-16 00:08:13 -04:00
Erik Broberg
fa3671eb4a Improve GeodeticPatch interface by allowing getting min/max lat/lon 2016-06-15 14:25:32 -04:00
Kalle Bladin
627b8e635b Activated texture layers can be set from mod file. 2016-06-14 14:00:21 -04:00
Kalle Bladin
88555a1e1b Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-14 00:20:55 -04:00
Kalle Bladin
0b7ce79e80 Collapse layer category rendering code in to for loop. 2016-06-14 00:20:37 -04:00
Kalle Bladin
164e133ce9 Update tileprovidermanager to loop through texture categories. 2016-06-13 22:17:15 -04:00
Erik Broberg
f91ea449a5 avoid an unnecessary hashmap access 2016-06-13 19:12:39 -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
f850aa53e6 Make it easy to compare desiredChunkLevel approaches through a simple common interface 2016-06-13 18:15:30 -04:00
Erik Broberg
84e6e9a7af Modularize desired chunk level calculation for easy testing of different approaches 2016-06-13 16:30:22 -04:00
Erik Broberg
795846f6ee Updated file structure and removed unused class GlobeMesh 2016-06-10 11:53:26 -04:00