sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #497 from NemesisMate/patch-7

Browse Source 
Ordering + raw methods instead of reversing.
This commit is contained in:
empirephoenix 2016-05-22 17:21:59 +02:00
commit 65fd7425fa
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
jme3-bullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
View File

@ -49,10 +49,12 @@ import com.jme3.scene.Spatial;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Comparator;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
@ -783,12 +785,24 @@ public class PhysicsSpace {
/** /**
* Performs a ray collision test and returns the results as a list of * Performs a ray collision test and returns the results as a list of
* PhysicsRayTestResults * PhysicsRayTestResults ordered by it hitFraction (lower to higher)
*/ */
public List rayTest(Vector3f from, Vector3f to) { public List rayTest(Vector3f from, Vector3f to) {
List results = new LinkedList(); List<PhysicsRayTestResult> results = new ArrayList<PhysicsRayTestResult>();
rayTest(from, to, results); rayTest(from, to, results);
return (List<PhysicsRayTestResult>) results;
return results;
}
/**
* Performs a ray collision test and returns the results as a list of
* PhysicsRayTestResults without performing any sort operation
*/
public List rayTestRaw(Vector3f from, Vector3f to) {
List<PhysicsRayTestResult> results = new ArrayList<PhysicsRayTestResult>();
rayTestRaw(from, to, results);
return results;
} }
/** /**
@ -808,13 +822,33 @@ public class PhysicsSpace {
return rayTestFlags; return rayTestFlags;
} }
private static Comparator<PhysicsRayTestResult> hitFractionComparator = new Comparator<PhysicsRayTestResult>() {
@Override
public int compare(PhysicsRayTestResult r1, PhysicsRayTestResult r2) {
float comp = r1.getHitFraction() - r2.getHitFraction();
return comp > 0 ? 1 : -1;
}
};
/** /**
* Performs a ray collision test and returns the results as a list of * Performs a ray collision test and returns the results as a list of
* PhysicsRayTestResults * PhysicsRayTestResults ordered by it hitFraction (lower to higher)
*/ */
public List<PhysicsRayTestResult> rayTest(Vector3f from, Vector3f to, List<PhysicsRayTestResult> results) { public List<PhysicsRayTestResult> rayTest(Vector3f from, Vector3f to, List<PhysicsRayTestResult> results) {
results.clear(); results.clear();
rayTest_native(from, to, physicsSpaceId, results, rayTestFlags); rayTest_native(from, to, physicsSpaceId, results, rayTestFlags);
Collections.sort(results, hitFractionComparator);
return results;
}
/**
* Performs a ray collision test and returns the results as a list of
* PhysicsRayTestResults without performing any sort operation
*/
public List<PhysicsRayTestResult> rayTestRaw(Vector3f from, Vector3f to, List<PhysicsRayTestResult> results) {
results.clear();
rayTest_native(from, to, physicsSpaceId, results, rayTestFlags);
return results; return results;
} }