Merge branch 'master' of github.com:ClearVolume/ClearGL

Author: skalarproduktraum

build.gradle

@@ -7,15 +7,15 @@ buildscript {
 plugins {
     id "com.jfrog.bintray" version "1.2"
     id "us.kirchmeier.capsule" version "1.0.2"
-//    id "com.diffplug.gradle.spotless" version "3.1.0"
+    id "com.diffplug.gradle.spotless" version "3.1.0"
 }
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'maven'
 apply plugin: 'maven-publish'
-//apply plugin: 'com.diffplug.gradle.spotless'
+apply plugin: 'com.diffplug.gradle.spotless'
 
 
 //***********************************************************************************
@@ -165,19 +165,18 @@ apply from: 'gradle/install-git-hooks.gradle'
 
 //***********************************************************************************
 // SPOTLESS:
-// TODO: Fix code style so it doesn't want to rewrite all of ClearGL
-// spotless {
-//    java {
-//        //licenseHeader '/* Licensed under Apache-2.0 */' // License header
-// 
-//        importOrder(['java', 'javax', 'com', 'org'])
-//
-//        removeUnusedImports() // removes any unused imports
-//
-//        eclipseFormatFile 'cleargl-eclipse-formatter.xml'  
-//    }
-//}
 
+spotless {
+    java {
+        //licenseHeader '/* Licensed under Apache-2.0 */' // License header
+ 
+        importOrder(['java', 'javax', 'com', 'org'])
+
+        removeUnusedImports() // removes any unused imports
+
+        eclipseFormatFile 'cleargl-eclipse-formatter.xml'  
+    }
+}
 
 //***********************************************************************************
 // UPLOAD TO FIJI REPO:

src/main/java/cleargl/GLMatrix.java

@@ -1,14 +1,12 @@
 package cleargl;
 
+import static java.lang.Math.*;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
 import com.jogamp.opengl.math.FloatUtil;
 import com.jogamp.opengl.math.Quaternion;
 import com.jogamp.opengl.math.VectorUtil;
 
-import java.io.Serializable;
-import java.nio.ByteBuffer;
-
-import static java.lang.Math.*;
-
 public class GLMatrix implements Serializable {
 
 	private final float[] mMatrix;
@@ -96,7 +94,8 @@ public void multinv(final GLMatrix pGLMatrix) {
 		mult(pGLMatrix);
 	}
 
-	public GLMatrix setFrustumMatrix(final float left, final float right, final float bottom, final float top, final float near, final float far) {
+	public GLMatrix setFrustumMatrix(final float left, final float right, final float bottom, final float top,
+			final float near, final float far) {
 		FloatUtil.makeFrustum(mMatrix, 0, true, left, right, bottom, top, near, far);
 
 		return this;
@@ -178,18 +177,19 @@ public GLMatrix setGeneralizedPerspectiveProjectionMatrix(final GLVector lowerLe
 		float top = Math.abs(lowerLeft.minus(upperLeft).y()) - res.y();
 		float n = -res.z();
 
-		float s = 0.1f/n;
+		float s = 0.1f / n;
 
-		System.err.println(eye + ", " + (right + res.x()) + "/" + (top + res.y()) + " => " + distance + "/" + n + " -> " + left + "/" + right + "/"+bottom+"/"+top + ", s=" + s);
-		FloatUtil.makeFrustum(mMatrix, 0, true, left*s, right*s, bottom*s, top*s, n*s, far);
+		System.err.println(eye + ", " + (right + res.x()) + "/" + (top + res.y()) + " => " + distance + "/" + n + " -> "
+				+ left + "/" + right + "/" + bottom + "/" + top + ", s=" + s);
+		FloatUtil.makeFrustum(mMatrix, 0, true, left * s, right * s, bottom * s, top * s, n * s, far);
 
-		final GLMatrix flip = new GLMatrix(new float[] {
+		final GLMatrix flip = new GLMatrix(new float[]{
 				1.0f, 0.0f, 0.0f, 0.0f,
 				0.0f, 1.0f, 0.0f, 0.0f,
 				0.0f, 0.0f, -1.0f, 0.0f,
 				0.0f, 0.0f, 1.0f, 1.0f});
 
-//		this.mult(flip);
+		// this.mult(flip);
 		return this;
 	}
 
@@ -604,12 +604,12 @@ public ByteBuffer put(ByteBuffer buffer) {
 	}
 
 	public ByteBuffer toBuffer() {
-	  ByteBuffer b = ByteBuffer.allocateDirect(16*4);
-	  b.asFloatBuffer().put(mMatrix);
-	  b.position(0);
-	  b.limit(16*4);
+		ByteBuffer b = ByteBuffer.allocateDirect(16 * 4);
+		b.asFloatBuffer().put(mMatrix);
+		b.position(0);
+		b.limit(16 * 4);
 
-	  return b;
+		return b;
 	}
 
 }