Commit Graph

367 Commits

Author SHA1 Message Date
Kalle Bladin d042f6c4be Merge branch 'develop' into feature/osirisrex 2016-08-19 12:33:49 -04:00
Kalle Bladin 9daccf4e99 Revert back osirisrex.mod 2016-08-19 12:31:19 -04:00
Kalle Bladin 86dc0d274c Update osiritsrex.mod 2016-08-19 12:04:18 -04:00
Kalle Bladin c8c9485ff4 Update newhorizons to the new scenegraph structure. 2016-08-19 12:02:25 -04:00
Alexander Bock e14387a4fa Update the data files for Pluto and Charon to download all necessary files 2016-08-19 08:35:44 +02:00
Kalle Bladin cd0fd8fb5c Update Rosetta scene to render correctly with new scene graph structure. 2016-08-18 20:47:05 -04:00
Kalle Bladin 628f8b479f Update updatestructures to have transform with translation, rotation and scale. 2016-08-18 16:59:51 -04:00
Kalle Bladin ae1f8e457b Update RenderableGlobe to use transformation from SceneGraphnNode and fix bug in SpiceRotation. 2016-08-18 14:21:20 -04:00
Kalle Bladin b5b388bf54 Change time and earth renderable for osiris rex scene 2016-08-18 12:10:54 -04:00
Alexander Bock 72e1e9231a Add an update method to the ProjectionComponent that takes care of Shader rebuildin 2016-08-18 16:27:44 +02:00
Alexander Bock e5db594c3b Add torrent for new missing Rosetta kernels 2016-08-18 13:55:00 +02:00
Alexander Bock 788ec99575 Merge branch 'develop' into feature/projectiontexturemap
Conflicts:
	support/cmake/support_macros.cmake
2016-08-18 13:23:55 +02:00
Kalle Bladin b072a54a79 Update lodearth and lodmars to new scenegraph structure. Also fix bug in scenegraphnode that caused wrong positioning. 2016-08-17 22:36:32 -04:00
Kalle Bladin d4e61b58f2 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-17 21:05:39 -04:00
Kalle Bladin 0152cb40db Update default scene to new scene graph structure. 2016-08-17 21:04:11 -04:00
Erik Broberg 23c4a05a96 Merge from globebrowsing 2016-08-17 20:25:58 -04:00
Erik Broberg d4f635513d Merge branch 'develop' into feature/globebrowsing 2016-08-17 19:53:28 -04:00
Erik Broberg 964953da89 Use stripped out debug scene 2016-08-17 18:17:25 -04:00
Kalle Bladin 1be12333ad Update renderable path to fade away with distance 2016-08-17 16:58:53 -04:00
Kalle Bladin 176fc02748 Increase precision of renderable trail and use that for showing the path of OSIRIS-REx. 2016-08-17 14:44:42 -04:00
Kalle Bladin 93ceb176fa New model hierarchy for osiris rex and add try catch in determineTarget in renderablefov 2016-08-17 14:08:48 -04:00
Alexander Bock c9cd968d34 Add rosettaimages to the .data file for automatic download 2016-08-17 15:08:27 +02:00
Alexander Bock 4f1fe0dd49 Add optional image dilation to the ProjectionComponent 2016-08-17 11:25:29 +02:00
Kalle Bladin 542b9e11e6 Update SceneGraphNode to have a full transformation defined in terms of translation, scale and rotation. 2016-08-17 00:19:25 -04:00
Kalle Bladin fb7104fbed Add renderable fov to OSIRIS-REx polycam and increse precision in rendering of view frustum (fov) 2016-08-15 20:20:36 -04:00
Kalle Bladin 2f05c8a5f0 Enable scene graph nodes to have transforms relative to parent node. 2016-08-15 13:08:30 -04:00
Erik Broberg 559cfeb63e Init LodMars with only one enabled color texture layer 2016-08-15 12:34:49 -04:00
Kalle Bladin b0d8dd59f4 Update function focusPosition in Camera and add a solar path for OSIRIS REx. 2016-08-12 16:13:24 -04:00
Kalle Bladin bd867ec402 Update SceneGraphNode to contain rotation information and remove rotation definition from renderable model. 2016-08-12 12:28:56 -04:00
Erik Broberg fa93a78d9f Rotate Osiris Rex model to match Spice specification 2016-08-10 13:57:12 -04:00
Erik Broberg 82e3dd95c3 Bennu does not have specular light. Fix upper case naming error 2016-08-09 21:03:48 -04:00
Erik Broberg 740bd7dc08 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-09 20:32:48 -04:00
Erik Broberg 19b659df2d Add Osiris-rex instrumnet times for Kalle 2016-08-09 20:31:57 -04:00
Erik Broberg 72252d6a47 Use place holders for projected images (UV coordinates still not working) 2016-08-09 20:31:06 -04:00
Kalle Bladin 6b9358f975 Update path to consider line fade and create proper bounding sphere for renderable model. 2016-08-09 19:59:51 -04:00
Erik Broberg a729e067ec Set scale of bennu and osiris-rex to be more reasonable wrt osiris-rex trail 2016-08-09 17:15:51 -04:00
Erik Broberg 0e610a3807 Fix Bennu positioning bug 2016-08-09 17:12:22 -04:00
Erik Broberg 50ef251838 Solve conflicts in mod files 2016-08-09 13:31:05 -04:00
Erik Broberg b02409eb6d Add osirisrex.mod and bennu.mod 2016-08-09 13:16:17 -04:00
Kalle Bladin a99040d661 Add osiris rex and bennu mod files. 2016-08-09 13:12:58 -04:00
Kalle Bladin fb87842b1b Update path rendering to higher precision. 2016-08-08 22:35:37 -04:00
Kalle Bladin d128e09691 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-08 17:20:45 -04:00
Erik Broberg b780e694c4 Set openspace time to right before first instrument event 2016-08-08 16:52:07 -04:00
Kalle Bladin d91dd3dbb7 Implement ability to update camera in two steps. still using old method. 2016-08-04 19:16:36 -04:00
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