Commit Graph

2078 Commits

Author SHA1 Message Date
Erik Broberg 5c199e386c The tile retrieval stack uses dependency injection to for easier reconfiguration 2016-05-27 16:59:10 -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
Kalle Bladin 221958dc4d Merge branch 'feature/interaction' into feature/globebrowsing 2016-05-25 16:37:20 -04:00
Kalle Bladin 6dbbf16a41 Movement speed is dependent on distance to bounding sphere. 2016-05-25 16:28:41 -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
Kalle Bladin d5d59302e2 Update interaction 2016-05-24 22:50:42 -04:00
Kalle Bladin f2c7a826b3 Smooth movements using delay. 2016-05-24 19:34:57 -04:00
Kalle Bladin 54a824e667 Some basic orbital interaction via mouse control. 2016-05-24 18:30:41 -04:00
Kalle Bladin 09ca260778 Rotating with orbital interaction mode. 2016-05-24 13:26:07 -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
Kalle Bladin f438535579 Add classes that are not yet used. 2016-05-23 13:02:24 -04:00
Kalle Bladin 9d235f42b2 Remove old parts of the interface to interaction handler. 2016-05-20 18:50:11 -04:00
Kalle Bladin c2ef5cca58 Remove all implementation from the interaction handler class. Interface is still the same. 2016-05-20 17:39:32 -04:00
Erik Broberg b74e3bbb5b Removed unused include of atomic - avoids annoying comiler warnings 2016-05-20 17:03:25 -04:00
Kalle Bladin faa52404b2 Merge branch 'feature/camera' into feature/interaction 2016-05-20 16:09:53 -04:00
Kalle Bladin 309c97098c Changed interface of camera class 2016-05-20 16:09:35 -04:00
Kalle Bladin dcd00e77d0 Minor structural changes in interaction handler. 2016-05-20 16:03:30 -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 3ff322c282 Clean up camera class 2016-05-20 12:03:05 -04:00
Kalle Bladin 74f190ef7e More clean up in camera class. 2016-05-20 11:46:36 -04:00
Kalle Bladin e057f60a18 Remove psc internally from camera class. 2016-05-20 10:31:33 -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
Kalle Bladin 9dda48d44b Remove functions setViewRotationMatrix and compileViewRotationMatrix from camera class. 2016-05-19 12:22:55 -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