mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-21 18:38:20 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,378 Commits 83 Branches 47 Tags
fd76e8063eead519ab4f89104ace8f9f76dfc8c3
Commit Graph

3378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Broberg fd76e8063e Fix compilation error after git pull 2016-08-22 15:26:19 -04:00
Erik Broberg 37bb16baa8 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-22 15:03:39 -04:00
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
Kalle Bladin 6d9d2b5127 Update RenderableFov to inherit transform in model matrix 2016-08-19 21:12:12 -04:00
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 b971270fcb Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-19 12:04:32 -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
Erik Broberg b92b5260ff Render dummy Mission phases 2016-08-19 10:58:03 -04:00
Alexander Bock adf02bd5f6 Updated Ghoul 
- Adapted to CommandlineParser changes
 2016-08-19 16:42:19 +02:00
Alexander Bock ea6d8d683b Merge branch 'feature/projectiontexturemap' into develop 2016-08-19 08:36:12 +02: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
Alexander Bock 4da2f1e5be Merge branch 'develop' into feature/projectiontexturemap 2016-08-19 08:23:20 +02: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
Alexander Bock 21e9599888 SyncWidget in Launcher must also compare base directory before removing duplicates (closing #126) 2016-08-18 17:33:08 +02:00
Alexander Bock 2ae7095d9b Fix image dilation (closing #108) 
- Using pixel(=texel) coordinates and integer offsets
 - Using a single channel stencil texture instead of a 4-channel one
 2016-08-18 16:29:00 +02: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 010b8739f1 Use the correct output in the renderablemodelprojection shader 2016-08-18 15:45:07 +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
Alexander Bock e284543434 Make use of a secondary stencil buffer for masking the dilation areas 2016-08-18 11:43:51 +02:00
Emil Axelsson c4c9396441 add rosetta image of the day crawler 2016-08-18 11:12:28 +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 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