Commit Graph

1973 Commits

Author SHA1 Message Date
Kalle Bladin 2909d120e5 Try a new dataset for color texture. 2016-05-16 10:27:57 -04:00
Kalle Bladin fecfcc5bd8 Fix problems for compiling and running on OSX. 2016-05-16 10:27:20 -04:00
Kalle Bladin 6ddec421b7 Solve problem with too big texture tiles requested. 2016-05-13 20:27:30 -04:00
Kalle Bladin c4c65c98d8 Solve merge conflict and removed rendering of borders. 2016-05-13 19:01:47 -04:00
Erik Broberg f48400523c A Chunk not visible to the camera wants to get merged. Cleaned up ChunkRender render signature 2016-05-13 18:31:44 -04:00
Kalle Bladin 6601282402 Fix rendering bugs and commented a TODO in layeredtextureshaderprovider.cpp 2016-05-13 18:19:29 -04:00
Kalle Bladin 6c13686229 Layered texture shader provider used to get shaders up to date. Not everything implemented yet. 2016-05-13 17:32:14 -04:00
Erik Broberg ac24890195 Merge 2016-05-13 15:19:37 -04:00
Erik Broberg ca968b8589 Added AABB class, doing frustum culling based screen space AABB based on chunks 8 extreme points (min/max height per corner) 2016-05-13 15:15:08 -04:00
Kalle Bladin edf08d2b3d Use datastructure TextureTile for tiles in shader. 2016-05-12 13:15:50 -04:00
Kalle Bladin ec8299da69 Solve merge conflict. 2016-05-12 11:46:59 -04:00
Erik Broberg 4c3604420e Added maximumRadius() and setting cache values from separate method instead of init list 2016-05-12 11:37:47 -04:00
Kalle Bladin 4e95aaab82 Using scaling and offset for heightmap based on dataset. 2016-05-12 11:06:49 -04:00
Erik Broberg f825efa5e5 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-11 18:43:09 -04:00
Erik Broberg 0c9ce5af70 Enabling 'Freeze camera used for chunk culling' from GUI. Helpful for culling debugging 2016-05-11 18:38:19 -04:00
Erik Broberg afd8ba5e9b Added copy constructor for Camera 2016-05-11 18:36:19 -04:00
Erik Broberg 9ccd43b8b9 Using lua key bindings in globebrowsing scene 2016-05-11 16:57:32 -04:00
Erik Broberg 6480ab3f11 Renamed ChunkLodGlobe to ChunkedLogGlobe and made DistanceSwitch not a renderable 2016-05-11 16:10:39 -04:00
Kalle Bladin 41865bdc92 Chunked lod patches can be rendered in camera space. 2016-05-11 15:47:29 -04:00
Kalle Bladin 1e37e62bdc Solve merge conflict. 2016-05-11 11:02:03 -04:00
Kalle Bladin 2cde44c822 Debugging culling and tree splitting 2016-05-11 10:56:37 -04:00
Erik Broberg ef11f45e38 Avoid unused calculations in Chunk update. Patches are 100x100 2016-05-10 21:31:24 -04:00
Erik Broberg 4c914510db replaced getChildIndices with getChild in ChunkIndex 2016-05-10 20:21:27 -04:00
Erik Broberg f528ea9cb7 merge 2016-05-10 20:02:14 -04:00
Erik Broberg 5cade91a37 Created class Chunk with a corresponding rendering method 2016-05-10 20:00:15 -04:00
Kalle Bladin 85d9ff8eee Solve merge conflict. 2016-05-10 19:36:17 -04:00
Kalle Bladin 574d7bfe79 Rendering small patches does not create new tiles. 2016-05-10 19:26:16 -04:00
Erik Broberg e6d6c15874 ChunkNodes store their own ChunkIndex 2016-05-10 17:26:58 -04:00
Erik Broberg bc99692192 Merge 2016-05-10 15:57:24 -04:00
Erik Broberg dbf7aa97ce Merged ChunkIndex and GeodeticTileIndex 2016-05-10 15:47:58 -04:00
Kalle Bladin 2b2c3166e4 Height mapping for chunked lod globe. 2016-05-10 13:29:07 -04:00
Erik Broberg 8c24108338 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-09 23:21:24 -04:00
Erik Broberg a176bd8ffc Using chunked log globe 2016-05-09 23:21:19 -04:00
Kalle Bladin 9d1b6a33b6 Add class horizonculler and fix for explicit opengl types. 2016-05-09 23:19:49 -04:00
Kalle Bladin 5b2d60b126 Rendering chunked lod globe. 2016-05-09 22:53:37 -04:00
Erik Broberg fa53b67846 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-09 22:12:29 -04:00
Erik Broberg f8d257b5bc TileProvider serves tiles with highest available resolution and a corresponding translation and scaling, given a tileIndex 2016-05-09 22:12:19 -04:00
Erik Broberg a816b71a5a Moved PatchCoverage specific logic from TileProvider to PatchCoverageProvider 2016-05-09 18:27:30 -04:00
Erik Broberg acfda284c9 Convenience methods in GeodeticTileIndex 2016-05-09 18:15:26 -04:00
Kalle Bladin 47fa0efed8 Solve problems with building on OSX. 2016-05-08 21:46:28 -04:00
Erik Broberg b63f427cff Fixed bug in GdalDataConverter<T>::geodeticToPixel which caused some tile texture data to be read and displayed incorrectly 2016-05-07 00:10:23 -04:00
Kalle Bladin 004f7c6185 Temporary solution to problem with too small tiles. 2016-05-05 19:32:59 -04:00
Kalle Bladin 418a661986 Fix bug when reading multi channel WMTS datasets. 2016-05-05 17:47:24 -04:00
Kalle Bladin 338dfcfe4c Fix problem with edges between tiles in clipmap rendering. 2016-05-04 21:42:51 -04:00
Kalle Bladin cc4c035f6b Solve texture wrapping problem for clipmap rendering. 2016-05-04 19:46:05 -04:00
Kalle Bladin 04a363bab1 Merge branch 'develop' into feature/globebrowsing 2016-05-04 15:57:44 -04:00
Kalle Bladin 47ea06ca94 Render patches locally (camera space). 2016-05-04 15:52:36 -04:00
Kalle Bladin 6de208721d Separate shader files. 2016-05-04 13:19:46 -04:00
Kalle Bladin d16c6a96d0 Color is separate from height map. 2016-05-04 12:49:17 -04:00
Kalle Bladin c73e6a59cd Use height maps defined in the mod file. 2016-05-04 11:22:31 -04:00