List of changes/updates I made to certain classes pertaining to shaders/materials, etc. [Committed]

madjack · September 2, 2011, 6:48pm

While I had fun with shaders I stumbled into some minor problems and proceeded to fixing them. Those are, as I said, minor fixes and include things like parameter formatting when an exception is thrown, or in Logger, so it would be easier to find where the problem was coming from.

Anyway, here’s the list of things and their diffs. I can commit them if they’re accepted.

Material.java

[patch]

— Base (BASE)

+++ Locally Modified (Based On LOCAL)

@@ -374,7 +374,7 @@

if (type != null && paramDef.getVarType() != type) {

logger.log(Level.WARNING, "Material parameter being set: {0} with "

               + &quot;type {1} doesn't match definition type {2}&quot;, new Object[]{name, type.name(), paramDef.getVarType()} );<br />

               + &quot;type {1} doesn''t match definition types {2}&quot;, new Object[]{name, type.name(), paramDef.getVarType()} );<br />

}

return newName;

@@ -439,7 +439,7 @@

MatParamTexture val = getTextureParam(name);

if (val == null) {

       throw new IllegalArgumentException(&quot;The given texture parameter is not set.&quot;);<br />

       throw new IllegalArgumentException(&quot;The given texture for parameter &quot;&quot; + name + &quot;&quot; is null.&quot;);<br />

}

int texUnit = val.getUnit();

[/patch]

LwjglRenderer.java

[patch]

— Base (BASE)

+++ Locally Modified (Based On LOCAL)

@@ -792,7 +792,7 @@

if (loc < 0) {

uniform.setLocation(-1);

// uniform is not declared in shader

       logger.log(Level.INFO, &quot;Uniform {0} is not declared in shader.&quot;, uniform.getName());<br />

       logger.log(Level.INFO, &quot;Uniform {0} is not declared in shader {1}.&quot;, new Object[]{uniform.getName(), shader.getSources()});<br />

} else {

uniform.setLocation(loc);

}

[/patch]

VarType.java

[patch]

— Base (BASE)

+++ Locally Modified (Based On LOCAL)

@@ -54,6 +54,7 @@

TextureBuffer(false,true),

Texture2D(false,true),

Texture2DArray(false,true),

Texture3D(false,true),

TextureArray(false,true),

TextureCubeMap(false,true),

[/patch]

MatParam.java

[patch]

— Base (BASE)

+++ Locally Modified (Based On LOCAL)

@@ -181,9 +181,60 @@

case Vector2:

Vector2f v2 = (Vector2f) value;

