Commit Graph

2108 Commits

Author SHA1 Message Date
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
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
f1d4e27ce0 Solve problem with globe lagging behind in globebrowsing interaction mode. 2016-05-27 15:34:52 -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
bbc002514d Possible to render in fisheye mode now that the combinedViewMatrix() function in the camera class actually returns the combined view matrix. 2016-05-27 12:13: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
3dff659b3c Cleanup. 2016-05-27 11:38:56 -04:00
Kalle Bladin
060298f74b Solve precision problem that causes jagged movement. 2016-05-27 11:09:07 -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
e4f62e5b5d Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-26 18:17:38 -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
Kalle Bladin
9d1aeaa58b Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-25 21:49:40 -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
fc57b1c770 Solve merge conflict. 2016-05-25 21:35:14 -04:00
Kalle Bladin
ceb7d0fa63 Remove use of old mousecontroller 2016-05-25 21:32:52 -04:00
Kalle Bladin
eed5885f25 Improve interaction. 2016-05-25 21:32:03 -04:00
Kalle Bladin
9bbd52867a Merge branch 'feature/interaction' of github.com:OpenSpace/OpenSpace-Development into feature/interaction 2016-05-25 18:50:40 -04:00
Kalle Bladin
601f86ae78 Solve bug for when tilting the camera. 2016-05-25 18:50:06 -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
128ee57538 Merge in initialization of camera pos from feature/interaction 2016-05-25 16:47:15 -04:00
Erik Broberg
af9b065de8 Camera gets initialized to position specified in scene file 2016-05-25 16:42:59 -04:00