2.105.8

MarginallyClever · Jan 11, 2024 · 7aadd27 · 7aadd27
1 parent 41f1a01
commit 7aadd27
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.marginallyclever</groupId>
 	<artifactId>RobotOverlord</artifactId>
-	<version>2.105.7</version>
+	<version>2.105.8</version>
 	<name>Robot Overlord</name>
 	<description>A friendly 3D user interface for controlling robots.</description>
 	<url>https://www.marginallyclever.com/</url>

diff --git a/...ain/java/com/marginallyclever/ro3/apps/viewport/viewporttools/move/RotateToolOneAxis.java b/...ain/java/com/marginallyclever/ro3/apps/viewport/viewporttools/move/RotateToolOneAxis.java
@@ -106,6 +106,7 @@ public RotateToolOneAxis(ColorRGB color) {
         this.color = color;
         buildMarkerMesh();
         buildAngleMesh();
+        ringMesh.setRenderStyle(GL3.GL_LINE_LOOP);
     }
 
     private void buildAngleMesh() {
@@ -389,8 +390,11 @@ private void drawWhileDragging(GL3 gl,ShaderProgram shaderProgram) {
 
     private void drawMainRingAndHandles(GL3 gl,ShaderProgram shaderProgram) {
         Matrix4d m = new Matrix4d(pivotMatrix);
-        m.transpose();
-        shaderProgram.setMatrix4d(gl,"modelMatrix",m);
+
+        Matrix4d scale = MatrixHelper.createScaleMatrix4(getRingRadiusScaled());
+        scale.mul(m,scale);
+        scale.transpose();
+        shaderProgram.setMatrix4d(gl,"modelMatrix",scale);
 
         float colorScale = cursorOverHandle ? 1:0.5f;
         float red   = color.red   * colorScale / 255f;
@@ -399,6 +403,9 @@ private void drawMainRingAndHandles(GL3 gl,ShaderProgram shaderProgram) {
         shaderProgram.set4f(gl, "objectColor", red, green, blue, 1.0f);
         ringMesh.render(gl,1,360);
 
+        m.transpose();
+        shaderProgram.setMatrix4d(gl,"modelMatrix",m);
+
         Matrix4d m2 = MatrixHelper.createScaleMatrix4(getGripRadiusScaled());
         m2.m03 = getHandleLengthScaled();
         m2.m13 = getHandleOffsetYScaled();