Commit Graph

3794 Commits

Author SHA1 Message Date
Erik Broberg ae6d27e474 TileIOResult -> RawTile, PreprocessData -> TileMetaData 2016-11-07 17:03:06 +01:00
Erik Broberg 05687abb65 Add documentation to GPU structs and small refactor 2016-10-28 12:13:25 +02:00
kalbl 33618cc5c9 Add documentation to culling 2016-10-27 21:53:54 +02:00
kalbl 708ddd8400 Clean up and document Chunk code 2016-10-27 21:51:03 +02:00
kalbl 4548394f1c Clean up and document functions in globes. 2016-10-27 15:29:41 +02:00
kalbl c3a63cedfb Clean up and fix comments. 2016-10-27 12:13:43 +02:00
kalbl 6e68472c66 Remove unused data struct TileProviderInitData and clean up. 2016-10-27 11:31:43 +02:00
kalbl b1a3814c37 Make distance switch distance dependent on globe radius. 2016-10-26 23:08:47 +02:00
kalbl 9117599043 Add check for key Layers 2016-10-26 22:15:07 +02:00
Erik Broberg 9f7e1e05b2 Merge in feature/globebrowsing 2016-10-26 19:16:37 +02:00
Erik Broberg c4bdd12e0a Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-10-26 19:09:19 +02:00
Erik Broberg 6104b1fb58 Change ColorTextures to ColorLayers etc 2016-10-26 18:49:51 +02:00
Erik Broberg 9f65907579 Refactor chunk rendering related class names and file structure 2016-10-26 18:15:31 +02:00
Erik Broberg 21b41e3ec0 Clean up and remove unused code 2016-10-26 14:40:35 +02:00
kalbl c3eae0347c Add default geo transform for global maps if it is not specified. 2016-10-25 23:32:08 +02:00
Erik Broberg baba1f02d0 layers in LayerGroup are private 2016-10-25 19:56:11 +02:00
Erik Broberg 1b2291484f Small DRY refactor 2016-10-25 19:47:31 +02:00
kalbl d2539b7ac5 Solve bug that caused chunk splitting to not match up with layer blending. 2016-10-25 19:39:29 +02:00
Erik Broberg 8d639f8c1a Fix tile level blending bug 2016-10-25 19:24:51 +02:00
Erik Broberg a050a58981 Solve merge conflicts 2016-10-25 19:05:37 +02:00
Erik Broberg 9eb805a39d Merge 2016-10-25 18:30:15 +02:00
Erik Broberg 220a713a57 Change scripted identifier names 2016-10-25 18:21:23 +02:00
Erik Broberg 3dfbb4e6bf Add GPULayerManager and remove LayeredTextureShaderUniformIdHandler 2016-10-25 18:20:59 +02:00
Erik Broberg ac3b67e3bb cleanup and rename Layer isActive to enabled 2016-10-25 17:00:01 +02:00
Erik Broberg 92ae076c51 Refactor CPU and GPU layer rendering settings 2016-10-25 16:35:49 +02:00
Erik Broberg 7a0a4628a5 Add faster time out for the sometimes very slow terrain dataset 2016-10-24 20:18:07 +02:00
Erik Broberg d03093d1e9 Layers have LayerRenderingSetting which syncs to GPU automatically 2016-10-24 20:17:05 +02:00
Erik Broberg 0bdb22cc3a Refactor: CPU to GPU mapping of all Layer data 2016-10-24 12:22:23 +02:00
kalbl dddb85d538 Solve build error when globe browsing module is inactive. 2016-10-24 10:24:42 +02:00
Erik Broberg bfbd331cdf Intermediate commit: Pre gpu layer refactorization 2016-10-21 15:19:59 +02:00
Erik Broberg 1df163a3b9 Intermediate commit: Mapping ChunkTilePiles between CPU and GPU. Height not working 2016-10-21 13:49:44 +02:00
kalbl 6ca7cc997c Merge branch 'feature/retina' into feature/globebrowsing 2016-10-20 21:04:18 +02:00
Erik Broberg fd6dd16417 Intermediate commit: pre shader refactorization 2016-10-20 18:54:44 +02:00
kalbl 2f32e67b87 Set interaction to properly depend on delta time. 2016-10-20 18:37:18 +02:00
kalbl 7e0e913131 Remove pointglobe from renderableglobe 2016-10-20 16:01:34 +02:00
kalbl 233b716b4b Remove unnecessary comment. 2016-10-20 15:09:59 +02:00
kalbl 2635a9db09 Remove textureinitdata since it is not used any more. 2016-10-20 15:09:38 +02:00
kalbl cc53396d41 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-10-20 15:05:57 +02:00
kalbl 4ff3823a26 Solve bug that caused incorrect height for no data values. 2016-10-20 15:04:59 +02:00
Erik Broberg 2af1731583 Simple mapping of structs on CPU to GPU. See gpuChunkTilePile 2016-10-20 10:17:40 +02:00
Emil Axelsson b87539f678 Fix const-correctness in shaders and add texture init data 2016-10-20 09:39:49 +02:00
Erik Broberg ee9bb36a06 TileProviderManager -> LayerManager. Fix shader recompilation bug 2016-10-19 16:10:56 +02:00
Alexander Bock febf8c9a1b High-DPI fixes for ImGUI 2016-10-19 15:54:19 +02:00
Alexander Bock e6720103fd Updated ImGUI version to 1.49 2016-10-19 15:42:45 +02:00
Erik Broberg 0d02844982 Clearify iteraction 2016-10-19 15:17:41 +02:00
Erik Broberg 331191bf03 Renaming Layer, LayerGroup. Cache activeLayers 2016-10-19 14:44:09 +02:00
Erik Broberg 69a0c58c32 TileProviderManager caches active providers 2016-10-19 13:35:42 +02:00
Erik Broberg 974fc6bb52 Rename TileAndTransform to ChunkTile 2016-10-19 12:18:38 +02:00
Erik Broberg 979bf1f992 Add class GPUTexture 2016-10-19 11:30:31 +02:00
Erik Broberg 0476c32994 Add templated class GPUData 2016-10-18 19:05:40 +02:00