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

Added setObserverPosition and setObserverOrientation methods; removed obsolete getSelectionPosition method.

ver1_5_1
Chris Laurel 2002-01-09 23:03:03 +00:00
parent eaf89aeca1
commit fd3b687dad
2 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/celengine/simulation.cpp
View File

@ -180,34 +180,6 @@ static Quatf lookAt(Point3f from, Point3f to, Vec3f up)
}
UniversalCoord Simulation::getSelectionPosition(Selection& sel, double when)
{
if (sel.body != NULL)
{
Point3f sunPos(0.0f, 0.0f, 0.0f);
const Star* sun = getSun(sel.body);
if (sun != NULL)
sunPos = sun->getPosition();
return astro::universalPosition(sel.body->getHeliocentricPosition(when),
sunPos);
}
else if (sel.star != NULL)
{
return astro::universalPosition(Point3d(0.0, 0.0, 0.0), sel.star->getPosition());
}
else if (sel.galaxy != NULL)
{
Point3d p = sel.galaxy->getPosition();
return astro::universalPosition(Point3d(0.0, 0.0, 0.0),
Point3f((float) p.x, (float) p.y, (float) p.z));
}
else
{
return UniversalCoord(Point3d(0.0, 0.0, 0.0));
}
}
float getSelectionSize(Selection& sel)
{
if (sel.body != NULL)
@ -549,6 +521,22 @@ Observer& Simulation::getObserver()
return observer;
}
void Simulation::setObserverPosition(const UniversalCoord& pos)
{
RigidTransform rt(pos, observer.getOrientation());
transform = fromUniversal(frame, rt, simTime);
observer.setPosition(pos);
}
void Simulation::setObserverOrientation(const Quatf& orientation)
{
RigidTransform rt(observer.getPosition(), orientation);
transform = fromUniversal(frame, rt, simTime);
observer.setOrientation(orientation);
}
Simulation::ObserverMode Simulation::getObserverMode() const
{
return observerMode;

7
src/celengine/simulation.h
View File

@ -72,8 +72,6 @@ class Simulation
Universe* getUniverse() const;
Observer& getObserver();
void orbit(Quatf q);
void rotate(Quatf q);
void changeOrbitDistance(float d);
@ -84,7 +82,6 @@ class Simulation
void setSelection(const Selection&);
void selectStar(uint32);
void selectPlanet(int);
UniversalCoord getSelectionPosition(Selection& sel, double when);
Selection findObject(std::string s);
Selection findObjectFromPath(std::string s);
void gotoSelection(double gotoTime,
@ -104,6 +101,10 @@ class Simulation
void track();
void cancelMotion();
Observer& getObserver();
void setObserverPosition(const UniversalCoord&);
void setObserverOrientation(const Quatf&);
SolarSystem* getNearestSolarSystem() const;
double getTimeScale();