part 2, renaming

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@7820 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

diff --git a/engine/src/terrain/com/jme3/terrain/GeoMapNew.java b/engine/src/terrain/com/jme3/terrain/GeoMap.java
similarity index 97%
rename from engine/src/terrain/com/jme3/terrain/GeoMapNew.java
rename to engine/src/terrain/com/jme3/terrain/GeoMap.java
index de14f9d..223cb13 100644 (file)
--- a/engine/src/terrain/com/jme3/terrain/GeoMapNew.java
+++ b/engine/src/terrain/com/jme3/terrain/GeoMap.java
@@ -51,15 +51,15 @@ import java.nio.IntBuffer;
 /**
  * Constructs heightfields to be used in Terrain.
  */
-public class GeoMapNew implements Savable {
+public class GeoMap implements Savable {
     
     protected FloatBuffer hdata;
     protected ByteBuffer ndata;
     protected int width, height, maxval;
     
-    public GeoMapNew() {}
+    public GeoMap() {}
     
-    public GeoMapNew(FloatBuffer heightData, ByteBuffer normalData, int width, int height, int maxval){
+    public GeoMap(FloatBuffer heightData, ByteBuffer normalData, int width, int height, int maxval){
         this.hdata = heightData;
         this.ndata = normalData;
         this.width = width;
@@ -67,7 +67,7 @@ public class GeoMapNew implements Savable {
         this.maxval = maxval;
     }
 
-    public GeoMapNew(int width, int height, int maxval) {
+    public GeoMap(int width, int height, int maxval) {
         this(ByteBuffer.allocateDirect(width*height*4).asFloatBuffer(),null,width,height,maxval);
     }
 
@@ -186,7 +186,7 @@ public class GeoMapNew implements Savable {
     /**
      * Copies a section of this geomap as a new geomap
      */
-    public Geomap copySubGeomap(int x, int y, int w, int h){
+    public GeoMap copySubGeomap(int x, int y, int w, int h){
         FloatBuffer nhdata = ByteBuffer.allocateDirect(w*h*4).asFloatBuffer();
         hdata.position(y*width+x);
         for (int cy = 0; cy < height; cy++){
@@ -210,7 +210,7 @@ public class GeoMapNew implements Savable {
             nndata.flip();
         }
 
-        return new BufferGeomap(nhdata,nndata,w,h,maxval);
+        return new GeoMap(nhdata,nndata,w,h,maxval);
     }
 
     /**

diff --git a/engine/src/terrain/com/jme3/terrain/geomipmap/LODGeomap.java b/engine/src/terrain/com/jme3/terrain/geomipmap/LODGeomap.java
index 5054fc9..80d52b3 100644 (file)
--- a/engine/src/terrain/com/jme3/terrain/geomipmap/LODGeomap.java
+++ b/engine/src/terrain/com/jme3/terrain/geomipmap/LODGeomap.java
@@ -31,7 +31,7 @@
  */\r
 package com.jme3.terrain.geomipmap;\r
 \r
-import com.jme3.terrain.GeoMapNew;\r
+import com.jme3.terrain.GeoMap;\r
 import com.jme3.export.JmeExporter;\r
 import com.jme3.export.JmeImporter;\r
 import com.jme3.math.FastMath;\r
@@ -46,7 +46,6 @@ import com.jme3.math.Vector3f;
 import com.jme3.scene.Mesh;\r
 import com.jme3.scene.Mesh.Mode;\r
 import com.jme3.scene.VertexBuffer.Type;\r
-import com.jme3.terrain.BufferGeomap;\r
 import com.jme3.util.BufferUtils;\r
 import java.io.IOException;\r
 \r
@@ -63,7 +62,7 @@ import java.io.IOException;
  *\r
  * @author Brent Owens\r
  */\r
-public class LODGeomap extends GeoMapNew {\r
+public class LODGeomap extends GeoMap {\r
 \r
     public LODGeomap() {\r
     }\r