Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:49:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix color not working for wire circle3d

Browse source
This commit is contained in:
Ryan Huffman 2015-04-03 16:28:12 -07:00
parent f311cc5f07
commit ce2c23de51
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/ui/overlays/Circle3DOverlay.cpp
View file

@ -98,6 +98,9 @@ void Circle3DOverlay::render(RenderArgs* args) {
const float MAX_COLOR = 255.0f; const float MAX_COLOR = 255.0f;
glm::vec4 color(colorX.red / MAX_COLOR, colorX.green / MAX_COLOR, colorX.blue / MAX_COLOR, alpha); glm::vec4 color(colorX.red / MAX_COLOR, colorX.green / MAX_COLOR, colorX.blue / MAX_COLOR, alpha);
bool colorChanged = colorX.red != _lastColor.red || colorX.green != _lastColor.green || colorX.blue != _lastColor.blue;
_lastColor = colorX;
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
glm::vec3 position = getPosition(); glm::vec3 position = getPosition();
@ -131,7 +134,7 @@ void Circle3DOverlay::render(RenderArgs* args) {
_quadVerticesID = geometryCache->allocateID(); _quadVerticesID = geometryCache->allocateID();
} }
if (geometryChanged) { if (geometryChanged || colorChanged) {
QVector<glm::vec2> points; QVector<glm::vec2> points;
@ -170,7 +173,7 @@ void Circle3DOverlay::render(RenderArgs* args) {
_lineVerticesID = geometryCache->allocateID(); _lineVerticesID = geometryCache->allocateID();
} }
if (geometryChanged) { if (geometryChanged || colorChanged) {
QVector<glm::vec2> points; QVector<glm::vec2> points;
float angle = startAt; float angle = startAt;

1
interface/src/ui/overlays/Circle3DOverlay.h
View file

@ -70,6 +70,7 @@ protected:
int _majorTicksVerticesID; int _majorTicksVerticesID;
int _minorTicksVerticesID; int _minorTicksVerticesID;
xColor _lastColor;
float _lastStartAt; float _lastStartAt;
float _lastEndAt; float _lastEndAt;
float _lastOuterRadius; float _lastOuterRadius;