Constellation.cpp   Constellation.cpp 
skipping to change at line 182 skipping to change at line 182
return; return;
sPainter.drawStelVertexArray(artPolygon); sPainter.drawStelVertexArray(artPolygon);
} }
} }
} }
// Draw the art texture // Draw the art texture
void Constellation::drawArt(StelPainter& sPainter) const void Constellation::drawArt(StelPainter& sPainter) const
{ {
glBlendFunc(GL_ONE, GL_ONE); sPainter.setBlending(true, GL_ONE, GL_ONE);
sPainter.enableTexture2d(true); sPainter.setCullFace(true);
glEnable(GL_BLEND);
glEnable(GL_CULL_FACE);
SphericalRegionP region = sPainter.getProjector()->getViewportConvex Polygon(); SphericalRegionP region = sPainter.getProjector()->getViewportConvex Polygon();
drawArtOptim(sPainter, *region); drawArtOptim(sPainter, *region);
sPainter.setCullFace(false);
glDisable(GL_CULL_FACE);
} }
const Constellation* Constellation::isStarIn(const StelObject* s) const const Constellation* Constellation::isStarIn(const StelObject* s) const
{ {
for(unsigned int i=0;i<numberOfSegments*2;++i) for(unsigned int i=0;i<numberOfSegments*2;++i)
{ {
// asterism[i]==s test was not working // asterism[i]==s test was not working
if (asterism[i]->getEnglishName()==s->getEnglishName()) if (asterism[i]->getEnglishName()==s->getEnglishName())
{ {
skipping to change at line 220 skipping to change at line 217
nameFader.update(deltaTime); nameFader.update(deltaTime);
artFader.update(deltaTime); artFader.update(deltaTime);
boundaryFader.update(deltaTime); boundaryFader.update(deltaTime);
} }
void Constellation::drawBoundaryOptim(StelPainter& sPainter) const void Constellation::drawBoundaryOptim(StelPainter& sPainter) const
{ {
if (!boundaryFader.getInterstate()) if (!boundaryFader.getInterstate())
return; return;
sPainter.enableTexture2d(false); sPainter.setBlending(true);
glEnable(GL_BLEND);
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; unsigned int i, j;
size_t size; 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();
 End of changes. 3 change blocks. 
11 lines changed or deleted 4 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/