Constellation.cpp   Constellation.cpp 
skipping to change at line 187 skipping to change at line 187
if (!boundaryFader.getInterstate()) if (!boundaryFader.getInterstate())
return; return;
sPainter.enableTexture2d(false); sPainter.enableTexture2d(false);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transpa rency mode glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transpa rency mode
sPainter.setColor(boundaryColor[0], boundaryColor[1], boundaryColor[ 2], boundaryFader.getInterstate()); sPainter.setColor(boundaryColor[0], boundaryColor[1], boundaryColor[ 2], boundaryFader.getInterstate());
unsigned int i, j, size; unsigned int i, j, size;
Vec3d pt1, pt2; Vec3f pt1, pt2;
Vec3d ptd1, ptd2;
std::vector<Vec3f> *points; std::vector<Vec3f> *points;
if (singleSelected) size = isolatedBoundarySegments.size(); if (singleSelected) size = isolatedBoundarySegments.size();
else size = sharedBoundarySegments.size(); else size = sharedBoundarySegments.size();
const SphericalCap viewportHalfspace = sPainter.getProjector()->getB oundingSphericalCap(); const SphericalCap& viewportHalfspace = sPainter.getProjector()->get BoundingCap();
for (i=0;i<size;i++) for (i=0;i<size;i++)
{ {
if (singleSelected) points = isolatedBoundarySegments[i]; if (singleSelected) points = isolatedBoundarySegments[i];
else points = sharedBoundarySegments[i]; else points = sharedBoundarySegments[i];
for (j=0;j<points->size()-1;j++) for (j=0;j<points->size()-1;j++)
{ {
pt1 = points->at(j); pt1 = points->at(j);
pt2 = points->at(j+1); pt2 = points->at(j+1);
if (pt1*pt2>0.9999999) if (pt1*pt2>0.9999999f)
continue; continue;
sPainter.drawGreatCircleArc(pt1, pt2, &viewportHalfs ptd1.set(pt1[0], pt1[1], pt1[2]);
pace); ptd2.set(pt2[0], pt2[1], pt2[2]);
sPainter.drawGreatCircleArc(ptd1, ptd2, &viewportHal
fspace);
} }
} }
} }
StelObjectP Constellation::getBrightestStarInConstellation(void) const StelObjectP Constellation::getBrightestStarInConstellation(void) const
{ {
float maxMag = 99.f; float maxMag = 99.f;
StelObjectP brightest; StelObjectP brightest;
// maybe the brightest star has always odd index, // maybe the brightest star has always odd index,
// so check all segment endpoints: // so check all segment endpoints:
 End of changes. 4 change blocks. 
5 lines changed or deleted 8 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/