Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
saturday06 committed Jun 9, 2024
1 parent 1dbfa05 commit 0ad2fb8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 2 additions & 0 deletions src/io_scene_vrm/common/shader.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@
OUTPUT_GROUP_NAME: Final = "VRM Add-on MToon 1.0 Output Revision 1"
OUTPUT_GROUP_DOUBLE_SIDED_LABEL: Final = "Double Sided"
OUTPUT_GROUP_TRANSPARENT_WITH_Z_WRITE_LABEL: Final = "Transparent With Z-Write"
OUTPUT_GROUP_TRANSPARENT_WITH_Z_WRITE_DEFAULT: Final = False
OUTPUT_GROUP_GI_EQUALIZATION_FACTOR_LABEL: Final = "GI Equalization Factor"
OUTPUT_GROUP_GI_EQUALIZATION_FACTOR_DEFAULT: Final = 0.9
OUTPUT_GROUP_RENDER_QUEUE_OFFSET_NUMBER_LABEL: Final = "Render Queue Offset Number"
OUTPUT_GROUP_BASE_COLOR_FACTOR_COLOR_LABEL: Final = "Lit Color"
OUTPUT_GROUP_BASE_COLOR_FACTOR_ALPHA_LABEL: Final = "Lit Color Alpha"
Expand Down
11 changes: 7 additions & 4 deletions src/io_scene_vrm/editor/mtoon1/property_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def get_bool(
self,
node_group_name: str,
group_label: str,
default_value: bool = False,
default_value: bool,
) -> bool:
value = self.get_value(node_group_name, group_label, int(default_value))
return bool(value)
Expand All @@ -247,7 +247,7 @@ def get_float(
self,
node_group_name: str,
group_label: str,
default_value: float = 0.0,
default_value: float,
) -> float:
value = self.get_value(node_group_name, group_label, int(default_value))
return float(value)
Expand All @@ -256,7 +256,7 @@ def get_value(
self,
node_group_name: str,
group_label: str,
default_value: float = 0,
default_value: float,
) -> Union[float, int]:
material = self.find_material()
node_tree = material.node_tree
Expand Down Expand Up @@ -2023,6 +2023,7 @@ def get_transparent_with_z_write(self) -> bool:
return self.get_bool(
shader.OUTPUT_GROUP_NAME,
shader.OUTPUT_GROUP_TRANSPARENT_WITH_Z_WRITE_LABEL,
shader.OUTPUT_GROUP_TRANSPARENT_WITH_Z_WRITE_DEFAULT,
)

def set_transparent_with_z_write(self, value: object) -> None:
Expand All @@ -2037,6 +2038,7 @@ def set_transparent_with_z_write(self, value: object) -> None:

transparent_with_z_write: BoolProperty( # type: ignore[valid-type]
name="Transparent With ZWrite Mode",
default=shader.OUTPUT_GROUP_TRANSPARENT_WITH_Z_WRITE_DEFAULT,
get=get_transparent_with_z_write,
set=set_transparent_with_z_write,
)
Expand Down Expand Up @@ -2114,6 +2116,7 @@ def get_gi_equalization_factor(self) -> float:
return self.get_float(
shader.OUTPUT_GROUP_NAME,
shader.OUTPUT_GROUP_GI_EQUALIZATION_FACTOR_LABEL,
shader.OUTPUT_GROUP_GI_EQUALIZATION_FACTOR_DEFAULT,
)

def set_gi_equalization_factor(self, value: object) -> None:
Expand All @@ -2126,7 +2129,7 @@ def set_gi_equalization_factor(self, value: object) -> None:
gi_equalization_factor: FloatProperty( # type: ignore[valid-type]
name="GI Equalization",
min=0.0,
default=0.9,
default=shader.OUTPUT_GROUP_GI_EQUALIZATION_FACTOR_DEFAULT,
max=1.0,
get=get_gi_equalization_factor,
set=set_gi_equalization_factor,
Expand Down

0 comments on commit 0ad2fb8

Please sign in to comment.