...and that's cross-portal collision

Fusion-Flux · Jul 10, 2023 · e319421 · e319421
1 parent 7bc3fd1
commit e319421
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/com/fusionflux/portalcubed/entity/Portal.java b/src/main/java/com/fusionflux/portalcubed/entity/Portal.java
@@ -568,7 +568,7 @@ private VoxelShape calculateCrossPortalCollisionShape(Vec3 normal, Vec3 origin,
             final Vec3 scaledNormalOffset = getNormal().scale(SURFACE_OFFSET);
             if (facing != getFacingDirection().getOpposite()) {
                 result = result.move(-origin.x, -origin.y, -origin.z);
-                final IPQuaternion transform = getTransformQuat().hamiltonProduct(FLIP_AXIS_W);
+                final IPQuaternion transform = getTransformQuat().getConjugated();
                 final MutableObject<VoxelShape> rotatedShape = new MutableObject<>(Shapes.empty());
                 result.forAllBoxes((x1, y1, z1, x2, y2, z2) -> {
                     final Vec3 minT = transform.rotate(new Vec3(x1, y1, z1), false);

diff --git a/src/main/java/com/fusionflux/portalcubed/util/GeneralUtil.java b/src/main/java/com/fusionflux/portalcubed/util/GeneralUtil.java
@@ -118,8 +118,7 @@ public static void setupPortalShapes(Entity entity) {
         for (Portal portal : list) {
             if (portal.calculateCutoutBox() != NULL_BOX && portal.calculateBoundsCheckBox() != NULL_BOX && portal.getActive()) {
                 cutoutShape = Shapes.or(cutoutShape, Shapes.create(portal.getCutoutBoundingBox()));
-                // TODO: Uncomment for testing or when it's working fully
-//                crossPortalCollisionShape = Shapes.or(crossPortalCollisionShape, portal.getCrossPortalCollisionShapeOther(entity));
+                crossPortalCollisionShape = Shapes.or(crossPortalCollisionShape, portal.getCrossPortalCollisionShapeOther(entity));
             }
         }