Remove collisionSceneGetPortalRotation()

mwpenny · Apr 6, 2024 · 62c49dd · 62c49dd
1 parent 97b31b4
commit 62c49dd
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/src/physics/collision_scene.c b/src/physics/collision_scene.c
@@ -514,12 +514,6 @@ void collisionSceneGetPortalTransform(int fromPortal, struct Transform* out) {
     transformConcat(gCollisionScene.portalTransforms[1 - fromPortal], &inverseA, out);
 }
 
-void collisionSceneGetPortalRotation(int fromPortal, struct Quaternion* out) {
-    struct Quaternion inverse;
-    quatConjugate(&gCollisionScene.portalTransforms[fromPortal]->rotation, &inverse);
-    quatMultiply(&gCollisionScene.portalTransforms[1 - fromPortal]->rotation, &inverse, out);
-}
-
 void collisionSceneAddDynamicObject(struct CollisionObject* object) {
     if (gCollisionScene.dynamicObjectCount < MAX_DYNAMIC_OBJECTS) {
         gCollisionScene.dynamicObjects[gCollisionScene.dynamicObjectCount] = object;

diff --git a/src/physics/collision_scene.h b/src/physics/collision_scene.h
@@ -49,7 +49,6 @@ int collisionSceneRaycast(struct CollisionScene* scene, int roomIndex, struct Ra
 int collisionSceneRaycastOnlyDynamic(struct CollisionScene* scene, struct Ray* ray, int collisionLayers, float maxDistance, struct RaycastHit* hit);
 
 void collisionSceneGetPortalTransform(int fromPortal, struct Transform* out);
-void collisionSceneGetPortalRotation(int fromPortal, struct Quaternion* out);
 
 void collisionSceneAddDynamicObject(struct CollisionObject* object);
 void collisionSceneRemoveDynamicObject(struct CollisionObject* object);

diff --git a/src/player/player.c b/src/player/player.c
@@ -527,11 +527,7 @@ void playerPortalGrabTransform(struct Player* player, struct Vector3* grabPoint,
         return;
     }
     struct Transform pointTransform;
-    if (grabPoint) {
-        collisionSceneGetPortalTransform(player->grabbingThroughPortal > 0 ? 0 : 1, &pointTransform);
-    } else {
-        collisionSceneGetPortalRotation(player->grabbingThroughPortal > 0 ? 0 : 1, &pointTransform.rotation);
-    }
+    collisionSceneGetPortalTransform(player->grabbingThroughPortal > 0 ? 0 : 1, &pointTransform);
 
     for (int i = 0; i < abs(player->grabbingThroughPortal); ++i) {
         if (grabPoint) {