Skip to content

Commit

Permalink
is it correct now?
Browse files Browse the repository at this point in the history
  • Loading branch information
Lilaa3 committed Jan 7, 2024
1 parent 36d13e0 commit ee9cb1b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
4 changes: 3 additions & 1 deletion fast64_internal/sm64/sm64_anim.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,9 @@ def getKeyFramesTranslation(romfile, transformValuesStart, boneIndex):
keyframes = []
for frame in range(boneIndex.numFrames):
romfile.seek(ptrToValue + frame * 2)
keyframes.append(int.from_bytes(romfile.read(2), "big", signed=True) / bpy.context.scene.fast64.sm64.blender_to_sm64_scale)
keyframes.append(
int.from_bytes(romfile.read(2), "big", signed=True) / bpy.context.scene.fast64.sm64.blender_to_sm64_scale
)

return keyframes

Expand Down
10 changes: 5 additions & 5 deletions fast64_internal/sm64/sm64_collision.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
from bpy.utils import register_class, unregister_class
from io import BytesIO
from .sm64_constants import (
level_enums,
level_pointers,
enumLevelNames,
insertableBinaryTypes,
defaultExtendSegment4,
level_enums,
level_pointers,
enumLevelNames,
insertableBinaryTypes,
defaultExtendSegment4,
)
from .sm64_utility import export_rom_checks
from .sm64_objects import SM64_Area, start_process_sm64_objects
Expand Down
3 changes: 2 additions & 1 deletion fast64_internal/sm64/sm64_geolayout_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -1764,7 +1764,8 @@ def processBone(
obj,
armatureObj.data,
fModel.f3d,
mathutils.Matrix.Scale(bpy.context.scene.fast64.sm64.blender_to_sm64_scale, 4) @ bone.matrix_local.inverted(),
mathutils.Matrix.Scale(bpy.context.scene.fast64.sm64.blender_to_sm64_scale, 4)
@ bone.matrix_local.inverted(),
infoDict,
)
fMeshes, fSkinnedMeshes, usedDrawLayers = saveModelGivenVertexGroup(
Expand Down
6 changes: 1 addition & 5 deletions fast64_internal/sm64/sm64_objects.py
Original file line number Diff line number Diff line change
Expand Up @@ -741,11 +741,7 @@ def handleRefreshDiffModelIDs(modelID):
elif refresh_version == "Refresh 6":
if modelID == "MODEL_TWEESTER":
modelID = "MODEL_TORNADO"
elif (
refresh_version == "Refresh 5"
or refresh_version == "Refresh 4"
or refresh_version == "Refresh 3"
):
elif refresh_version == "Refresh 5" or refresh_version == "Refresh 4" or refresh_version == "Refresh 3":
if modelID == "MODEL_TWEESTER":
modelID = "MODEL_TORNADO"
elif modelID == "MODEL_WAVE_TRAIL":
Expand Down

0 comments on commit ee9cb1b

Please sign in to comment.