aboutsummaryrefslogtreecommitdiffstats
path: root/ardor3d-effects/src
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-effects/src
parent2835439b704b945e3121b5a9f17d207bc5b2c5ea (diff)
Removes tons of warnings
Diffstat (limited to 'ardor3d-effects/src')
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/AnimationEntry.java3
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/Particle.java3
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/ParticleAppearanceRamp.java3
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/ParticleInfluence.java3
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/RampEntry.java3
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/TexAnimation.java3
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/LineSegmentEmitter.java3
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/MeshEmitter.java3
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/PointEmitter.java3
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/RectangleEmitter.java3
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/RingEmitter.java3
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/SavableParticleEmitter.java1
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/water/ProjectedGrid.java2
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/effect/water/WaterHeightGenerator.java1
-rw-r--r--ardor3d-effects/src/main/java/com/ardor3d/extension/shadow/map/ParallelSplitShadowMapPass.java2
15 files changed, 39 insertions, 0 deletions
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/AnimationEntry.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/AnimationEntry.java
index 13d2554..f304962 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/AnimationEntry.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/AnimationEntry.java
@@ -51,16 +51,19 @@ public class AnimationEntry implements Savable {
_rate = rate;
}
+ @Override
public Class<? extends AnimationEntry> getClassTag() {
return getClass();
}
+ @Override
public void read(final InputCapsule capsule) throws IOException {
_offset = capsule.readDouble("offsetMS", 0.05);
_rate = capsule.readDouble("rate", 0.2);
_frames = capsule.readIntArray("frames", null);
}
+ @Override
public void write(final OutputCapsule capsule) throws IOException {
capsule.write(_offset, "offsetMS", 0.05);
capsule.write(_rate, "rate", 0.2);
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/Particle.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/Particle.java
index 7099bae..4414b42 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/Particle.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/Particle.java
@@ -460,6 +460,7 @@ public class Particle implements Savable {
// Savable interface methods
// /////
+ @Override
public void write(final OutputCapsule capsule) throws IOException {
capsule.write(startIndex, "startIndex", 0);
capsule.write(_position, "position", new Vector3(Vector3.ZERO));
@@ -471,6 +472,7 @@ public class Particle implements Savable {
capsule.write(type, "type", ParticleSystem.ParticleType.Quad);
}
+ @Override
public void read(final InputCapsule capsule) throws IOException {
startIndex = capsule.readInt("startIndex", 0);
_position.set((Vector3) capsule.readSavable("position", new Vector3(Vector3.ZERO)));
@@ -482,6 +484,7 @@ public class Particle implements Savable {
type = capsule.readEnum("type", ParticleSystem.ParticleType.class, ParticleSystem.ParticleType.Quad);
}
+ @Override
public Class<? extends Particle> getClassTag() {
return this.getClass();
}
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/ParticleAppearanceRamp.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/ParticleAppearanceRamp.java
index c55f504..4d121cf 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/ParticleAppearanceRamp.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/ParticleAppearanceRamp.java
@@ -154,10 +154,12 @@ public class ParticleAppearanceRamp implements Savable {
}
}
+ @Override
public Class<? extends ParticleAppearanceRamp> getClassTag() {
return getClass();
}
+ @Override
public void read(final InputCapsule capsule) throws IOException {
_entries = capsule.readSavableList("entries", null);
if (_entries == null) {
@@ -165,6 +167,7 @@ public class ParticleAppearanceRamp implements Savable {
}
}
+ @Override
public void write(final OutputCapsule capsule) throws IOException {
capsule.writeSavableList(_entries, "entries", null);
}
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/ParticleInfluence.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/ParticleInfluence.java
index 3cd6906..ce0842b 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/ParticleInfluence.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/ParticleInfluence.java
@@ -69,14 +69,17 @@ public abstract class ParticleInfluence implements Savable {
*/
public abstract void apply(double dt, Particle particle, int index);
+ @Override
public void write(final OutputCapsule capsule) throws IOException {
capsule.write(_enabled, "enabled", true);
}
+ @Override
public void read(final InputCapsule capsule) throws IOException {
_enabled = capsule.readBoolean("enabled", true);
}
+ @Override
public Class<? extends ParticleInfluence> getClassTag() {
return this.getClass();
}
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/RampEntry.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/RampEntry.java
index 690532a..3801ba8 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/RampEntry.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/RampEntry.java
@@ -113,10 +113,12 @@ public class RampEntry implements Savable {
_offset = offset;
}
+ @Override
public Class<? extends RampEntry> getClassTag() {
return getClass();
}
+ @Override
public void read(final InputCapsule capsule) throws IOException {
_offset = capsule.readDouble("offsetMS", DEFAULT_OFFSET);
_size = capsule.readDouble("size", DEFAULT_SIZE);
@@ -125,6 +127,7 @@ public class RampEntry implements Savable {
_color = (ColorRGBA) capsule.readSavable("color", DEFAULT_COLOR);
}
+ @Override
public void write(final OutputCapsule capsule) throws IOException {
capsule.write(_offset, "offsetMS", DEFAULT_OFFSET);
capsule.write(_size, "size", DEFAULT_SIZE);
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/TexAnimation.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/TexAnimation.java
index 3b73b03..bfcc10a 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/TexAnimation.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/TexAnimation.java
@@ -73,10 +73,12 @@ public class TexAnimation implements Savable {
}
}
+ @Override
public Class<? extends TexAnimation> getClassTag() {
return getClass();
}
+ @Override
public void read(final InputCapsule capsule) throws IOException {
_entries = capsule.readSavableList("entries", null);
if (_entries == null) {
@@ -84,6 +86,7 @@ public class TexAnimation implements Savable {
}
}
+ @Override
public void write(final OutputCapsule capsule) throws IOException {
capsule.writeSavableList(_entries, "entries", null);
}
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/LineSegmentEmitter.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/LineSegmentEmitter.java
index 9e2a75c..8b91b29 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/LineSegmentEmitter.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/LineSegmentEmitter.java
@@ -41,6 +41,7 @@ public class LineSegmentEmitter extends SavableParticleEmitter {
return _source;
}
+ @Override
public Vector3 randomEmissionPoint(final Vector3 store) {
Vector3 rVal = store;
if (rVal == null) {
@@ -55,10 +56,12 @@ public class LineSegmentEmitter extends SavableParticleEmitter {
// Methods for Savable
// /////////////////
+ @Override
public void read(final InputCapsule capsule) throws IOException {
_source = (LineSegment3) capsule.readSavable("source", null);
}
+ @Override
public void write(final OutputCapsule capsule) throws IOException {
capsule.write(_source, "source", null);
}
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/MeshEmitter.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/MeshEmitter.java
index 48fb32d..2ef83dc 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/MeshEmitter.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/MeshEmitter.java
@@ -52,6 +52,7 @@ public class MeshEmitter extends SavableParticleEmitter {
return _onlyVertices;
}
+ @Override
public Vector3 randomEmissionPoint(final Vector3 store) {
Vector3 rVal = store;
if (rVal == null) {
@@ -70,11 +71,13 @@ public class MeshEmitter extends SavableParticleEmitter {
// Methods for Savable
// /////////////////
+ @Override
public void read(final InputCapsule capsule) throws IOException {
_source = (Mesh) capsule.readSavable("source", null);
_onlyVertices = capsule.readBoolean("onlyVertices", false);
}
+ @Override
public void write(final OutputCapsule capsule) throws IOException {
capsule.write(_source, "source", null);
capsule.write(_onlyVertices, "onlyVertices", false);
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/PointEmitter.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/PointEmitter.java
index 9e6b84d..2828532 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/PointEmitter.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/PointEmitter.java
@@ -20,6 +20,7 @@ public class PointEmitter extends SavableParticleEmitter {
public PointEmitter() {}
+ @Override
public Vector3 randomEmissionPoint(final Vector3 store) {
Vector3 rVal = store;
if (rVal == null) {
@@ -34,7 +35,9 @@ public class PointEmitter extends SavableParticleEmitter {
// Methods for Savable
// /////////////////
+ @Override
public void read(final InputCapsule capsule) throws IOException {}
+ @Override
public void write(final OutputCapsule capsule) throws IOException {}
}
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/RectangleEmitter.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/RectangleEmitter.java
index 18264f4..20750f1 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/RectangleEmitter.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/RectangleEmitter.java
@@ -41,6 +41,7 @@ public class RectangleEmitter extends SavableParticleEmitter {
return _source;
}
+ @Override
public Vector3 randomEmissionPoint(final Vector3 store) {
Vector3 rVal = store;
if (rVal == null) {
@@ -55,10 +56,12 @@ public class RectangleEmitter extends SavableParticleEmitter {
// Methods for Savable
// /////////////////
+ @Override
public void read(final InputCapsule capsule) throws IOException {
_source = (Rectangle3) capsule.readSavable("source", null);
}
+ @Override
public void write(final OutputCapsule capsule) throws IOException {
capsule.write(_source, "source", null);
}
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/RingEmitter.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/RingEmitter.java
index 738bb60..338aa7f 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/RingEmitter.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/RingEmitter.java
@@ -41,6 +41,7 @@ public class RingEmitter extends SavableParticleEmitter {
return _source;
}
+ @Override
public Vector3 randomEmissionPoint(final Vector3 store) {
Vector3 rVal = store;
if (rVal == null) {
@@ -55,10 +56,12 @@ public class RingEmitter extends SavableParticleEmitter {
// Methods for Savable
// /////////////////
+ @Override
public void read(final InputCapsule capsule) throws IOException {
_source = (Ring) capsule.readSavable("source", null);
}
+ @Override
public void write(final OutputCapsule capsule) throws IOException {
capsule.write(_source, "source", null);
}
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/SavableParticleEmitter.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/SavableParticleEmitter.java
index a11413a..27caa54 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/SavableParticleEmitter.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/particle/emitter/SavableParticleEmitter.java
@@ -18,6 +18,7 @@ public abstract class SavableParticleEmitter implements Savable, ParticleEmitter
// Methods for Savable
// /////////////////
+ @Override
public Class<? extends SavableParticleEmitter> getClassTag() {
return this.getClass();
}
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/water/ProjectedGrid.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/water/ProjectedGrid.java
index bfe48d5..98e9ba8 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/water/ProjectedGrid.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/water/ProjectedGrid.java
@@ -315,6 +315,7 @@ public class ProjectedGrid extends Mesh {
final int from = sizeY * i / (nrUpdateThreads);
final int to = sizeY * (i + 1) / (nrUpdateThreads);
final Future<?> future = executorService.submit(new Runnable() {
+ @Override
public void run() {
updateGrid(from, to);
}
@@ -631,6 +632,7 @@ public class ProjectedGrid extends Mesh {
namePrefix = "ProjectedGrid Pool-" + poolNumber.getAndIncrement() + "-thread-";
}
+ @Override
public Thread newThread(final Runnable r) {
final Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0);
if (!t.isDaemon()) {
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/water/WaterHeightGenerator.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/water/WaterHeightGenerator.java
index b7e86ef..2fe7839 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/water/WaterHeightGenerator.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/effect/water/WaterHeightGenerator.java
@@ -24,6 +24,7 @@ public class WaterHeightGenerator implements HeightGenerator {
private double speedbig = 0.5;
private int octaves = 2;
+ @Override
public double getHeight(final double x, final double z, final double time) {
final double zval = z * scaleybig * 4 + time * speedbig * 4;
double height = Math.sin(zval);
diff --git a/ardor3d-effects/src/main/java/com/ardor3d/extension/shadow/map/ParallelSplitShadowMapPass.java b/ardor3d-effects/src/main/java/com/ardor3d/extension/shadow/map/ParallelSplitShadowMapPass.java
index 96f452e..1c983fa 100644
--- a/ardor3d-effects/src/main/java/com/ardor3d/extension/shadow/map/ParallelSplitShadowMapPass.java
+++ b/ardor3d-effects/src/main/java/com/ardor3d/extension/shadow/map/ParallelSplitShadowMapPass.java
@@ -763,6 +763,7 @@ public class ParallelSplitShadowMapPass extends Pass {
private Face cullFace;
private boolean isVisible;
+ @Override
public void apply(final Renderable renderable) {
if (renderable instanceof Mesh) {
final Mesh mesh = (Mesh) renderable;
@@ -782,6 +783,7 @@ public class ParallelSplitShadowMapPass extends Pass {
}
}
+ @Override
public void restore(final Renderable renderable) {
if (renderable instanceof Mesh) {
final Mesh mesh = (Mesh) renderable;