Commit Graph

3355 Commits

Author SHA1 Message Date
Erik Broberg f1c705fa19 Add mission description 2016-08-22 15:03:30 -04:00
Erik Broberg 6a2b422f00 Use mission file formatting favoring data as opposed to lua structure 2016-08-22 14:46:37 -04:00
Erik Broberg b6429183d6 Move parsing of time range to TimeRange class 2016-08-22 13:13:57 -04:00
Erik Broberg 46f005fa58 Add Mission related classes. Add basic mission phase viz. Move TimeRange to separate file 2016-08-22 11:53:59 -04:00
Erik Broberg b92b5260ff Render dummy Mission phases 2016-08-19 10:58:03 -04:00
Erik Broberg 559ba76edd Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-18 21:38:04 -04:00
Kalle Bladin cd0fd8fb5c Update Rosetta scene to render correctly with new scene graph structure. 2016-08-18 20:47:05 -04:00
Erik Broberg b1bcc5741f Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-18 18:37:11 -04:00
Erik Broberg 8f8114fabf Image has a TimeRange instead of two doubles 2016-08-18 18:23:52 -04:00
Erik Broberg ae25a171a6 Use proper default values- and clearify interface of TimeRange 2016-08-18 17:55:31 -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
Erik Broberg 48a2f181b0 Merge branch 'feature/globebrowsing' into feature/osirisrex 2016-08-18 12:27:19 -04:00
Erik Broberg 5d21878ead Revert concurrent job manager unit tests to use old ThreadPool 2016-08-18 12:21:02 -04:00
Kalle Bladin b5b388bf54 Change time and earth renderable for osiris rex scene 2016-08-18 12:10:54 -04: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 dedabeb612 Use updated ghoul 2016-08-17 19:32:19 -04:00
Erik Broberg 09ad585be5 Rebase to feature/globebrowsing 2016-08-17 19:16:01 -04:00
Erik Broberg 1199acc7b9 Re-add and revert back to old ThreadPool. See ticket #128 2016-08-17 18:22:27 -04:00
Erik Broberg 194a4e8832 Use fixes in ghoul 2016-08-17 18:22:27 -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 f8333171a8 Merge commit '6c43d8404aa29290909b5f7ce838bbd503576cb4' into develop 2016-08-17 20:04:17 +02:00
Alexander Bock 6c43d8404a Added missing files 2016-08-17 16:27:13 +02:00
Alexander Bock c93d882ea6 Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)
Updating SGCT and Ghoul references
2016-08-17 16:26:14 +02:00
Alexander Bock 04d67d0baf Merge commit 'c9cd968d34f691fe34e68cf7e68abff201f72b30' into develop 2016-08-17 15:09:10 +02:00
Alexander Bock c9cd968d34 Add rosettaimages to the .data file for automatic download 2016-08-17 15:08:27 +02:00
Kalle Bladin 1ed0008b94 Remove unused constant KeyBody in Renderable. 2016-08-17 00:46:48 -04:00
Kalle Bladin a9b8bec7b4 Remove parts of bounding sphere definition in SceneGraphNode. 2016-08-17 00:38:18 -04:00
Kalle Bladin c01808ce10 Convert tabs to spaces. 2016-08-17 00:30:53 -04:00
Kalle Bladin 64ba3d2717 Add new files supposed to be in previous commit. 2016-08-17 00:30:03 -04: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
Erik Broberg 9125073cc3 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-08-16 22:20:30 -04:00
Erik Broberg 3cb519ad77 Fix bug where TileDataLayout is created based on an uninitialized variable 2016-08-16 22:20:13 -04:00
Alexander Bock f9e66c315c Enable Edit and Continue in Visual Studio 2016-08-16 10:49:52 +02:00
Emil Axelsson d0e520943c Merge branch 'develop' of github.com:OpenSpace/OpenSpace into develop 2016-08-16 10:39:36 +02:00
Alexander Bock 7f757bbcb7 Use correct normal for RenderableRings closing (#124) 2016-08-16 09:41:13 +02:00
Kalle Bladin c55872d5f4 Increase precision in renderable plane projection. 2016-08-16 00:49:41 -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
Matthew Territo c7ea365300 Merge branch 'develop' into feature/globebrowsing 2016-08-15 13:06:17 -06:00
Alexander Bock dd9eeeb092 Remove the use of PowerScaledCoordinates in the RenderableModel as it caused an interpolation issue (closing #107) 2016-08-15 20:06:04 +02:00
Kalle Bladin 9d04fd5593 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-15 13:08:50 -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 5bddbcd683 Init lodScaleFactor to better reflect full screen resolution 2016-08-15 12:39:20 -04:00