spacecruft
/
CelestiaContent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added duration parameter for centerSelection and gotoSelection methods.

pull/3/head
Chris Laurel 2001-03-23 03:25:44 +00:00
parent d3b9d7b829
commit 14843d0cf9
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/simulation.cpp
View File

@ -573,7 +573,8 @@ Selection Simulation::pickObject(Vec3f pickRay)
}
void Simulation::computeGotoParameters(Selection& destination, JourneyParams& jparams)
void Simulation::computeGotoParameters(Selection& destination, JourneyParams& jparams,
double gotoTime)
{
UniversalCoord targetPosition = getSelectionPosition(selection, simTime);
Vec3d v = targetPosition - observer.getPosition();
@ -583,9 +584,7 @@ void Simulation::computeGotoParameters(Selection& destination, JourneyParams& jp
v.normalize();
// TODO: This should be an option someplace
jparams.duration = 5.0f;
jparams.duration = gotoTime;
jparams.startTime = realTime;
// Right where we are now . . .
@ -601,12 +600,12 @@ void Simulation::computeGotoParameters(Selection& destination, JourneyParams& jp
}
void Simulation::computeCenterParameters(Selection& destination, JourneyParams& jparams)
void Simulation::computeCenterParameters(Selection& destination, JourneyParams& jparams,
double centerTime)
{
UniversalCoord targetPosition = getSelectionPosition(selection, simTime);
// TODO: This should be an option someplace
jparams.duration = 0.5f;
jparams.duration = centerTime;
jparams.startTime = realTime;
// Don't move through space, just rotate the camera
@ -732,11 +731,11 @@ float Simulation::getTargetSpeed()
return targetSpeed;
}
void Simulation::gotoSelection()
void Simulation::gotoSelection(double gotoTime)
{
if (selection.body != NULL || selection.star != NULL)
{
computeGotoParameters(selection, journey);
computeGotoParameters(selection, journey, gotoTime);
observerMode = Travelling;
}
}
@ -746,11 +745,11 @@ void Simulation::cancelMotion()
observerMode = Free;
}
void Simulation::centerSelection()
void Simulation::centerSelection(double centerTime)
{
if (selection.body != NULL || selection.star != NULL)
{
computeCenterParameters(selection, journey);
computeCenterParameters(selection, journey, centerTime);
observerMode = Travelling;
}
}

8
src/simulation.h
View File

@ -58,8 +58,8 @@ class Simulation
void selectStar(uint32);
void selectPlanet(int);
void selectBody(string s);
void gotoSelection();
void centerSelection();
void gotoSelection(double gotoTime = 5.0);
void centerSelection(double centerTime = 0.5);
void follow();
void cancelMotion();
@ -113,8 +113,8 @@ class Simulation
SolarSystem& solarSystem,
Vec3f pickRay);
Selection pickStar(Vec3f pickRay);
void computeGotoParameters(Selection& sel, JourneyParams& jparams);
void computeCenterParameters(Selection& sel, JourneyParams& jparams);
void computeGotoParameters(Selection& sel, JourneyParams& jparams, double gotoTime);
void computeCenterParameters(Selection& sel, JourneyParams& jparams, double centerTime);
void displaySelectionInfo(Console&);
private: