spacecruft/celestia
spacecruft/celestia
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Corrected calculation of exponential term in goto interpolation for offset from target.

Browse source
This commit is contained in:
Chris Laurel 2001-09-07 22:12:52 +00:00
parent eba7e46d4a
commit 2f4928b0fb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/simulation.cpp
View file

@ -225,7 +225,7 @@ void Simulation::update(double dt)
// second half of the trip is a mirror of the first.
{
double c = astro::kilometersToLightYears(1.0);
double distance = astro::lightYearsToKilometers((journey.from - journey.to).length());
double distance = astro::lightYearsToKilometers(journey.from.distanceTo(journey.to));
double m = 2.0 * log(distance / 2.0 + 1.0);
Vec3d v = jv;
v.normalize();
@ -719,7 +719,6 @@ void Simulation::computeGotoParameters(Selection& destination,
{
UniversalCoord targetPosition = getSelectionPosition(selection, simTime);
Vec3d v = targetPosition - observer.getPosition();
double distance = astro::lightYearsToKilometers(v.length());
v.normalize();
jparams.duration = gotoTime;
@ -746,7 +745,8 @@ void Simulation::computeGotoParameters(Selection& destination,
jparams.finalOrientation = lookAt(Point3f(0, 0, 0), to, jparams.up);
jparams.accelTime = 0.5;
pair<double, double> sol = solve_bisection(TravelExpFunc(distance / 2.0, jparams.accelTime),
double distance = astro::lightYearsToKilometers(jparams.from.distanceTo(jparams.to)) / 2.0;
pair<double, double> sol = solve_bisection(TravelExpFunc(distance, jparams.accelTime),
0.0001, 100.0,
1e-10);
jparams.expFactor = sol.first;