aboutsummaryrefslogtreecommitdiffstats
path: root/ardor3d-terrain
diff options
context:
space:
mode:
authorJulien Gouesse <[email protected]>2014-08-08 22:02:24 +0200
committerJulien Gouesse <[email protected]>2014-08-08 22:02:24 +0200
commitd8553c06068332a2e604f1336238e5cdf12c762c (patch)
treecbd1b37833a82868bd30621ba1cf053f2853c6ed /ardor3d-terrain
parent2835439b704b945e3121b5a9f17d207bc5b2c5ea (diff)
Removes tons of warnings
Diffstat (limited to 'ardor3d-terrain')
-rw-r--r--ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/Terrain.java1
-rw-r--r--ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/TerrainGridCache.java4
-rw-r--r--ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/TextureGridCache.java4
-rw-r--r--ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/Luminance12ToRGBFunction.java1
-rw-r--r--ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/Luminance8ToRGBFunction.java1
-rw-r--r--ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGB8ToRGBAFunction.java1
-rw-r--r--ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGB8ToRGBFunction.java1
-rw-r--r--ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGBA8ToRGBAFunction.java1
-rw-r--r--ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGBA8ToRGBFunction.java1
9 files changed, 15 insertions, 0 deletions
diff --git a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/Terrain.java b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/Terrain.java
index cad6281..48df204 100644
--- a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/Terrain.java
+++ b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/Terrain.java
@@ -445,6 +445,7 @@ public class Terrain extends Node implements Pickable {
}
_geometryClipmapShader.setShaderDataLogic(new GLSLShaderDataLogic() {
+ @Override
public void applyData(final GLSLShaderObjectsState shader, final Mesh mesh, final Renderer renderer) {
if (mesh instanceof ClipmapLevel) {
shader.setUniform("vertexDistance", (float) ((ClipmapLevel) mesh).getVertexDistance());
diff --git a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/TerrainGridCache.java b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/TerrainGridCache.java
index 8c03bdd..680a3dc 100644
--- a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/TerrainGridCache.java
+++ b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/TerrainGridCache.java
@@ -160,6 +160,7 @@ public class TerrainGridCache implements TerrainCache, Runnable {
return updateTiles;
}
+ @Override
public void setCurrentPosition(final int x, final int y) {
final int tileX = MathUtils.floor((float) x / tileSize);
final int tileY = MathUtils.floor((float) y / tileSize);
@@ -623,6 +624,7 @@ public class TerrainGridCache implements TerrainCache, Runnable {
}
}
+ @Override
public boolean isValid() {
int nrValid = 0;
for (final TileLoadingData data : currentTiles) {
@@ -633,10 +635,12 @@ public class TerrainGridCache implements TerrainCache, Runnable {
return nrValid != 0;
}
+ @Override
public void setMailBox(final DoubleBufferedList<Region> mailBox) {
this.mailBox = mailBox;
}
+ @Override
public void shutdown() {
exit = true;
started = false;
diff --git a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/TextureGridCache.java b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/TextureGridCache.java
index 27df40d..ee8612b 100644
--- a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/TextureGridCache.java
+++ b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/TextureGridCache.java
@@ -167,6 +167,7 @@ public class TextureGridCache implements TextureCache, Runnable {
return updateTiles;
}
+ @Override
public void setCurrentPosition(final int x, final int y) {
final int tileX = MathUtils.floor((float) x / tileSize);
final int tileY = MathUtils.floor((float) y / tileSize);
@@ -577,6 +578,7 @@ public class TextureGridCache implements TextureCache, Runnable {
}
}
+ @Override
public boolean isValid() {
int nrValid = 0;
for (final TileLoadingData data : currentTiles) {
@@ -587,6 +589,7 @@ public class TextureGridCache implements TextureCache, Runnable {
return nrValid != 0;
}
+ @Override
public void setMailBox(final DoubleBufferedList<Region> mailBox) {
this.mailBox = mailBox;
}
@@ -599,6 +602,7 @@ public class TextureGridCache implements TextureCache, Runnable {
this.function = function;
}
+ @Override
public void shutdown() {
exit = true;
started = false;
diff --git a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/Luminance12ToRGBFunction.java b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/Luminance12ToRGBFunction.java
index a2d5102..fc47c63 100644
--- a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/Luminance12ToRGBFunction.java
+++ b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/Luminance12ToRGBFunction.java
@@ -24,6 +24,7 @@ public class Luminance12ToRGBFunction implements SourceCacheFunction {
return INSTANCE;
}
+ @Override
public void doConversion(final ByteBuffer sourceData, final byte[] store, final int destX, final int destY,
final int dataSize, final int tileSize) {
final int offset = (destY * tileSize * dataSize + destX * tileSize) * 3;
diff --git a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/Luminance8ToRGBFunction.java b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/Luminance8ToRGBFunction.java
index 983851a..781f5db 100644
--- a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/Luminance8ToRGBFunction.java
+++ b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/Luminance8ToRGBFunction.java
@@ -23,6 +23,7 @@ public class Luminance8ToRGBFunction implements SourceCacheFunction {
return INSTANCE;
}
+ @Override
public void doConversion(final ByteBuffer sourceData, final byte[] store, final int destX, final int destY,
final int dataSize, final int tileSize) {
final int offset = (destY * tileSize * dataSize + destX * tileSize) * 3;
diff --git a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGB8ToRGBAFunction.java b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGB8ToRGBAFunction.java
index 836ae39..d03552b 100644
--- a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGB8ToRGBAFunction.java
+++ b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGB8ToRGBAFunction.java
@@ -23,6 +23,7 @@ public class RGB8ToRGBAFunction implements SourceCacheFunction {
return INSTANCE;
}
+ @Override
public void doConversion(final ByteBuffer sourceData, final byte[] store, final int destX, final int destY,
final int dataSize, final int tileSize) {
try {
diff --git a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGB8ToRGBFunction.java b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGB8ToRGBFunction.java
index 6a161f6..653411e 100644
--- a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGB8ToRGBFunction.java
+++ b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGB8ToRGBFunction.java
@@ -23,6 +23,7 @@ public class RGB8ToRGBFunction implements SourceCacheFunction {
return INSTANCE;
}
+ @Override
public void doConversion(final ByteBuffer sourceData, final byte[] store, final int destX, final int destY,
final int dataSize, final int tileSize) {
try {
diff --git a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGBA8ToRGBAFunction.java b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGBA8ToRGBAFunction.java
index 88ca47a..ec234f9 100644
--- a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGBA8ToRGBAFunction.java
+++ b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGBA8ToRGBAFunction.java
@@ -23,6 +23,7 @@ public class RGBA8ToRGBAFunction implements SourceCacheFunction {
return INSTANCE;
}
+ @Override
public void doConversion(final ByteBuffer sourceData, final byte[] store, final int destX, final int destY,
final int dataSize, final int tileSize) {
try {
diff --git a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGBA8ToRGBFunction.java b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGBA8ToRGBFunction.java
index 8c0c4df..7f613f4 100644
--- a/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGBA8ToRGBFunction.java
+++ b/ardor3d-terrain/src/main/java/com/ardor3d/extension/terrain/client/functions/RGBA8ToRGBFunction.java
@@ -23,6 +23,7 @@ public class RGBA8ToRGBFunction implements SourceCacheFunction {
return INSTANCE;
}
+ @Override
public void doConversion(final ByteBuffer sourceData, final byte[] store, final int destX, final int destY,
final int dataSize, final int tileSize) {
try {