Commit Graph

323 Commits

Author SHA1 Message Date
Erik Broberg
d6aa4216cc Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-02 19:25:39 -04:00
Erik Broberg
64668e9feb Merge from feature/globebrowsing 2016-08-02 19:25:23 -04:00
Kalle Bladin
4e0bbe2da0 Solve bug that cause some vertices to be misplaced in MultiModelGeometry and calculate MVP matrix for renderable model in double precision 2016-08-02 19:14:52 -04:00
Erik Broberg
244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Alexander Bock
22c2e705f9 Added ESRI AHTSE test datasets (probably incorrectly) 2016-08-02 11:40:55 +02:00
Alexander Bock
5f1fa3f755 Implement shadowing on RenderableRings 2016-07-31 20:22:29 +02:00
Alexander Bock
9f1abc67a2 Enable setting the texture offset for rings
Enable setting the color-based transparency for rings
2016-07-29 13:23:43 +02:00
Alexander Bock
635ce1713b Add initial implementation of rings for Saturn 2016-07-29 07:54:16 +02:00
Alexander Bock
d8c6b3ddc8 Removing extra space in autumn.tf 2016-07-28 15:42:53 +02:00
Kalle
93d661bfc6 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace-Development into feature/osirisrex 2016-07-22 17:06:02 -04:00
Kalle
1de4e47621 Add debugmodel scene to test and rewrite model rendering. 2016-07-21 19:17:57 -04:00
Erik Broberg
1b1fe181ed Fix invalid image file paths. Set focus node to OsirisRex 2016-07-21 18:12:21 -04:00
Erik Broberg
d677cb10e7 Merge branch 'feature/globebrowsing' into feature/osirisrex 2016-07-21 18:09:32 -04:00
Erik Broberg
73e3c71b9a Init StatsCollector to disabled and delete committed stats data 2016-07-21 17:42:35 -04:00
Erik Broberg
0ce065db2b Fix invalid paths to debug texture in mod files 2016-07-21 17:30:50 -04:00
Kalle
c7aa6f8de2 Merge osirisrex with globe browsing branch 2016-07-21 17:23:30 -04:00
Erik Broberg
58a8c1dc1b Remove debug textures from lodearth and lodmars, keep them in debugglobe 2016-07-21 17:21:03 -04:00
Erik Broberg
e081cae980 Fix file structure for data/scene/lodearth/map_service_configs 2016-07-21 17:05:04 -04:00
Kalle
ede5efdf6d Set interaction mode to globe browsing in debugglobe scene 2016-07-21 16:04:09 -04:00
Erik Broberg
469f0ea22b Add a RenderableGlobe at OsirisRex position 2016-07-21 15:14:27 -04:00
Erik Broberg
cde5c1b469 Add BennuTrail 2016-07-19 18:14:54 -04:00
Erik Broberg
ea4c3061b9 Add and read Osiris Rex spice kernels 2016-07-19 16:52:21 -04:00
Erik Broberg
85810372b4 Add empty osirisrex scene and event data 2016-07-19 14:36:12 -04:00
Erik Broberg
f222219a6d Fix spice positioning bug in lodearth.mod 2016-07-19 13:37:16 -04:00
Erik Broberg
d6aed778c4 Update globebrowsing.scene. Add level-of-detail data folders for Earth and Mars 2016-07-19 11:39:48 -04:00
Kalle Bladin
541fbba322 Merge with develop and solve conflicts. 2016-07-18 17:26:30 -04:00
Alexander Bock
9df88a6a79 Remove static SPICE kernel loading from the cfg file and move it into the preInitialization step of a scene (closing #117) 2016-07-18 14:54:36 +02:00
Kalle Bladin
1d9aab6e63 Remove datasets from debugglobe.mod 2016-07-15 18:57:03 -04:00
Kalle Bladin
98a142e96d Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-13 13:46:02 -04:00
nusic
f4f0e53b2c Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-13 13:44:11 -04:00
nusic
c2488b6d8a Add ChunkIndexTileProvider to dynamically render chunk indices on tiles 2016-07-13 13:43:12 -04:00
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