- fix scaling in terrain compound generation

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8738 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
13 years ago · 397c2acec8
parent 197bba7fe8
commit 397c2acec8
2 changed files with 2 additions and 2 deletions
--- a/engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java
+++ b/engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java
@ -96,7 +96,7 @@ public class CollisionShapeFactory {
                }
                TerrainQuad terrain = (TerrainQuad) spatial;
                Transform trans = getTransform(spatial, realRootNode);
-                shape.addChildShape(new HeightfieldCollisionShape(terrain.getHeightMap(), terrain.getLocalScale()),
+                shape.addChildShape(new HeightfieldCollisionShape(terrain.getHeightMap(), trans.getScale()),
                        trans.getTranslation(),
                        trans.getRotation().toRotationMatrix());
            } else if (spatial instanceof Node) {
--- a/engine/src/jbullet/com/jme3/bullet/util/CollisionShapeFactory.java
+++ b/engine/src/jbullet/com/jme3/bullet/util/CollisionShapeFactory.java
@ -96,7 +96,7 @@ public class CollisionShapeFactory {
                }
                TerrainQuad terrain = (TerrainQuad) spatial;
                Transform trans = getTransform(spatial, realRootNode);
-                shape.addChildShape(new HeightfieldCollisionShape(terrain.getHeightMap(), terrain.getLocalScale()),
+                shape.addChildShape(new HeightfieldCollisionShape(terrain.getHeightMap(), trans.getScale()),
                        trans.getTranslation(),
                        trans.getRotation().toRotationMatrix());
            } else if (spatial instanceof Node) {