Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 01:50:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix shifting tickmarks

Browse source
This commit is contained in:
ZappoMan 2014-10-10 22:06:12 -07:00
parent e6d7add5dc
commit a08ddecc3a
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -168,7 +168,8 @@ void Circle3DOverlay::render() {
xColor color = getMajorTickMarksColor(); xColor color = getMajorTickMarksColor();
glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha); glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);
float angle = startAt; float tickMarkAngle = getMajorTickMarksAngle();
float angle = startAt - fmod(startAt, tickMarkAngle) + tickMarkAngle;
float angleInRadians = glm::radians(angle); float angleInRadians = glm::radians(angle);
float tickMarkLength = getMajorTickMarksLength(); float tickMarkLength = getMajorTickMarksLength();
float startRadius = (tickMarkLength > 0.0f) ? innerRadius : outerRadius; float startRadius = (tickMarkLength > 0.0f) ? innerRadius : outerRadius;
@ -183,7 +184,7 @@ void Circle3DOverlay::render() {
glVertex2f(thisPointA.x, thisPointA.y); glVertex2f(thisPointA.x, thisPointA.y);
glVertex2f(thisPointB.x, thisPointB.y); glVertex2f(thisPointB.x, thisPointB.y);
angle += getMajorTickMarksAngle(); angle += tickMarkAngle;
} }
} }
@ -193,7 +194,8 @@ void Circle3DOverlay::render() {
xColor color = getMinorTickMarksColor(); xColor color = getMinorTickMarksColor();
glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha); glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);
float angle = startAt; float tickMarkAngle = getMinorTickMarksAngle();
float angle = startAt - fmod(startAt, tickMarkAngle) + tickMarkAngle;
float angleInRadians = glm::radians(angle); float angleInRadians = glm::radians(angle);
float tickMarkLength = getMinorTickMarksLength(); float tickMarkLength = getMinorTickMarksLength();
float startRadius = (tickMarkLength > 0.0f) ? innerRadius : outerRadius; float startRadius = (tickMarkLength > 0.0f) ? innerRadius : outerRadius;
@ -208,7 +210,7 @@ void Circle3DOverlay::render() {
glVertex2f(thisPointA.x, thisPointA.y); glVertex2f(thisPointA.x, thisPointA.y);
glVertex2f(thisPointB.x, thisPointB.y); glVertex2f(thisPointB.x, thisPointB.y);
angle += getMinorTickMarksAngle(); angle += tickMarkAngle;
} }
} }