mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-25 06:19:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Targeting fixes for pluto viz etc.

Browse Source
This commit is contained in:
Michal Marcinkowski
2015-01-23 17:54:32 -05:00
parent 4c53f763f0
commit 1d5b051b65
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openspace-data

Submodule openspace-data updated: 789072edac...a100e1b5bb

2
scripts/default_startup.lua
View File

@@ -1,5 +1,5 @@
--openspace.setPropertyValue('Earth.renderable.colorTexture', '${OPENSPACE_DATA}/modules/mars/textures/mars.png')
openspace.time.setTime("2015-07-14T09:19:00.557") -- pluto
openspace.time.setTime("2015-07-14T09:13:00.557") -- pluto
--openspace.time.setDeltaTime(200000.0)
--openspace.time.setDeltaTime(5000.00)

8
src/rendering/renderablefov.cpp
View File

@@ -359,6 +359,8 @@ void RenderableFov::computeColors(){
double t = 0.0;
if (diff <= 7.0) t = 1.f - diff / 7.0;
if (diff < 0) t = 0.0;
c_project = glm::vec4(0.0, 1.0, 0.00,1);
col_end = glm::vec4(1.00, 0.29, 0.00, 1);
blue = glm::vec4(0, 0.5, 0.7, 1);
@@ -412,9 +414,11 @@ void RenderableFov::render(const RenderData& data){
// set target based on visibility to specific instrument,
// from here on the _fovTarget is the target for all spice functions.
std::string potential[5] = { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" };
//std::string potential[5] = { "Jupiter", "Io", "Europa", "Ganymede", "Callisto" };
std::string potential[2] = { "Pluto", "Charon" };
_fovTarget = potential[0]; //default
for (int i = 0; i < 5; i++){
for (int i = 0; i < 2; i++){
_withinFOV = openspace::SpiceManager::ref().targetWithinFieldOfView(_instrumentID, potential[i],
_spacecraft, _method,
_aberrationCorrection, _time);