mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 23:09:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,268 Commits 85 Branches 48 Tags
396ecbe5d5730fd2e0876fdfa4e0a76f2eac9708
Commit Graph

542 Commits

Author SHA1 Message Date
Kalle Bladin 84834f230d Merge branch 'develop' into feature/osirisrex 2016-08-29 13:01:28 -04:00
Alexander Bock 6884eca40e Merge remote-tracking branch 'origin/feature/rosetta-shadowmapping' into feature/rosetta 
Conflicts:
	modules/newhorizons/rendering/renderablemodelprojection.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	modules/newhorizons/util/projectioncomponent.cpp
 2016-08-29 18:34:18 +02:00
Alexander Bock ae6ade497b Merge branch 'feature/render-bins' into feature/rosetta 
Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl
 2016-08-29 15:53:59 +02:00
Alexander Bock 35462c2c53 Add improved rosetta model 2016-08-29 13:22:15 +02:00
Kalle Bladin e3780f2fc6 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-26 17:54:43 -04:00
Kalle Bladin 547807a8d1 Fix problem with projection texture getting overwritten upon image projection. 2016-08-26 17:54:15 -04:00
Erik Broberg ef94fe3533 Add key bindings file for OsirisRex scene 2016-08-26 17:36:43 -04:00
Emil Axelsson 47583327ec use additive blending for white planet markers to avoid z-fighting 2016-08-26 10:31:02 +02:00
Kalle Bladin 64fca6e08d Update start time for osiris rex 2016-08-25 20:18:16 -04:00
Kalle Bladin 64187aca5d fix but in InstrumentTimesParser that caused sequence time to be overwritten. 2016-08-25 20:17:17 -04:00
Emil Axelsson b6be6da974 add support for additive blending in renderable plane 2016-08-25 20:44:00 +02:00
Kalle Bladin e2730a45ea Update new new horizons to use new renderables. 2016-08-24 11:44:12 -04:00
Kalle Bladin d3a0fe1553 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-23 20:50:24 -04:00
Kalle Bladin 9aea11e173 Update rosetta and newhorizons to new renderable trail. 2016-08-23 20:49:35 -04:00
Erik Broberg bbffb3929c Update osirisrex.mission based on SPICE coverage, SPICE observations and OSIRIS-REx website 2016-08-23 20:38:49 -04:00
Kalle Bladin 3ec224061d Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-23 17:30:02 -04:00
Kalle Bladin 57d47cd856 Implement class RenderableTrailNew and use it for osiris rex. Higher precision than the old one. 2016-08-23 17:29:51 -04:00
Erik Broberg f539d5b0b0 Show mission progress from osiris rex spice kernels 2016-08-23 12:43:59 -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 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
Emil Axelsson 6d56b1d38a implement shadow mapping for image projections on non-convex bodies 2016-08-19 16:56:57 +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
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