up

Author: elect86

src/main/kotlin/glm_/glm.kt

@@ -88,66 +88,6 @@ class Java {
 
     companion object {
         @JvmField
-        val glm = Glm
-    }
-
-    object Glm :
-            mat2x2_operators,
-            mat3x3_operators,
-            mat4x4_operators,
-
-            func_common,
-            func_vector2_common,
-            func_vector3_common,
-            func_vector4_common,
-
-            func_vector1_relational,
-            func_vector2_relational,
-            func_vector3_relational,
-            func_vector4_relational,
-            func_vectorBoolean_relational,
-
-            func_matrix,
-
-            func_exponential,
-            func_geometric,
-            func_trigonometric,
-
-            matrix_transform,
-            quat_func,
-
-            epsilon,
-
-            componentWise,
-
-            round,
-
-            func_integer,
-
-            bitfield,
-
-            colorSpace,
-
-            gauss,
-
-            noise,
-
-            packing,
-            func_packing,
-
-            random {
-
-        @JvmField
-        val detail = Detail
-
-        @JvmField
-        val PI = kotlin.math.PI
-        @JvmField
-        val PIf = kotlin.math.PI.f
-
-        @JvmField
-        val epsilonF = 1.1920928955078125e-7f
-        @JvmField
-        val epsilon = 2.2204460492503131e-16
+        val glm = glm_.glm
     }
 }

src/test/java/glm_/Test.java

@@ -1,22 +1,23 @@
 package glm_;
 
-import glm_.Java.Glm;
 import glm_.mat4x4.Mat4;
 import glm_.vec2.Vec2;
 import glm_.vec3.Vec3;
 
-//import static glm.Java.glm;
+//import static glm_.glm;
+
+import static glm_.Java.glm;
 
 /**
  * Created by GBarbieri on 08.02.2017.
  */
 public class Test {
 
-    final static Glm glm = Glm.INSTANCE;
+//    final static Glm glm = Glm.INSTANCE;
 
     public static void main(String[] argvs) {
         glm.normalize(3.4);
-        Glm.detail.mod289(new Vec2());
+        glm.detail.mod289(new Vec2());
 
         Vec2 v = new Vec2(3, 4);