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

[SM64] Fix object rotations #339

Merged
merged 1 commit into from
May 20, 2024
Merged

[SM64] Fix object rotations #339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions fast64_internal/sm64/sm64_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ def process_sm64_objects(obj, area, rootMatrix, transformMatrix, specialsOnly):
)

# Hacky solution to handle Z-up to Y-up conversion
rotation = originalRotation @ mathutils.Quaternion((1, 0, 0), math.radians(90.0))
rotation = (originalRotation @ mathutils.Quaternion((1, 0, 0), math.radians(90.0))).to_euler("ZXY")

if obj.type == "EMPTY":
if obj.sm64_obj_type == "Area Root" and obj.areaIndex != area.index:
Expand All @@ -814,7 +814,7 @@ def process_sm64_objects(obj, area, rootMatrix, transformMatrix, specialsOnly):
SM64_Special_Object(
preset,
translation,
rotation.to_euler() if obj.sm64_obj_set_yaw else None,
rotation if obj.sm64_obj_set_yaw else None,
obj.fast64.sm64.game_object.get_behavior_params()
if (obj.sm64_obj_set_yaw and obj.sm64_obj_set_bparam)
else None,
Expand All @@ -836,7 +836,7 @@ def process_sm64_objects(obj, area, rootMatrix, transformMatrix, specialsOnly):
SM64_Object(
modelID,
translation,
rotation.to_euler(),
rotation,
behaviour,
obj.fast64.sm64.game_object.get_behavior_params(),
get_act_string(obj),
Expand All @@ -848,12 +848,12 @@ def process_sm64_objects(obj, area, rootMatrix, transformMatrix, specialsOnly):
SM64_Macro_Object(
macro,
translation,
rotation.to_euler(),
rotation,
obj.fast64.sm64.game_object.get_behavior_params() if obj.sm64_obj_set_bparam else None,
)
)
elif obj.sm64_obj_type == "Mario Start":
mario_start = SM64_Mario_Start(obj.sm64_obj_mario_start_area, translation, rotation.to_euler())
mario_start = SM64_Mario_Start(obj.sm64_obj_mario_start_area, translation, rotation)
area.objects.append(mario_start)
area.mario_start = mario_start
elif obj.sm64_obj_type == "Trajectory":
Expand All @@ -873,7 +873,7 @@ def process_sm64_objects(obj, area, rootMatrix, transformMatrix, specialsOnly):
triggerIndex,
obj.cameraVolumeFunction,
translation,
rotation.to_euler(),
rotation,
scale,
obj.empty_display_size,
)
Expand Down
Loading