Commit Graph

2139 Commits

Author SHA1 Message Date
Kalle Bladin 7ec7bbecea Remove OpenStreetMap dataset from debugglobe 2016-06-06 17:43:34 -04:00
Kalle Bladin e251e6f60f Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-06 17:40:34 -04:00
Kalle Bladin ba437809e0 Update culling to be done with double precision. 2016-06-06 17:40:11 -04:00
Erik Broberg db9923dc05 Do Time -> TileProvider mapping only once per frame 2016-06-06 14:25:37 -04:00
Erik Broberg c95363a732 Fix bug that caused multiple calls glBufferData(...) 2016-06-06 13:35:11 -04:00
Erik Broberg 08af82a82a Inject TileCache into TileProvider 2016-06-06 13:04:21 -04:00
Erik Broberg 113c37203b Add some temporal wms configs 2016-06-06 12:28:02 -04:00
Erik Broberg 2c37ac07a0 Select CachingTileProvider or TemporalTileProvider based on input XML 2016-06-06 12:26:23 -04:00
Erik Broberg 85c742642e Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-05 22:14:08 -04:00
Erik Broberg 097c9cf1db Move TileProvider initialization to TileProviderManager 2016-06-05 22:13:50 -04:00
Kalle Bladin f51f282dbb Merge branch 'feature/interaction' into feature/globebrowsing 2016-06-05 21:28:12 -04:00
Kalle Bladin 45e7c41690 Update camera to use double precition. 2016-06-05 21:27:20 -04:00
Kalle Bladin 187ddb8049 Solve merge conflict 2016-06-05 21:26:04 -04:00
Kalle Bladin d7278bfcc8 Update camera class. 2016-06-05 21:07:36 -04:00
Erik Broberg babad53a63 Add temporal GDAL dataset 2016-06-05 20:26:14 -04:00
Erik Broberg c3bd0bf4ee merge 2016-06-05 18:55:16 -04:00
Erik Broberg 5156071361 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-05 18:43:01 -04:00
Erik Broberg febe7326be Read temporal meta data from XML config and use it for TileProvider selection 2016-06-05 18:39:11 -04:00
Kalle Bladin 82d375373d Make it possible to activate and deactivate layer types and blending. 2016-06-05 18:38:19 -04:00
Erik Broberg 6285cac488 Add more flexibility to construction of Time instances 2016-06-05 18:35:40 -04:00
Kalle Bladin 9d59c25310 Failed experiment with anisotropic filtering. 2016-06-05 12:55:00 -04:00
Erik Broberg 9aea10b03e Read and parse time format from XML at TemporalTileProvider construction 2016-06-03 16:33:28 -04:00
Kalle Bladin cc31082eff Add more layers to debugglobe. 2016-06-03 14:39:02 -04:00
Kalle Bladin c891cc8d85 Change sampling of textures from array to be fixed. 2016-06-02 17:42:58 -04:00
Erik Broberg 678e91816b Setup a simple working demo with TemporalTileProvider as a TileProvider 2016-06-02 14:00:11 -04:00
Kalle Bladin 96c4f0e1c9 Solve merge conflict 2016-06-02 12:57:25 -04:00
Erik Broberg 2eaea4c7a9 Make TileProviderManager manage abstract TileProviders 2016-06-02 12:57:02 -04:00
Kalle Bladin a5b6eb935a Include list to compile on OSX 2016-06-02 12:55:59 -04:00
Erik Broberg 76b4cceb3c Simply the getHighestResolutionTile function signature 2016-06-02 12:40:54 -04:00
Erik Broberg 0b62168317 rename TileProvider -> CachingTileProvider 2016-06-02 12:31:57 -04:00
Erik Broberg 87e1a623dd Fix tile selection when chunk level > max dataset level 2016-06-02 12:29:09 -04:00
Erik Broberg a5fbacd92e Avoid program crash when no layer is active 2016-06-02 12:26:57 -04:00
Erik Broberg de7fcc91f4 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-02 12:12:09 -04:00
Erik Broberg 3a9f39c6cd Initialize only the first color texture and heightmap as active 2016-06-02 12:07:52 -04:00
Kalle Bladin 1e551a9e65 Change minimum value for lodScaleFactor 2016-06-02 12:04:07 -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
Erik Broberg 014da92270 Fixed bug causing level blending not working properly 2016-06-02 11:51:31 -04:00
Kalle Bladin 14eb1c0563 Clean up chunked lod patch shaders. 2016-06-02 11:16:10 -04:00
Erik Broberg 4e9dfce160 Enable TileProvider to provide Nth highest resolution tile 2016-06-02 11:09:15 -04:00
Erik Broberg bc98f7486f Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-01 22:20:57 -04:00
Erik Broberg 8b19e2fadc Remove default texture from TileProvider 2016-06-01 22:20:44 -04:00
Erik Broberg abbc431f63 Remove default texture from TileProvider 2016-06-01 22:19:37 -04:00
Erik Broberg ebb24f47f0 Merge 2016-06-01 21:48:23 -04:00
Erik Broberg b8496f8d57 Add simple TemporalTileProvider implementation 2016-06-01 20:55:32 -04:00
Erik Broberg 1097db4b5f Increase value range of delta time in GUI 2016-06-01 20:53:51 -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
Erik Broberg 447b4d4b62 Remove TileDataset with GDALDataset parameter as GDALOpen can take raw XML 2016-06-01 19:23:11 -04:00
Erik Broberg 9ddb54d546 Add explicit default constructor and copy constructor to class Time 2016-05-31 19:50:11 -04:00
Erik Broberg 6d4c9331dd Enable Time conversion to ISO8601 format 2016-05-31 19:37:17 -04:00