comparison: src/gldraw.cpp
src/gldraw.cpp
- changeset 189
- ac2d3e8dd110
- parent 188
- 4e686b771996
- child 191
- 9bb6a17305ad
equal
deleted
inserted
replaced
| 188:4e686b771996 | 189:ac2d3e8dd110 |
|---|---|
| 110 m_thinBorderPen.setWidth (1); | 110 m_thinBorderPen.setWidth (1); |
| 111 | 111 |
| 112 // Init camera icons | 112 // Init camera icons |
| 113 for (const GLRenderer::Camera cam : g_Cameras) { | 113 for (const GLRenderer::Camera cam : g_Cameras) { |
| 114 str iconname; | 114 str iconname; |
| 115 iconname.format ("camera-%s", str (g_CameraNames[cam]).tolower ().chars ()); | 115 iconname.format ("camera-%s", str (g_CameraNames[cam]).lower ().c ()); |
| 116 | 116 |
| 117 CameraIcon* info = &g_CameraIcons[cam]; | 117 CameraIcon* info = &g_CameraIcons[cam]; |
| 118 info->img = new QPixmap (getIcon (iconname)); | 118 info->img = new QPixmap (getIcon (iconname)); |
| 119 info->cam = cam; | 119 info->cam = cam; |
| 120 } | 120 } |
| 247 | 247 |
| 248 if (obj->color == maincolor) | 248 if (obj->color == maincolor) |
| 249 qcol = getMainColor (); | 249 qcol = getMainColor (); |
| 250 else { | 250 else { |
| 251 color* col = getColor (obj->color); | 251 color* col = getColor (obj->color); |
| 252 qcol = col->qColor; | 252 qcol = col->faceColor; |
| 253 } | 253 } |
| 254 | 254 |
| 255 if (obj->color == edgecolor) { | 255 if (obj->color == edgecolor) { |
| 256 qcol = Qt::black; | 256 qcol = Qt::black; |
| 257 color* col; | 257 color* col; |
| 258 | 258 |
| 259 if (!gl_blackedges && obj->parent != null && (col = getColor (obj->parent->color)) != null) | 259 if (!gl_blackedges && obj->parent != null && (col = getColor (obj->parent->color)) != null) |
| 260 qcol = col->qEdge; | 260 qcol = col->edgeColor; |
| 261 } | 261 } |
| 262 | 262 |
| 263 if (qcol.isValid () == false) { | 263 if (qcol.isValid () == false) { |
| 264 // The color was unknown. Use main color to make the object at least | 264 // The color was unknown. Use main color to make the object at least |
| 265 // not appear pitch-black. | 265 // not appear pitch-black. |
