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

* Reverted r8152, r8157 and r8158

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8159 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..rd 2011-09-03 18:52:56 +00:00
parent df7d2684fd
commit 5a3f191135
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/src/core/com/jme3/material/MatParam.java
View File

@ -181,6 +181,10 @@ public class MatParam implements Savable, Cloneable {
case Vector2: case Vector2:
Vector2f v2 = (Vector2f) value; Vector2f v2 = (Vector2f) value;
return v2.getX() + " " + v2.getY(); return v2.getX() + " " + v2.getY();
/*
This may get used at a later point of time
When arrays can be inserted in J3M files
case Vector2Array: case Vector2Array:
Vector2f[] v2Arr = (Vector2f[]) value; Vector2f[] v2Arr = (Vector2f[]) value;
String v2str = ""; String v2str = "";
@ -188,9 +192,11 @@ public class MatParam implements Savable, Cloneable {
v2str += v2Arr[i].getX() + " " + v2Arr[i].getY() + "\n"; v2str += v2Arr[i].getX() + " " + v2Arr[i].getY() + "\n";
} }
return v2str; return v2str;
*/
case Vector3: case Vector3:
Vector3f v3 = (Vector3f) value; Vector3f v3 = (Vector3f) value;
return v3.getX() + " " + v3.getY() + " " + v3.getZ(); return v3.getX() + " " + v3.getY() + " " + v3.getZ();
/*
case Vector3Array: case Vector3Array:
Vector3f[] v3Arr = (Vector3f[]) value; Vector3f[] v3Arr = (Vector3f[]) value;
String v3str = ""; String v3str = "";
@ -235,6 +241,7 @@ public class MatParam implements Savable, Cloneable {
} else { } else {
throw new UnsupportedOperationException("Unexpected Vector4Array type: " + value); throw new UnsupportedOperationException("Unexpected Vector4Array type: " + value);
} }
*/
case Vector4: case Vector4:
// can be either ColorRGBA, Vector4f or Quaternion // can be either ColorRGBA, Vector4f or Quaternion
if (value instanceof Vector4f) { if (value instanceof Vector4f) {

2
engine/src/core/com/jme3/shader/VarType.java
View File

@ -54,9 +54,7 @@ public enum VarType {
TextureBuffer(false,true), TextureBuffer(false,true),
Texture2D(false,true), Texture2D(false,true),
Texture2DArray(false,true),
Texture3D(false,true), Texture3D(false,true),
Texture3DArray(false,true),
TextureArray(false,true), TextureArray(false,true),
TextureCubeMap(false,true), TextureCubeMap(false,true),
Int; Int;

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

@ -792,7 +792,7 @@ public class LwjglRenderer implements Renderer {
if (loc < 0) { if (loc < 0) {
uniform.setLocation(-1); uniform.setLocation(-1);
// uniform is not declared in shader // uniform is not declared in shader
logger.log(Level.INFO, "Uniform {0} is not declared in shader {1}.", new Object[]{uniform.getName(), shader.getSources()}); logger.log(Level.INFO, "Uniform {0} is not declared in shader.", uniform.getName());
} else { } else {
uniform.setLocation(loc); uniform.setLocation(loc);
} }