Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[F3D] Don´t hide properties that will get exported (specifically geo modes) #379

Merged
merged 6 commits into from
Jul 24, 2024
Merged

[F3D] Don´t hide properties that will get exported (specifically geo modes) #379

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec8e3e9
[F3D] Don´t hide properties that will get exported
Lilaa3 Jul 12, 2024
97ce2b4
Disable indent columns of props dependent on others
Lilaa3 Jul 18, 2024
4adf98a
Requested change
Lilaa3 Jul 19, 2024
993b72a
accidentally left this one in, oops
Lilaa3 Jul 19, 2024
d5c931e
moved fresnel color to lighting group
Lilaa3 Jul 19, 2024
029de3b
Requested change
Lilaa3 Jul 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions fast64_internal/f3d/f3d_material.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,18 +409,20 @@ def ui_geo_mode(settings, dataHolder, layout, useDropdown):
icon="TRIA_DOWN" if dataHolder.menu_geo else "TRIA_RIGHT",
)
if not useDropdown or dataHolder.menu_geo:
disable_dependent = False # Don't disable dependent props in world defaults

def indentGroup(parent: UILayout, textOrProp: Union[str, "F3DMaterialProperty"], isText: bool) -> UILayout:
c = parent.column(align=True)
if isText:
c.label(text=textOrProp)
enable = True
else:
c.prop(settings, textOrProp)
if not getattr(settings, textOrProp):
return None
Comment on lines -419 to -420
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Enable should not be a parameter, enable should be coming from this, that's the whole point of this function, to enable/disable the group based on whether the head of the group is enabled.

enable = getattr(settings, textOrProp)
c = c.split(factor=0.1)
c.label(text="")
c = c.column(align=True)
c.enabled = enable or not disable_dependent
return c

isF3DEX3 = bpy.context.scene.f3d_type == "F3DEX3"
Expand All @@ -431,6 +433,7 @@ def indentGroup(parent: UILayout, textOrProp: Union[str, "F3DMaterialProperty"],
ccWarnings = True
ccUse = all_combiner_uses(dataHolder)
shadeInCC = ccUse["Shade"] or ccUse["Shade Alpha"]
disable_dependent = True
if settings.set_rendermode:
blendWarnings = True
shadeInBlender = settings.does_blender_use_input("G_BL_A_SHADE")
Expand All @@ -439,16 +442,15 @@ def indentGroup(parent: UILayout, textOrProp: Union[str, "F3DMaterialProperty"],
inputGroup.prop(settings, "g_shade_smooth")

c = indentGroup(inputGroup, "g_lighting", False)
if c is not None:
if ccWarnings and not shadeInCC and not settings.g_tex_gen:
c.label(text="Shade not used in CC, can disable lighting.", icon="INFO")
if isF3DEX3:
c.prop(settings, "g_packed_normals")
c.prop(settings, "g_lighting_specular")
c.prop(settings, "g_ambocclusion")
d = indentGroup(c, "g_tex_gen", False)
if d is not None:
d.prop(settings, "g_tex_gen_linear")
if ccWarnings and not shadeInCC and settings.g_lighting and not settings.g_tex_gen:
multilineLabel(c, "Shade not used in CC, can disable\nlighting.", icon="INFO")
if isF3DEX3:
c.prop(settings, "g_packed_normals")
c.prop(settings, "g_lighting_specular")
c.prop(settings, "g_ambocclusion")
c.prop(settings, "g_fresnel_color")
d = indentGroup(c, "g_tex_gen", False)
d.prop(settings, "g_tex_gen_linear")

if lightFxPrereq and settings.g_fresnel_color:
shadeColorLabel = "Fresnel"
Expand All @@ -458,11 +460,7 @@ def indentGroup(parent: UILayout, textOrProp: Union[str, "F3DMaterialProperty"],
shadeColorLabel = "Lighting * vertex color"
else:
shadeColorLabel = "Lighting"
if lightFxPrereq:
c = indentGroup(inputGroup, f"Shade color = {shadeColorLabel}:", True)
c.prop(settings, "g_fresnel_color")
else:
inputGroup.column().label(text=f"Shade color = {shadeColorLabel}")
inputGroup.label(text=f"Shade color = {shadeColorLabel}")

shadowMapInShadeAlpha = False
if settings.g_fog:
Expand All @@ -477,9 +475,11 @@ def indentGroup(parent: UILayout, textOrProp: Union[str, "F3DMaterialProperty"],
else:
shadeAlphaLabel = "Vtx alpha"
c = indentGroup(inputGroup, f"Shade alpha = {shadeAlphaLabel}:", True)
if lightFxPrereq:
c.prop(settings, "g_lighttoalpha")
c.prop(settings, "g_fresnel_alpha")
if isF3DEX3:
lighting_group = c.column(align=True)
lighting_group.enabled = settings.g_lighting or not disable_dependent
lighting_group.prop(settings, "g_lighttoalpha")
lighting_group.prop(settings, "g_fresnel_alpha")
c.prop(settings, "g_fog")
if lightFxPrereq and settings.g_fog and settings.g_fresnel_alpha:
c.label(text="Fog overrides Fresnel Alpha.", icon="ERROR")
Expand Down Expand Up @@ -1733,7 +1733,7 @@ def update_node_values_of_material(material: Material, context):

nodes = material.node_tree.nodes

if f3dMat.rdp_settings.g_tex_gen:
if f3dMat.rdp_settings.g_lighting and f3dMat.rdp_settings.g_tex_gen:
if f3dMat.rdp_settings.g_tex_gen_linear:
nodes["UV"].node_tree = bpy.data.node_groups["UV_EnvMap_Linear"]
else:
Expand Down Expand Up @@ -2074,7 +2074,8 @@ def update_tex_values_manual(material: Material, context, prop_path=None):
elif texture_settings.mute:
texture_settings.mute = False

isTexGen = f3dMat.rdp_settings.g_tex_gen # linear requires tex gen to be enabled as well
# linear requires tex gen to be enabled as well
isTexGen = f3dMat.rdp_settings.g_lighting and f3dMat.rdp_settings.g_tex_gen

if f3dMat.scale_autoprop:
if isTexGen:
Expand Down
Loading