From 530b0bb40b2518dcceeb73c07ab37a62f5e62b21 Mon Sep 17 00:00:00 2001
From: normen667 <normen667@75d07b2b-3a1a-0410-a2c5-0572b91ccdca>
Date: Tue, 10 May 2011 16:17:13 +0000
Subject: [PATCH] - merge changes to native bullet

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@7481 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java | 7 +++++--
 1 file changed, 5 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 278a53243..012d8a9d5 100644
--- a/engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java
+++ b/engine/src/bullet/com/jme3/bullet/util/CollisionShapeFactory.java
@@ -40,13 +40,13 @@ import com.jme3.bullet.collision.shapes.HullCollisionShape;
 import com.jme3.bullet.collision.shapes.MeshCollisionShape;
 import com.jme3.bullet.collision.shapes.infos.ChildCollisionShape;
 import com.jme3.math.Matrix3f;
-import com.jme3.math.Quaternion;
 import com.jme3.math.Transform;
 import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
+import com.jme3.terrain.geomipmap.TerrainPatch;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -147,6 +147,9 @@ public class CollisionShapeFactory {
         if (spatial instanceof TerrainQuad) {
             TerrainQuad terrain = (TerrainQuad) spatial;
             return new HeightfieldCollisionShape(terrain.getHeightMap(), terrain.getLocalScale());
+        } else if (spatial instanceof TerrainPatch) {
+            TerrainPatch terrain = (TerrainPatch) spatial;
+            return new HeightfieldCollisionShape(terrain.getHeightmap().array(), terrain.getLocalScale());
         } else if (spatial instanceof Geometry) {
             return createSingleMeshShape((Geometry) spatial, spatial);
         } else if (spatial instanceof Node) {
@@ -226,7 +229,7 @@ public class CollisionShapeFactory {
             return null;
         }
     }
-
+    
     /**
      * This method moves each child shape of a compound shape by the given vector
      * @param vector
-- 
2.11.0