v1.1.0

Author: DanielBoxer

__init__.py

@@ -43,13 +43,17 @@
     UVGAMI_OT_add_grid,
     UVGAMI_OT_remove_grid,
 )
-from .src.ops.viewer import UVGAMI_OT_view_unwrap
+from .src.ops.viewer import (
+    UVGAMI_OT_view_unwrap,
+    UVGAMI_OT_view_uvs,
+)
 from .src.ops.info import (
     UVGAMI_OT_clear_logs,
     UVGAMI_OT_copy_logs,
 )
 from .src.ui.panels import (
     UVGAMI_PT_main,
+    UVGAMI_PT_speed,
     UVGAMI_PT_guides,
     UVGAMI_PT_symmetry,
     UVGAMI_PT_grid,
@@ -62,17 +66,18 @@
     UVGAMI_PG_properties,
     UVGAMI_AP_preferences,
 )
+from .src.updater import addon_updater_ops
 
 
 bl_info = {
     "name": "UVgami",
     "author": "Daniel Boxer",
     "description": "Automatic UV unwrapping",
     "blender": (2, 90, 0),
-    "version": (1, 0, 0),
+    "version": (1, 1, 0),
     "location": "View3D > Sidebar > UVgami",
     "category": "UV",
-    "doc_url": "https://github.com/DanielBoxer/UVgami/blob/main/documentation.md",
+    "doc_url": "",
     "tracker_url": "https://github.com/DanielBoxer/UVgami/issues",
 }
 
@@ -99,9 +104,11 @@
     UVGAMI_OT_clear_logs,
     UVGAMI_OT_copy_logs,
     UVGAMI_OT_setup_wsl,
+    UVGAMI_OT_view_uvs,
     UVGAMI_PT_main,
     UVGAMI_PT_guides,
     UVGAMI_PT_symmetry,
+    UVGAMI_PT_speed,
     UVGAMI_PT_grid,
     UVGAMI_PT_pack,
     UVGAMI_PT_uv,
@@ -113,6 +120,10 @@
 
 
 def register():
+    try:
+        addon_updater_ops.register(bl_info)
+    except ValueError:
+        pass
     for cls in classes:
         bpy.utils.register_class(cls)
     bpy.types.Scene.uvgami = bpy.props.PointerProperty(type=UVGAMI_PG_properties)

src/manager.py

@@ -2,6 +2,7 @@
 # See __init__.py and LICENSE for more information
 
 import bpy
+import bmesh
 import multiprocessing
 from .utils import (
     get_preferences,
@@ -11,6 +12,8 @@
     set_active_any,
     switch_shading,
     set_origin,
+    new_bmesh,
+    set_bmesh,
 )
 from . import progress_bar
 from .logger import logger
@@ -126,6 +129,11 @@ def finish_unwrap(self, unwrap, invalid_pass=False):
                 if unwrap.symmetrize_job is not None:
                     unwrap.symmetrize_job.finish(output)
 
+                if unwrap.merge_cuts:
+                    bm = new_bmesh(output)
+                    bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=1e-7)
+                    set_bmesh(bm, output)
+
                 # automatically add grid material to final object
                 if props.auto_grid:
                     grid_img = make_grid_img()

src/ops/misc.py

@@ -7,7 +7,16 @@
 import subprocess
 import shutil
 from ..ui.panels import expand
-from ..utils import calc_center, validate_obj, get_linux_path, get_preferences
+from ..utils import (
+    calc_center,
+    validate_obj,
+    get_linux_path,
+    get_preferences,
+    check_exists,
+    deselect_all,
+)
+
+sym_planes = {}
 
 
 class UVGAMI_OT_expand(bpy.types.Operator):
@@ -51,30 +60,48 @@ def execute(self, context):
 class UVGAMI_OT_preview_symmetry(bpy.types.Operator):
     bl_idname = "uvgami.preview_symmetry"
     bl_label = "Preview"
-    bl_description = "Add a plane mesh to verify symmetry of selected meshes"
+    bl_description = (
+        "Add a plane meshes to verify symmetry of selected meshes."
+        " Press again to delete the planes"
+    )
     bl_options = {"UNDO"}
 
     def execute(self, context):
         sym = context.scene.uvgami.sym_axes
+        old_select = context.selected_objects
+        old_active = context.view_layer.objects.active
         for obj in context.selected_objects:
-            if validate_obj(self, obj):
-                center = calc_center(obj)
-                if "X" in sym:
-                    bpy.ops.mesh.primitive_plane_add(
-                        size=obj.dimensions.y * 2,
-                        location=center,
-                        rotation=(0, math.radians(90), 0),
-                    )
-                if "Y" in sym:
-                    bpy.ops.mesh.primitive_plane_add(
-                        size=obj.dimensions.x * 2,
-                        location=center,
-                        rotation=(math.radians(90), 0, 0),
-                    )
-                if "Z" in sym:
-                    bpy.ops.mesh.primitive_plane_add(
-                        size=obj.dimensions.z * 2, location=center
-                    )
+            if obj not in sym_planes:
+                if validate_obj(self, obj):
+                    center = calc_center(obj)
+                    before = set(context.scene.objects)
+                    if "X" in sym:
+                        bpy.ops.mesh.primitive_plane_add(
+                            size=obj.dimensions.y * 2,
+                            location=center,
+                            rotation=(0, math.radians(90), 0),
+                        )
+                    if "Y" in sym:
+                        bpy.ops.mesh.primitive_plane_add(
+                            size=obj.dimensions.x * 2,
+                            location=center,
+                            rotation=(math.radians(90), 0, 0),
+                        )
+                    if "Z" in sym:
+                        bpy.ops.mesh.primitive_plane_add(
+                            size=obj.dimensions.z * 2, location=center
+                        )
+                    sym_planes[obj] = set(context.scene.objects).difference(before)
+            else:
+                for plane in sym_planes[obj]:
+                    if check_exists(plane):
+                        bpy.data.objects.remove(plane, do_unlink=True)
+                del sym_planes[obj]
+
+        deselect_all()
+        for obj in old_select:
+            obj.select_set(True)
+        context.view_layer.objects.active = old_active
         return {"FINISHED"}
 
 

