From 9c719970d86513f755624cc587df77ff8a007ce2 Mon Sep 17 00:00:00 2001 From: makiam Date: Sat, 10 Feb 2024 23:07:58 +0300 Subject: [PATCH 1/5] Relocate handleSize assignment --- .../polymesh/PolyMeshViewer.java | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/artofillusion/polymesh/PolyMeshViewer.java b/src/artofillusion/polymesh/PolyMeshViewer.java index 1432344..4bc7cd1 100644 --- a/src/artofillusion/polymesh/PolyMeshViewer.java +++ b/src/artofillusion/polymesh/PolyMeshViewer.java @@ -16,17 +16,17 @@ import java.awt.Color; import java.awt.Point; import java.awt.Polygon; -import java.awt.event.MouseEvent; + import java.util.ArrayList; -import java.util.Iterator; -import artofillusion.MeshEditorWindow; + + import artofillusion.MeshViewer; import artofillusion.RenderingMesh; import artofillusion.TextureParameter; -import artofillusion.TriMeshEditorWindow; + import artofillusion.UndoRecord; -import artofillusion.ViewerCanvas; + import artofillusion.animation.SkeletonTool; import artofillusion.math.RGBColor; import artofillusion.math.Vec2; @@ -37,7 +37,7 @@ import artofillusion.polymesh.PolyMesh.Wface; import artofillusion.polymesh.PolyMesh.Wvertex; import artofillusion.polymesh.QuadMesh.QuadEdge; -import artofillusion.polymesh.QuadMesh.QuadVertex; + import artofillusion.texture.FaceParameterValue; import artofillusion.ui.EditingTool; import artofillusion.ui.MeshEditController; @@ -305,11 +305,7 @@ else if (renderMode == RENDER_SMOOTH) /** * Draw the vertices of the control mesh. - * - * @param unselectedColor - * Color for unselected vertices - * @param selectedColor - * Color for selected vertices + * */ private void drawVertices() @@ -321,7 +317,7 @@ private void drawVertices() PolyMesh viewMesh = mesh; Color vertColor = mesh.getVertColor(); Color selectedVertColor = vertColor; - int handleSize = mesh.getHandleSize(); + if (currentTool.hilightSelection()) selectedVertColor = mesh.getSelectedVertColor(); if (currentTool instanceof SkeletonTool) @@ -351,6 +347,8 @@ private void drawVertices() else sv = (MeshVertex[]) viewMesh.getVertices(); + + int handleSize = mesh.getHandleSize(); for (int i = 0; i < screenVert.length; i++) { if(!visible[i]) continue; @@ -375,10 +373,6 @@ private void drawVertices() * * @param p * Description of the Parameter - * @param unselectedColor - * Color for unselected vertices - * @param selectedColor - * Color for selected vertices */ private void drawEdges(Vec2[] p) From ccbfeb8cab0bd31776e117b2f53ce2819b81381b Mon Sep 17 00:00:00 2001 From: makiam Date: Sun, 11 Feb 2024 00:15:03 +0300 Subject: [PATCH 2/5] Remove unused MeshVertex sv[] variable and assignment --- src/artofillusion/polymesh/PolyMeshViewer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/artofillusion/polymesh/PolyMeshViewer.java b/src/artofillusion/polymesh/PolyMeshViewer.java index 4bc7cd1..0ce3a36 100644 --- a/src/artofillusion/polymesh/PolyMeshViewer.java +++ b/src/artofillusion/polymesh/PolyMeshViewer.java @@ -337,15 +337,14 @@ private void drawVertices() viewMesh = mesh.getMirroredMesh(); } QuadMesh subMesh = null; - MeshVertex sv[]; + boolean project = (controller instanceof PolyMeshEditorWindow && ((PolyMeshEditorWindow) controller).getProjectOntoSurface()); if (project && viewMesh.getSubdividedMesh() != null) { subMesh = viewMesh.getSubdividedMesh(); - sv = (MeshVertex[]) subMesh.getVertices(); + } - else - sv = (MeshVertex[]) viewMesh.getVertices(); + int handleSize = mesh.getHandleSize(); From 354b354e30d1eade1b3996e36f244c34d2258a4a Mon Sep 17 00:00:00 2001 From: makiam Date: Sun, 11 Feb 2024 00:28:59 +0300 Subject: [PATCH 3/5] Remove unused project evaluation and empty conditional expression --- src/artofillusion/polymesh/PolyMeshViewer.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/artofillusion/polymesh/PolyMeshViewer.java b/src/artofillusion/polymesh/PolyMeshViewer.java index 0ce3a36..96fd28d 100644 --- a/src/artofillusion/polymesh/PolyMeshViewer.java +++ b/src/artofillusion/polymesh/PolyMeshViewer.java @@ -336,14 +336,6 @@ private void drawVertices() mirror = true; viewMesh = mesh.getMirroredMesh(); } - QuadMesh subMesh = null; - - boolean project = (controller instanceof PolyMeshEditorWindow && ((PolyMeshEditorWindow) controller).getProjectOntoSurface()); - if (project && viewMesh.getSubdividedMesh() != null) - { - subMesh = viewMesh.getSubdividedMesh(); - - } From 168f8d42e7f0829209208403203f5ed9d28cd266 Mon Sep 17 00:00:00 2001 From: makiam Date: Sun, 11 Feb 2024 00:44:38 +0300 Subject: [PATCH 4/5] Remove unused project evaluation and empty conditional expression --- src/artofillusion/polymesh/PolyMeshViewer.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/artofillusion/polymesh/PolyMeshViewer.java b/src/artofillusion/polymesh/PolyMeshViewer.java index 96fd28d..3221219 100644 --- a/src/artofillusion/polymesh/PolyMeshViewer.java +++ b/src/artofillusion/polymesh/PolyMeshViewer.java @@ -314,7 +314,6 @@ private void drawVertices() return; PolyMesh mesh = (PolyMesh) getController().getObject().getObject(); - PolyMesh viewMesh = mesh; Color vertColor = mesh.getVertColor(); Color selectedVertColor = vertColor; @@ -325,19 +324,13 @@ private void drawVertices() selectedVertColor = disableColor(selectedVertColor); vertColor = disableColor(vertColor); } - // First, draw any unselected portions of the object. + boolean selected[] = controller.getSelection(); boolean mirror = false; int[] invVertTable = mesh.getInvMirroredVerts(); - if (mesh.getMirrorState() != PolyMesh.NO_MIRROR) - { - mirror = true; - viewMesh = mesh.getMirroredMesh(); - } - - + if (mesh.getMirrorState() != PolyMesh.NO_MIRROR) mirror = true; int handleSize = mesh.getHandleSize(); for (int i = 0; i < screenVert.length; i++) @@ -722,6 +715,7 @@ protected void mouseMoved(WidgetMouseEvent e) * Description of the Parameter */ + @Override protected void mousePressed(WidgetMouseEvent e) { PolyMesh mesh = (PolyMesh) getController().getObject().getObject(); From e3abbe6091039be70cf7e126a856c268b6265ef3 Mon Sep 17 00:00:00 2001 From: makiam Date: Sun, 11 Feb 2024 00:54:06 +0300 Subject: [PATCH 5/5] Add method annotations --- src/artofillusion/polymesh/PolyMeshViewer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/artofillusion/polymesh/PolyMeshViewer.java b/src/artofillusion/polymesh/PolyMeshViewer.java index 3221219..5be22ff 100644 --- a/src/artofillusion/polymesh/PolyMeshViewer.java +++ b/src/artofillusion/polymesh/PolyMeshViewer.java @@ -54,7 +54,6 @@ import buoy.event.KeyPressedEvent; import buoy.event.MouseClickedEvent; import buoy.event.MouseMovedEvent; -import buoy.event.WidgetEvent; import buoy.event.WidgetMouseEvent; import buoy.widget.RowContainer; @@ -1117,7 +1116,8 @@ && isEdgeVisible(ref)) /** Set the currently selected tool. */ - public void setTool(EditingTool tool) + @Override + public void setTool(EditingTool tool) { manipulators.clear(); manipulatorArray = new Manipulator[0]; @@ -1434,6 +1434,7 @@ protected void keyPressed(KeyPressedEvent e) return; } + @Override public void setPerspective(boolean perspective) { for (int i = 0; i < manipulatorArray.length; i++)