remove dependency from GL renderer

Author: riccardobl

jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/DracoMeshCompressionExtensionLoader.java

@@ -51,7 +51,6 @@
 import com.jme3.asset.AssetLoadException;
 import com.jme3.plugins.json.JsonElement;
 import com.jme3.plugins.json.JsonObject;
-import com.jme3.renderer.opengl.GL;
 import com.jme3.scene.Mesh;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.scene.VertexBuffer.Type;
@@ -216,15 +215,16 @@ private static DracoMesh readDracoMesh(GltfLoader loader, JsonElement extension)
 	 */
 	VertexBuffer createIndicesVertexBuffer(GltfLoader loader, int componentType, int indices[]) {
 		Buffer data = null;
-		if (componentType == GL.GL_UNSIGNED_BYTE) {
+		if (componentType == GltfConstants.GL_UNSIGNED_BYTE) {
 			data = createByteBuffer(indices);
-		} else if (componentType == GL.GL_UNSIGNED_SHORT) {
+		} else if (componentType == GltfConstants.GL_UNSIGNED_SHORT) {
 			data = createShortBuffer(indices);
-		} else if (componentType == GL.GL_UNSIGNED_INT) {
+		} else if (componentType == GltfConstants.GL_UNSIGNED_INT) {
 			data = BufferUtils.createIntBuffer(indices);
 		} else {
 			throw new AssetLoadException("The indices accessor must have a component type of "
-			        + GL.GL_UNSIGNED_BYTE + ", " + GL.GL_UNSIGNED_SHORT + ", or " + GL.GL_UNSIGNED_INT
+			        + GltfConstants.GL_UNSIGNED_BYTE + ", " + GltfConstants.GL_UNSIGNED_SHORT + ", or "
+			        + GltfConstants.GL_UNSIGNED_INT
 			        + ", but has " + componentType);
 		}
 		VertexBuffer vb = new VertexBuffer(VertexBuffer.Type.Index);
@@ -365,30 +365,31 @@ private static VertexBuffer createAttributeVertexBuffer(String attributeName, Js
 		int componentCount = getAccessorComponentCount(accessor);
 		Type bufferType = getVertexBufferType(attributeName);
 
-		if (componentType == GL.GL_BYTE || componentType == GL.GL_UNSIGNED_BYTE) {
+		if (componentType == GltfConstants.GL_BYTE || componentType == GltfConstants.GL_UNSIGNED_BYTE) {
 			ByteBuffer attributeData = readByteDracoAttribute(pointAttribute, indices, count, componentCount);
 			VertexBuffer attributeVertexBuffer = createByteAttributeVertexBuffer(accessor, bufferType,
 			        attributeData);
 			return attributeVertexBuffer;
 		}
-		if (componentType == GL.GL_SHORT || componentType == GL.GL_UNSIGNED_SHORT) {
+		if (componentType == GltfConstants.GL_SHORT || componentType == GltfConstants.GL_UNSIGNED_SHORT) {
 			ShortBuffer attributeData = readShortDracoAttribute(pointAttribute, indices, count,
 			        componentCount);
 			VertexBuffer attributeVertexBuffer = createShortAttributeVertexBuffer(accessor, bufferType,
 			        attributeData);
 			return attributeVertexBuffer;
 		}
-		if (componentType == GL.GL_FLOAT) {
+		if (componentType == GltfConstants.GL_FLOAT) {
 			FloatBuffer attributeData = readFloatDracoAttribute(pointAttribute, indices, count,
 			        componentCount);
 			VertexBuffer attributeVertexBuffer = createFloatAttributeVertexBuffer(accessor, bufferType,
 			        attributeData);
 			return attributeVertexBuffer;
 		}
 		throw new AssetLoadException(
-		        "The accessor for attribute " + attributeName + " must have a component type of " + GL.GL_BYTE
-		                + ", " + GL.GL_UNSIGNED_BYTE + ", " + GL.GL_SHORT + ", " + GL.GL_UNSIGNED_SHORT + ", "
-		                + "or " + GL.GL_FLOAT + ", but has " + componentType);
+		        "The accessor for attribute " + attributeName + " must have a component type of "
+		                + GltfConstants.GL_BYTE + ", " + GltfConstants.GL_UNSIGNED_BYTE + ", "
+		                + GltfConstants.GL_SHORT + ", " + GltfConstants.GL_UNSIGNED_SHORT + ", " + "or "
+		                + GltfConstants.GL_FLOAT + ", but has " + componentType);
 	}
 
 	/**

jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfConstants.java

@@ -0,0 +1,11 @@
+package com.jme3.scene.plugins.gltf;
+
+public class GltfConstants {
+    public static final int GL_BYTE = 0x1400;
+    public static final int GL_UNSIGNED_BYTE = 0x1401;
+    public static final int GL_SHORT = 0x1402;
+    public static final int GL_UNSIGNED_SHORT = 0x1403;
+    public static final int GL_UNSIGNED_INT = 0x1405;
+    public static final int GL_FLOAT = 0x1406;
+
+}

jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfUtils.java

@@ -105,17 +105,17 @@ public static Mesh.Mode getMeshMode(Integer mode) {
 
     public static VertexBuffer.Format getVertexBufferFormat(int componentType) {
         switch (componentType) {
-            case GL.GL_BYTE:
+            case GltfConstants.GL_BYTE:
                 return VertexBuffer.Format.Byte;
-            case GL.GL_UNSIGNED_BYTE:
+            case GltfConstants.GL_UNSIGNED_BYTE:
                 return VertexBuffer.Format.UnsignedByte;
-            case GL.GL_SHORT:
+            case GltfConstants.GL_SHORT:
                 return VertexBuffer.Format.Short;
-            case GL.GL_UNSIGNED_SHORT:
+            case GltfConstants.GL_UNSIGNED_SHORT:
                 return VertexBuffer.Format.UnsignedShort;
-            case GL.GL_UNSIGNED_INT:
+            case GltfConstants.GL_UNSIGNED_INT:
                 return VertexBuffer.Format.UnsignedInt;
-            case GL.GL_FLOAT:
+            case GltfConstants.GL_FLOAT:
                 return VertexBuffer.Format.Float;
             default:
                 throw new AssetLoadException("Illegal component type: " + componentType);