using direct allocation

Author: i-make-robots

src/main/java/com/marginallyclever/convenience/helpers/OpenGLHelper.java

@@ -14,16 +14,7 @@
  *
  */
 public class OpenGLHelper {
-	private static final IntBuffer depthFunc = IntBuffer.allocate(1);
-	private static final FloatBuffer lineWidth = FloatBuffer.allocate(1);
-
 	private static final List<Integer> errorCodes = new ArrayList<>();
-	
-	public static int drawAtopEverythingStart(GL3 gl) {
-		gl.glGetIntegerv(GL3.GL_DEPTH_FUNC, depthFunc);
-		gl.glDepthFunc(GL3.GL_ALWAYS);
-		return depthFunc.get();
-	}
 
 	public static void checkGLError(GL3 gl3,org.slf4j.Logger logger) {
 		int err = gl3.glGetError();
@@ -37,24 +28,4 @@ public static void checkGLError(GL3 gl3,org.slf4j.Logger logger) {
 			}
 		}
 	}
-
-	public static void drawAtopEverythingEnd(GL3 gl, int previousState) {
-		gl.glDepthFunc(previousState);
-	}
-
-	public static float setLineWidth(GL3 gl,float newWidth) {
-		gl.glGetFloatv(GL3.GL_LINE_WIDTH, lineWidth);
-		gl.glLineWidth(newWidth);
-		return lineWidth.get(0);
-	}
-
-	public static boolean disableTextureStart(GL3 gl) {
-		boolean b = gl.glIsEnabled(GL3.GL_TEXTURE_2D);
-		gl.glDisable(GL3.GL_TEXTURE_2D);
-		return b;
-	}
-	
-	public static void disableTextureEnd(GL3 gl,boolean oldState) {
-		if(oldState) gl.glEnable(GL3.GL_TEXTURE_2D);
-	}
 }

src/main/java/com/marginallyclever/makelangelo/Mesh.java

@@ -11,6 +11,8 @@
 import javax.vecmath.Vector3d;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.util.ArrayList;
@@ -142,7 +144,8 @@ private void updateBuffers(GL3 gl) {
 		if(hasTextures) setupArray(gl,3,2,numVertexes,textureArray);
 
 		if(hasIndexes) {
-			IntBuffer data = IntBuffer.allocate(indexArray.size());
+            ByteBuffer bb = ByteBuffer.allocateDirect(indexArray.size() * Integer.BYTES).order(ByteOrder.nativeOrder());
+			IntBuffer data = bb.asIntBuffer();
 			for (Integer integer : indexArray) data.put(integer);
 			data.rewind();
 
@@ -182,7 +185,8 @@ private void bindArray(GL3 gl, int attribIndex, int size) {
 	}
 
 	private void setupArray(GL3 gl, int attribIndex, int size, long numVertexes,List<Float> list) {
-		FloatBuffer data = FloatBuffer.allocate(list.size());
+        ByteBuffer bb = ByteBuffer.allocateDirect(list.size()*Float.BYTES).order(ByteOrder.nativeOrder());
+		FloatBuffer data = bb.asFloatBuffer();
 		for( Float f : list ) data.put(f);
 		data.rewind();
 		bindArray(gl,attribIndex,size);

src/main/java/com/marginallyclever/makelangelo/donatelloimpl/nodes/turtle/PathImageMask.java

@@ -18,8 +18,10 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- * Use an image to mask a path.  Lay the path over the image and remove all parts of the path where the image is brighter
- * than a cutoff value.  The fine grain resolution (and the amount of testing) is controlled by the stepSize.
+ * Use an [BufferedImage] to mask a [Turtle] path.  Lay the path over the image and remove all parts of
+ * the path where the image is brighter than a cutoff value.  The fine grain resolution (and the amount of testing) is
+ * controlled by the stepSize.
+ * Another way to think of it is a union between the dark parts of the image and the path.
  * @author Dan Royer
  * @since 2022-03-08
  */

src/main/java/com/marginallyclever/makelangelo/preview/ShaderProgram.java

@@ -8,7 +8,6 @@
 import javax.vecmath.Matrix4d;
 import javax.vecmath.Vector3d;
 import java.awt.*;
-import java.nio.FloatBuffer;
 import java.security.InvalidParameterException;
 import java.util.HashMap;
 import java.util.Map;
@@ -23,7 +22,7 @@ public class ShaderProgram {
     private final int vertexShaderId;
     private final int fragmentShaderId;
     private final Map<String, Integer> uniformLocations = new HashMap<>();
-    private final FloatBuffer matrixBuffer = FloatBuffer.allocate(16);
+    private final float [] matrixBuffer = new float[16];
 
     public ShaderProgram(GL3 gl, String[] vertexCode, String[] fragmentCode) {
         super();
@@ -141,28 +140,27 @@ public void setVector3d(GL3 gl, String name, Vector3d value) {
         OpenGLHelper.checkGLError(gl,logger);
     }
 
-    private FloatBuffer matrixToFloatBuffer(Matrix4d m) {
-        matrixBuffer.put( (float)m.m00 );
-        matrixBuffer.put( (float)m.m01 );
-        matrixBuffer.put( (float)m.m02 );
-        matrixBuffer.put( (float)m.m03 );
+    private float [] matrixToFloatBuffer(Matrix4d m) {
+        int i = 0;
+        matrixBuffer[i++] = (float)m.m00;
+        matrixBuffer[i++] = (float)m.m01;
+        matrixBuffer[i++] = (float)m.m02;
+        matrixBuffer[i++] = (float)m.m03;
 
-        matrixBuffer.put( (float)m.m10 );
-        matrixBuffer.put( (float)m.m11 );
-        matrixBuffer.put( (float)m.m12 );
-        matrixBuffer.put( (float)m.m13 );
+        matrixBuffer[i++] = (float)m.m10;
+        matrixBuffer[i++] = (float)m.m11;
+        matrixBuffer[i++] = (float)m.m12;
+        matrixBuffer[i++] = (float)m.m13;
 
-        matrixBuffer.put( (float)m.m20 );
-        matrixBuffer.put( (float)m.m21 );
-        matrixBuffer.put( (float)m.m22 );
-        matrixBuffer.put( (float)m.m23 );
-
-        matrixBuffer.put( (float)m.m30 );
-        matrixBuffer.put( (float)m.m31 );
-        matrixBuffer.put( (float)m.m32 );
-        matrixBuffer.put( (float)m.m33 );
-        matrixBuffer.rewind();
+        matrixBuffer[i++] = (float)m.m20;
+        matrixBuffer[i++] = (float)m.m21;
+        matrixBuffer[i++] = (float)m.m22;
+        matrixBuffer[i++] = (float)m.m23;
 
+        matrixBuffer[i++] = (float)m.m30;
+        matrixBuffer[i++] = (float)m.m31;
+        matrixBuffer[i++] = (float)m.m32;
+        matrixBuffer[i++] = (float)m.m33;
         return matrixBuffer;
     }
 
@@ -175,7 +173,7 @@ private FloatBuffer matrixToFloatBuffer(Matrix4d m) {
      * @param value the matrix to set
      */
     public void setMatrix4d(GL3 gl, String name, Matrix4d value) {
-        gl.glUniformMatrix4fv(getUniformLocation(gl, name), 1, true, matrixToFloatBuffer(value));
+        gl.glUniformMatrix4fv(getUniformLocation(gl, name), 1, true, matrixToFloatBuffer(value),0);
         OpenGLHelper.checkGLError(gl,logger);
     }