diff options
author | Michael Bien <[email protected]> | 2009-08-08 21:43:30 +0200 |
---|---|---|
committer | Michael Bien <[email protected]> | 2009-08-08 21:43:30 +0200 |
commit | 8ef9d7364a942c19ec5e1f306e08193e83f4fea6 (patch) | |
tree | 6dcf95825d2933992199a7062b15e38d3f721c95 /src/jogl/classes/javax/media/opengl/GLUniformData.java | |
parent | 2a8e9876ca4567de3b08813c280d006f9b2c32e6 (diff) | |
parent | fb3e50b4e7e11df911a83ab7966cf8f293c20da2 (diff) |
Merge branch 'master' of ssh://[email protected]/jogl~jogl-git
Diffstat (limited to 'src/jogl/classes/javax/media/opengl/GLUniformData.java')
-rw-r--r-- | src/jogl/classes/javax/media/opengl/GLUniformData.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLUniformData.java b/src/jogl/classes/javax/media/opengl/GLUniformData.java index 8b5fb1a03..f628ce35a 100644 --- a/src/jogl/classes/javax/media/opengl/GLUniformData.java +++ b/src/jogl/classes/javax/media/opengl/GLUniformData.java @@ -10,7 +10,7 @@ public class GLUniformData { * * Number of objects is 1 * - * @arg components number of elements of one object, ie 4 for GL_FLOAT_VEC4, + * @param components number of elements of one object, ie 4 for GL_FLOAT_VEC4, */ public GLUniformData(String name, int val) { init(name, 1, new Integer(val)); @@ -21,7 +21,7 @@ public class GLUniformData { * * Number of objects is 1 * - * @arg components number of elements of one object, ie 4 for GL_FLOAT_VEC4, + * @param components number of elements of one object, ie 4 for GL_FLOAT_VEC4, */ public GLUniformData(String name, float val) { init(name, 1, new Float(val)); @@ -32,7 +32,7 @@ public class GLUniformData { * * Number of objects is calculated by data.limit()/components * - * @arg components number of elements of one object, ie 4 for GL_FLOAT_VEC4, + * @param components number of elements of one object, ie 4 for GL_FLOAT_VEC4, */ public GLUniformData(String name, int components, IntBuffer data) { init(name, components, data); @@ -43,7 +43,7 @@ public class GLUniformData { * * Number of objects is calculated by data.limit()/components * - * @arg components number of elements of one object, ie 4 for GL_FLOAT_VEC4, + * @param components number of elements of one object, ie 4 for GL_FLOAT_VEC4, */ public GLUniformData(String name, int components, FloatBuffer data) { init(name, components, data); @@ -54,8 +54,8 @@ public class GLUniformData { * * Number of objects is calculated by data.limit()/(rows*columns) * - * @arg rows the matrix rows - * @arg column the matrix column + * @param rows the matrix rows + * @param column the matrix column */ public GLUniformData(String name, int rows, int columns, FloatBuffer data) { init(name, rows, columns, data); |