comparison: src/glRenderer.cc
src/glRenderer.cc
- changeset 815
- efe34366e56a
- parent 795
- 195fa1fff9c3
- child 816
- 9adb822de7b9
equal
deleted
inserted
replaced
| 814:c8ef30fd0e54 | 815:efe34366e56a |
|---|---|
| 76 CFGENTRY (Bool, antiAliasedLines, true) | 76 CFGENTRY (Bool, antiAliasedLines, true) |
| 77 CFGENTRY (Bool, drawLineLengths, true) | 77 CFGENTRY (Bool, drawLineLengths, true) |
| 78 CFGENTRY (Bool, drawAngles, false) | 78 CFGENTRY (Bool, drawAngles, false) |
| 79 CFGENTRY (Bool, randomColors, false) | 79 CFGENTRY (Bool, randomColors, false) |
| 80 CFGENTRY (Bool, highlightObjectBelowCursor, true) | 80 CFGENTRY (Bool, highlightObjectBelowCursor, true) |
| 81 CFGENTRY (Bool, drawSurfaces, true) | |
| 82 CFGENTRY (Bool, drawEdgeLines, true) | |
| 83 CFGENTRY (Bool, drawConditionalLines, true) | |
| 81 | 84 |
| 82 // argh | 85 // argh |
| 83 const char* g_CameraNames[7] = | 86 const char* g_CameraNames[7] = |
| 84 { | 87 { |
| 85 QT_TRANSLATE_NOOP ("GLRenderer", "Top"), | 88 QT_TRANSLATE_NOOP ("GLRenderer", "Top"), |
| 478 | 481 |
| 479 // ============================================================================= | 482 // ============================================================================= |
| 480 // | 483 // |
| 481 void GLRenderer::drawVBOs (EVBOSurface surface, EVBOComplement colors, GLenum type) | 484 void GLRenderer::drawVBOs (EVBOSurface surface, EVBOComplement colors, GLenum type) |
| 482 { | 485 { |
| 486 // Filter this through some configuration options | |
| 487 if (((surface == VBOSF_Quads || surface == VBOSF_Triangles) && cfg::drawSurfaces == false) || | |
| 488 (surface == VBOSF_Lines && cfg::drawEdgeLines == false) || | |
| 489 (surface == VBOSF_CondLines && cfg::drawConditionalLines == false)) | |
| 490 { | |
| 491 return; | |
| 492 } | |
| 493 | |
| 483 int surfacenum = m_compiler->vboNumber (surface, VBOCM_Surfaces); | 494 int surfacenum = m_compiler->vboNumber (surface, VBOCM_Surfaces); |
| 484 int colornum = m_compiler->vboNumber (surface, colors); | 495 int colornum = m_compiler->vboNumber (surface, colors); |
| 485 m_compiler->prepareVBO (surfacenum); | 496 m_compiler->prepareVBO (surfacenum); |
| 486 m_compiler->prepareVBO (colornum); | 497 m_compiler->prepareVBO (colornum); |
| 487 GLuint surfacevbo = m_compiler->vbo (surfacenum); | 498 GLuint surfacevbo = m_compiler->vbo (surfacenum); |
