StelObserver.cpp   StelObserver.cpp 
skipping to change at line 167 skipping to change at line 167
if (a1[2]-a2[2] < -M_PI) if (a1[2]-a2[2] < -M_PI)
a1[2] += 2.0*M_PI; a1[2] += 2.0*M_PI;
setRot(a1*f1 + a2*f2); setRot(a1*f1 + a2*f2);
// rotation offset // rotation offset
re.offset = f1*re.offset + f2*dest->getRotationElements().offset; re.offset = f1*re.offset + f2*dest->getRotationElements().offset;
} }
StelObserver::StelObserver(const StelLocation &loc) : currentLocation(loc) StelObserver::StelObserver(const StelLocation &loc) : currentLocation(loc)
{ {
SolarSystem* ssystem = (SolarSystem*)GETSTELMODULE("SolarSystem"); SolarSystem* ssystem = GETSTELMODULE(SolarSystem);
planet = ssystem->searchByEnglishName(loc.planetName); planet = ssystem->searchByEnglishName(loc.planetName);
if (planet==NULL) if (planet==NULL)
{ {
qWarning() << "Can't create StelObserver on planet " + loc.p lanetName + " because it is unknown. Use Earth as default."; qWarning() << "Can't create StelObserver on planet " + loc.p lanetName + " because it is unknown. Use Earth as default.";
planet=ssystem->getEarth(); planet=ssystem->getEarth();
} }
} }
StelObserver::~StelObserver() StelObserver::~StelObserver()
{ {
skipping to change at line 210 skipping to change at line 210
} }
Mat4d StelObserver::getRotEquatorialToVsop87(void) const Mat4d StelObserver::getRotEquatorialToVsop87(void) const
{ {
return getHomePlanet()->getRotEquatorialToVsop87(); return getHomePlanet()->getRotEquatorialToVsop87();
} }
SpaceShipObserver::SpaceShipObserver(const StelLocation& startLoc, const St elLocation& target, double atransitSeconds) : StelObserver(startLoc), SpaceShipObserver::SpaceShipObserver(const StelLocation& startLoc, const St elLocation& target, double atransitSeconds) : StelObserver(startLoc),
moveStartLocation(startLoc), moveTargetLocation(target), art ificialPlanet(NULL), transitSeconds(atransitSeconds) moveStartLocation(startLoc), moveTargetLocation(target), art ificialPlanet(NULL), transitSeconds(atransitSeconds)
{ {
SolarSystem* ssystem = (SolarSystem*)GETSTELMODULE("SolarSystem"); SolarSystem* ssystem = GETSTELMODULE(SolarSystem);
Planet *targetPlanet = ssystem->searchByEnglishName(moveTargetLocati on.planetName); Planet *targetPlanet = ssystem->searchByEnglishName(moveTargetLocati on.planetName);
if (moveStartLocation.planetName!=moveTargetLocation.planetName) if (moveStartLocation.planetName!=moveTargetLocation.planetName)
{ {
Planet *startPlanet = ssystem->searchByEnglishName(moveStart Location.planetName); Planet *startPlanet = ssystem->searchByEnglishName(moveStart Location.planetName);
if (startPlanet==NULL || targetPlanet==NULL) if (startPlanet==NULL || targetPlanet==NULL)
{ {
qWarning() << "Can't move from planet " + moveStartL ocation.planetName + " to planet " + moveTargetLocation.planetName + " beca use it is unknown"; qWarning() << "Can't move from planet " + moveStartL ocation.planetName + " to planet " + moveTargetLocation.planetName + " beca use it is unknown";
timeToGo = -1.; // Will abort properly the move timeToGo = -1.; // Will abort properly the move
if (targetPlanet==NULL) if (targetPlanet==NULL)
{ {
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/