Bladeren bron

Merge pull request #1262 from MeFisto94/fix-terrain-picker

Fixes #1261 - Clone the Terrain Picker, so that loading a terrain from file still works (after cloning, the picker would have the wrong terrain quad instance)
Paul Speed 5 jaren geleden
bovenliggende
commit
81f9b9d92a
1 gewijzigde bestanden met toevoegingen van 2 en 3 verwijderingen
  1. 2 3
      jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainQuad.java

+ 2 - 3
jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainQuad.java

@@ -1793,9 +1793,8 @@ public class TerrainQuad extends Node implements Terrain {
         // This was not cloned before... I think that's a mistake.
         this.affectedAreaBBox = cloner.clone(affectedAreaBBox);
 
-        // picker is not cloneable and not cloned.  This also seems like
-        // a mistake if you ever load the same terrain twice.
-        // this.picker = cloner.clone(picker);
+        // Otherwise, picker would be cloned by reference and thus "this" would be wrong
+        this.picker = new BresenhamTerrainPicker(this);
 
         // neighbourFinder is also not cloned.  Maybe that's ok.
     }