Constellation.cpp   Constellation.cpp 
skipping to change at line 225 skipping to change at line 225
{ {
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_t size;
Vec3f pt1, pt2; Vec3f pt1, pt2;
Vec3d ptd1, ptd2; 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()->get BoundingCap(); const SphericalCap& viewportHalfspace = sPainter.getProjector()->get BoundingCap();
for (i=0;i<size;i++) for (i=0;i<size;i++)
skipping to change at line 262 skipping to change at line 263
bool Constellation::checkVisibility() const bool Constellation::checkVisibility() const
{ {
// Is supported seasonal rules by current starlore? // Is supported seasonal rules by current starlore?
if (!seasonalRuleEnabled) if (!seasonalRuleEnabled)
return true; return true;
bool visible = false; bool visible = false;
int year, month, day; int year, month, day;
// Get the current month // Get the current month
StelUtils::getDateFromJulianDay(StelApp::getInstance().getCore()->ge tJDay(), &year, &month, &day); StelUtils::getDateFromJulianDay(StelApp::getInstance().getCore()->ge tJD(), &year, &month, &day);
if (endSeason >= beginSeason) if (endSeason >= beginSeason)
{ {
// OK, it's a "normal" season rule... // OK, it's a "normal" season rule...
if ((month >= beginSeason) && (month <= endSeason)) if ((month >= beginSeason) && (month <= endSeason))
visible = true; visible = true;
} }
else else
{ {
// ...oops, it's a "inverted" season rule // ...oops, it's a "inverted" season rule
if (((month>=1) && (month<=endSeason)) || ((month>=beginSeas on) && (month<=12))) if (((month>=1) && (month<=endSeason)) || ((month>=beginSeas on) && (month<=12)))
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 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/