Merge pull request #91 from teamneoneko/Current-Dev

Current dev

blender_manifest.toml

@@ -3,7 +3,7 @@
 schema_version = "1.0.0"
 
 id = "avatar_toolkit"
-version = "0.1.0"
+version = "0.1.1"
 name = "Avatar Toolkit"
 tagline = "A modern tool for importing and optimizing models for VRChat, Resonite, and other similar games."
 maintainer = "Team NekoNeo"

core/logging_setup.py

@@ -1,5 +1,6 @@
 import logging
-from typing import Optional
+from typing import Optional, Any
+from bpy.types import Context
 
 logger = logging.getLogger('avatar_toolkit')
 
@@ -18,7 +19,7 @@ def configure_logging(enabled: bool = False) -> None:
         handler.setFormatter(formatter)
         logger.addHandler(handler)
 
-def update_logging_state(self, context) -> None:
+def update_logging_state(self: Any, context: Context) -> None:
     """Update logging state based on user preference"""
     from .addon_preferences import save_preference
     enabled = self.enable_logging

core/properties.py

@@ -1,5 +1,5 @@
 import bpy
-from typing import List, Tuple, Optional
+from typing import List, Tuple, Optional, Any, Dict, Union, Callable
 from bpy.types import PropertyGroup, Material, Scene, Object, Context
 from bpy.props import (
     StringProperty, 
@@ -18,19 +18,21 @@
 from ..functions.visemes import VisemePreview
 from ..functions.eye_tracking import set_rotation
 
-def update_validation_mode(self, context):
+def update_validation_mode(self: PropertyGroup, context: Context) -> None:
+    """Updates validation mode and saves preference"""
     logger.info(f"Updating validation mode to: {self.validation_mode}")
     save_preference("validation_mode", self.validation_mode)
 
-def update_logging_state(self, context):
+def update_logging_state(self: PropertyGroup, context: Context) -> None:
+    """Updates logging state and configures logging"""
     logger.info(f"Updating logging state to: {self.enable_logging}")
     save_preference("enable_logging", self.enable_logging)
     from .logging_setup import configure_logging
     configure_logging(self.enable_logging)
 
-def update_shape_intensity(self, context):
+def update_shape_intensity(self: PropertyGroup, context: Context) -> None:
+    """Updates shape key intensity and refreshes preview"""
     if self.viseme_preview_mode:
-        from ..functions.visemes import VisemePreview
         VisemePreview.update_preview(context)
 
 class AvatarToolkitSceneProperties(PropertyGroup):
@@ -133,13 +135,7 @@ class AvatarToolkitSceneProperties(PropertyGroup):
         description=t("Visemes.preview_mode_desc"),
         default=False
     )
-
-    viseme_preview_selection: StringProperty(
-        name=t("Visemes.preview_selection"),
-        description=t("Visemes.preview_selection_desc"),
-        default="vrc.v_aa"
-    )
-
+
     mouth_a: StringProperty(
         name=t("Visemes.mouth_a"),
         description=t("Visemes.mouth_a_desc")
@@ -155,6 +151,11 @@ class AvatarToolkitSceneProperties(PropertyGroup):
         description=t("Visemes.mouth_ch_desc")
     )
 
+    viseme_mesh: StringProperty(
+        name=t("Visemes.mesh_select"),
+        description=t("Visemes.mesh_select_desc"),
+    )
+
     shape_intensity: FloatProperty(
         name=t("Visemes.shape_intensity"),
         description=t("Visemes.shape_intensity_desc"),
@@ -366,16 +367,6 @@ class AvatarToolkitSceneProperties(PropertyGroup):
         default=True
     )
 
-    attach_mesh: StringProperty(
-        name=t("Tools.attach_mesh_select"),
-        description=t("Tools.attach_mesh_select_desc")
-    )
-
-    attach_bone: StringProperty(
-        name=t("Tools.attach_bone_select"),
-        description=t("Tools.attach_bone_select_desc")
-    )
-
 def register() -> None:
     """Register the Avatar Toolkit property group"""
     logger.info("Registering Avatar Toolkit properties")