LabelMgr.cpp   LabelMgr.cpp 
skipping to change at line 297 skipping to change at line 297
if (vJustify == 't') if (vJustify == 't')
jyOffset = sPainter.getFontMetrics().height(); jyOffset = sPainter.getFontMetrics().height();
else if (vJustify == 'c') else if (vJustify == 'c')
jyOffset = sPainter.getFontMetrics().height() / 2.; jyOffset = sPainter.getFontMetrics().height() / 2.;
sPainter.setColor(labelColor[0], labelColor[1], labelColor[2], label Fader.getInterstate()); sPainter.setColor(labelColor[0], labelColor[1], labelColor[2], label Fader.getInterstate());
sPainter.drawText(labelXY[0]+xOffset-jxOffset, labelXY[1]+yOffset-jy Offset, labelText, 0, 0, 0, false); sPainter.drawText(labelXY[0]+xOffset-jxOffset, labelXY[1]+yOffset-jy Offset, labelText, 0, 0, 0, false);
if (labelStyle == SkyLabel::Line) if (labelStyle == SkyLabel::Line)
{ {
sPainter.enableTexture2d(false); sPainter.setBlending(true);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
// screen coordinates of object // screen coordinates of object
Vec3d objXY; Vec3d objXY;
sPainter.getProjector()->project(objectPos,objXY); sPainter.getProjector()->project(objectPos,objXY);
double lineEndX = labelXY[0]+xOffset; double lineEndX = labelXY[0]+xOffset;
double lineEndY = labelXY[1]+yOffset; double lineEndY = labelXY[1]+yOffset;
if (vJustify == 'b') if (vJustify == 'b')
lineEndY -= 5; lineEndY -= 5;
 End of changes. 1 change blocks. 
3 lines changed or deleted 1 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/