diff options
| author | Sven Gothel <[email protected]> | 2011-03-30 16:10:09 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-03-30 16:10:09 +0200 |
| commit | 8c43a24f6ed75b6c8f0b2d5a0b77d3b14e1d745e (patch) | |
| tree | de11763b7add7a576e8a7f666c18429751abdedb | |
| parent | 69e9ae0bd6ada2177562714e301d68480eb001b8 (diff) | |
| parent | 48d0ea92f795d2f187a418918c9246ee28848065 (diff) | |
Merge branch 'master' of ssh://jogamp.org/data/tmp/cache/jogl-turtle2d
3 files changed, 3 insertions, 11 deletions
diff --git a/src/demo/GPURegionNewtDemo02.java b/src/demo/GPURegionNewtDemo02.java index a7b56ad42..3d7b60574 100644 --- a/src/demo/GPURegionNewtDemo02.java +++ b/src/demo/GPURegionNewtDemo02.java @@ -94,10 +94,7 @@ public class GPURegionNewtDemo02 { public RegionGLListener() { super(SVertex.factory(), Region.TWO_PASS, DEBUG, TRACE); - setMatrix(-20, 00, 0f, -50, 400); - //setMatrix(-20, 00, 0f, -400, 400); - //setMatrix(-20, 00, 0f, -400, 400); - //setMatrix(-20, 00, 0f, -100, 800); + setMatrix(-20, 00, 0f, -50, 1140); } private void createTestOutline(){ @@ -149,9 +146,6 @@ public class GPURegionNewtDemo02 { regionRenderer.init(gl); regionRenderer.setAlpha(gl, 1.0f); regionRenderer.setColor(gl, 0.0f, 0.0f, 0.0f); - //gl.glSampleCoverage(0.95f, false); - //gl.glEnable(GL2GL3.GL_SAMPLE_COVERAGE); // sample coverage doesn't really make a difference to lines - //gl.glEnable(GL2GL3.GL_SAMPLE_ALPHA_TO_ONE); MSAATool.dump(drawable); createTestOutline(); diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestRegionRenderer01.java b/src/test/com/jogamp/opengl/test/junit/graph/TestRegionRenderer01.java index 35f0325c9..52892e646 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/TestRegionRenderer01.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/TestRegionRenderer01.java @@ -56,7 +56,7 @@ public class TestRegionRenderer01 { public void testRegionRendererR2T01() throws InterruptedException {
GLProfile glp = GLProfile.get(GLProfile.GL3);
GLCapabilities caps = new GLCapabilities(glp);
- caps.setOnscreen(false);
+ //caps.setOnscreen(false);
caps.setAlphaBits(4);
GLWindow window = createWindow("shape-r2t1-msaa0", caps, 800,400);
@@ -83,7 +83,7 @@ public class TestRegionRenderer01 { public void testRegionRendererMSAA01() throws InterruptedException {
GLProfile glp = GLProfile.get(GLProfile.GL2ES2);
GLCapabilities caps = new GLCapabilities(glp);
- caps.setOnscreen(false);
+ // caps.setOnscreen(false);
caps.setAlphaBits(4);
caps.setSampleBuffers(true);
caps.setNumSamples(4);
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRenderer01.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRenderer01.java index 8f5174a89..acfde7e1f 100755 --- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRenderer01.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRenderer01.java @@ -59,7 +59,6 @@ public class TestTextRenderer01 { public void testTextRendererR2T01() throws InterruptedException {
GLProfile glp = GLProfile.get(GLProfile.GL3);
GLCapabilities caps = new GLCapabilities(glp);
- caps.setOnscreen(false);
caps.setAlphaBits(4);
GLWindow window = createWindow("text-r2t1-msaa0", caps, 800,400);
@@ -94,7 +93,6 @@ public class TestTextRenderer01 { public void testTextRendererMSAA01() throws InterruptedException {
GLProfile glp = GLProfile.get(GLProfile.GL2ES2);
GLCapabilities caps = new GLCapabilities(glp);
- caps.setOnscreen(false);
caps.setAlphaBits(4);
caps.setSampleBuffers(true);
caps.setNumSamples(4);
|