sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

part 2, renaming

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7820 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
bre..ns 2011-07-04 23:55:45 +00:00
parent 1a78dd200c
commit e3574d2fe7
2 changed files with 8 additions and 9 deletions
engine/src/terrain/com/jme3/terrain
GeoMap.java
geomipmap
LODGeomap.java

12
engine/src/terrain/com/jme3/terrain/GeoMapNew.java → engine/src/terrain/com/jme3/terrain/GeoMap.java

@ -51,15 +51,15 @@ import java.nio.IntBuffer;
/** /**
* Constructs heightfields to be used in Terrain. * Constructs heightfields to be used in Terrain.
*/ */
public class GeoMapNew implements Savable { public class GeoMap implements Savable {
protected FloatBuffer hdata; protected FloatBuffer hdata;
protected ByteBuffer ndata; protected ByteBuffer ndata;
protected int width, height, maxval; 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.hdata = heightData;
this.ndata = normalData; this.ndata = normalData;
this.width = width; this.width = width;
@ -67,7 +67,7 @@ public class GeoMapNew implements Savable {
this.maxval = maxval; 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); 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 * 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(); FloatBuffer nhdata = ByteBuffer.allocateDirect(w*h*4).asFloatBuffer();
hdata.position(y*width+x); hdata.position(y*width+x);
for (int cy = 0; cy < height; cy++){ for (int cy = 0; cy < height; cy++){
@ -210,7 +210,7 @@ public class GeoMapNew implements Savable {
nndata.flip(); nndata.flip();
} }
return new BufferGeomap(nhdata,nndata,w,h,maxval); return new GeoMap(nhdata,nndata,w,h,maxval);
} }
/** /**

5
engine/src/terrain/com/jme3/terrain/geomipmap/LODGeomap.java

@ -31,7 +31,7 @@
*/ */
package com.jme3.terrain.geomipmap; package com.jme3.terrain.geomipmap;
import com.jme3.terrain.GeoMapNew; import com.jme3.terrain.GeoMap;
import com.jme3.export.JmeExporter; import com.jme3.export.JmeExporter;
import com.jme3.export.JmeImporter; import com.jme3.export.JmeImporter;
import com.jme3.math.FastMath; import com.jme3.math.FastMath;
@ -46,7 +46,6 @@ import com.jme3.math.Vector3f;
import com.jme3.scene.Mesh; import com.jme3.scene.Mesh;
import com.jme3.scene.Mesh.Mode; import com.jme3.scene.Mesh.Mode;
import com.jme3.scene.VertexBuffer.Type; import com.jme3.scene.VertexBuffer.Type;
import com.jme3.terrain.BufferGeomap;
import com.jme3.util.BufferUtils; import com.jme3.util.BufferUtils;
import java.io.IOException; import java.io.IOException;
@ -63,7 +62,7 @@ import java.io.IOException;
* *
* @author Brent Owens * @author Brent Owens
*/ */
public class LODGeomap extends GeoMapNew { public class LODGeomap extends GeoMap {
public LODGeomap() { public LODGeomap() {
} }