more deprecation cleanup

cleanup_build_scripts
Kirill Vainer 9 years ago
parent 112a77fd5d
commit 37f8ee91af
  1. 36
      jme3-core/src/main/java/com/jme3/asset/TextureKey.java
  2. 8
      jme3-core/src/main/java/com/jme3/scene/debug/WireBox.java
  3. 18
      jme3-terrain/src/main/java/com/jme3/terrain/GeoMap.java
  4. 5
      jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/LODGeomap.java
  5. 5
      jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainPatch.java
  6. 15
      jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainQuad.java

@ -123,24 +123,6 @@ public class TextureKey extends AssetKey<Texture> {
this.anisotropy = anisotropy; this.anisotropy = anisotropy;
} }
/**
* @deprecated Use {@link #setTextureTypeHint(com.jme3.texture.Texture.Type) }
* instead.
*/
@Deprecated
public boolean isAsCube() {
return textureTypeHint == Type.CubeMap;
}
/**
* @deprecated Use {@link #setTextureTypeHint(com.jme3.texture.Texture.Type) }
* instead.
*/
@Deprecated
public void setAsCube(boolean asCube) {
textureTypeHint = asCube ? Type.CubeMap : Type.TwoDimensional;
}
public boolean isGenerateMips() { public boolean isGenerateMips() {
return generateMips; return generateMips;
} }
@ -149,24 +131,6 @@ public class TextureKey extends AssetKey<Texture> {
this.generateMips = generateMips; this.generateMips = generateMips;
} }
/**
* @deprecated Use {@link #setTextureTypeHint(com.jme3.texture.Texture.Type) }
* instead.
*/
@Deprecated
public boolean isAsTexture3D() {
return textureTypeHint == Type.ThreeDimensional;
}
/**
* @deprecated Use {@link #setTextureTypeHint(com.jme3.texture.Texture.Type) }
* instead.
*/
@Deprecated
public void setAsTexture3D(boolean asTexture3D) {
textureTypeHint = asTexture3D ? Type.ThreeDimensional : Type.TwoDimensional;
}
/** /**
* The type of texture expected to be returned. * The type of texture expected to be returned.
* *

@ -101,14 +101,6 @@ public class WireBox extends Mesh {
); );
updateBound(); updateBound();
} }
/**
* Old method retained for compatibility: use makeGeometry instead.
*/
@Deprecated
public void fromBoundingBox(BoundingBox bbox) {
updatePositions(bbox.getXExtent(), bbox.getYExtent(), bbox.getZExtent());
}
/** /**
* Create a geometry suitable for visualizing the specified bounding box. * Create a geometry suitable for visualizing the specified bounding box.

@ -51,16 +51,7 @@ public class GeoMap implements Savable {
protected int width, height, maxval; protected int width, height, maxval;
public GeoMap() {} public GeoMap() {}
@Deprecated
public GeoMap(FloatBuffer heightData, int width, int height, int maxval){
hdata = new float[heightData.limit()];
heightData.get(hdata);
this.width = width;
this.height = height;
this.maxval = maxval;
}
public GeoMap(float[] heightData, int width, int height, int maxval){ public GeoMap(float[] heightData, int width, int height, int maxval){
this.hdata = heightData; this.hdata = heightData;
this.width = width; this.width = width;
@ -68,13 +59,6 @@ public class GeoMap implements Savable {
this.maxval = maxval; this.maxval = maxval;
} }
@Deprecated
public FloatBuffer getHeightData(){
if (!isLoaded())
return null;
return BufferUtils.createFloatBuffer(hdata);
}
public float[] getHeightArray(){ public float[] getHeightArray(){
if (!isLoaded()) if (!isLoaded())
return null; return null;

@ -69,11 +69,6 @@ public class LODGeomap extends GeoMap {
public LODGeomap() { public LODGeomap() {
} }
@Deprecated
public LODGeomap(int size, FloatBuffer heightMap) {
super(heightMap, size, size, 1);
}
public LODGeomap(int size, float[] heightMap) { public LODGeomap(int size, float[] heightMap) {
super(heightMap, size, size, 1); super(heightMap, size, size, 1);

@ -218,11 +218,6 @@ public class TerrainPatch extends Geometry {
return lodEntropy; return lodEntropy;
} }
@Deprecated
public FloatBuffer getHeightmap() {
return BufferUtils.createFloatBuffer(geomap.getHeightArray());
}
public float[] getHeightMap() { public float[] getHeightMap() {
return geomap.getHeightArray(); return geomap.getHeightArray();
} }

@ -161,21 +161,6 @@ public class TerrainQuad extends Node implements Terrain {
addControl(new NormalRecalcControl(this)); addControl(new NormalRecalcControl(this));
} }
/**
*
* @param name the name of the scene element. This is required for
* identification and comparison purposes.
* @param patchSize size of the individual patches
* @param quadSize
* @param totalSize the size of this entire terrain tree (on one side)
* @param heightMap The height map to generate the terrain from (a flat
* height map will be generated if this is null)
*/
@Deprecated
public TerrainQuad(String name, int patchSize, int quadSize, int totalSize, float[] heightMap) {
this(name, patchSize, totalSize, quadSize, Vector3f.UNIT_XYZ, heightMap);
}
/** /**
* *
* @param name the name of the scene element. This is required for * @param name the name of the scene element. This is required for

Loading…
Cancel
Save