thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-10-30 08:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use mb method for end pad collision

Browse source
This commit is contained in:
RandomityGuy 2022-12-19 21:39:55 +05:30
parent 5772110c52
commit 2342d940a6
3 changed files with 61 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/MarbleWorld.hx
View file

@ -1,5 +1,6 @@
package src; package src;
import collision.Collision;
import shapes.MegaMarble; import shapes.MegaMarble;
import shapes.Blast; import shapes.Blast;
import shapes.Glass; import shapes.Glass;
@ -1517,7 +1518,54 @@ class MarbleWorld extends Scheduler {
if (this.finishTime == null) { if (this.finishTime == null) {
if (spherebounds.collide(this.endPad.finishBounds)) { if (spherebounds.collide(this.endPad.finishBounds)) {
if (collision.gjk.GJK.gjk(gjkSphere, this.endPad.finishCollider, false) != null) { var padUp = this.endPad.getAbsPos().up();
padUp = padUp.multiply(10);
var checkBounds = spherebounds.clone();
checkBounds.zMin -= 10;
checkBounds.zMax += 10;
var checkBoundsCenter = checkBounds.getCenter();
var checkSphereRadius = checkBounds.getMax().sub(checkBoundsCenter).length();
var checkSphere = new Bounds();
checkSphere.addSpherePos(checkBoundsCenter.x, checkBoundsCenter.y, checkBoundsCenter.z, checkSphereRadius);
var endpadBB = this.collisionWorld.boundingSearch(checkSphere, false);
var found = false;
for (collider in endpadBB) {
if (collider.go == this.endPad) {
var chull = cast(collider, collision.CollisionHull);
for (surface in chull.surfaces) {
var i = 0;
while (i < surface.indices.length) {
var surfaceN = surface.normals[surface.indices[i]].transformed3x3(chull.transform);
var v1 = surface.points[surface.indices[i]].transformed(chull.transform);
var surfaceD = -surfaceN.dot(v1);
if (surfaceN.dot(padUp.multiply(-10)) < 0) {
var dist = surfaceN.dot(checkBoundsCenter.toVector()) + surfaceD;
if (dist >= 0 && dist < 5) {
var intersectT = -(checkBoundsCenter.dot(surfaceN.toPoint()) + surfaceD) / (padUp.dot(surfaceN));
var intersectP = checkBoundsCenter.add(padUp.multiply(intersectT).toPoint()).toVector();
if (Collision.PointInTriangle(intersectP, v1, surface.points[surface.indices[i + 1]].transformed(chull.transform),
surface.points[surface.indices[i + 2]].transformed(chull.transform))) {
found = true;
break;
}
}
}
i += 3;
}
if (found) {
break;
}
}
if (found) {
break;
}
}
}
if (found) {
if (!endPad.inFinish) { if (!endPad.inFinish) {
touchFinish(); touchFinish();
endPad.inFinish = true; endPad.inFinish = true;

4
src/collision/CollisionWorld.hx
View file

@ -80,8 +80,8 @@ class CollisionWorld {
return contacts; return contacts;
} }
public function boundingSearch(bounds:Bounds) { public function boundingSearch(bounds:Bounds, useCache:Bool = true) {
var contacts = this.octree.boundingSearch(bounds).map(x -> cast(x, CollisionEntity)); var contacts = this.octree.boundingSearch(bounds, useCache).map(x -> cast(x, CollisionEntity));
for (obj in dynamicEntities) { for (obj in dynamicEntities) {
if (obj.boundingBox.collide(bounds)) if (obj.boundingBox.collide(bounds))
contacts.push(obj); contacts.push(obj);

16
src/octree/Octree.hx
View file

@ -139,16 +139,20 @@ class Octree {
return intersections; return intersections;
} }
public function boundingSearch(bounds:Bounds) { public function boundingSearch(bounds:Bounds, useCache:Bool = true) {
var intersections = []; var intersections = [];
if (this.prevBoundSearch != null) { if (useCache) {
if (this.prevBoundSearch.containsBounds(bounds)) { if (this.prevBoundSearch != null) {
return boundSearchCache; if (this.prevBoundSearch.containsBounds(bounds)) {
return boundSearchCache;
}
} }
} }
this.root.boundingSearch(bounds, intersections); this.root.boundingSearch(bounds, intersections);
prevBoundSearch = bounds; if (useCache) {
boundSearchCache = intersections; prevBoundSearch = bounds;
boundSearchCache = intersections;
}
return intersections; return intersections;
} }