gered/gdx-tilemap3d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

use our own ray-to-box intersection test instead ...

Browse source 
libgdx's own Intersector doesn't seem to behave in *exactly* the same
manner apparently. not going to spend any time with this since I already
ported my own code to do the exact same thing anyway and it does behave
how we want it to.
This commit is contained in:
Gered 2013-11-28 12:28:30 -05:00
parent ddca05dd95
commit 0c44efc93c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/ca/blarg/gdx/tilemap3d/TileContainer.java
View file

@ -1,15 +1,13 @@
package ca.blarg.gdx.tilemap3d; package ca.blarg.gdx.tilemap3d;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import com.badlogic.gdx.math.Intersector;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.badlogic.gdx.math.collision.Ray;
import ca.blarg.gdx.math.IntersectionTester; import ca.blarg.gdx.math.IntersectionTester;
import ca.blarg.gdx.math.MathHelpers; import ca.blarg.gdx.math.MathHelpers;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh;
import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection; import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector3;
import com.badlogic.gdx.math.collision.BoundingBox;
import com.badlogic.gdx.math.collision.Ray;
public abstract class TileContainer { public abstract class TileContainer {
static final Vector3 tmp1 = new Vector3(); static final Vector3 tmp1 = new Vector3();
@ -104,7 +102,8 @@ public abstract class TileContainer {
public boolean checkForCollision(Ray ray, TileCoord collisionCoords) { public boolean checkForCollision(Ray ray, TileCoord collisionCoords) {
// make sure that the ray and this TileContainer can actually collide in the first place // make sure that the ray and this TileContainer can actually collide in the first place
if (!Intersector.intersectRayBounds(ray, getBounds(), tmp1)) tmp1.set(Vector3.Zero);
if (!IntersectionTester.test(ray, getBounds(), tmp1))
return false; return false;
// convert initial collision point to tile coords (this is in "world/tilemap space") // convert initial collision point to tile coords (this is in "world/tilemap space")
@ -262,6 +261,7 @@ public abstract class TileContainer {
public boolean checkForCollision(Ray ray, TileCoord collisionCoords, TileMeshCollection tileMeshes, Vector3 tileMeshCollisionPoint) { public boolean checkForCollision(Ray ray, TileCoord collisionCoords, TileMeshCollection tileMeshes, Vector3 tileMeshCollisionPoint) {
// if the ray doesn't collide with any solid tiles in the first place, then // if the ray doesn't collide with any solid tiles in the first place, then
// we can skip this more expensive triangle collision check... // we can skip this more expensive triangle collision check...
tmpCoords.set(Vector3.Zero);
if (!checkForCollision(ray, tmpCoords)) if (!checkForCollision(ray, tmpCoords))
return false; return false;
@ -303,7 +303,7 @@ public abstract class TileContainer {
tmpB.set(vertices[i + 1]).add(tileWorldPosition); tmpB.set(vertices[i + 1]).add(tileWorldPosition);
tmpC.set(vertices[i + 2]).add(tileWorldPosition); tmpC.set(vertices[i + 2]).add(tileWorldPosition);
if (Intersector.intersectRayTriangle(ray, tmpA, tmpB, tmpC, collisionPoint)) { if (IntersectionTester.test(ray, tmpA, tmpB, tmpC, collisionPoint)) {
collided = true; collided = true;
// if this is the closest collision yet, then keep the distance // if this is the closest collision yet, then keep the distance