From 548188c24ad3e31fd2348ddfd041fff9d96ff2a0 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Sun, 20 Mar 2022 23:39:27 +0100
Subject: [PATCH] [DEV] commit all  with new insland

---
 .gitignore                                      |  2 ++
 .project                                        | 11 +++++++++++
 .../gale/resource/ResourceColored3DObject.java  |  7 ++++++-
 .../resource/ResourceVirtualArrayObject.java    | 17 ++++++++---------
 test/.gitignore                                 |  2 ++
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index d075be7..695c7ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+
+/__pycache__/
 /bin/
 /Operator/
 /DrawerProperties/
diff --git a/.project b/.project
index d129442..06c0125 100644
--- a/.project
+++ b/.project
@@ -21,4 +21,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1646149232195</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/src/org/atriasoft/gale/resource/ResourceColored3DObject.java b/src/org/atriasoft/gale/resource/ResourceColored3DObject.java
index f75a039..1dae37c 100644
--- a/src/org/atriasoft/gale/resource/ResourceColored3DObject.java
+++ b/src/org/atriasoft/gale/resource/ResourceColored3DObject.java
@@ -324,6 +324,11 @@ public class ResourceColored3DObject extends Resource {
 	}
 	
 	public void drawCylinder(final float radius, final float size, final int lats, final int longs, final Matrix4f transformationMatrix, final Color tmpColor) {
+		drawCylinder(radius, size, lats, longs, transformationMatrix, tmpColor, true, true);
+	}
+	
+	public void drawCylinder(final float radius, final float size, final int lats, final int longs, final Matrix4f transformationMatrix, final Color tmpColor, final boolean updateDepthBuffer,
+			final boolean depthtest) {
 		final List<Vector3f> tmpVertices = new ArrayList<>();
 		// center to border (TOP)
 		
@@ -390,7 +395,7 @@ public class ResourceColored3DObject extends Resource {
 			tmpVertices.add(v2);
 			tmpVertices.add(v3);
 		}
-		draw(tmpVertices, tmpColor, transformationMatrix, true, true);
+		draw(tmpVertices, tmpColor, transformationMatrix, updateDepthBuffer, depthtest);
 	}
 	
 	public void drawLine(final List<Vector3f> vertices, final Color color, final Matrix4f transformationMatrix, final boolean updateDepthBuffer, final boolean depthtest) {
diff --git a/src/org/atriasoft/gale/resource/ResourceVirtualArrayObject.java b/src/org/atriasoft/gale/resource/ResourceVirtualArrayObject.java
index 79bcd1e..722e5e2 100644
--- a/src/org/atriasoft/gale/resource/ResourceVirtualArrayObject.java
+++ b/src/org/atriasoft/gale/resource/ResourceVirtualArrayObject.java
@@ -13,7 +13,6 @@ import org.atriasoft.gale.backend3d.OpenGL;
 import org.atriasoft.gale.backend3d.OpenGL.RenderMode;
 import org.atriasoft.gale.backend3d.OpenGL.Usage;
 import org.atriasoft.gale.internal.Log;
-
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL15;
@@ -285,14 +284,14 @@ public class ResourceVirtualArrayObject extends Resource {
 		OpenGL.drawElements(mode, this.vertexCount);
 	}
 	
+	public void render(final RenderMode mode, final int start, final int stop) {
+		OpenGL.drawArrays(mode, start, stop);
+	}
+	
 	public void renderArrays(final RenderMode mode) {
 		Log.verbose("request rendering direct : " + this.vertexCount);
 		OpenGL.drawArrays(mode, 0, this.vertexCount);
 	}
-
-	public void render(final RenderMode mode, final int start, final int stop) {
-		OpenGL.drawArrays(mode, start, stop);
-	}
 	
 	public void setColors(final Color[] colors) {
 		this.colors = colors;
@@ -368,13 +367,13 @@ public class ResourceVirtualArrayObject extends Resource {
 		// select the buffer to set data inside it ...
 		if (data instanceof float[] buffer) {
 			OpenGL.bufferData(buffer, usage);
-		} else if (data instanceof int[]buffer) {
+		} else if (data instanceof int[] buffer) {
 			OpenGL.bufferData(buffer, usage);
-		} else if (data instanceof Vector2f[]buffer) {
+		} else if (data instanceof Vector2f[] buffer) {
 			OpenGL.bufferData(buffer, usage);
-		} else if (data instanceof Vector3f[]buffer) {
+		} else if (data instanceof Vector3f[] buffer) {
 			OpenGL.bufferData(buffer, usage);
-		} else if (data instanceof Color[]buffer) {
+		} else if (data instanceof Color[] buffer) {
 			OpenGL.bufferData(buffer, usage);
 		} else {
 			Log.error("Not managed VBO model : " + data.getClass().getCanonicalName());
diff --git a/test/.gitignore b/test/.gitignore
index ae3c172..f00a440 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1 +1,3 @@
+
+/__pycache__/
 /bin/