return v2.getX() + " " + v2.getY();
```
 case Vector2Array: 
```

           Vector2f[] v2Arr = (Vector2f[]) value;<br />

           String v2str = &quot;&quot;;<br />

           for (int i = 0; i &lt; v2Arr.length ; i++) {<br />

               v2str += v2Arr<i>.getX() + &quot; &quot; + v2Arr<i>.getY() + &quot;n&quot;;<br />

```
 } 
```
```
 return v2str; 
```

case Vector3:

Vector3f v3 = (Vector3f) value;

return v3.getX() + " " + v3.getY() + " " + v3.getZ();

```
 case Vector3Array: 
```

           Vector3f[] v3Arr = (Vector3f[]) value;<br />

           String v3str = &quot;&quot;;<br />

           for (int i = 0; i &lt; v3Arr.length ; i++) {<br />

               v3str += v3Arr<i>.getX() + &quot; &quot;<br />

                       + v3Arr<i>.getY() + &quot; &quot;<br />

                       + v3Arr<i>.getZ() + &quot;n&quot;;<br />

```
 } 
```
```
 return v3str; 
```
```
 case Vector4Array: 
```

           // can be either ColorRGBA, Vector4f or Quaternion<br />

           if (value instanceof Vector4f) {<br />

               Vector4f[] v4arr = (Vector4f[]) value;<br />

               String v4str = &quot;&quot;;<br />

               for (int i = 0; i &lt; v4arr.length ; i++) {<br />

                   v4str += v4arr<i>.getX() + &quot; &quot;<br />

                           + v4arr<i>.getY() + &quot; &quot;<br />

                           + v4arr<i>.getZ() + &quot; &quot;<br />

                           + v4arr<i>.getW() + &quot;n&quot;;<br />

```
 } 
```
```
 return v4str; 
```

           } else if (value instanceof ColorRGBA) {<br />

               ColorRGBA[] colorArr = (ColorRGBA[]) value;<br />

               String colStr = &quot;&quot;;<br />

               for (int i = 0; i &lt; colorArr.length ; i++) {<br />

                   colStr += colorArr<i>.getRed() + &quot; &quot;<br />

                           + colorArr<i>.getGreen() + &quot; &quot;<br />

                           + colorArr<i>.getBlue() + &quot; &quot;<br />

                           + colorArr<i>.getAlpha() + &quot;n&quot;;<br />

```
 } 
```
```
 return colStr; 
```

           } else if (value instanceof Quaternion) {<br />

               Quaternion[] quatArr = (Quaternion[]) value;<br />

               String quatStr = &quot;&quot;;<br />

               for (int i = 0; i &lt; quatArr.length ; i++) {<br />

                   quatStr += quatArr<i>.getX() + &quot; &quot;<br />

                           + quatArr<i>.getY() + &quot; &quot;<br />

                           + quatArr<i>.getZ() + &quot; &quot;<br />

                           + quatArr<i>.getW() + &quot;n&quot;;<br />

```
 } 
```
```
 return quatStr; 
```
```
 } else { 
```

               throw new UnsupportedOperationException(&quot;Unexpected Vector4Array type: &quot; + value);<br />

```
 } 
```

case Vector4:

// can be either ColorRGBA, Vector4f or Quaternion

if (value instanceof Vector4f) {

[/patch]

RenderState.java

[patch]

— Base (BASE)

+++ Locally Modified (Based On LOCAL)

@@ -140,27 +140,27 @@

/**

Additive blending. For use with glows and particle emitters.

    * Result = Source Color + Destination Color<br />

    * Result = Source Color + Destination Color -&gt; (GL_ONE, GL_ONE)<br />

*/

Additive,

/**

Premultiplied alpha blending, for use with premult alpha textures.

    * Result = Source Color + (Dest Color * (1 - Source Alpha) )<br />

    * Result = Source Color + (Dest Color * (1 - Source Alpha) ) -&gt; (GL_ONE, GL_ONE_MINUS_SRC_ALPHA)<br />

*/

PremultAlpha,

/**

Additive blending that is multiplied with source alpha.
For use with glows and particle emitters.

    * Result = (Source Alpha * Source Color) + Dest Color<br />

    * Result = (Source Alpha * Source Color) + Dest Color -&gt; (GL_SRC_ALPHA, GL_ONE)<br />

*/

AlphaAdditive,

/**

Color blending, blends in color from dest color
using source color.

    * Result = Source Color + (1 - Source Color) * Dest Color<br />

    * Result = Source Color + (1 - Source Color) * Dest Color -&gt; (GL_ONE, GL_ONE_MINUS_SRC_COLOR)<br />

*/

Color,

/**

@@ -168,19 +168,19 @@

using source alpha.
Result = Source Alpha * Source Color +

    *          (1 - Source Alpha) * Dest Color<br />

    *          (1 - Source Alpha) * Dest Color -&gt; (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)<br />

*/

Alpha,

/**

Multiplies the source and dest colors.

    * Result = Source Color * Dest Color<br />

    * Result = Source Color * Dest Color -&gt; (GL_DST_COLOR, GL_ZERO)<br />

*/

Modulate,

/**

Multiplies the source and dest colors then doubles the result.

    * Result = 2 * Source Color * Dest Color<br />

    * Result = 2 * Source Color * Dest Color -&gt; (GL_DST_COLOR, GL_SRC_COLOR)<br />

/

ModulateX2

}

[/patch]

ColorRGBA.java (this one is mostly formatting, but at the end there are 2 new methods. A ColorRBGA to Vector3f and to Vector4f. toVector3f simply drops the Alpha value).

[patch]

— Base (BASE)

+++ Locally Modified (Based On LOCAL)

@@ -1,35 +1,32 @@

/

- Copyright © 2009-2010 jMonkeyEngine
- All rights reserved.

- Copyright © 2009-2010 jMonkeyEngine All rights reserved.
  
  *

Redistribution and use in source and binary forms, with or without

- modification, are permitted provided that the following conditions are
- met:

- modification, are permitted provided that the following conditions are met:
- *
- - Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
  
  *

- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
*

- Redistributions in binary form must reproduce the above copyright

- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.

- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
  
  *

- Neither the name of ‘jMonkeyEngine’ nor the names of its contributors

- may be used to endorse or promote products derived from this software
- without specific prior written permission.

- may be used to endorse or promote products derived from this software
- without specific prior written permission.
  
  *

- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
  
  */
  
  -
  
  package com.jme3.math;
  
  import com.jme3.export.InputCapsule;
  
  @@ -39,25 +36,24 @@
  
  import com.jme3.export.Savable;
  
  import java.io.IOException;
  
  -
  
  /**

- <code>ColorRGBA</code> defines a color made from a collection of
- red, green and blue values. An alpha value determines is transparency.
- All values must be between 0 and 1. If any value is set higher or lower
- than these constraints they are clamped to the min or max. That is, if
- a value smaller than zero is set the value clamps to zero. If a value
- higher than 1 is passed, that value is clamped to 1. However, because the
- attributes r, g, b, a are public for efficiency reasons, they can be
- directly modified with invalid values. The client should take care when
- directly addressing the values. A call to clamp will assure that the values
- are within the constraints.

- <code>ColorRGBA</code> defines a color made from a collection of red, green
- and blue values. An alpha value determines is transparency. All values must
- be between 0 and 1. If any value is set higher or lower than these
- constraints they are clamped to the min or max. That is, if a value smaller
- than zero is set the value clamps to zero. If a value higher than 1 is
- passed, that value is clamped to 1. However, because the attributes r, g, b,
- a are public for efficiency reasons, they can be directly modified with
- invalid values. The client should take care when directly addressing the
- values. A call to clamp will assure that the values are within the
- constraints.
*

@author Mark Powell
@version $Id: ColorRGBA.java,v 1.29 2007/09/09 18:25:14 irrisor Exp $

*/

public final class ColorRGBA implements Savable, Cloneable, java.io.Serializable {

static final long serialVersionUID = 1;

-

/**
the color black (0,0,0).

*/

@@ -105,21 +101,19 @@

/**
the color orange (251/255, 130/255,0).

*/

public static final ColorRGBA Orange = new ColorRGBA(251f/255f, 130f/255f, 0f, 1f);

public static final ColorRGBA Orange = new ColorRGBA(251f / 255f, 130f / 255f, 0f, 1f);

/**

the color brown (65/255, 40/255, 25/255).

*/

public static final ColorRGBA Brown = new ColorRGBA(65f/255f, 40f/255f, 25f/255f, 1f);

public static final ColorRGBA Brown = new ColorRGBA(65f / 255f, 40f / 255f, 25f / 255f, 1f);

/**

the color pink (1, 0.68, 0.68).

*/

public static final ColorRGBA Pink = new ColorRGBA(1f, 0.68f, 0.68f, 1f);

-

/**
the black color with no alpha (0, 0, 0, 0);

*/

public static final ColorRGBA BlackNoAlpha = new ColorRGBA(0f, 0f, 0f, 0f);

-

/**
The red component of the color.

*/

@@ -133,7 +127,7 @@

*/

public float b;

/**

* the alpha component of the color.  0 is transparent and 1 is opaque<br />

* the alpha component of the color. 0 is transparent and 1 is opaque<br />

*/

public float a;

@@ -201,7 +195,7 @@

@return this

*/

public ColorRGBA set(ColorRGBA rgba) {

```
 if(rgba == null) { 
```

```
 if (rgba == null) { 
```

r = 0;

g = 0;

b = 0;

@@ -254,7 +248,7 @@

@return the float array that contains the color elements.

*/

public float[] getColorArray() {

```
 return new float[] {r,g,b,a}; 
```

   return new float[]{r, g, b, a};<br />

}

/**

@@ -264,26 +258,26 @@

@return The float[] after storage.

*/

public float[] getColorArray(float[] store) {

```
 store[0]=r; 
```
```
 store[1]=g; 
```
```
 store[2]=b; 
```
```
 store[3]=a; 
```

```
 store[0] = r; 
```
```
 store[1] = g; 
```
```
 store[2] = b; 
```
```
 store[3] = a; 
```

return store;

}

public float getAlpha(){

public float getAlpha() {

return a;

}

public float getRed(){

public float getRed() {

return r;

}

public float getBlue(){

public float getBlue() {

return b;

}

public float getGreen(){

public float getGreen() {

return g;

}

@@ -294,11 +288,11 @@

@param changeAmnt An amount between 0.0 - 1.0 representing a precentage
change from this towards finalColor

*/

public void interpolate(ColorRGBA finalColor,float changeAmnt){

   this.r=(1-changeAmnt)*this.r + changeAmnt*finalColor.r;<br />

   this.g=(1-changeAmnt)*this.g + changeAmnt*finalColor.g;<br />

   this.b=(1-changeAmnt)*this.b + changeAmnt*finalColor.b;<br />

   this.a=(1-changeAmnt)*this.a + changeAmnt*finalColor.a;<br />

public void interpolate(ColorRGBA finalColor, float changeAmnt) {

   this.r = (1 - changeAmnt) * this.r + changeAmnt * finalColor.r;<br />

   this.g = (1 - changeAmnt) * this.g + changeAmnt * finalColor.g;<br />

   this.b = (1 - changeAmnt) * this.b + changeAmnt * finalColor.b;<br />

   this.a = (1 - changeAmnt) * this.a + changeAmnt * finalColor.a;<br />

}

/**

@@ -309,11 +303,11 @@

@param changeAmnt An amount between 0.0 - 1.0 representing a precentage
change from beginColor towards finalColor

*/

public void interpolate(ColorRGBA beginColor,ColorRGBA finalColor,float changeAmnt){

   this.r=(1-changeAmnt)*beginColor.r + changeAmnt*finalColor.r;<br />

   this.g=(1-changeAmnt)*beginColor.g + changeAmnt*finalColor.g;<br />

   this.b=(1-changeAmnt)*beginColor.b + changeAmnt*finalColor.b;<br />

   this.a=(1-changeAmnt)*beginColor.a + changeAmnt*finalColor.a;<br />

public void interpolate(ColorRGBA beginColor, ColorRGBA finalColor, float changeAmnt) {

   this.r = (1 - changeAmnt) * beginColor.r + changeAmnt * finalColor.r;<br />

   this.g = (1 - changeAmnt) * beginColor.g + changeAmnt * finalColor.g;<br />

   this.b = (1 - changeAmnt) * beginColor.b + changeAmnt * finalColor.b;<br />

   this.a = (1 - changeAmnt) * beginColor.a + changeAmnt * finalColor.a;<br />

}

/**

@@ -394,7 +388,7 @@

@return the string representation of this color.

*/

public String toString() {

   return &quot;Color[&quot;+r+&quot;, &quot;+g+&quot;, &quot;+b+&quot;, &quot;+a+&quot;]&quot;;<br />

   return &quot;Color[&quot; + r + &quot;, &quot; + g + &quot;, &quot; + b + &quot;, &quot; + a + &quot;]&quot;;<br />

}

@Override

@@ -433,19 +427,27 @@

@return true if the colors are equal, false otherwise.

*/

public boolean equals(Object o) {

   if( !(o instanceof ColorRGBA) ) {<br />

   if (!(o instanceof ColorRGBA)) {<br />

return false;

}

```
 if(this == o) { 
```

```
 if (this == o) { 
```

return true;

}

   ColorRGBA comp = (ColorRGBA)o;<br />

   if (Float.compare(r, comp.r) != 0) return false;<br />

   if (Float.compare(g, comp.g) != 0) return false;<br />

   if (Float.compare(b, comp.b) != 0) return false;<br />

   if (Float.compare(a, comp.a) != 0) return false;<br />

   ColorRGBA comp = (ColorRGBA) o;<br />

   if (Float.compare(r, comp.r) != 0) {<br />

```
 return false; 
```
```
 } 
```

   if (Float.compare(g, comp.g) != 0) {<br />

```
 return false; 
```
```
 } 
```

   if (Float.compare(b, comp.b) != 0) {<br />

```
 return false; 
```
```
 } 
```

   if (Float.compare(a, comp.a) != 0) {<br />

```
 return false; 
```
```
 } 
```

return true;

}

@@ -464,7 +466,6 @@

return hash;

}

-

public void write(JmeExporter e) throws IOException {

OutputCapsule capsule = e.getCapsule(this);

capsule.write(r, "r", 0);

@@ -481,12 +482,12 @@

a = capsule.readFloat("a", 0);

}

public byte[] asBytesRGBA(){

public byte[] asBytesRGBA() {

byte[] store = new byte[4];

   store[0] = (byte)((int)(r * 255) &amp; 0xFF);<br />

   store[1] = (byte)((int)(g * 255) &amp; 0xFF);<br />

   store[2] = (byte)((int)(b * 255) &amp; 0xFF);<br />

   store[3] = (byte)((int)(a * 255) &amp; 0xFF);<br />

   store[0] = (byte) ((int) (r * 255) &amp; 0xFF);<br />

   store[1] = (byte) ((int) (g * 255) &amp; 0xFF);<br />

   store[2] = (byte) ((int) (b * 255) &amp; 0xFF);<br />

   store[3] = (byte) ((int) (a * 255) &amp; 0xFF);<br />

return store;

}

@@ -517,14 +518,36 @@

public void fromIntARGB(int color) {

a = ((byte) (color >> 24) & 0xFF) / 255f;

r = ((byte) (color >> 16) & 0xFF) / 255f;

   g = ((byte) (color &gt;&gt; 8)  &amp; 0xFF) / 255f;<br />

   b = ((byte) (color)       &amp; 0xFF) / 255f;<br />

   g = ((byte) (color &gt;&gt; 8) &amp; 0xFF) / 255f;<br />

   b = ((byte) (color) &amp; 0xFF) / 255f;<br />

}

public void fromIntRGBA(int color) {

r = ((byte) (color >> 24) & 0xFF) / 255f;

g = ((byte) (color >> 16) & 0xFF) / 255f;

   b = ((byte) (color &gt;&gt; 8)  &amp; 0xFF) / 255f;<br />

   a = ((byte) (color)       &amp; 0xFF) / 255f;<br />

   b = ((byte) (color &gt;&gt; 8) &amp; 0xFF) / 255f;<br />

   a = ((byte) (color) &amp; 0xFF) / 255f;<br />

}

+

/**

* Transform the current ColorRGBA to a Vector3f using<br />

* x = r, y = g, z = b. The Alpha value is not used.<br />

```
* 
```

* This method is useful to use for shaders assignment.<br />

* @return A Vector3f containing the RGB value of current color definition.<br />

```
*/ 
```
public Vector3f toVector3f() {
```
 return new Vector3f(r, g, b); 
```

}

+

/**

* Transform the current ColorRGBA to a Vector4f using<br />

```
* x = r, y = g, z = b, w = a. 
```
```
* 
```

* This method is useful to use for shaders assignment.<br />

* @return A Vector4f containing the RGBA value of current color definition.<br />

```
*/ 
```
public Vector4f toVector4f() {

   return new Vector4f(r, g, b, a);<br />

}

+}

[/patch]

There are a couple of other files, but they only contain formatting fixes (or missing parameters in Javadoc).

Anyway. Let me know if you want me to commit those or if I should modify/change or forget those additions/mods.

normen · September 2, 2011, 7:29pm

Looks good to me, go ahead

madjack · September 3, 2011, 9:59am

@normen I just realized the jME3 I got is not from https. Is there a way to change the local svn params so I won’t have to recheckout in https and redo the changes I made so I can commit them? I checked the subversion’s options and I can’t find a way to do this, maybe I could manually change the files or is it better to redo it from scratch?

madjack · September 3, 2011, 10:19am

I used “relocate”, seems to work. Hopefully I won’t be breaking anything.

Momoko_Fan · September 3, 2011, 7:01pm

Do note that I reverted some stuff. Specifically the adding of enums is not necessary since 3D texture arrays are not supported by OpenGL (and don’t exactly make sense either), and also because that change breaks J3O serialization.

madjack · September 3, 2011, 7:21pm

Ok, no probs.