From 2c510f660483077dc419dc79b19f85608ba58283 Mon Sep 17 00:00:00 2001 From: Julien Gouesse Date: Fri, 30 Oct 2015 21:24:04 +0100 Subject: Disables the use of GLSL in GLJPanel used in JoglSwingCanvas as it caused too much troubles with other GLSL shaders and the wireframe state --- .../main/java/com/ardor3d/framework/jogl/awt/JoglSwingCanvas.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'ardor3d-jogl-awt/src') diff --git a/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/awt/JoglSwingCanvas.java b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/awt/JoglSwingCanvas.java index c924a35..e70e6e8 100644 --- a/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/awt/JoglSwingCanvas.java +++ b/ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/awt/JoglSwingCanvas.java @@ -31,12 +31,9 @@ import com.jogamp.opengl.awt.GLJPanel; * the AWT input system directly and its abstraction in Ardor3D (com.ardor3d.input.awt). As this canvas is generally * slower and heavier (in term of memory footprint) than JoglAwtCanvas, use it if and only if you have some problems * when mixing heavyweight and lightweight components. - * - * N.B: This canvas uses GLSL internally when it is available and supported, setting the property jogl.gljpanel.noglsl - * to true is recommended to avoid any conflicts with the effects based on GLSL including the bloom effect. */ public class JoglSwingCanvas extends GLJPanel implements Canvas { - + private static final long serialVersionUID = 1L; private final JoglCanvasRenderer _canvasRenderer; -- cgit v1.2.3