From cfd40df7b69876e3a6e341fb99d7d4ad0fc1c402 Mon Sep 17 00:00:00 2001
From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com>
Date: Mon, 12 Dec 2022 01:42:12 +0530
Subject: [PATCH] attempt fix internal edge collisions

---
 src/Marble.hx              | 24 +++++++++++-------------
 src/collision/Collision.hx | 13 ++++++++-----
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/Marble.hx b/src/Marble.hx
index 54a42d8f..5aadea3d 100644
--- a/src/Marble.hx
+++ b/src/Marble.hx
@@ -1046,21 +1046,19 @@ class Marble extends GameObject {
 
 							var isOnEdge:Bool = false;
 
-							for (i in 0...surface.indices.length) {
-								{
-									var thisVert = surface.points[surface.indices[i]];
-									if (thisVert != lastVert) {
-										var edgePlane = PlaneF.ThreePoints(toDifPoint(thisVert).add(polyPlane.getNormal()), toDifPoint(thisVert),
-											toDifPoint(lastVert));
-										lastVert = thisVert;
+							for (j in 0...surface.indices.length) {
+								var thisVert = surface.points[surface.indices[j]];
+								if (thisVert != lastVert) {
+									var edgePlane = PlaneF.ThreePoints(toDifPoint(thisVert).add(polyPlane.getNormal()), toDifPoint(thisVert),
+										toDifPoint(lastVert));
+									lastVert = thisVert;
 
-										// if we are on the far side of the edge
-										if (edgePlane.getNormal().dot(toDifPoint(collisionPos)) + edgePlane.d < 0.0)
-											break;
-									}
+									// if we are on the far side of the edge
+									if (edgePlane.getNormal().dot(toDifPoint(collisionPos)) + edgePlane.d < 0.0)
+										break;
 								}
 
-								isOnEdge = i != surface.indices.length;
+								isOnEdge = j != surface.indices.length;
 							}
 
 							// If we're inside the poly, just get the position
@@ -1084,7 +1082,7 @@ class Marble extends GameObject {
 						}
 						var radSq = radius * radius;
 						for (iter in 0...surface.indices.length) {
-							var thisVert = surface.points[surface.indices[i]];
+							var thisVert = surface.points[surface.indices[iter]];
 
 							var vertDiff = lastVert.sub(thisVert);
 							var posDiff = position.sub(thisVert);
diff --git a/src/collision/Collision.hx b/src/collision/Collision.hx
index 6d5bf414..f27b8f58 100644
--- a/src/collision/Collision.hx
+++ b/src/collision/Collision.hx
@@ -131,11 +131,14 @@ class Collision {
 				// } else
 				var edgeDotAng = Math.acos(edgeDots[chosenEdge]);
 				if (edgeDotAng < Math.PI / 12) {
-					if (edgeDotAng == 0) {
-						res.normal = center.sub(res.point).normalized();
-					} else {
-						res.normal = normal; // edgeNormals[chosenEdge];
-					}
+					// if (edgeDotAng == 0) {
+					// 	res.normal = center.sub(res.point).normalized();
+					// } else {
+					// 	res.normal = normal; // edgeNormals[chosenEdge];
+					// }
+					res.point = null;
+					res.normal = null;
+					res.result = false;
 				} else {
 					res.result = false;
 					res.normal = center.sub(res.point).normalized();