mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-19 03:19:06 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,103 Commits 86 Branches 46 Tags
3a9f39c6cdb098011f8fc225ade77f87ef548c3d
Commit Graph

421 Commits

Author SHA1 Message Date
Erik Broberg
3a9f39c6cd Initialize only the first color texture and heightmap as active 2016-06-02 12:07:52 -04:00
Erik Broberg
014da92270 Fixed bug causing level blending not working properly 2016-06-02 11:51:31 -04:00
Erik Broberg
4e9dfce160 Enable TileProvider to provide Nth highest resolution tile 2016-06-02 11:09:15 -04:00
Erik Broberg
8b19e2fadc Remove default texture from TileProvider 2016-06-01 22:20:44 -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
Kalle Bladin
0202828c73 Layers can be turned on and off during runtime and shaders will be recompiled accordingly. 2016-05-31 19:26:42 -04:00
Kalle Bladin
aa5e64c31b Change length of skirts to be relative the size of the patches. 2016-05-31 12:49:08 -04:00
Kalle Bladin
096c19e49f Change definition of for loop statements in shader preprocessor to include both max and min. 2016-05-31 12:17:40 -04:00
Erik Broberg
d152ffc3a8 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-27 17:12:39 -04:00
Erik Broberg
7df837825a Solved conflict 2016-05-27 17:12:28 -04:00
Kalle Bladin
7bd9f644c1 Add skirtedgrid files. 2016-05-27 17:11:48 -04:00
Erik Broberg
b8ab68647b Added unimplemented class TemporalTileProvider 2016-05-27 17:01:18 -04:00
Erik Broberg
5c199e386c The tile retrieval stack uses dependency injection to for easier reconfiguration 2016-05-27 16:59:10 -04:00
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