diff --git a/__init__.py b/__init__.py index 1a67b17..b18a007 100644 --- a/__init__.py +++ b/__init__.py @@ -26,6 +26,7 @@ from .fast64_internal.oot.actor.properties import initOOTActorProperties from .fast64_internal.utility_anim import utility_anim_register, utility_anim_unregister, ArmatureApplyWithMeshOperator from .fast64_internal.mk64 import MK64_Properties, mk64_register, mk64_unregister +from .fast64_internal.mk64.mk64_constants import mk64_world_defaults from .fast64_internal.f3d.f3d_material import ( F3D_MAT_CUR_VERSION, @@ -392,6 +393,9 @@ def set_game_defaults(scene: bpy.types.Scene, set_ucode=True): if scene.gameEditorMode == "SM64": f3d_type = "F3D" world_defaults = sm64_world_defaults + elif scene.gameEditorMode == "MK64": + f3d_type = "F3DEX" + world_defaults = mk64_world_defaults elif scene.gameEditorMode == "OOT": f3d_type = "F3DEX2/LX2" world_defaults = oot_world_defaults diff --git a/fast64_internal/f3d/f3d_material_presets.py b/fast64_internal/f3d/f3d_material_presets.py index 2a9c26a..da4c7f6 100644 --- a/fast64_internal/f3d/f3d_material_presets.py +++ b/fast64_internal/f3d/f3d_material_presets.py @@ -6444,4 +6444,23 @@ material_presets = { "sm64_vertex_colored_texture": sm64_vertex_colored_texture, "sm64_vertex_colored_texture_transparent": sm64_vertex_colored_texture_transparent, }, + "mk64": { + "shaded_environment_mapped": shaded_environment_mapped, + "shaded_environment_mapped_transparent": shaded_environment_mapped_transparent, + "shaded_multitexture_lerp": shaded_multitexture_lerp, + "shaded_multitexture_lerp_transparent": shaded_multitexture_lerp_transparent, + "shaded_solid": shaded_solid, + "shaded_multitexture_lerp_transparent_vertex_alpha": shaded_multitexture_lerp_transparent_vertex_alpha, + "shaded_solid_transparent": shaded_solid_transparent, + "shaded_texture": shaded_texture, + "shaded_texture_cutout": shaded_texture_cutout, + "shaded_texture_transparent": shaded_texture_transparent, + "shaded_texture_transparent_vertex_alpha": shaded_texture_transparent_vertex_alpha, + "unlit_texture": unlit_texture, + "unlit_texture_cutout": unlit_texture_cutout, + "unlit_texture_transparent": unlit_texture_transparent, + "vertex_colored_texture": vertex_colored_texture, + "vertex_colored_texture_cutout": vertex_colored_texture_cutout, + "vertex_colored_texture_transparent": vertex_colored_texture_transparent, + }, } diff --git a/fast64_internal/mk64/mk64_constants.py b/fast64_internal/mk64/mk64_constants.py new file mode 100644 index 0000000..e625c2d --- /dev/null +++ b/fast64_internal/mk64/mk64_constants.py @@ -0,0 +1,16 @@ +mk64_world_defaults = { + "geometryMode": { + "zBuffer": True, + "shade": True, + "cullBack": True, + "lighting": True, + "shadeSmooth": True, + }, + "otherModeH": { + "alphaDither": "G_AD_NOISE", + "textureFilter": "G_TF_BILERP", + "perspectiveCorrection": "G_TP_PERSP", + "textureConvert": "G_TC_FILT", + "cycleType": "G_CYC_2CYCLE", + }, +}