From 2327e2303d76f6520a2bb6c45a220e3d86eec83b Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Tue, 15 Nov 2011 23:06:06 +0000 Subject: [PATCH] - add workaround for bugged TerrainGrid test data git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8691 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/test/jme3test/terrain/TerrainFractalGridTest.java | 4 ++++ .../jme3test/terrain/TerrainQuadGridSerializationTest.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java b/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java index dcea80e25..d2d7b3526 100644 --- a/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java +++ b/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java @@ -184,6 +184,10 @@ public class TerrainFractalGridTest extends SimpleApplication { // } catch (IOException ex) { // Logger.getLogger(TerrainFractalGridTest.class.getName()).log(Level.SEVERE, null, ex); // } + //workaround for bugged test j3o's + while(quad.getControl(RigidBodyControl.class)!=null){ + quad.removeControl(RigidBodyControl.class); + } quad.addControl(new RigidBodyControl(new HeightfieldCollisionShape(quad.getHeightMap(), terrain.getLocalScale()), 0)); bulletAppState.getPhysicsSpace().add(quad); } diff --git a/engine/src/test/jme3test/terrain/TerrainQuadGridSerializationTest.java b/engine/src/test/jme3test/terrain/TerrainQuadGridSerializationTest.java index b4e719721..268fb6ed5 100644 --- a/engine/src/test/jme3test/terrain/TerrainQuadGridSerializationTest.java +++ b/engine/src/test/jme3test/terrain/TerrainQuadGridSerializationTest.java @@ -82,6 +82,10 @@ public class TerrainQuadGridSerializationTest extends SimpleApplication { } public void tileAttached(Vector3f cell, TerrainQuad quad) { + //workaround for bugged test j3o's + while(quad.getControl(RigidBodyControl.class)!=null){ + quad.removeControl(RigidBodyControl.class); + } quad.addControl(new RigidBodyControl(new HeightfieldCollisionShape(quad.getHeightMap(), terrain.getLocalScale()), 0)); bulletAppState.getPhysicsSpace().add(quad); }