Revert "Reformat Code"

This reverts commit e0f7dab34f.

app/src/main/java/com/hippo/glview/glrenderer/GLES11Canvas.java

@@ -62,8 +62,8 @@ public class GLES11Canvas implements GLCanvas {
     private static final int MSKEW_Y = 1;
     private static final int MSCALE_X = 0;
     private static final int MSCALE_Y = 5;
-    private static final float[] sCropRect = new float[4];
-    private static final GLId mGLId = new GLES11IdImpl();
+    private static float[] sCropRect = new float[4];
+    private static GLId mGLId = new GLES11IdImpl();
 
     static {
         float[] temp = {
@@ -98,12 +98,12 @@ public class GLES11Canvas implements GLCanvas {
         }
     }
 
-    private final float[] mMatrixValues = new float[16];
-    private final float[] mTextureMatrixValues = new float[16];
+    private final float mMatrixValues[] = new float[16];
+    private final float mTextureMatrixValues[] = new float[16];
     // The results of mapPoints are stored in this buffer, and the order is
     // x1, y1, x2, y2.
-    private final float[] mMapPointsBuffer = new float[4];
-    private final float[] mTextureColor = new float[4];
+    private final float mMapPointsBuffer[] = new float[4];
+    private final float mTextureColor[] = new float[4];
     private final ArrayList<RawTexture> mTargetStack = new ArrayList<RawTexture>();
     private final ArrayList<ConfigState> mRestoreStack = new ArrayList<ConfigState>();
     private final RectF mDrawTextureSourceRect = new RectF();
@@ -111,21 +111,21 @@ public class GLES11Canvas implements GLCanvas {
     private final float[] mTempMatrix = new float[32];
     private final IntList mUnboundTextures = new IntList();
     private final IntList mDeleteBuffers = new IntList();
-    private final GL11 mGL;
-    private final int mBoxCoords;
-    private final GLState mGLState;
-    private final boolean mBlendEnabled = true;
-    private final int[] mFrameBuffer = new int[1];
     // Drawing statistics
     int mCountDrawLine;
     int mCountFillRect;
     int mCountDrawMesh;
     int mCountTextureRect;
     int mCountTextureOES;
+    private GL11 mGL;
+    private int mBoxCoords;
+    private GLState mGLState;
     private float mAlpha;
     private ConfigState mRecycledRestoreAction;
     private int mScreenWidth;
     private int mScreenHeight;
+    private boolean mBlendEnabled = true;
+    private int mFrameBuffer[] = new int[1];
     private RawTexture mTargetTexture;
 
     public GLES11Canvas(GL11 gl) {
@@ -191,7 +191,7 @@ public class GLES11Canvas implements GLCanvas {
         }
     }
 
-    private static boolean isMatrixRotatedOrFlipped(float[] matrix) {
+    private static boolean isMatrixRotatedOrFlipped(float matrix[]) {
         final float eps = 1e-5f;
         return Math.abs(matrix[MSKEW_X]) > eps
                 || Math.abs(matrix[MSKEW_Y]) > eps
@@ -247,7 +247,7 @@ public class GLES11Canvas implements GLCanvas {
         gl.glMatrixMode(GL11.GL_MODELVIEW);
         gl.glLoadIdentity();
 
-        float[] matrix = mMatrixValues;
+        float matrix[] = mMatrixValues;
         Matrix.setIdentityM(matrix, 0);
         // to match the graphic coordinate system in android, we flip it vertically.
         if (mTargetTexture == null) {
@@ -408,7 +408,7 @@ public class GLES11Canvas implements GLCanvas {
     }
 
     @Override
-    public void multiplyMatrix(float[] matrix, int offset) {
+    public void multiplyMatrix(float matrix[], int offset) {
         float[] temp = mTempMatrix;
         Matrix.multiplyMM(temp, 0, mMatrixValues, 0, matrix, offset);
         System.arraycopy(temp, 0, mMatrixValues, 0, 16);
@@ -467,7 +467,7 @@ public class GLES11Canvas implements GLCanvas {
 
     // Transforms two points by the given matrix m. The result
     // {x1', y1', x2', y2'} are stored in mMapPointsBuffer and also returned.
-    private float[] mapPoints(float[] m, int x1, int y1, int x2, int y2) {
+    private float[] mapPoints(float m[], int x1, int y1, int x2, int y2) {
         float[] r = mMapPointsBuffer;
 
         // Multiply m and (x1 y1 0 1) to produce (x3 y3 z3 w3). z3 is unused.
@@ -506,7 +506,7 @@ public class GLES11Canvas implements GLCanvas {
             textureRect(x, y, width, height);
         } else {
             // draw the rect from bottom-left to top-right
-            float[] points = mapPoints(
+            float points[] = mapPoints(
                     mMatrixValues, x, y + height, x + width, y);
             x = (int) (points[0] + 0.5f);
             y = (int) (points[1] + 0.5f);
@@ -958,12 +958,13 @@ public class GLES11Canvas implements GLCanvas {
     private static class GLState {
 
         private final GL11 mGL;
-        private final boolean mLineSmooth = false;
+
         private int mTexEnvMode = GL11.GL_REPLACE;
         private float mTextureAlpha = 1.0f;
         private int mTextureTarget = GL11.GL_TEXTURE_2D;
         private boolean mBlendEnabled = true;
         private float mLineWidth = 1.0f;
+        private boolean mLineSmooth = false;
 
         public GLState(GL11 gl) {
             mGL = gl;
@@ -1058,7 +1059,7 @@ public class GLES11Canvas implements GLCanvas {
 
     private static class ConfigState {
         float mAlpha;
-        float[] mMatrix = new float[16];
+        float mMatrix[] = new float[16];
         ConfigState mNextFree;
 
         public void restore(GLES11Canvas canvas) {