TelescopeControl.cpp   TelescopeControl.cpp 
skipping to change at line 279 skipping to change at line 279
{ {
if (telescope->isConnected() && telescope->hasKnownPosition( )) if (telescope->isConnected() && telescope->hasKnownPosition( ))
{ {
Vec3d XY; Vec3d XY;
if (prj->projectCheck(telescope->getJ2000EquatorialP os(core), XY)) if (prj->projectCheck(telescope->getJ2000EquatorialP os(core), XY))
{ {
//Telescope circles appear synchronously wit h markers //Telescope circles appear synchronously wit h markers
if (circleFader.getInterstate() >= 0) if (circleFader.getInterstate() >= 0)
{ {
sPainter.setColor(circleColor[0], ci rcleColor[1], circleColor[2], circleFader.getInterstate()); sPainter.setColor(circleColor[0], ci rcleColor[1], circleColor[2], circleFader.getInterstate());
glDisable(GL_TEXTURE_2D);
foreach (double circle, telescope->g etOculars()) foreach (double circle, telescope->g etOculars())
{ {
sPainter.drawCircle(XY[0], X Y[1], 0.5 * prj->getPixelPerRadAtCenter() * (M_PI/180) * (circle)); sPainter.drawCircle(XY[0], X Y[1], 0.5 * prj->getPixelPerRadAtCenter() * (M_PI/180) * (circle));
} }
glEnable(GL_TEXTURE_2D);
} }
if (reticleFader.getInterstate() >= 0) if (reticleFader.getInterstate() >= 0)
{ {
glEnable(GL_TEXTURE_2D); sPainter.setBlending(true, GL_SRC_AL
glEnable(GL_BLEND); PHA, GL_ONE);
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
sPainter.setColor(reticleColor[0], r eticleColor[1], reticleColor[2], reticleFader.getInterstate()); sPainter.setColor(reticleColor[0], r eticleColor[1], reticleColor[2], reticleFader.getInterstate());
sPainter.drawSprite2dMode(XY[0],XY[1 ],15.f); sPainter.drawSprite2dMode(XY[0],XY[1 ],15.f);
glDisable(GL_TEXTURE_2D);
} }
if (labelFader.getInterstate() >= 0) if (labelFader.getInterstate() >= 0)
{ {
sPainter.setColor(labelColor[0], lab elColor[1], labelColor[2], labelFader.getInterstate()); sPainter.setColor(labelColor[0], lab elColor[1], labelColor[2], labelFader.getInterstate());
//TODO: Different position of the la bel if circles are shown? //TODO: Different position of the la bel if circles are shown?
//TODO: Remove magic number (text sp acing) //TODO: Remove magic number (text sp acing)
sPainter.drawText(XY[0], XY[1], tele scope->getNameI18n(), 0, 6 + 10, -4, false); sPainter.drawText(XY[0], XY[1], tele scope->getNameI18n(), 0, 6 + 10, -4, false);
//Same position as the other objects : doesn't work, telescope label overlaps object label //Same position as the other objects : doesn't work, telescope label overlaps object label
//sPainter.drawText(XY[0], XY[1], sc ope->getNameI18n(), 0, 10, 10, false); //sPainter.drawText(XY[0], XY[1], sc ope->getNameI18n(), 0, 10, 10, false);
reticleTexture->bind(); reticleTexture->bind();
skipping to change at line 422 skipping to change at line 417
const StelObjectP obj = newSelected[0]; const StelObjectP obj = newSelected[0];
Vec3d pos = obj->getJ2000EquatorialPos(core); Vec3d pos = obj->getJ2000EquatorialPos(core);
Vec3d screenpos; Vec3d screenpos;
// Compute 2D pos and return if outside screen // Compute 2D pos and return if outside screen
if (!prj->project(pos, screenpos)) if (!prj->project(pos, screenpos))
return; return;
const Vec3f& c(obj->getInfoColor()); const Vec3f& c(obj->getInfoColor());
sPainter.setColor(c[0], c[1], c[2]); sPainter.setColor(c[0], c[1], c[2]);
selectionTexture->bind(); selectionTexture->bind();
glEnable(GL_TEXTURE_2D); sPainter.setBlending(true);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal
transparency mode
sPainter.drawSprite2dMode(screenpos[0], screenpos[1], 25., S telApp::getInstance().getTotalRunTime() * 40.); sPainter.drawSprite2dMode(screenpos[0], screenpos[1], 25., S telApp::getInstance().getTotalRunTime() * 40.);
} }
#endif //COMPATIBILITY_001002 #endif //COMPATIBILITY_001002
} }
void TelescopeControl::telescopeGoto(int slotNumber, const Vec3d &j2000Pos) void TelescopeControl::telescopeGoto(int slotNumber, const Vec3d &j2000Pos)
{ {
//TODO: See the original code. I think that something is wrong here. .. //TODO: See the original code. I think that something is wrong here. ..
if(telescopeClients.contains(slotNumber)) if(telescopeClients.contains(slotNumber))
telescopeClients.value(slotNumber)->telescopeGoto(j2000Pos); telescopeClients.value(slotNumber)->telescopeGoto(j2000Pos);
 End of changes. 5 change blocks. 
10 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/