From 6d9e260a720eced54ddfbb33e645bcc897acf7fb Mon Sep 17 00:00:00 2001
From: Joacim Breiler <joacim@breiler.com>
Date: Fri, 29 Nov 2024 14:41:46 +0100
Subject: [PATCH] Changed order of renderables to support transperency

---
 .../com/willwinder/ugs/nbm/visualizer/renderables/Grid.java  | 3 +--
 .../com/willwinder/ugs/nbm/visualizer/renderables/Plane.java | 1 -
 .../ugs/nbm/visualizer/renderables/SizeDisplay.java          | 2 +-
 .../com/willwinder/ugs/nbm/visualizer/renderables/Tool.java  | 5 +----
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/Grid.java b/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/Grid.java
index 5f3a106f59..b682a08bce 100644
--- a/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/Grid.java
+++ b/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/Grid.java
@@ -42,7 +42,7 @@ public class Grid extends VertexObjectRenderable {
     private float[] zAxisColor;
 
     public Grid(String title) {
-        super(6, title, VISUALIZER_OPTION_GRID, new PlainShader());
+        super(10, title, VISUALIZER_OPTION_GRID, new PlainShader());
         reloadPreferences(new VisualizerOptions());
     }
 
@@ -59,7 +59,6 @@ public final void reloadPreferences(VisualizerOptions vo) {
     public void render(GLAutoDrawable drawable) {
         GL2 gl = drawable.getGL().getGL2();
         gl.glLineWidth(1.2f);
-        gl.glDisable(GL.GL_DEPTH_TEST);
         gl.glDrawArrays(GL.GL_LINES, 0, getVertexCount());
     }
 
diff --git a/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/Plane.java b/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/Plane.java
index 73ec254be4..95904d1194 100644
--- a/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/Plane.java
+++ b/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/Plane.java
@@ -45,7 +45,6 @@ public void reloadPreferences(VisualizerOptions vo) {
     @Override
     public void render(GLAutoDrawable drawable) {
         GL2 gl = drawable.getGL().getGL2();
-        gl.glDisable(GL.GL_DEPTH_TEST);
         gl.glDrawArrays(GL.GL_TRIANGLES, 0, getVertexCount());
     }
 
diff --git a/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/SizeDisplay.java b/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/SizeDisplay.java
index c892c5437a..147a375dfa 100644
--- a/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/SizeDisplay.java
+++ b/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/SizeDisplay.java
@@ -54,7 +54,7 @@ public class SizeDisplay extends Renderable implements UGSEventListener {
     private boolean textRendererDirty = true;
 
     public SizeDisplay(String title) {
-        super(3, title, VISUALIZER_OPTION_SIZE_DISPLAY);
+        super(8, title, VISUALIZER_OPTION_SIZE_DISPLAY);
         reloadPreferences(new VisualizerOptions());
         backend = CentralLookup.getDefault().lookup(BackendAPI.class);
         units = backend.getSettings().getPreferredUnits();
diff --git a/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/Tool.java b/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/Tool.java
index 740f0da798..42314db35a 100644
--- a/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/Tool.java
+++ b/ugs-platform/ugs-platform-visualizer/src/main/java/com/willwinder/ugs/nbm/visualizer/renderables/Tool.java
@@ -18,7 +18,6 @@ This file is part of Universal Gcode Sender (UGS).
  */
 package com.willwinder.ugs.nbm.visualizer.renderables;
 
-import com.jogamp.opengl.GL;
 import com.jogamp.opengl.GL2;
 import com.jogamp.opengl.GLAutoDrawable;
 import com.jogamp.opengl.glu.GLU;
@@ -42,7 +41,7 @@ public final class Tool extends Renderable {
     Color toolColor;
 
     public Tool(String title) {
-        super(4, title, VISUALIZER_OPTION_TOOL);
+        super(11, title, VISUALIZER_OPTION_TOOL);
         reloadPreferences(new VisualizerOptions());
     }
 
@@ -76,8 +75,6 @@ public void draw(GLAutoDrawable drawable, boolean idle, Position machineCoord, P
 
         double scale = 1. / scaleFactor;
         gl.glPushMatrix();
-            gl.glEnable(GL.GL_DEPTH_TEST);
-
             gl.glTranslated(position.x, position.y, position.z);
             gl.glScaled(scale, scale, scale);