mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-07 20:09:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,654 Commits 83 Branches 48 Tags
423c55ba3822135b01840c4804a8ddcb9e3f02b4
Commit Graph

57 Commits

Author SHA1 Message Date
Alexander Bock bc1366e79d Use correct identifiers in OsirisRex data files 2016-09-20 21:23:58 +02:00
Alexander Bock f15efdad6e Add OsirisRex data file 2016-09-20 21:09:59 +02:00
Alexander Bock 428f488bb6 Add documentation to Ephemeris classes 
Remove unused "Reference" specification from mod files
Add osirisrex files to gitgnore
Make Ephemeris values into properties
 2016-09-20 19:24:14 +02:00
Alexander Bock 329986c0c6 Merge branch 'develop' into feature/globebrowsing 
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
 2016-09-20 15:52:01 +02:00
Kalle Bladin 0442046262 Update openspace config and mod files for osirisrex 2016-09-13 12:27:50 -04:00
Kalle Bladin be8f7bf541 Update scene files 2016-09-13 11:55:32 -04:00
Kalle Bladin b27e9548a1 Update mod files 2016-09-07 21:39:59 -04:00
Kalle Bladin 7416d7ca69 Update mod files for osirisrex 2016-09-06 22:57:29 -04:00
Alexander Bock 0060e4782a Adding a configuration value to ProjectionComponent that determines the aspect ratio of the projection texture (default = 1.0) 2016-09-01 09:54:49 +02:00
Erik Broberg af5c0c71e8 More explicit scheduled script helpers and set osiris rex trails enabled values at launch 2016-08-30 15:37:33 -04:00
Erik Broberg a50cb8d06a Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-30 15:06:35 -04:00
Kalle Bladin 64be557abf Use alpha from projection texture in RenderableModelProjection. 2016-08-30 14:17:00 -04:00
Erik Broberg 73c4cb795b Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-30 14:04:39 -04:00
Erik Broberg 69681ea36e Move helper lua functions for script scheduling to scripts/common.lua 2016-08-30 14:03:19 -04:00
Erik Broberg 8c137a78b2 Add scheduled scripts for enabling different Bennu trails 2016-08-30 13:34:56 -04:00
Kalle Bladin 53a626a0ea Solve merge conflict 2016-08-30 13:12:45 -04:00
Kalle Bladin 357462adac Update osirisrex.mod and spice kernel loading order 2016-08-30 13:01:55 -04:00
Erik Broberg 99309b3cb3 Use more explicit names for different osiris rex trails 2016-08-29 16:52:18 -04:00
Erik Broberg b74b01d294 Add new class ScriptScheduler together with example input file: data/scene/osirisrex/scheduled_scripts.lua 2016-08-29 16:16:11 -04:00
Kalle Bladin 547807a8d1 Fix problem with projection texture getting overwritten upon image projection. 2016-08-26 17:54:15 -04:00
Kalle Bladin 64187aca5d fix but in InstrumentTimesParser that caused sequence time to be overwritten. 2016-08-25 20:17:17 -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 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 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
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
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 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