Commit Graph

302 Commits

Author SHA1 Message Date
Kalle 8fcaaf2799 Merge remote-tracking branch 'origin/develop' into feature/globebrowsing 2016-07-13 12:09:02 -04:00
Kalle 7e7a1cb720 Change friction to bool properties 2016-07-13 11:29:29 -04:00
Kalle 6e827e4337 Change back scene to use debug globe. 2016-07-12 15:01:54 -04:00
Kalle 916916f82b Fix bug that caused change in camera direction when switching between interaction mode. 2016-07-12 14:52:00 -04:00
Alexander Bock cf55af3cea Minor cleanups 2016-07-12 08:26:04 -04:00
Erik Broberg 1d94dfeb1b Prep presentation 2016-07-11 16:53:02 -04:00
Alexander Bock 0228ca241b Add Juno scene and scenegraphnodes
Enable ability to apply a rotation matrix to the rotation vector to accomodate for model misalignments
2016-07-10 09:40:30 +02:00
Kalle 36531a42af Solve merge conflict from previous filter. 2016-07-08 19:26:29 -04:00
Kalle a51d5db43a Clean up in gebugglobe.mod 2016-07-08 13:50:48 -04:00
Kalle 3985dea808 Height map overlay working but needs to be used for height sampling on cpu. 2016-07-08 12:42:41 -04:00
Alexander Bock f8e65ad044 Updated Rosetta model 2016-07-08 11:02:22 +02:00
Alexander Bock 5a41f7fa78 Fix Io trail
Do not crash coordinate system change if some nodes are not loaded
2016-07-08 10:49:05 +02:00
Kalle fd05a88419 Create new layer category heightmap overlay used for local datasets with alpha channel. 2016-07-07 20:59:02 -04:00
Erik Broberg 7ebd4f55b6 No-overview datasets use virtual overview to downsample write region. Ensure tiles have even number of pixels 2016-07-06 11:57:20 -04:00
Erik Broberg 060a22242d No-overview datasets use virtual overview to downsample write region. Ensure tiles have even number of pixels 2016-07-06 11:57:20 -04:00
Erik Broberg 3e2166e145 Add moon height and color WMS 2016-07-05 21:44:05 -04:00
Erik Broberg a868864354 Add moon height and color WMS 2016-07-05 21:44:05 -04:00
Erik Broberg ec3d5ff073 Add Mercurius wms and restructure map service configs 2016-07-05 19:20:17 -04:00
Erik Broberg 4edaab710e Add Mercurius wms and restructure map service configs 2016-07-05 19:20:17 -04:00
Kalle 4b3b6e8a76 Fix invisible earth. 2016-07-01 17:55:56 -04:00
Kalle a47241b11f Fix invisible earth. 2016-07-01 17:55:56 -04:00
Kalle 3f1f5be712 Globe browsing interaction mode follows the rotation of the globe. 2016-07-01 12:46:16 -04:00
Kalle 3c7d1e22fc Globe browsing interaction mode follows the rotation of the globe. 2016-07-01 12:46:16 -04:00
kbladin a89f474502 Solve merge conflict and add properties for friction and interaction parameters. 2016-06-30 14:07:51 -04:00
kbladin d4f89448e0 Change rosetta scene to work with new camera dictionary 2016-06-29 22:40:38 -04:00
Kalle Bladin 161d722623 Enable setting of friction, sensitivity and followscalefactor in interaction handler. 2016-06-29 21:13:04 -04:00
Alexander Bock 5de58e2d31 Remove the square image plane from Rosetta 2016-06-30 00:29:04 +02:00
Kalle Bladin 24152be38e Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-29 15:24:12 -04:00
Kalle Bladin 35a095c448 Change camera dictionary state representation to consider position, rotation and focus node. 2016-06-29 15:23:37 -04:00
Erik Broberg 5030465bb8 Add a local test texture and a new TileProvider severing a single tile 2016-06-29 15:18:25 -04:00
Erik Broberg 1d856151ed Implement and use factory pattern for TileProvider instantiation 2016-06-29 13:47:11 -04:00
Erik Broberg 072a97ee10 Make TileProviders default to disabled if unspecified in mode file 2016-06-29 12:41:36 -04:00
Kalle Bladin e5ccf185cd Remove rotation state variables from interaction mode and enable more freely local rotation. 2016-06-28 22:28:56 -04:00
Kalle Bladin ce72f57183 Minimum camera height above surface is now configurable. 2016-06-27 18:46:35 -04:00
Kalle Bladin 9d8932218f Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-27 16:17:22 -04:00
Kalle Bladin 627f00faba Generalize tile fetching to consider datasets without overviews. 2016-06-27 16:17:10 -04:00
Erik Broberg 7d80598166 Add Mars Viking MDIM21 dataset config 2016-06-27 13:44:08 -04:00
Kalle Bladin 5e8018b715 Limit camera to not go below the ground in globebrowsing interaction mode. 2016-06-21 22:57:12 -04:00
Kalle Bladin 1ab25d5845 Add new layer category grayscale overlay and use it for mars ctx global map. 2016-06-21 12:26:52 -04:00
Kalle Bladin db675d3993 Add Mars datasets. 2016-06-20 19:33:20 -04:00
Alexander Bock c3eda5e4e6 Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 21:37:43 +02:00
Alexander Bock da0190ae1c Remove default-performance measurements from default scene 2016-06-17 18:31:51 +02:00
Alexander Bock 82f97943c5 Use correct histograms for ENLIL 2016-06-17 18:31:39 +02:00
Alexander Bock 8bf06cdff2 Set fieldlines scene to the correct time of January 1st, 2015 2016-06-17 18:30:56 +02:00
Alexander Bock 9282d7e66b Remove warnings from missing 'Atmosphere' definitions for Jupiter and its moons 2016-06-17 17:00:30 +02:00
Kalle Bladin 1f08bb413c Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-17 10:52:58 -04:00
Kalle Bladin 101795aa00 Group layer categories in gui. 2016-06-17 10:52:44 -04:00
Alexander Bock 4e240ddb19 Add 'atmosphereearth' scene node 2016-06-17 16:50:00 +02:00
Alexander Bock e5662df36d Remove warnings from missing 'Atmosphere' definitions for Pluto moons 2016-06-17 16:48:34 +02:00
Alexander Bock 5c8bd32ae5 Merge branch 'feature/globebrowsing' into release/ips 2016-06-17 15:46:46 +02:00