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

CollisionShapeFactory.createCompoundShape now exclude geometies the are batched in a BatchNode.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10070 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2013-01-14 22:28:59 +00:00
parent 601a34ba99
commit dada1c1d38
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/bullet-common/com/jme3/bullet/util/CollisionShapeFactory.java
View File

@ -102,7 +102,7 @@ public class CollisionShapeFactory {
shape.addChildShape(new HeightfieldCollisionShape(terrain.getHeightMap(), terrain.getLocalScale()), shape.addChildShape(new HeightfieldCollisionShape(terrain.getHeightMap(), terrain.getLocalScale()),
trans.getTranslation(), trans.getTranslation(),
trans.getRotation().toRotationMatrix()); trans.getRotation().toRotationMatrix());
} else if (spatial instanceof Geometry) { } else if (spatial instanceof Geometry && !((Geometry)spatial).isBatched()) {
Boolean bool = spatial.getUserData(UserData.JME_PHYSICSIGNORE); Boolean bool = spatial.getUserData(UserData.JME_PHYSICSIGNORE);
if (bool != null && bool.booleanValue()) { if (bool != null && bool.booleanValue()) {
continue; // go to the next child in the loop continue; // go to the next child in the loop