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

Fixed a bug in Universe::getNearestSolarSystem() that would miss finding 

a solar system if there was a closer star without a solar system (which was
possible in some multiple star systems.)
ver1_5_1
Chris Laurel 2008-01-15 00:13:01 +00:00
parent 15d44865df
commit baae4530f7
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/celengine/universe.cpp
View File

@ -239,7 +239,7 @@ bool Universe::isMarked(const Selection& sel, int priority) const
class ClosestStarFinder : public StarHandler class ClosestStarFinder : public StarHandler
{ {
public: public:
ClosestStarFinder(float _maxDistance); ClosestStarFinder(float _maxDistance, const Universe* _universe);
~ClosestStarFinder() {}; ~ClosestStarFinder() {};
void process(const Star& star, float distance, float appMag); void process(const Star& star, float distance, float appMag);
@ -247,10 +247,17 @@ public:
float maxDistance; float maxDistance;
float closestDistance; float closestDistance;
Star* closestStar; Star* closestStar;
const Universe* universe;
bool withPlanets;
}; };
ClosestStarFinder::ClosestStarFinder(float _maxDistance) : ClosestStarFinder::ClosestStarFinder(float _maxDistance,
maxDistance(_maxDistance), closestDistance(_maxDistance), closestStar(NULL) const Universe* _universe) :
maxDistance(_maxDistance),
closestDistance(_maxDistance),
closestStar(NULL),
universe(_universe),
withPlanets(false)
{ {
} }
@ -258,8 +265,11 @@ void ClosestStarFinder::process(const Star& star, float distance, float)
{ {
if (distance < closestDistance) if (distance < closestDistance)
{ {
closestStar = const_cast<Star*>(&star); if (!withPlanets || universe->getSolarSystem(&star))
closestDistance = distance; {
closestStar = const_cast<Star*>(&star);
closestDistance = distance;
}
} }
} }
@ -1251,7 +1261,8 @@ SolarSystem* Universe::getNearestSolarSystem(const UniversalCoord& position) con
{ {
Point3f pos = (Point3f) position; Point3f pos = (Point3f) position;
Point3f lyPos(pos.x * 1.0e-6f, pos.y * 1.0e-6f, pos.z * 1.0e-6f); Point3f lyPos(pos.x * 1.0e-6f, pos.y * 1.0e-6f, pos.z * 1.0e-6f);
ClosestStarFinder closestFinder(1.0f); ClosestStarFinder closestFinder(1.0f, this);
closestFinder.withPlanets = true;
starCatalog->findCloseStars(closestFinder, lyPos, 1.0f); starCatalog->findCloseStars(closestFinder, lyPos, 1.0f);
return getSolarSystem(closestFinder.closestStar); return getSolarSystem(closestFinder.closestStar);
} }