Commit Graph

2107 Commits

Author SHA1 Message Date
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
Kalle Bladin 0215c63bab Camera class compiles but missing implementation of two functions. 2016-05-19 11:29:31 -04:00
Alexander Bock b964cbe1a2 Remove comments in Downloadmanager 2016-05-19 13:25:47 +02:00
Alexander Bock 54fa1c8cbc Merge branch 'feature/rosetta' into develop 2016-05-19 13:24:26 +02:00
Alexander Bock caae5336b5 Make use of new thread priority scheme
Updated Ghoul repository
2016-05-19 13:23:40 +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 92df988bb6 Show some information when NewHorizons is not present 2016-05-18 21:37:41 +02:00
Alexander Bock dba650c80d Create separate key bindings for rosetta mission
Prolong rosetta trail
2016-05-18 21:37:27 +02:00
Alexander Bock ecf1862eb3 Only show Pluto text information when NewHorizons node is present 2016-05-18 20:40:38 +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 ccffe60eee Use new Rosetta kernels for image projections 2016-05-18 19:18:59 +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 0c96a08afa Rename Pluto heightmap and normalmap 2016-05-18 19:11:29 +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 2f69520331 Fix Pluto.mod file 2016-05-18 11:30:32 +02:00
Alexander Bock 74c7413115 Adding functionality to clear projections on RenderableModelProjection (closing #22) 2016-05-18 00:36:11 +02:00