aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-03-26 10:38:28 +0100
committerSven Gothel <[email protected]>2014-03-26 10:38:28 +0100
commitd7e710c7be9cfc26e2c35d5332f3dc5002538d75 (patch)
tree93f0ec3feb530cef6b1c19a19091970bc317b7f5
parent38febaa43f91e389ffdaf64a2cdd8145629e0b8d (diff)
Fix test applets: GraphTextDemo (No MSAA, add VBAA def. ctor GPUTextGLListener0A); MovieCube (Size 800x600)
-rw-r--r--jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-applet3-napplet.html4
-rw-r--r--jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-napplet.html4
-rw-r--r--jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html4
-rw-r--r--jnlp-files/jogl-applet-runner-newt-GraphTextDemo01b-napplet.html4
-rw-r--r--jnlp-files/jogl-applet-runner-newt-MovieCube-applet3-napplet.html4
-rw-r--r--jnlp-files/jogl-applet-runner-newt-MovieCube-napplet.html4
-rw-r--r--jnlp-files/jogl-applet-runner-newt-MovieCube.html4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextGLListener0A.java7
8 files changed, 21 insertions, 14 deletions
diff --git a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-applet3-napplet.html b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-applet3-napplet.html
index 6bfc9a4e3..0ff71c9f7 100644
--- a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-applet3-napplet.html
+++ b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-applet3-napplet.html
@@ -20,7 +20,7 @@ JOGL Applet3 Graph Text Demo 01
<param name="gl_profile" value="GL2ES2">
<param name="gl_swap_interval" value="1">
<param name="gl_alpha" value="4">
- <param name="gl_multisamplebuffer" value="4">
+ <param name="gl_multisamplebuffer" value="0">
<param name="gl_nodefaultkeyListener" value="true">
<param name="gl_debug" value="false">
<param name="gl_trace" value="false">
@@ -36,7 +36,7 @@ JOGL Applet3 Graph Text Demo 01
gl_profile="GL2ES2"
gl_swap_interval="1"
gl_alpha="4"
- gl_multisamplebuffer="4"
+ gl_multisamplebuffer="0"
gl_nodefaultkeyListener="true"
gl_debug="false"
gl_trace="false">
diff --git a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-napplet.html b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-napplet.html
index 28fed6673..4264367be 100644
--- a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-napplet.html
+++ b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01-napplet.html
@@ -20,7 +20,7 @@ JOGL Graph Text Demo 01
<param name="gl_profile" value="GL2ES2">
<param name="gl_swap_interval" value="1">
<param name="gl_alpha" value="4">
- <param name="gl_multisamplebuffer" value="4">
+ <param name="gl_multisamplebuffer" value="0">
<param name="gl_nodefaultkeyListener" value="true">
<param name="gl_debug" value="false">
<param name="gl_trace" value="false">
@@ -36,7 +36,7 @@ JOGL Graph Text Demo 01
gl_profile="GL2ES2"
gl_swap_interval="1"
gl_alpha="4"
- gl_multisamplebuffer="4"
+ gl_multisamplebuffer="0"
gl_nodefaultkeyListener="true"
gl_debug="false"
gl_trace="false">
diff --git a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html
index fc00b73fc..1b4213c00 100644
--- a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html
+++ b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html
@@ -20,7 +20,7 @@ JOGL Graph Text Demo 01
<param name="gl_profile" value="GL2ES2">
<param name="gl_swap_interval" value="1">
<param name="gl_alpha" value="4">
- <param name="gl_multisamplebuffer" value="4">
+ <param name="gl_multisamplebuffer" value="0">
<param name="gl_nodefaultkeyListener" value="true">
<param name="gl_debug" value="false">
<param name="gl_trace" value="false">
@@ -37,7 +37,7 @@ JOGL Graph Text Demo 01
gl_profile="GL2ES2"
gl_swap_interval="1"
gl_alpha="4"
- gl_multisamplebuffer="4"
+ gl_multisamplebuffer="0"
gl_nodefaultkeyListener="true"
gl_debug="false"
gl_trace="false"
diff --git a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01b-napplet.html b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01b-napplet.html
index cf0723ea3..2baa095cb 100644
--- a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01b-napplet.html
+++ b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01b-napplet.html
@@ -21,7 +21,7 @@ JOGL Graph Text Demo 01b (w/ atomic/jogl-fonts-p0.jar in path)
<param name="gl_profile" value="GL2ES2">
<param name="gl_swap_interval" value="1">
<param name="gl_alpha" value="4">
- <param name="gl_multisamplebuffer" value="4">
+ <param name="gl_multisamplebuffer" value="0">
<param name="gl_nodefaultkeyListener" value="true">
<param name="gl_debug" value="false">
<param name="gl_trace" value="false">
@@ -38,7 +38,7 @@ JOGL Graph Text Demo 01b (w/ atomic/jogl-fonts-p0.jar in path)
gl_profile="GL2ES2"
gl_swap_interval="1"
gl_alpha="4"
- gl_multisamplebuffer="4"
+ gl_multisamplebuffer="0"
gl_nodefaultkeyListener="true"
gl_debug="false"
gl_trace="false">
diff --git a/jnlp-files/jogl-applet-runner-newt-MovieCube-applet3-napplet.html b/jnlp-files/jogl-applet-runner-newt-MovieCube-applet3-napplet.html
index 590bf308c..ac7e582f3 100644
--- a/jnlp-files/jogl-applet-runner-newt-MovieCube-applet3-napplet.html
+++ b/jnlp-files/jogl-applet-runner-newt-MovieCube-applet3-napplet.html
@@ -11,7 +11,7 @@ JogAmp's Applet3 MovieCube - GLMediaPlayer Demo 01
<P>
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
- width="510" height="300">
+ width="800" height="600">
<param name="code" value="com.jogamp.newt.util.applet.JOGLNewtApplet3Run">
<param name="archive" value="jar/gluegen-rt.jar,
jar/joal.jar,
@@ -24,7 +24,7 @@ JogAmp's Applet3 MovieCube - GLMediaPlayer Demo 01
<param name="gl_trace" value="false">
<comment>
<embed code="com.jogamp.newt.util.applet.JOGLNewtApplet3Run"
- width="510" height="300"
+ width="800" height="600"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
archive="jar/gluegen-rt.jar,
diff --git a/jnlp-files/jogl-applet-runner-newt-MovieCube-napplet.html b/jnlp-files/jogl-applet-runner-newt-MovieCube-napplet.html
index 3630a1529..c0e9bd2eb 100644
--- a/jnlp-files/jogl-applet-runner-newt-MovieCube-napplet.html
+++ b/jnlp-files/jogl-applet-runner-newt-MovieCube-napplet.html
@@ -11,7 +11,7 @@ JogAmp's MovieCube - GLMediaPlayer Demo 01
<P>
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
- width="510" height="300">
+ width="800" height="600">
<param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run">
<param name="archive" value="jar/gluegen-rt.jar,
jar/joal.jar,
@@ -24,7 +24,7 @@ JogAmp's MovieCube - GLMediaPlayer Demo 01
<param name="gl_trace" value="false">
<comment>
<embed code="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"
- width="510" height="300"
+ width="800" height="600"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
archive="jar/gluegen-rt.jar,
diff --git a/jnlp-files/jogl-applet-runner-newt-MovieCube.html b/jnlp-files/jogl-applet-runner-newt-MovieCube.html
index ba9a25c5a..0de7b4112 100644
--- a/jnlp-files/jogl-applet-runner-newt-MovieCube.html
+++ b/jnlp-files/jogl-applet-runner-newt-MovieCube.html
@@ -11,7 +11,7 @@ JogAmp's MovieCube - GLMediaPlayer Demo 01
<P>
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
- width="510" height="300">
+ width="800" height="600">
<param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run">
<param name="archive" value="jar/gluegen-rt.jar,
jar/joal.jar,
@@ -25,7 +25,7 @@ JogAmp's MovieCube - GLMediaPlayer Demo 01
<param name="jnlp_href" value="jogl-applet-runner-newt.jnlp">
<comment>
<embed code="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"
- width="510" height="300"
+ width="800" height="600"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
archive="jar/gluegen-rt.jar,
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextGLListener0A.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextGLListener0A.java
index 05b833470..a484c08ef 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextGLListener0A.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextGLListener0A.java
@@ -31,12 +31,19 @@ package com.jogamp.opengl.test.junit.graph.demos;
import javax.media.opengl.GL2ES2;
import javax.media.opengl.GLAutoDrawable;
+import com.jogamp.graph.curve.Region;
import com.jogamp.graph.curve.opengl.RenderState;
import com.jogamp.graph.curve.opengl.RegionRenderer;
+import com.jogamp.graph.geom.SVertex;
import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.opengl.util.glsl.ShaderState;
public class GPUTextGLListener0A extends GPUTextRendererListenerBase01 {
+ public GPUTextGLListener0A() {
+ super(RenderState.createRenderState(new ShaderState(), SVertex.factory()), Region.VBAA_RENDERING_BIT, 4, true, false, false);
+ }
+
public GPUTextGLListener0A(RenderState rs, int renderModes, int sampleCount, boolean blending, boolean debug, boolean trace) {
super(rs, renderModes, sampleCount, blending, debug, trace);
}