diff --git a/fast64_internal/f3d/f3d_constants.py b/fast64_internal/f3d/f3d_constants.py deleted file mode 100644 index f7bb049..0000000 --- a/fast64_internal/f3d/f3d_constants.py +++ /dev/null @@ -1,129 +0,0 @@ -import mathutils - -# Equivalent of euler(-90, -90, 0) -blenderToSM64Rotation = mathutils.Matrix( - [[0, 1, 0], - [0, 0, 1], - [1, 0, 0]] -) - -blenderToSM64RotationLevel = mathutils.Matrix( - [[1, 0, 0], - [0, 0, 1], - [0,-1, 0]] -) - -colorFormats = { - 'RGBA' : 0, - 'YUV' : 1, - 'CI' : 2, - 'IA' : 3, - 'I' : 4 -} - -pixelBitSizes = { - '4bit' : 0, - '8bit' : 1, - '16bit' : 2, - '32bit' : 3 -} - -# Color combinations -# In SM64, environment alpha controls Mario's alpha. - -# 2 cycle with specular lighting stored in primitive -S_PHONG_TEX = ['TEXEL0', '0', 'SHADE', '0', - 'TEXEL0', '0', 'ENVIRONMENT', '0', - 'PRIMITIVE', 'COMBINED', 'TEXEL0', 'COMBINED', - '0', '0', '0', 'COMBINED'] - -# MULTIPLY TWO TEXTURES -S_MULTIPLY = [ - 'TEXEL0', '0', 'TEXEL1', '0', - '0', '0', '0', 'ENVIRONMENT', - 'TEXEL0', '0', 'TEXEL1', '0', - '0', '0', '0', 'ENVIRONMENT' -] - -S_PRIM_TRANSPARENT_SHADE = ['TEXEL0', '0', 'SHADE', '0', - 'TEXEL0', '0', 'PRIMITIVE', '0', - 'TEXEL0', '0', 'SHADE', '0', - 'TEXEL0', '0', 'PRIMITIVE', '0'] - -# REGULAR SHADED TEXTURE -S_SHADED_TEX = ['TEXEL0', '0', 'SHADE', '0', - '0', '0', '0', 'ENVIRONMENT', - 'TEXEL0', '0', 'SHADE', '0', - '0', '0', '0', 'ENVIRONMENT'] - -# VERTEX COLOR -S_VERTEX_COLORED_TEX = ['TEXEL0', '0', 'SHADE', '0', - 'ENVIRONMENT', '0', 'SHADE', '0', - 'TEXEL0', '0', 'SHADE', '0', - 'ENVIRONMENT', '0', 'SHADE', '0'] - -S_VERTEX_COLORED_TEX_NO_VERT_ALPHA = ['TEXEL0', '0', 'SHADE', '0', - '0', '0', '0', 'TEXEL0', - 'TEXEL0', '0', 'SHADE', '0', - '0', '0', '0', 'TEXEL0',] - -S_VERTEX_COLORED_TEX_TRANSPARENT = ['TEXEL0', '0', 'SHADE', '0', - 'TEXEL0', '0', 'SHADE', '0', - 'TEXEL0', '0', 'SHADE', '0', - 'TEXEL0', '0', 'SHADE', '0'] - -S_SHADED_TEX_CUTOUT = ['TEXEL0', '0', 'SHADE', '0', - 'TEXEL0', '0', 'ENVIRONMENT', '0', - 'TEXEL0', '0', 'SHADE', '0', - 'TEXEL0', '0', 'ENVIRONMENT', '0'] - -# UNLIT TEXTURE, USED FOR METAL MARIO -S_UNLIT_TEX = ['0', '0', '0', 'TEXEL0', - '0', '0', '0', 'ENVIRONMENT', - '0', '0', '0', 'TEXEL0', - '0', '0', '0', 'ENVIRONMENT'] - -S_UNLIT_TEX_CUTOUT = ['0', '0', '0', 'TEXEL0', - 'TEXEL0', '0', 'ENVIRONMENT', '0', - '0', '0', '0', 'TEXEL0', - 'TEXEL0', '0', 'ENVIRONMENT', '0'] - -# SM64 CUSTOM IMPORTER CC -S_SHADED_TEX_NOALPHA = ['TEXEL0', '0', 'SHADE', '0', - '0', '0', '0', 'SHADE', - 'TEXEL0', '0', 'SHADE', '0', - '0', '0', '0', 'SHADE'] - -# SM64 BODY CC -S_SHADED_SOLID = ['0', '0', '0', 'SHADE', - '0', '0', '0', 'ENVIRONMENT', - '0', '0', '0', 'SHADE', - '0', '0', '0', 'ENVIRONMENT'] - -# SM64 BODY TEXTURES (FACE, SIDEBURNS, ETC.) -S_UNLIT_DECAL_ON_SHADED_SOLID = ['TEXEL0', 'SHADE', 'TEXEL0_ALPHA', 'SHADE', - '0', '0', '0', 'ENVIRONMENT', - 'TEXEL0', 'SHADE', 'TEXEL0_ALPHA', 'SHADE', - '0', '0', '0', 'ENVIRONMENT'] - -# SHADED RANDOM NOISE -S_SHADED_NOISE = ['NOISE', '0', 'SHADE', '0', - '0', '0', '0', 'ENVIRONMENT', - 'NOISE', '0', 'SHADE', '0', - '0', '0', '0', 'ENVIRONMENT'] - -# FOG SHADED TEXTURES -S_FOG_SHADED_TEX = ['TEXEL0', '0', 'SHADE', '0', - '0', '0', '0', 'ENVIRONMENT', - '0', '0', '0', 'COMBINED', - '0', '0', '0', 'COMBINED'] - -S_FOG_SHADED_TEX_CUTOUT = ['TEXEL0', '0', 'SHADE', '0', - 'TEXEL0', '0', 'ENVIRONMENT', '0', - '0', '0', '0', 'COMBINED', - '0', '0', '0', 'COMBINED'] - -S_FOG_PRIM_TRANSPARENT_SHADE = ['TEXEL0', '0', 'SHADE', '0', - 'TEXEL0', '0', 'PRIMITIVE', '0', - '0', '0', '0', 'COMBINED', - '0', '0', '0', 'COMBINED'] \ No newline at end of file diff --git a/fast64_internal/f3d/f3d_texture_writer.py b/fast64_internal/f3d/f3d_texture_writer.py index 1671f7a..6a8ee8a 100644 --- a/fast64_internal/f3d/f3d_texture_writer.py +++ b/fast64_internal/f3d/f3d_texture_writer.py @@ -4,7 +4,6 @@ import bpy from math import ceil, floor from .f3d_enums import * -from .f3d_constants import * from .f3d_material import ( all_combiner_uses, getTmemWordUsage, diff --git a/fast64_internal/f3d/f3d_writer.py b/fast64_internal/f3d/f3d_writer.py index dd981b1..35791bd 100644 --- a/fast64_internal/f3d/f3d_writer.py +++ b/fast64_internal/f3d/f3d_writer.py @@ -7,7 +7,6 @@ from math import ceil from bpy.utils import register_class, unregister_class from .f3d_enums import * -from .f3d_constants import * from .f3d_material import ( all_combiner_uses, getMaterialScrollDimensions, @@ -495,7 +494,14 @@ def revertMatAndEndDraw(gfxList, otherCommands): DPPipeSync(), SPSetGeometryMode(["G_LIGHTING"]), SPClearGeometryMode(["G_TEXTURE_GEN"]), - DPSetCombineMode(*S_SHADED_SOLID), + DPSetCombineMode( + *( + ["0", "0", "0", "SHADE"] + + ["0", "0", "0", "ENVIRONMENT"] + + ["0", "0", "0", "SHADE"] + + ["0", "0", "0", "ENVIRONMENT"] + ) + ), SPTexture(0xFFFF, 0xFFFF, 0, 0, 0), ] + otherCommands diff --git a/pyproject.toml b/pyproject.toml index 3340c81..6f284af 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,5 +14,6 @@ target-version = [ # This is a regular expression, escape dots with a backslash like '\.' # Note: All whitespace seems to be trimmed (thankfully), probably by Black? extend-exclude = ''' -^/fast64_internal/f3d/f3d_constants\.py +^ +$ '''