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

* @SuppressWarnings("fallthrough") to prevent warnings

Browse Source 
* Fixed rest of the warnings

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7241 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..rd 2011-04-14 03:37:05 +00:00
parent 7dd3d52e9e
commit d729da9e78
7 changed files with 273 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/src/core-plugins/com/jme3/export/binary/BinaryOutputCapsule.java
View File

@ -416,6 +416,13 @@ final class BinaryOutputCapsule implements OutputCapsule {
return Arrays.equals(bytes, other);
}
@Override
public int hashCode() {
int hash = 7;
hash = 23 * hash + Arrays.hashCode(this.bytes);
return hash;
}
public void finish() {
// renamed to finish as 'finalize' in java.lang.Object should not be
// overridden like this

10
engine/src/core/com/jme3/math/Matrix3f.java
View File

@ -170,6 +170,7 @@ public final class Matrix3f implements Savable, Cloneable {
* the colum index.
* @return the value at (i, j).
*/
@SuppressWarnings("fallthrough")
public float get(int i, int j) {
switch (i) {
case 0:
@ -489,6 +490,7 @@ public final class Matrix3f implements Savable, Cloneable {
* the value for (i, j).
* @return this
*/
@SuppressWarnings("fallthrough")
public Matrix3f set(int i, int j, float value) {
switch (i) {
case 0:
@ -846,7 +848,6 @@ public final class Matrix3f implements Savable, Cloneable {
* @return This matrix, after the multiplication
*/
public Matrix3f multLocal(Matrix3f mat) {
return mult(mat, this);
}
@ -1050,8 +1051,9 @@ public final class Matrix3f implements Savable, Cloneable {
*
* @return the string representation of this object.
*/
@Override
public String toString() {
StringBuffer result = new StringBuffer("Matrix3f\n[\n");
StringBuilder result = new StringBuilder("Matrix3f\n[\n");
result.append(" ");
result.append(m00);
result.append(" ");
@ -1085,6 +1087,7 @@ public final class Matrix3f implements Savable, Cloneable {
* @return the hashcode for this instance of Matrix4f.
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
int hash = 37;
hash = 37 * hash + Float.floatToIntBits(m00);
@ -1109,6 +1112,7 @@ public final class Matrix3f implements Savable, Cloneable {
* the object to compare for equality
* @return true if they are equal
*/
@Override
public boolean equals(Object o) {
if (!(o instanceof Matrix3f) || o == null) {
return false;
@ -1270,7 +1274,7 @@ public final class Matrix3f implements Savable, Cloneable {
m22 *= scale.z;
}
static final boolean equalIdentity(Matrix3f mat) {
static boolean equalIdentity(Matrix3f mat) {
if (Math.abs(mat.m00 - 1) > 1e-4) return false;
if (Math.abs(mat.m11 - 1) > 1e-4) return false;
if (Math.abs(mat.m22 - 1) > 1e-4) return false;

2
engine/src/core/com/jme3/math/Matrix4f.java
View File

@ -280,6 +280,7 @@ public final class Matrix4f implements Savable, Cloneable {
* the colum index.
* @return the value at (i, j).
*/
@SuppressWarnings("fallthrough")
public float get(int i, int j) {
switch (i) {
case 0:
@ -450,6 +451,7 @@ public final class Matrix4f implements Savable, Cloneable {
* @param value
* the value for (i, j).
*/
@SuppressWarnings("fallthrough")
public void set(int i, int j, float value) {
switch (i) {
case 0:

1
engine/src/core/com/jme3/scene/shape/Surface.java
View File

@ -20,6 +20,7 @@ import com.jme3.util.BufferUtils;
* @author Marcin Roguski (Kealthas)
*/
public class Surface extends Mesh {
private SplineType type; //the type of the surface
private List<List<Vector4f>> controlPoints; //space control points and their weights
private List<Float>[] knots; //knots of the surface

4
engine/src/core/com/jme3/scene/shape/Torus.java
View File

@ -153,12 +153,8 @@ public class Torus extends Mesh {
float sinPhi = FastMath.sin(phi);
tempNormal.set(radialAxis).multLocal(cosPhi);
tempNormal.z += sinPhi;
if (true)
fnb.put(tempNormal.x).put(tempNormal.y).put(
tempNormal.z);
else
fnb.put(-tempNormal.x).put(-tempNormal.y)
.put(-tempNormal.z);
tempNormal.multLocal(innerRadius).addLocal(torusMiddle);
fpb.put(tempNormal.x).put(tempNormal.y).put(

3
engine/src/desktop-fx/com/jme3/shadow/PssmShadowRenderer.java
View File

@ -286,6 +286,7 @@ public class PssmShadowRenderer implements SceneProcessor {
this.direction.set(direction).normalizeLocal();
}
@SuppressWarnings("fallthrough")
public void postQueue(RenderQueue rq) {
GeometryList occluders = rq.getShadowQueueContent(ShadowMode.Cast);
if (occluders.size() == 0)
@ -317,6 +318,8 @@ public class PssmShadowRenderer implements SceneProcessor {
shadowCam.updateViewProjection();
PssmShadowUtil.updateFrustumSplits(splitsArray, viewCam.getFrustumNear(), zFar, lambda);
switch (splitsArray.length){
case 5:
splits.a = splitsArray[4];

5
engine/src/lwjgl-ogl/com/jme3/renderer/lwjgl/LwjglRenderer.java
View File

@ -82,6 +82,7 @@ import java.util.logging.Logger;
//import org.lwjgl.opengl.ARBVertexArrayObject;
//import org.lwjgl.opengl.ARBHalfFloatVertex;
//import org.lwjgl.opengl.ARBVertexArrayObject;
//import jme3tools.converters.MipMapGenerator;
import org.lwjgl.opengl.ARBDrawBuffers;
//import org.lwjgl.opengl.ARBDrawInstanced;
import org.lwjgl.opengl.ARBDrawInstanced;
@ -168,6 +169,7 @@ public class LwjglRenderer implements Renderer {
return caps;
}
@SuppressWarnings("fallthrough")
public void initialize() {
ContextCapabilities ctxCaps = GLContext.getCapabilities();
if (ctxCaps.OpenGL20) {
@ -1514,6 +1516,7 @@ public class LwjglRenderer implements Renderer {
}
}
@SuppressWarnings("fallthrough")
private void setupTextureParams(Texture tex) {
Image image = tex.getImage();
int target = convertTextureType(tex.getType(), image != null ? image.getMultiSamples() : 1);
@ -1618,6 +1621,8 @@ public class LwjglRenderer implements Renderer {
|| img.getWidth() != img.getHeight()){
logger.log(Level.WARNING, "Encountered NPOT texture {0}, "
+ "it might not display correctly.", img);
//MipMapGenerator.resizeToPowerOf2(img);
}
}
}