commit 1535f677a1c552eac943efd9a4674dcff87809a0 Author: Leszek Koltunski Date: Thu Feb 27 22:46:46 2020 +0000 Minor. diff --git a/src/main/java/org/distorted/examples/generic/GenericMeshList.java b/src/main/java/org/distorted/examples/generic/GenericMeshList.java index 832e3ef..c8fb76f 100644 --- a/src/main/java/org/distorted/examples/generic/GenericMeshList.java +++ b/src/main/java/org/distorted/examples/generic/GenericMeshList.java @@ -31,16 +31,15 @@ import org.distorted.library.type.Static4D; public enum GenericMeshList { - CUBES ( "Cubes" , 3 ), - RECTANGLES ( "Rectangles" , 2 ), - SPHERE ( "Sphere" , 1 ), - QUAD ( "Quad" , 0 ), - TRIANGLES ( "Triangles" , 1 ), + Cubes ( 3 ), + Rectangles ( 2 ), + Sphere ( 1 ), + Quad ( 0 ), + Triangles ( 1 ), ; static final int LENGTH = values().length; private static final GenericMeshList[] meshes; - private String mName; private int mDimension; static @@ -56,9 +55,8 @@ public enum GenericMeshList /////////////////////////////////////////////////////////////////////////////////////////////////// - GenericMeshList(String name, int dim ) + GenericMeshList( int dim ) { - mName = name; mDimension = dim; } @@ -66,7 +64,7 @@ public enum GenericMeshList static String getName(int ordinal) { - return meshes[ordinal].mName; + return meshes[ordinal].name(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -86,7 +84,7 @@ public enum GenericMeshList switch( meshes[ordinal] ) { - case CUBES : if( bitmapID!=-1 ) + case Cubes : if( bitmapID!=-1 ) { mesh = new MeshCubes(cols, str, slic); } @@ -100,16 +98,16 @@ public enum GenericMeshList } mesh.setStretch(cols,rows,slic); break; - case RECTANGLES: mesh = new MeshRectangles(cols,rows); + case Rectangles: mesh = new MeshRectangles(cols,rows); mesh.setStretch(cols,rows,0); break; - case SPHERE : mesh = new MeshSphere(rows); + case Sphere : mesh = new MeshSphere(rows); mesh.setStretch(rows,rows,rows); break; - case QUAD : mesh = new MeshQuad(); + case Quad : mesh = new MeshQuad(); mesh.setStretch(1,1,0); break; - case TRIANGLES : mesh = new MeshTriangles(rows); + case Triangles : mesh = new MeshTriangles(rows); mesh.setStretch(rows,rows,0); break; default: mesh = null; diff --git a/src/main/java/org/distorted/examples/generic/GenericRenderer.java b/src/main/java/org/distorted/examples/generic/GenericRenderer.java index cca9b0b..557a94f 100644 --- a/src/main/java/org/distorted/examples/generic/GenericRenderer.java +++ b/src/main/java/org/distorted/examples/generic/GenericRenderer.java @@ -158,7 +158,7 @@ class GenericRenderer implements GLSurfaceView.Renderer void resetMatrixEffects() { - Static3D rotateObj = new Static3D( (float)mObjWidth/2, (float)mObjHeight/2, (float)mObjDepth/2 ); + Static3D rotateObj = new Static3D( mObjWidth/2, mObjHeight/2, mObjDepth/2 ); MatrixEffectQuaternion quat1obj = new MatrixEffectQuaternion(mQuat1, rotateObj); MatrixEffectQuaternion quat2obj = new MatrixEffectQuaternion(mQuat2, rotateObj); diff --git a/src/main/java/org/distorted/examples/inflate/InflateMeshList.java b/src/main/java/org/distorted/examples/inflate/InflateMeshList.java index f4e4c2d..4b7da3c 100644 --- a/src/main/java/org/distorted/examples/inflate/InflateMeshList.java +++ b/src/main/java/org/distorted/examples/inflate/InflateMeshList.java @@ -31,16 +31,15 @@ import org.distorted.library.type.Static4D; public enum InflateMeshList { - CUBES ( "Cubes" , 3 ), - RECTANGLES ( "Rectangles" , 2 ), - SPHERE ( "Sphere" , 1 ), - QUAD ( "Quad" , 0 ), - TRIANGLES ( "Triangles" , 1 ), + Cubes ( 3 ), + Rectangles ( 2 ), + Sphere ( 1 ), + Quad ( 0 ), + Triangles ( 1 ), ; static final int LENGTH = values().length; private static final InflateMeshList[] meshes; - private String mName; private int mDimension; static @@ -56,9 +55,8 @@ public enum InflateMeshList /////////////////////////////////////////////////////////////////////////////////////////////////// - InflateMeshList(String name, int dim ) + InflateMeshList( int dim ) { - mName = name; mDimension = dim; } @@ -66,7 +64,7 @@ public enum InflateMeshList static String getName(int ordinal) { - return meshes[ordinal].mName; + return meshes[ordinal].name(); } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -86,7 +84,7 @@ public enum InflateMeshList switch( meshes[ordinal] ) { - case CUBES : if( bitmapID!=-1 ) + case Cubes : if( bitmapID!=-1 ) { mesh = new MeshCubes(cols, str, slic); } @@ -100,16 +98,16 @@ public enum InflateMeshList } mesh.setStretch(cols,rows,slic); break; - case RECTANGLES: mesh = new MeshRectangles(cols,rows); + case Rectangles: mesh = new MeshRectangles(cols,rows); mesh.setStretch(cols,rows,0); break; - case SPHERE : mesh = new MeshSphere(rows); + case Sphere : mesh = new MeshSphere(rows); mesh.setStretch(rows,rows,rows); break; - case QUAD : mesh = new MeshQuad(); + case Quad : mesh = new MeshQuad(); mesh.setStretch(1,1,0); break; - case TRIANGLES : mesh = new MeshTriangles(rows); + case Triangles : mesh = new MeshTriangles(rows); mesh.setStretch(rows,rows,0); break; default: mesh = null; diff --git a/src/main/java/org/distorted/examples/inflate/InflateRenderer.java b/src/main/java/org/distorted/examples/inflate/InflateRenderer.java index 326904d..9341cbc 100644 --- a/src/main/java/org/distorted/examples/inflate/InflateRenderer.java +++ b/src/main/java/org/distorted/examples/inflate/InflateRenderer.java @@ -116,7 +116,7 @@ class InflateRenderer implements GLSurfaceView.Renderer float factor = ( width*mObjHeight > height*mObjWidth ) ? (SCALE*height)/mObjHeight : (SCALE*width)/mObjWidth; mMove.set( (width-factor*mObjWidth)/2 , (height-factor*mObjHeight)/2 , -factor*mObjDepth/2 ); mScale.set(factor,factor,factor); - mCenter.set( (float)mObjWidth/2, (float)mObjHeight/2, (float)mObjDepth/2 ); + mCenter.set( mObjWidth/2, mObjHeight/2, mObjDepth/2 ); mScreen.resize(width, height); }