Merge pull request #725 from stephengold/master
test and fix for issue #710 (phantom triangles in mesh collision)
This commit is contained in:
commit
ff75671162
@ -1013,6 +1013,18 @@ public class Mesh implements Savable, Cloneable, JmeCloneable {
|
|||||||
BoundingVolume worldBound,
|
BoundingVolume worldBound,
|
||||||
CollisionResults results){
|
CollisionResults results){
|
||||||
|
|
||||||
|
switch (mode) {
|
||||||
|
case Points:
|
||||||
|
case Lines:
|
||||||
|
case LineStrip:
|
||||||
|
case LineLoop:
|
||||||
|
/*
|
||||||
|
* Collisions can be detected only with triangles,
|
||||||
|
* and there are no triangles in this mesh.
|
||||||
|
*/
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (getVertexCount() == 0) {
|
if (getVertexCount() == 0) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
128
jme3-core/src/test/java/com/jme3/scene/PhantomTrianglesTest.java
Normal file
128
jme3-core/src/test/java/com/jme3/scene/PhantomTrianglesTest.java
Normal file
@ -0,0 +1,128 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2017 jMonkeyEngine
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are
|
||||||
|
* met:
|
||||||
|
*
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* * Neither the name of 'jMonkeyEngine' nor the names of its contributors
|
||||||
|
* may be used to endorse or promote products derived from this software
|
||||||
|
* without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||||
|
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
||||||
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||||
|
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||||
|
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||||
|
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||||
|
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
package com.jme3.scene;
|
||||||
|
|
||||||
|
import com.jme3.asset.AssetManager;
|
||||||
|
import com.jme3.asset.DesktopAssetManager;
|
||||||
|
import com.jme3.asset.plugins.ClasspathLocator;
|
||||||
|
import com.jme3.collision.CollisionResult;
|
||||||
|
import com.jme3.collision.CollisionResults;
|
||||||
|
import com.jme3.material.Material;
|
||||||
|
import com.jme3.material.plugins.J3MLoader;
|
||||||
|
import com.jme3.math.Ray;
|
||||||
|
import com.jme3.math.Vector3f;
|
||||||
|
import com.jme3.scene.shape.Quad;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Verify that collideWith() doesn't reports collisions with phantom triangles.
|
||||||
|
* This was issue #710 at GitHub.
|
||||||
|
*
|
||||||
|
* @author Stephen Gold
|
||||||
|
*/
|
||||||
|
public class PhantomTrianglesTest {
|
||||||
|
|
||||||
|
AssetManager assetManager;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ray in the -Z direction, starting from (0.1, 0.2, 10)
|
||||||
|
*/
|
||||||
|
final private Ray ray = new Ray(/* origin */new Vector3f(0.1f, 0.2f, 10f),
|
||||||
|
/* direction */ new Vector3f(0f, 0f, -1f));
|
||||||
|
Node rootNode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cast a ray at the geometries and report all collisions.
|
||||||
|
*/
|
||||||
|
void castRay() {
|
||||||
|
CollisionResults results = new CollisionResults();
|
||||||
|
rootNode.collideWith(ray, results);
|
||||||
|
int numResults = results.size();
|
||||||
|
for (int resultI = 0; resultI < numResults; resultI++) {
|
||||||
|
CollisionResult result = results.getCollision(resultI);
|
||||||
|
Geometry geometry = result.getGeometry();
|
||||||
|
String name = geometry.getName();
|
||||||
|
if (name.equals("white lines")) {
|
||||||
|
assert false; // phantom triangle
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attach a red square in the XY plane with its lower left corner at (0, 0,
|
||||||
|
* 0). It is composed of 2 triangles.
|
||||||
|
*/
|
||||||
|
void createRedSquare() {
|
||||||
|
Mesh quadMesh = new Quad(1f, 1f);
|
||||||
|
Geometry redSquare = new Geometry("red square", quadMesh);
|
||||||
|
Material red = assetManager.loadMaterial("Common/Materials/RedColor.j3m");
|
||||||
|
redSquare.setMaterial(red);
|
||||||
|
rootNode.attachChild(redSquare);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attach a pair of parallel white lines in the z=1 plane.
|
||||||
|
*/
|
||||||
|
void createWhiteLines() {
|
||||||
|
Mesh lineMesh = new Mesh();
|
||||||
|
lineMesh.setMode(Mesh.Mode.Lines);
|
||||||
|
float[] corners = new float[]{
|
||||||
|
-1f, -1f, 0f,
|
||||||
|
-1f, 1f, 0f,
|
||||||
|
1f, 1f, 0f,
|
||||||
|
1f, -1f, 0f
|
||||||
|
};
|
||||||
|
lineMesh.setBuffer(VertexBuffer.Type.Position, 3, corners);
|
||||||
|
short[] indices = new short[]{0, 1, 2, 3};
|
||||||
|
lineMesh.setBuffer(VertexBuffer.Type.Index, 2, indices);
|
||||||
|
lineMesh.updateBound();
|
||||||
|
Geometry whiteLines = new Geometry("white lines", lineMesh);
|
||||||
|
Material white = assetManager.loadMaterial("Common/Materials/WhiteColor.j3m");
|
||||||
|
whiteLines.setMaterial(white);
|
||||||
|
whiteLines.move(0f, 0f, 1f);
|
||||||
|
rootNode.attachChild(whiteLines);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testPhantomTriangles() {
|
||||||
|
assetManager = new DesktopAssetManager();
|
||||||
|
assetManager.registerLocator(null, ClasspathLocator.class);
|
||||||
|
assetManager.registerLoader(J3MLoader.class, "j3m", "j3md");
|
||||||
|
rootNode = new Node();
|
||||||
|
|
||||||
|
createRedSquare();
|
||||||
|
createWhiteLines();
|
||||||
|
rootNode.updateLogicalState(0.01f);
|
||||||
|
rootNode.updateGeometricState();
|
||||||
|
castRay();
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user