Commit Graph

403 Commits

Author SHA1 Message Date
Kalle Bladin 7df7df6610 Implement skirts. 2016-05-27 16:48:23 -04:00
Kalle Bladin 118dfe32f8 Number of segments per patch can be set from mod file. 2016-05-27 14:05:50 -04:00
Kalle Bladin 02a83cfb5a The data type to be read by GDAL can be changed explicitly. 2016-05-27 13:39:40 -04:00
Kalle Bladin b3157137f5 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-27 11:39:15 -04:00
Kalle Bladin e0814a23dd The ellipsoid of a globe is used to determine how to move the camera in a new interaction mode. 2016-05-26 18:56:36 -04:00
Erik Broberg 21965ff915 Factored out async reading from tile data provision, creating an endpoint for future disk caching of tile 2016-05-26 18:17:20 -04:00
Erik Broberg e5df1f8fee Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-25 21:49:08 -04:00
Erik Broberg 698a50bc40 removed unused AsyncReader code and moved GDAL related stuff from TileProvider til TextureDataProvider 2016-05-25 21:48:54 -04:00
Kalle Bladin f525eb53cc Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-25 18:03:21 -04:00
Kalle Bladin 3925c30b43 Change size in boundingbox for the globe and the texture and patch size. 2016-05-25 18:03:13 -04:00
Erik Broberg b91221c77c Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-25 15:49:01 -04:00
Erik Broberg 6dc2ced613 Removed unused class TextureTileSet 2016-05-25 15:48:46 -04:00
Kalle Bladin 99ecefa49a Removed globe mesh from renderable globe 2016-05-25 13:21:39 -04:00
Kalle Bladin 8ab0a70886 Solve merge conflict for interaction. 2016-05-25 13:20:12 -04:00
Kalle Bladin 2a11f73932 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-24 22:55:34 -04:00
Erik Broberg 3bb2161a09 1 Thread for Tile loading, allowing MaxConnections concurrent connections per RasterIO 2016-05-23 18:26:25 -04:00
Erik Broberg 50a0141cce Keeping track of tiles with IO errors, and display parent instead 2016-05-23 16:37:31 -04:00
Erik Broberg b74e3bbb5b Removed unused include of atomic - avoids annoying comiler warnings 2016-05-20 17:03:25 -04:00
Erik Broberg 8844775a1f TileProviderManager owns a common thread pool for all TileProviders 2016-05-20 13:20:46 -04:00
Erik Broberg bb551432e3 ConcurrentJobManager uses ThreadPool to do parallel Gdal RasterIO calls. Some tile gets corrupted... 2016-05-20 12:55:37 -04:00
Kalle Bladin 1db9f2f60c Clean up camera class. 2016-05-19 23:21:48 -04:00
Erik Broberg bfb8e1a92d Added functionality for fetching tile using GDALAsyncReader. Not working yet, so requests are still serial 2016-05-19 21:23:46 -04:00
Erik Broberg bcb107890f Breaking down GDAL data fetching into sub tasks which can be reused later in async data fetching 2016-05-19 12:18:31 -04:00
Kalle Bladin 4ac19f21b7 Solve merge conflict. 2016-05-19 12:10:14 -04:00
Alexander Bock 54fa1c8cbc Merge branch 'feature/rosetta' into develop 2016-05-19 13:24:26 +02:00
Alexander Bock 94bac5d886 Fix RenderableTrails artifacts with high delta time (closing #84) 2016-05-19 12:46:11 +02:00
Erik Broberg efa78e6756 TextureDataProvider is no longer templated 2016-05-18 16:52:58 -04:00
Alexander Bock dba650c80d Create separate key bindings for rosetta mission
Prolong rosetta trail
2016-05-18 21:37:27 +02:00
Alexander Bock 7d32dba5cb Enable SingleSphereGeometry to have more segments
Another fix for RenderablePlanetProjection heightmap offset
2016-05-18 20:19:47 +02:00
Alexander Bock e6abbcd73a Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop 2016-05-18 19:11:54 +02:00
Alexander Bock 0ab3f0c026 Some fixes on heightmap displacement for RenderablePlanet
Some fixes on heightmap displacement for RenderablePlanetProjection
Enable optional normal map on RenderablePlanetProjection
2016-05-18 19:03:03 +02:00
Erik Broberg 1615b92162 Changed gdaldataconverter to TextureDataProvider. Clean up public interface and added skeleton interface for async data fetching 2016-05-18 10:53:56 -04:00
Emil Axelsson fe4fde67de remove incorrect include path 2016-05-18 13:31:33 +02:00
Emil Axelsson 5cd8cdd250 Merge pull request #82 from OpenSpace/feature/dataconverter
volume conversion tools and really basic data converter app
2016-05-18 13:09:01 +02:00
Alexander Bock caeb8618a8 Enable heightmaps for RenderablePlanet (closing #21) 2016-05-18 12:12:28 +02:00
Emil Axelsson 2911168e5b volume conversion tools and really basic data converter app 2016-05-18 11:56:06 +02:00
Alexander Bock 74c7413115 Adding functionality to clear projections on RenderableModelProjection (closing #22) 2016-05-18 00:36:11 +02:00
Erik Broberg 2f5bd47f45 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-17 18:23:12 -04:00
Erik Broberg ce67314065 Naive and simple distance dependent interaction speed. Useful for debugging 2016-05-17 18:22:57 -04:00
Kalle Bladin 9ef9ae513e Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-17 16:54:34 -04:00
Kalle Bladin 039c5293c2 Render several texture layers on top of each other with more datasets. 2016-05-17 16:54:21 -04:00
Alexander Bock e7f728868d Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop 2016-05-17 19:47:46 +02:00
Alexander Bock bd90a0c44c Fix the image flipping on RenderableModelProjection 2016-05-17 19:25:59 +02:00
Erik Broberg f30a322623 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-17 13:22:55 -04:00
Erik Broberg 974fff33fd Fixed bug introduced in commit f484005... due to enum Chunk::Status was implicitely casted to bool. Changed enum to class 2016-05-17 13:22:45 -04:00
Kalle Bladin 8f394a2b80 Add local scopes to for loops in shaders. 2016-05-17 13:18:56 -04:00
Michael Nilsson d2e913b70e moved histogram class to core 2016-05-17 12:49:16 -04:00
Kalle Bladin fdc4690117 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-16 20:52:14 -04:00
Kalle Bladin daf1b5873e Rendering using many layers. 2016-05-16 20:48:23 -04:00
Erik Broberg a9d34d4d25 Added thread pool class and a simple unit test 2016-05-16 20:28:16 -04:00