Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No more glLineWidth post OpenGL 3.x

master
Andrew Copland 2014-10-14 20:43:09 +01:00
parent a9d3de0ce5
commit 54b1ec45ff
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ShipCpanelMultiFuncDisplays.cpp
View File

@ -143,7 +143,7 @@ void ScannerWidget::Draw()
// objects above
if (!m_contacts.empty()) DrawBlobs(false);
glLineWidth(1.f);
// glLineWidth(1.f);
SetScissor(false);
}
@ -345,11 +345,11 @@ void ScannerWidget::DrawBlobs(bool below)
float pointSize = 1.f;
if (weight == WEIGHT_LIGHT) {
glLineWidth(1);
// glLineWidth(1);
pointSize = 3.f;
}
else {
glLineWidth(2);
// glLineWidth(2);
pointSize = 4.f;
}

4
src/SystemView.cpp
View File

@ -610,7 +610,7 @@ void SystemView::Draw3D()
vector3d pos(0,0,0);
if (m_selectedObject) GetTransformTo(m_selectedObject, pos);
glLineWidth(2);
// glLineWidth(2);
m_objectLabels->Clear();
if (m_system->GetUnexplored())
m_infoLabel->SetText(Lang::UNEXPLORED_SYSTEM_NO_SYSTEM_VIEW);
@ -626,7 +626,7 @@ void SystemView::Draw3D()
}
}
}
glLineWidth(1);
// glLineWidth(1);
if(m_shipDrawing != OFF) {
RefreshShips();

9
src/WorldView.cpp
View File

@ -1854,14 +1854,14 @@ void WorldView::Draw()
// don't draw crosshairs etc in hyperspace
if (Pi::player->GetFlightState() == Ship::HYPERSPACE) return;
glLineWidth(2.0f);
// glLineWidth(2.0f);
const Color retroIconColor( (Pi::player->GetNavTarget()) ? green : white );
// nav target square
DrawTargetSquare(m_navTargetIndicator, green);
glLineWidth(1.0f);
// glLineWidth(1.0f);
// velocity indicators
DrawVelocityIndicator(m_velIndicator, V_PROGRADE, white);
@ -1869,14 +1869,15 @@ void WorldView::Draw()
DrawVelocityIndicator(m_navVelIndicator, V_PROGRADE, green);
DrawVelocityIndicator(m_burnIndicator, V_BURN, Color::STEELBLUE);
glLineWidth(2.0f);
// glLineWidth(2.0f);
DrawImageIndicator(m_mouseDirIndicator, m_indicatorMousedir.get(), yellow);
// combat target indicator
DrawCombatTargetIndicator(m_combatTargetIndicator, m_targetLeadIndicator, red);
glLineWidth(1.0f);
// glLineWidth(1.0f);
Graphics::CheckRenderErrors();
// normal crosshairs
if (GetCamType() == CAM_INTERNAL) {

8
src/graphics/Drawables.cpp
View File

@ -184,9 +184,9 @@ void Line3D::Draw(Renderer *r, RenderState *rs)
}
// XXX would be nicer to draw this as a textured triangle strip
// can't guarantee linewidth support
glLineWidth(m_width);
// glLineWidth(m_width);
r->DrawBuffer(m_vertexBuffer.Get(), rs, m_material.Get(), Graphics::LINE_SINGLE);
glLineWidth(1.f);
// glLineWidth(1.f);
}
void Line3D::CreateVertexBuffer(Graphics::Renderer *r, const Uint32 size)
@ -272,9 +272,9 @@ void Lines::Draw(Renderer *r, RenderState *rs, const PrimitiveType pt)
}
// XXX would be nicer to draw this as a textured triangle strip
// can't guarantee linewidth support
glLineWidth(m_width);
// glLineWidth(m_width);
r->DrawBuffer(m_vertexBuffer.Get(), rs, m_material.Get(), pt);
glLineWidth(1.f);
// glLineWidth(1.f);
}
void Lines::CreateVertexBuffer(Graphics::Renderer *r, const Uint32 size)