comparison: src/gldraw.cpp
src/gldraw.cpp
- changeset 551
- 0efe5dbcef07
- parent 550
- d97594e3fc54
- child 553
- 2418d5955421
equal
deleted
inserted
replaced
| 550:d97594e3fc54 | 551:0efe5dbcef07 |
|---|---|
| 285 return; | 285 return; |
| 286 } | 286 } |
| 287 | 287 |
| 288 if ((list == BFCFrontList || list == BFCBackList) && | 288 if ((list == BFCFrontList || list == BFCBackList) && |
| 289 obj->getType() != LDObject::Line && | 289 obj->getType() != LDObject::Line && |
| 290 obj->getType() != LDObject::CndLine) | 290 obj->getType() != LDObject::CondLine) |
| 291 { if (list == GL::BFCFrontList) | 291 { if (list == GL::BFCFrontList) |
| 292 qcol = QColor (40, 192, 0); | 292 qcol = QColor (40, 192, 0); |
| 293 else | 293 else |
| 294 qcol = QColor (224, 0, 0); | 294 qcol = QColor (224, 0, 0); |
| 295 } | 295 } |
| 837 // ============================================================================= | 837 // ============================================================================= |
| 838 // ----------------------------------------------------------------------------- | 838 // ----------------------------------------------------------------------------- |
| 839 void GLRenderer::compileSubObject (LDObject* obj, const GLenum gltype) | 839 void GLRenderer::compileSubObject (LDObject* obj, const GLenum gltype) |
| 840 { glBegin (gltype); | 840 { glBegin (gltype); |
| 841 | 841 |
| 842 const int numverts = (obj->getType() != LDObject::CndLine) ? obj->vertices() : 2; | 842 const int numverts = (obj->getType() != LDObject::CondLine) ? obj->vertices() : 2; |
| 843 | 843 |
| 844 if (g_glInvert == false) | 844 if (g_glInvert == false) |
| 845 for (int i = 0; i < numverts; ++i) | 845 for (int i = 0; i < numverts; ++i) |
| 846 compileVertex (obj->getVertex (i)); | 846 compileVertex (obj->getVertex (i)); |
| 847 else | 847 else |
| 859 switch (obj->getType()) | 859 switch (obj->getType()) |
| 860 { case LDObject::Line: | 860 { case LDObject::Line: |
| 861 compileSubObject (obj, GL_LINES); | 861 compileSubObject (obj, GL_LINES); |
| 862 break; | 862 break; |
| 863 | 863 |
| 864 case LDObject::CndLine: | 864 case LDObject::CondLine: |
| 865 | 865 |
| 866 // Draw conditional lines with a dash pattern - however, use a full | 866 // Draw conditional lines with a dash pattern - however, use a full |
| 867 // line when drawing a pick list to make selecting them easier. | 867 // line when drawing a pick list to make selecting them easier. |
| 868 if (list != GL::PickList) | 868 if (list != GL::PickList) |
| 869 { glLineStipple (1, 0x6666); | 869 { glLineStipple (1, 0x6666); |
