comparison: src/gldraw.cc
src/gldraw.cc
- changeset 593
- 108d7d21e155
- parent 592
- d3cf7a23bb59
- child 598
- c111fa74fd17
equal
deleted
inserted
replaced
| 592:d3cf7a23bb59 | 593:108d7d21e155 |
|---|---|
| 57 }; | 57 }; |
| 58 | 58 |
| 59 cfg (String, gl_bgcolor, "#FFFFFF") | 59 cfg (String, gl_bgcolor, "#FFFFFF") |
| 60 cfg (String, gl_maincolor, "#A0A0A0") | 60 cfg (String, gl_maincolor, "#A0A0A0") |
| 61 cfg (Float, gl_maincolor_alpha, 1.0) | 61 cfg (Float, gl_maincolor_alpha, 1.0) |
| 62 cfg (String, gl_selectcolor, "#0080FF") | |
| 62 cfg (Int, gl_linethickness, 2) | 63 cfg (Int, gl_linethickness, 2) |
| 63 cfg (Bool, gl_colorbfc, false) | 64 cfg (Bool, gl_colorbfc, false) |
| 64 cfg (Int, gl_camera, GLRenderer::EFreeCamera) | 65 cfg (Int, gl_camera, GLRenderer::EFreeCamera) |
| 65 cfg (Bool, gl_blackedges, false) | 66 cfg (Bool, gl_blackedges, false) |
| 66 cfg (Bool, gl_axes, false) | 67 cfg (Bool, gl_axes, false) |
| 334 g_warnedColors << obj->getColor(); | 335 g_warnedColors << obj->getColor(); |
| 335 return; | 336 return; |
| 336 } | 337 } |
| 337 } | 338 } |
| 338 | 339 |
| 339 long r = qcol.red(), | 340 int r = qcol.red(), |
| 340 g = qcol.green(), | 341 g = qcol.green(), |
| 341 b = qcol.blue(), | 342 b = qcol.blue(), |
| 342 a = qcol.alpha(); | 343 a = qcol.alpha(); |
| 343 | 344 |
| 344 if (obj->topLevelParent()->isSelected()) | 345 if (obj->topLevelParent()->isSelected()) |
| 345 { // Brighten it up for the select list. | 346 { // Brighten it up for the select list. |
| 346 const uchar add = 51; | 347 QColor selcolor (gl_selectcolor); |
| 347 | 348 r = (r + selcolor.red()) / 2; |
| 348 r = min (r + add, 255l); | 349 g = (g + selcolor.green()) / 2; |
| 349 g = min (g + add, 255l); | 350 b = (b + selcolor.blue()) / 2; |
| 350 b = min (b + add, 255l); | |
| 351 } | 351 } |
| 352 | 352 |
| 353 glColor4f ( | 353 glColor4f ( |
| 354 ((double) r) / 255.0f, | 354 ((double) r) / 255.0f, |
| 355 ((double) g) / 255.0f, | 355 ((double) g) / 255.0f, |
