summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/com
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-10-04 03:31:18 +0200
committerSven Gothel <[email protected]>2012-10-04 03:31:18 +0200
commit4c9083b0766ef94643d91102fb91a5f9e598a914 (patch)
treec040c4c6e30ee920ad9b843a55e0377b4d587632 /src/jogl/classes/com
parent65a94fb5d05c6997126bcaabd21c7f1814f6f203 (diff)
Fix regression of commit a644d779ab19cb1d200ae4ba567b9c042c34b337, cannot compile FixedFuncHook due to removed 'isDirty()'
- getModifiedBits() -> getModifiedBits(boolean clear)
Diffstat (limited to 'src/jogl/classes/com')
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
index eb4231533..686dd3895 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
@@ -933,19 +933,22 @@ public class PMVMatrix implements GLMatrixFunc {
}
/**
- * Returns the modified bits due to mutable operations and clears it.
+ * Returns the modified bits due to mutable operations..
* <p>
* A modified bit is set, if the corresponding matrix had been modified by a mutable operation
- * since last {@link #update()} or {@link #getModifiedBits()} call.
+ * since last {@link #update()} or {@link #getModifiedBits(boolean) getModifiedBits(true)} call.
* </p>
+ * @param clear if true, clears the modified bits, otherwise leaves them untouched.
*
* @see #MODIFIED_PROJECTION
* @see #MODIFIED_MODELVIEW
* @see #MODIFIED_TEXTURE
*/
- public final int getModifiedBits() {
+ public final int getModifiedBits(boolean clear) {
final int r = modifiedBits;
- modifiedBits = 0;
+ if(clear) {
+ modifiedBits = 0;
+ }
return r;
}
@@ -1024,7 +1027,7 @@ public class PMVMatrix implements GLMatrixFunc {
* {@link #glGetMviMatrixf() Mvi get} or {@link #glGetMvitMatrixf() Mvit get} etc anymore.
* </p>
* <p>
- * This method clears the modified bits like {@link #getModifiedBits()},
+ * This method clears the modified bits like {@link #getModifiedBits(boolean) getModifiedBits(true)},
* which are set by any mutable operation. The modified bits have no impact
* on this method, but the return value.
* </p>
@@ -1034,7 +1037,7 @@ public class PMVMatrix implements GLMatrixFunc {
* In other words, method returns true if any matrix used by the caller must be updated,
* e.g. uniforms in a shader program.
*
- * @see #getModifiedBits()
+ * @see #getModifiedBits(boolean)
* @see #MODIFIED_PROJECTION
* @see #MODIFIED_MODELVIEW
* @see #MODIFIED_TEXTURE