Added AO, reduced repetitive code

Added the AO pass, and reduced the repetitive code, to use a function instead.

issue: Seen does not work

Author: DrachenSeele

SFR_Panel.py

@@ -191,6 +191,7 @@ def draw(self, context):
         layout.label(text="Texture Optimization Factor")
         col = layout.column(align=True)
         col.prop(settings, "diffuse_resize", slider=True)
+        col.prop(settings, "ao_resize", slider=True)
         col.prop(settings, "specular_resize", slider=True)
         col.prop(settings, "roughness_resize", slider=True)
         col.prop(settings, "normal_resize", slider=True)

SFR_Settings.py

@@ -109,7 +109,15 @@ class SFR_Settings(PropertyGroup):
         default=0,
         max=7,
         min=0,
-        description="the factor by which the diffuse or albedo textures will be scaled down, 0 = unaffected \nrecomended: 0",
+        description="the factor by which the ambient occlusion textures will be scaled down, 0 = unaffected \nrecomended: 0",
+        options=set(),  # Not animatable!
+    )
+    ao_resize: IntProperty(
+        name="Ambient Occlusion",
+        default=2,
+        max=7,
+        min=0,
+        description="the factor by which the roughness or glossiness textures will be scaled down, 0 = unaffected \nrecomended: 2",
         options=set(),  # Not animatable!
     )
     specular_resize: IntProperty(

Utils/SFR_TextureOptimizer.py

@@ -45,6 +45,7 @@ def execute(self, context: Context):
         Opacity = ["opacity","alpha","presence"]
         Normal = ["normal","norm","nor","nrm","bump","bmp","height"]
         Translucency = ["translucency","transmission","translucent"]
+        AO = ["ao","ambient occlusion","occlusion"]
 
         #make skimage not give warning
         import imageio.core.util
@@ -67,49 +68,27 @@ def add_to_seen(file, type):
 
             return False
 
-
-        for file in os.listdir(path):
-            if not os.path.isfile(os.path.join(path, file)):
-                continue
-            # lowercase file name for comparisons
-            nc_file = nc(file)
-
-            if settings.diffuse_resize > 0:
-                if [name for name in Diffuse if name in nc_file]:
-                    if add_to_seen(file, 'Diffuse'):
-                        continue
-                    resize_image(file, settings.diffuse_resize, path)
-
-            if settings.specular_resize > 0:
-                if [name for name in Specular if name in nc_file]:
-                    if add_to_seen(file, 'Specular'):
-                        continue
-                    resize_image(file, settings.specular_resize, path)
-
-            if settings.roughness_resize > 0:
-                if [name for name in Roughness if name in nc_file]:
-                    if add_to_seen(file, 'Roughness'):
-                        continue
-                    resize_image(file, settings.roughness_resize, path)
-
-            if settings.opacity_resize > 0:
-                if [name for name in Opacity if name in nc_file]:
-                    if add_to_seen(file, 'Opacity'):
-                        continue
-                    resize_image(file, settings.opacity_resize, path)
-
-            if settings.normal_resize > 0:
-                if [name for name in Normal if name in nc_file]:
-                    if add_to_seen(file, 'Normal'):
-                        continue
-                    resize_image(file, settings.normal_resize, path)
-
-            if settings.translucency_resize > 0:
-                if [name for name in Translucency if name in nc_file]:
-                    if add_to_seen(file, 'Translucency'):
-                        continue
-                    resize_image(file, settings.translucency_resize, path)
-
+        def do_resize(path, setting, prop, type):
+            for file in os.listdir(path):
+                if not os.path.isfile(os.path.join(path, file)):
+                    continue
+                # lowercase file name for comparisons
+                nc_file = nc(file)
+
+                if setting > 0:
+                    if [name for name in prop if name in nc_file]:
+                        if add_to_seen(file, type):
+                            continue
+                        resize_image(file, setting, path)
+            
+        do_resize(path, settings.diffuse_resize, Diffuse, 'Diffuse')
+        do_resize(path, settings.ao_resize, AO, 'AO')
+        do_resize(path, settings.specular_resize, Specular, 'Specular')
+        do_resize(path, settings.roughness_resize, Roughness, 'Roughness')
+        do_resize(path, settings.opacity_resize, Opacity, 'Opacity')
+        do_resize(path, settings.normal_resize, Normal, 'Normal')
+        do_resize(path, settings.translucency_resize, Translucency, 'Translucency')
+                
         print("TEXTURE OPTIMIZATION: COMPLETED")
 
         return {'FINISHED'}