From bd613fee2bacbc2efd33cfb4a0399268036a9511 Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Sun, 20 Nov 2011 11:50:18 +0000 Subject: [PATCH] - fix bullet CollisionShapeFactory for new terrain heightfield git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8735 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java | 2 +- .../src/jbullet/com/jme3/bullet/util/CollisionShapeFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java b/engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java index d2a15de84..f89d554a2 100644 --- a/engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java +++ b/engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java @@ -154,7 +154,7 @@ public class CollisionShapeFactory { return new HeightfieldCollisionShape(terrain.getHeightMap(), terrain.getLocalScale()); } else if (spatial instanceof TerrainPatch) { TerrainPatch terrain = (TerrainPatch) spatial; - return new HeightfieldCollisionShape(terrain.getHeightmap().array(), terrain.getLocalScale()); + return new HeightfieldCollisionShape(terrain.getHeightmap(), terrain.getLocalScale()); } else if (spatial instanceof Geometry) { return createSingleMeshShape((Geometry) spatial, spatial); } else if (spatial instanceof Node) { diff --git a/engine/src/jbullet/com/jme3/bullet/util/CollisionShapeFactory.java b/engine/src/jbullet/com/jme3/bullet/util/CollisionShapeFactory.java index 52bed4895..a71e51301 100644 --- a/engine/src/jbullet/com/jme3/bullet/util/CollisionShapeFactory.java +++ b/engine/src/jbullet/com/jme3/bullet/util/CollisionShapeFactory.java @@ -155,7 +155,7 @@ public class CollisionShapeFactory { return new HeightfieldCollisionShape(terrain.getHeightMap(), terrain.getLocalScale()); } else if (spatial instanceof TerrainPatch) { TerrainPatch terrain = (TerrainPatch) spatial; - return new HeightfieldCollisionShape(terrain.getHeightmap().array(), terrain.getLocalScale()); + return new HeightfieldCollisionShape(terrain.getHeightmap(), terrain.getLocalScale()); } else if (spatial instanceof Geometry) { return createSingleMeshShape((Geometry) spatial, spatial); } else if (spatial instanceof Node) {