src/ops/start.py

@@ -3,11 +3,11 @@
 
 import bpy
 import bmesh
-import mathutils
 import pathlib
 import platform
 import shutil
 import subprocess
+import numpy
 from ..manager import manager
 from ..unwrap import Unwrap
 from ..utils import (
@@ -20,6 +20,8 @@
     set_bmesh,
     get_linux_path,
     calc_center,
+    apply_transforms,
+    cut,
 )
 from ..ui.panels import expand
 from ..job import Preserve, Join, Cleanup, Symmetrise
@@ -37,6 +39,7 @@ def execute(self, context):
         try:
             logger.new_info()
             prefs = get_preferences()
+            props = context.scene.uvgami
             engine_path = pathlib.Path(prefs.engine_path)
             if prefs.autosave:
                 if bpy.data.is_saved:
@@ -149,6 +152,43 @@ def execute(self, context):
                         # if the modifier is disabled, don't apply
                         pass
 
+                # cuts
+                if props.use_cuts and not props.use_symmetry:
+                    bm = new_bmesh(copy_object)
+
+                    if props.cut_type == "EVEN":
+                        # make even cuts on axes
+                        apply_transforms(copy_object)
+                        props = context.scene.uvgami
+                        axes = props.cut_axes
+                        cuts = props.cuts
+
+                        a_length = len(axes) if len(axes) != 0 else 3
+                        d = cuts // a_length
+                        r = cuts % a_length
+
+                        # distribute cuts
+                        x_num = d if r == 0 else d + 1
+                        y_num = d if r != 2 else d + 1
+                        z_num = d
+
+                        center = calc_center(obj)
+                        if not axes or "X" in axes:
+                            cut(x_num, center, copy_object.dimensions.x, 0, bm)
+                        if not axes or "Y" in axes:
+                            cut(y_num, center, copy_object.dimensions.y, 1, bm)
+                        if not axes or "Z" in axes:
+                            cut(z_num, center, copy_object.dimensions.z, 2, bm)
+
+                    else:
+                        # cut on seams
+                        seams = numpy.zeros(len(bm.edges), dtype=numpy.bool)
+                        obj.data.edges.foreach_get("use_seam", seams)
+                        bm_seams = numpy.array(bm.edges)[seams]
+                        bmesh.ops.split_edges(bm, edges=bm_seams)
+
+                    set_bmesh(bm, copy_object)
+
                 # save name, format: input name, unwrap name
                 names[copy_object.name] = [obj.name, obj.name]
                 objects.append(copy_object)
@@ -166,7 +206,6 @@ def execute(self, context):
                 self.report({"ERROR"}, report_msg)
                 return {"CANCELLED"}
             else:
-                props = context.scene.uvgami
                 input_path = get_dir_path() / "input"
                 input_path.mkdir(exist_ok=True)
                 output_path = input_path.parent / "output"
@@ -194,17 +233,7 @@ def execute(self, context):
                     # bisect if symmetry on
                     axes = props.sym_axes
                     if props.use_symmetry:
-                        # apply all transforms
-                        location, _, scale = obj.matrix_basis.decompose()
-                        actual = (
-                            mathutils.Matrix.Translation(location)
-                            @ obj.matrix_basis.to_3x3().normalized().to_4x4()
-                            @ mathutils.Matrix.Diagonal(scale).to_4x4()
-                        )
-                        obj.data.transform(actual)
-                        for c in obj.children:
-                            c.matrix_local = actual @ c.matrix_local
-                        obj.matrix_basis = mathutils.Matrix()
+                        apply_transforms(obj)
 
                         bm = new_bmesh(obj)
                         obj_center = calc_center(obj)
@@ -227,8 +256,9 @@ def execute(self, context):
                                 plane_no=direction,
                                 clear_inner=True,
                             )
-                        # if the object already had vertices down it's center plane, there will be duplicates
-                        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=0.0001)
+                        # if the object already had vertices down it's center plane
+                        # there will be duplicates
+                        bmesh.ops.remove_doubles(bm, verts=bm.verts, dist=1e-7)
                         set_bmesh(bm, obj)
 
                     # separate objects
@@ -240,11 +270,11 @@ def execute(self, context):
                         join_job = Join(len(s))
                         cleanup_job = None
 
-                        # the delete job can come after join because it doesn't depend on
-                        # the unwrapped objects
+                        # the delete job can come after join because it doesn't depend
+                        # on the unwrapped objects
                         if prefs.cleanup == "HIDE" or prefs.cleanup == "DELETE":
-                            # the count is > 1 because all the separated objs need to finish
-                            # before deleting the original
+                            # the count is > 1 because all the separated objs need to
+                            # finish before deleting the original
                             cleanup_job = Cleanup(len(s), prefs.cleanup)
                             manager.input[cleanup_job] = input[object_idx]
 
@@ -444,6 +474,7 @@ def execute(self, context):
                         len(obj.data.vertices),
                         shade_smooth,
                         angle,
+                        props.use_cuts and not props.use_symmetry,
                     )
                     manager.active.append(unwrap)