Planet.cpp   Planet.cpp 
skipping to change at line 849 skipping to change at line 849
void Planet::drawHints(const StelCore* core, const QFont& planetNameFont) void Planet::drawHints(const StelCore* core, const QFont& planetNameFont)
{ {
if (labelsFader.getInterstate()<=0.f) if (labelsFader.getInterstate()<=0.f)
return; return;
const StelNavigator* nav = core->getNavigator(); const StelNavigator* nav = core->getNavigator();
const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000) ; const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000) ;
StelPainter sPainter(prj); StelPainter sPainter(prj);
sPainter.setFont(planetNameFont); sPainter.setFont(planetNameFont);
// Draw nameI18 + scaling if it's not == 1. // Draw nameI18 + scaling if it's not == 1.
float tmp = 10.f + getAngularSize(core)*M_PI/180.f*prj->getPixelPerR adAtCenter()/1.44f; // Shift for nameI18 printing float tmp = (hintFader.getInterstate()<=0 ? 7.f : 10.f) + getAngular Size(core)*M_PI/180.f*prj->getPixelPerRadAtCenter()/1.44f; // Shift for nam eI18 printing
sPainter.setColor(labelColor[0], labelColor[1], labelColor[2],labels Fader.getInterstate()); sPainter.setColor(labelColor[0], labelColor[1], labelColor[2],labels Fader.getInterstate());
sPainter.drawText(screenPos[0],screenPos[1], getSkyLabel(nav), 0, tm p, tmp, false); sPainter.drawText(screenPos[0],screenPos[1], getSkyLabel(nav), 0, tm p, tmp, false);
// hint disapears smoothly on close view // hint disapears smoothly on close view
if (hintFader.getInterstate()<=0) if (hintFader.getInterstate()<=0)
return; return;
tmp -= 10.f; tmp -= 10.f;
if (tmp<1) tmp=1; if (tmp<1) tmp=1;
sPainter.setColor(labelColor[0], labelColor[1], labelColor[2],labels Fader.getInterstate()*hintFader.getInterstate()/tmp*0.7f); sPainter.setColor(labelColor[0], labelColor[1], labelColor[2],labels Fader.getInterstate()*hintFader.getInterstate()/tmp*0.7f);
skipping to change at line 934 skipping to change at line 934
// on it's orbit all the time (since segmented rather than smooth cu rve) // on it's orbit all the time (since segmented rather than smooth cu rve)
Vec3d savePos = orbit[ORBIT_SEGMENTS/2]; Vec3d savePos = orbit[ORBIT_SEGMENTS/2];
orbit[ORBIT_SEGMENTS/2]=getHeliocentricEclipticPos(); orbit[ORBIT_SEGMENTS/2]=getHeliocentricEclipticPos();
orbit[ORBIT_SEGMENTS]=orbit[0]; orbit[ORBIT_SEGMENTS]=orbit[0];
int nbIter = closeOrbit ? ORBIT_SEGMENTS : ORBIT_SEGMENTS-1; int nbIter = closeOrbit ? ORBIT_SEGMENTS : ORBIT_SEGMENTS-1;
QVarLengthArray<float, 1024> vertexArray; QVarLengthArray<float, 1024> vertexArray;
sPainter.enableClientStates(true, false, false); sPainter.enableClientStates(true, false, false);
for (int n=0; n<=nbIter; ++n) for (int n=0; n<=nbIter; ++n)
{ {
if (prj->project(orbit[n],onscreen)) if (prj->project(orbit[n],onscreen) && (vertexArray.size()== 0 || !prj->intersectViewportDiscontinuity(orbit[n-1], orbit[n])))
{ {
vertexArray.append(onscreen[0]); vertexArray.append(onscreen[0]);
vertexArray.append(onscreen[1]); vertexArray.append(onscreen[1]);
} }
else if (!vertexArray.isEmpty()) else if (!vertexArray.isEmpty())
{ {
sPainter.setVertexPointer(2, GL_FLOAT, vertexArray.c onstData()); sPainter.setVertexPointer(2, GL_FLOAT, vertexArray.c onstData());
sPainter.drawFromArray(StelPainter::LineStrip, verte xArray.size()/2, 0, false); sPainter.drawFromArray(StelPainter::LineStrip, verte xArray.size()/2, 0, false);
vertexArray.clear(); vertexArray.clear();
} }
 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/