fly/flightgear
1
0
Fork 0
Code Activity

Remove non-functional transparency from PUI map

Browse source 
This alpha blending never worked, and now it really doesn’t work, so
remove it (PUI map is not long for this world, anyway)
This commit is contained in:
James Turner 2018-03-01 15:55:41 +00:00
parent 6e6fafd5b4
commit 7f815c4c51
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/GUI/MapWidget.cxx
View file

@ -787,7 +787,7 @@ void MapWidget::paintRuler()
SGVec2d acftPos = project(_aircraft); SGVec2d acftPos = project(_aircraft);
SGVec2d clickPos = project(_clickGeod); SGVec2d clickPos = project(_clickGeod);
glColor4f(0.0, 1.0, 1.0, 0.6); glColor3f(0.0, 1.0, 1.0);
drawLine(acftPos, clickPos); drawLine(acftPos, clickPos);
circleAtAlt(clickPos, 8, 10, 5); circleAtAlt(clickPos, 8, 10, 5);
@ -812,7 +812,7 @@ void MapWidget::paintAircraftLocation(const SGGeod& aircraftPos)
double hdg = fgGetDouble("/orientation/heading-deg"); double hdg = fgGetDouble("/orientation/heading-deg");
glLineWidth(2.0); glLineWidth(2.0);
glColor4f(1.0, 1.0, 0.0, 1.0); glColor3f(1.0, 1.0, 0.0);
glPushMatrix(); glPushMatrix();
glTranslated(loc.x(), loc.y(), 0.0); glTranslated(loc.x(), loc.y(), 0.0);
glRotatef(hdg - _upHeading, 0.0, 0.0, -1.0); glRotatef(hdg - _upHeading, 0.0, 0.0, -1.0);
@ -848,9 +848,9 @@ void MapWidget::paintRoute()
} }
if (w < _route->currentIndex()) { if (w < _route->currentIndex()) {
glColor4f(0.5, 0.5, 0.5, 0.7); glColor3f(0.5, 0.5, 0.5);
} else { } else {
glColor4f(1.0, 0.0, 1.0, 1.0); glColor3f(1.0, 0.0, 1.0);
} }
flightgear::WayptRef wpt(_route->wayptAtIndex(w)); flightgear::WayptRef wpt(_route->wayptAtIndex(w));
@ -879,7 +879,7 @@ void MapWidget::paintRoute()
} }
SGVec2d p = project(g); SGVec2d p = project(g);
glColor4f(1.0, 0.0, 1.0, 1.0); glColor3f(1.0, 0.0, 1.0);
circleAtAlt(p, 8, 12, 5); circleAtAlt(p, 8, 12, 5);
std::ostringstream legend; std::ostringstream legend;
@ -912,7 +912,7 @@ void MapWidget::drawFlightHistory()
// first pass, draw the actual lines // first pass, draw the actual lines
glLineWidth(2.0); glLineWidth(2.0);
glColor4f(0.0, 0.0, 1.0, 0.7); glColor3f(0.0, 0.0, 1.0);
glBegin(GL_LINE_STRIP); glBegin(GL_LINE_STRIP);
for (unsigned int i=0; i<_flightHistoryPath.size(); ++i) { for (unsigned int i=0; i<_flightHistoryPath.size(); ++i) {
@ -987,7 +987,7 @@ void MapWidget::drawLatLonGrid()
int ix = 0; int ix = 0;
int iy = 0; int iy = 0;
glColor4f(0.8, 0.8, 0.8, 1.0); glColor3f(0.8, 0.8, 0.8);
glBegin(GL_LINES); glBegin(GL_LINES);
bool didDraw; bool didDraw;
do { do {
@ -1038,7 +1038,7 @@ void MapWidget::drawGPSData()
SGGeod trackRadial; SGGeod trackRadial;
SGGeodesy::direct(_aircraft, gpsTrackDeg, _drawRangeNm * SG_NM_TO_METER, trackRadial, az2); SGGeodesy::direct(_aircraft, gpsTrackDeg, _drawRangeNm * SG_NM_TO_METER, trackRadial, az2);
glColor4f(1.0, 1.0, 0.0, 1.0); glColor3f(1.0, 1.0, 0.0);
glEnable(GL_LINE_STIPPLE); glEnable(GL_LINE_STIPPLE);
glLineStipple(1, 0x00FF); glLineStipple(1, 0x00FF);
drawLine(project(_aircraft), project(trackRadial)); drawLine(project(_aircraft), project(trackRadial));
@ -1049,7 +1049,7 @@ void MapWidget::drawGPSData()
SGVec2d wp0Pos = project(wp0Geod); SGVec2d wp0Pos = project(wp0Geod);
SGVec2d wp1Pos = project(wp1Geod); SGVec2d wp1Pos = project(wp1Geod);
glColor4f(1.0, 0.0, 1.0, 1.0); glColor3f(1.0, 0.0, 1.0);
drawLine(wp0Pos, wp1Pos); drawLine(wp0Pos, wp1Pos);
} }
@ -1387,7 +1387,7 @@ void MapWidget::drawRunwayPre(FGRunway* rwy)
glLineWidth(4.0); glLineWidth(4.0);
glColor3f(1.0, 0.0, 1.0); glColor3f(1.0, 0.0, 1.0);
drawLine(p1, p2); drawLine(p1, p2);
} }
void MapWidget::drawRunway(FGRunway* rwy) void MapWidget::drawRunway(FGRunway* rwy)