Merge pull request #62 from travnick/release/v4.13

Release/v4.13

Author: dwhite5914

io_export_cryblend/__init__.py

@@ -683,15 +683,28 @@ class FindWeightless(bpy.types.Operator):
     bl_label = "Find Weightless Vertices"
     bl_idname = "mesh.find_weightless"
 
+    # Minimum net weight to be considered non-weightless
+    weight_epsilon = 0.0001
+
+    # Weightless: a vertex not belonging to any groups or with a net weight of 0
     def execute(self, context):
         obj = bpy.context.active_object
-        if obj.type == 'MESH':
+        bpy.ops.object.mode_set(mode="EDIT")
+        bpy.ops.mesh.select_all(action="DESELECT")
+        bpy.ops.object.mode_set(mode="OBJECT")
+        if obj.type == "MESH":
             for v in obj.data.vertices:
-                v.select = True
-                for g in v.groups:
-                    v.select = False
-                    break
-        return {'FINISHED'}
+                if (not v.groups):
+                    v.select = True
+                else:
+                    weight = 0
+                    for g in v.groups:
+                        weight += g.weight
+                    if (weight < self.weight_epsilon):
+                        v.select = True
+        obj.data.update()
+        bpy.ops.object.mode_set(mode="EDIT")
+        return {"FINISHED"}
 
 
 class RemoveAllWeight(bpy.types.Operator):

io_export_cryblend/dds_converter.py

@@ -55,18 +55,40 @@ def __call__(self, images_to_convert, refresh_rc, save_tiff):
 
             tiff_image_for_rc = utils.get_absolute_path_for_rc(tiff_image_path)
 
+            try:
+                create_normal_texture()
+            except:
+                cbPrint("Failed to invert green channel")
+
             rc_process = utils.run_rc(self.__rc_exe,
                                       tiff_image_for_rc,
                                       rc_params)
 
+            # re-save the original image after running the RC to
+            # prevent the original one from getting lost
+            try:
+                if ("_ddn" in image.name):
+                    image.save()
+            except:
+                cbPrint("Failed to invert green channel")
+
             rc_process.wait()
-            cbPrint("RC return code %s" % rc_process.returncode)
 
         if save_tiff:
             self.__save_tiffs()
 
         self.__remove_tmp_files()
 
+    def create_normal_texture():
+        if ("_ddn" in image.name):
+            # make a copy to prevent editing the original image
+            temp_normal_image = image.copy()
+            self.__invert_green_channel(temp_normal_image)
+            # save to file and delete the temporary image
+            new_normal_image_path = "%s_cb_normal.%s" % (os.path.splitext(temp_normal_image.filepath_raw)[0], os.path.splitext(temp_normal_image.filepath_raw)[1])
+            temp_normal_image.save_render(filepath=new_normal_image_path)
+            bpy.data.images.remove(temp_normal_image)
+
     def __get_rc_params(self, refresh_rc, destination_path):
         rc_params = ["/verbose", "/threads=cores", "/userdialog=1"]
         if refresh_rc:
@@ -79,7 +101,20 @@ def __get_rc_params(self, refresh_rc, destination_path):
 
         return rc_params
 
+    def __invert_green_channel(self, image):
+        override = {'edit_image': bpy.data.images[image.name]}
+        bpy.ops.image.invert(override, invert_g=True)
+        image.update()
+
     def __get_temp_tiff_image_path(self, image):
+        # check if the image already is a .tif
+        image_extension = utils.get_extension_from_path(image.filepath)
+        cbPrint(image_extension)
+
+        if ".tif" == image_extension:
+            cbPrint("Image {!r} is already a tif, not converting".format(image.name), 'debug')
+            return image.filepath
+
         tiff_image_path = utils.get_path_with_new_extension(image.filepath,
                                                             "tif")
         tiff_image_absolute_path = utils.get_absolute_path(tiff_image_path)

io_export_cryblend/export.py

@@ -1280,9 +1280,13 @@ def __export_library_geometries(self, parent_element):
             if uvlay:
                 cbPrint("Found UV map.")
             elif (object_.type == "MESH"):
-                cbPrint("Your UV map is missing, adding.")
                 override = {'object': object_}
-                bpy.ops.mesh.uv_texture_add(override)
+                bpy.ops.object.mode_set(override, mode='EDIT')
+                bpy.ops.mesh.select_all(override, action='SELECT')
+                bpy.ops.uv.smart_project(override, angle_limit=66, island_margin=0.03, user_area_weight=0)
+                bpy.ops.object.mode_set(override, mode='OBJECT')
+                object_.data.update(calc_tessface=1)
+                cbPrint("Missing UV map.  Mesh unwrapped using smart UV project", message_type='warning')
 
             for uvindex, uvlayer in enumerate(uvlay):
                 mapslot = uvindex

io_export_cryblend/utils.py

@@ -85,8 +85,8 @@ def get_guid():
 
 
 def random_hex_sector(length):
-    fixed_lenght_hex_format = "%0" + str(length) + "x" 
-    return fixed_lenght_hex_format % random.randrange(16 ** length)
+    fixed_length_hex_format = "%0" + str(length) + "x"
+    return fixed_length_hex_format % random.randrange(16 ** length)
 
 
 # borrowed from obj exporter
@@ -232,6 +232,9 @@ def run_rc(rc_path, files_to_process, params=None):
 def get_path_with_new_extension(image_path, extension):
     return "%s.%s" % (os.path.splitext(image_path)[0], extension)
 
+def get_extension_from_path(image_path):
+    return "%s" % (os.path.splitext(image_path)[1])
+
 
 # this is needed if you want to access more than the first def
 if __name__ == "__main__":