diff options
Diffstat (limited to 'src/jogl/classes/jogamp')
3 files changed, 12 insertions, 10 deletions
diff --git a/src/jogl/classes/jogamp/graph/curve/tess/HEdge.java b/src/jogl/classes/jogamp/graph/curve/tess/HEdge.java index 3bdf54590..4976fd1fc 100644 --- a/src/jogl/classes/jogamp/graph/curve/tess/HEdge.java +++ b/src/jogl/classes/jogamp/graph/curve/tess/HEdge.java @@ -32,9 +32,9 @@ import com.jogamp.graph.geom.Triangle; public class HEdge { - public static int BOUNDARY = 3; - public static int INNER = 1; - public static int HOLE = 2; + public static final int BOUNDARY = 3; + public static final int INNER = 1; + public static final int HOLE = 2; private GraphVertex vert; private HEdge prev = null; diff --git a/src/jogl/classes/jogamp/opengl/glu/GLUquadricImpl.java b/src/jogl/classes/jogamp/opengl/glu/GLUquadricImpl.java index 977881e6b..a6952ec5a 100644 --- a/src/jogl/classes/jogamp/opengl/glu/GLUquadricImpl.java +++ b/src/jogl/classes/jogamp/opengl/glu/GLUquadricImpl.java @@ -119,6 +119,7 @@ import javax.media.opengl.GL; import javax.media.opengl.glu.GLU; import javax.media.opengl.glu.GLUquadric; +import com.jogamp.opengl.math.FloatUtil; import com.jogamp.opengl.util.ImmModeSink; import com.jogamp.opengl.util.glsl.ShaderState; @@ -375,7 +376,7 @@ public class GLUquadricImpl implements GLUquadric { nsign = 1.0f; } - da = 2.0f * PI / slices; + da = PI_2 / slices; dr = (topRadius - baseRadius) / stacks; dz = height / stacks; nz = (baseRadius - topRadius) / height; @@ -519,7 +520,7 @@ public class GLUquadricImpl implements GLUquadric { } } - da = 2.0f * PI / slices; + da = PI_2 / slices; dr = (outerRadius - innerRadius) / loops; switch (drawStyle) { @@ -971,7 +972,7 @@ public class GLUquadricImpl implements GLUquadric { } drho = PI / stacks; - dtheta = 2.0f * PI / slices; + dtheta = PI_2 / slices; if (drawStyle == GLU.GLU_FILL) { if (!textureFlag) { @@ -1118,7 +1119,8 @@ public class GLUquadricImpl implements GLUquadric { // Internals only below this point // - private static final float PI = (float)Math.PI; + private static final float PI = FloatUtil.PI; + private static final float PI_2 = 2f * FloatUtil.PI; private static final int CACHE_SIZE = 240; private final void glBegin(final GL gl, final int mode) { diff --git a/src/jogl/classes/jogamp/opengl/util/pngj/PngHelperInternal.java b/src/jogl/classes/jogamp/opengl/util/pngj/PngHelperInternal.java index f1bee1957..48e5e8517 100644 --- a/src/jogl/classes/jogamp/opengl/util/pngj/PngHelperInternal.java +++ b/src/jogl/classes/jogamp/opengl/util/pngj/PngHelperInternal.java @@ -16,13 +16,13 @@ public class PngHelperInternal { /**
* Default charset, used internally by PNG for several things
*/
- public static Charset charsetLatin1 = Charset.forName("ISO-8859-1");
+ public static final Charset charsetLatin1 = Charset.forName("ISO-8859-1");
/**
* UTF-8 is only used for some chunks
*/
- public static Charset charsetUTF8 = Charset.forName("UTF-8");
+ public static final Charset charsetUTF8 = Charset.forName("UTF-8");
- static boolean DEBUG = false;
+ static final boolean DEBUG = false;
/**
* PNG magic bytes
|