aboutsummaryrefslogtreecommitdiffstats
path: root/ardor3d-jogl-awt/src
diff options
context:
space:
mode:
authorJulien Gouesse <[email protected]>2015-10-30 21:24:04 +0100
committerJulien Gouesse <[email protected]>2015-10-30 21:24:04 +0100
commit2c510f660483077dc419dc79b19f85608ba58283 (patch)
tree4d256c3fa65fdaa81bb3cf274f848d8b13ef530d /ardor3d-jogl-awt/src
parenta0bbf1e95492cd651efeba129494bb14622da764 (diff)
Disables the use of GLSL in GLJPanel used in JoglSwingCanvas as it caused too much troubles with other GLSL shaders and the wireframe state
Diffstat (limited to 'ardor3d-jogl-awt/src')
-rw-r--r--ardor3d-jogl-awt/src/main/java/com/ardor3d/framework/jogl/awt/JoglSwingCanvas.java5
1 files changed, 1 insertions, 4 deletions
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;