diff options
| author | Sven Gothel <[email protected]> | 2013-10-18 09:43:24 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-10-18 09:43:24 +0200 |
| commit | c6b8ad4a8972f62fb8d0c1dcd7eca1de24393028 (patch) | |
| tree | b09aac018616200214b8d5518df4dcb2f2c9822a /src/jogl/classes/com/jogamp | |
| parent | 1c51abc1872b3cb984800fd76941a82dacd9e7b1 (diff) | |
| parent | 6aaca0f31eb25938ffab92dd19ffcaacbe5768d9 (diff) | |
Merge remote-tracking branch 'hharrison/master'
Diffstat (limited to 'src/jogl/classes/com/jogamp')
3 files changed, 2 insertions, 4 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java index 78cbb18cf..52a59c599 100644 --- a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java +++ b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java @@ -361,7 +361,7 @@ public class Quaternion { y = (m[6] - m[2]) * S; z = (m[1] - m[3]) * S; } else { - if ((m[0] > m[4]) & (m[0] > m[8])) { + if ((m[0] > m[4]) && (m[0] > m[8])) { final float S = FloatUtil.sqrt(1.0f + m[0] - m[4] - m[8]) * 2f; // S=4*qx w = (m[7] - m[5]) / S; x = 0.25f * S; diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java b/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java index 418d7fa81..b9903ac6d 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java +++ b/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java @@ -619,8 +619,6 @@ public class GLBuffers extends Buffers { case GL2GL3.GL_UNSIGNED_SHORT_4_4_4_4_REV: case GL2GL3.GL_UNSIGNED_SHORT_5_5_5_1: case GL2GL3.GL_UNSIGNED_SHORT_1_5_5_5_REV: - compSize = 2; - compCount = 1; case GL2.GL_UNSIGNED_SHORT_8_8_APPLE: case GL2.GL_UNSIGNED_SHORT_8_8_REV_APPLE: compSize = 2; diff --git a/src/jogl/classes/com/jogamp/opengl/util/RandomTileRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/RandomTileRenderer.java index b00866dd9..1c87dad4e 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/RandomTileRenderer.java +++ b/src/jogl/classes/com/jogamp/opengl/util/RandomTileRenderer.java @@ -76,7 +76,7 @@ public class RandomTileRenderer extends TileRendererBase { * @throws IllegalArgumentException is tile x/y are < 0 or tile size is <= 0x0 */ public void setTileRect(int tX, int tY, int tWidth, int tHeight) throws IllegalStateException, IllegalArgumentException { - if( 0 > tX || 0 > tX ) { + if( 0 > tX || 0 > tY ) { throw new IllegalArgumentException("Tile pos must be >= 0/0"); } if( 0 >= tWidth || 0 >= tHeight ) { |