diff options
Diffstat (limited to 'src/demos/com')
7 files changed, 15 insertions, 18 deletions
diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener00.java b/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener00.java index 1f49bf8f5..c0f2a6bb1 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener00.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener00.java @@ -34,6 +34,7 @@ import com.jogamp.opengl.GLAutoDrawable; import com.jogamp.opengl.GLProfile; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.graph.curve.OutlineShape; +import com.jogamp.graph.curve.Region; import com.jogamp.graph.curve.opengl.GLRegion; import com.jogamp.graph.curve.opengl.RenderState; import com.jogamp.math.Vec4f; @@ -126,7 +127,7 @@ public class GPURegionGLListener00 extends GPURendererListenerBase01 { regionRenderer.setWeight(weight); } regionRenderer.enable(gl, true); - region.draw(gl, regionRenderer, getSampleCount()); + region.draw(gl, regionRenderer, Region.MAX_AA_QUALITY, getSampleCount()); regionRenderer.enable(gl, false); } } diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener01.java b/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener01.java index 413adca80..55433f21a 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener01.java @@ -33,6 +33,7 @@ import com.jogamp.opengl.GL2ES2; import com.jogamp.opengl.GLAutoDrawable; import com.jogamp.opengl.fixedfunc.GLMatrixFunc; import com.jogamp.graph.curve.OutlineShape; +import com.jogamp.graph.curve.Region; import com.jogamp.graph.curve.opengl.GLRegion; import com.jogamp.graph.curve.opengl.RenderState; import com.jogamp.math.Vec4f; @@ -291,7 +292,7 @@ public class GPURegionGLListener01 extends GPURendererListenerBase01 { regionRenderer.setWeight(weight); } regionRenderer.enable(gl, true); - region.draw(gl, regionRenderer, getSampleCount()); + region.draw(gl, regionRenderer, Region.MAX_AA_QUALITY, getSampleCount()); regionRenderer.enable(gl, false); } } diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener10.java b/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener10.java index a802ce386..843da6d46 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener10.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPURegionGLListener10.java @@ -132,7 +132,7 @@ public class GPURegionGLListener10 extends GPURendererListenerBase01 { regionRenderer.setWeight(weight); } regionRenderer.enable(gl, true); - region.draw(gl, regionRenderer, getSampleCount()); + region.draw(gl, regionRenderer, Region.MAX_AA_QUALITY, getSampleCount()); regionRenderer.enable(gl, false); } diff --git a/src/demos/com/jogamp/opengl/demos/graph/TextRendererGLELBase.java b/src/demos/com/jogamp/opengl/demos/graph/TextRendererGLELBase.java index b515db2a9..c0dd2386b 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/TextRendererGLELBase.java +++ b/src/demos/com/jogamp/opengl/demos/graph/TextRendererGLELBase.java @@ -32,7 +32,7 @@ import java.io.IOException; import com.jogamp.opengl.GL2ES2; import com.jogamp.opengl.GLAutoDrawable; import com.jogamp.opengl.GLEventListener; - +import com.jogamp.graph.curve.Region; import com.jogamp.graph.curve.opengl.GLRegion; import com.jogamp.graph.curve.opengl.RenderState; import com.jogamp.graph.curve.opengl.RegionRenderer; @@ -310,7 +310,7 @@ public abstract class TextRendererGLELBase implements GLEventListener { pmvMatrix.scaleMv(sxy, sxy, 1.0f); } renderer.enable(gl, true); - region.draw(gl, renderer, vbaaSampleCount); + region.draw(gl, renderer, Region.MAX_AA_QUALITY, vbaaSampleCount); renderer.enable(gl, false); if( !exclusivePMVMatrix ) { diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java index 20642d737..eac90cf7d 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo20.java @@ -570,20 +570,15 @@ public class UISceneDemo20 implements GLEventListener { public void mouseClicked(final MouseEvent e) { final Shape.EventInfo shapeEvent = (Shape.EventInfo) e.getAttachment(); if( shapeEvent.shape instanceof GraphShape ) { - int quality = ((GraphShape)shapeEvent.shape).getQuality(); - + int quality = ((GraphShape)shapeEvent.shape).getAAQuality(); if( shapeEvent.objPos.x() < shapeEvent.shape.getBounds().getCenter().x() ) { // left-half pressed - if( quality > 0 ) { - quality--; - } + quality--; } else { // right-half pressed - if( quality < Region.MAX_QUALITY ) { - quality++; - } + quality++; } - scene.setAllShapesQuality(quality); + scene.setAAQuality(quality); // validated / clipped } } } ); button.addMouseListener(dragZoomRotateListener); @@ -1082,7 +1077,7 @@ public class UISceneDemo20 implements GLEventListener { truePtSizeLabel.moveTo(dxMiddleAbs, dyTopLabelAbs - jogampLabel.getScaledLineHeight() - truePtSizeLabel.getScaledLineHeight(), dz); } { - final AABBox fbox = fontFPS.getGlyphBounds(scene.getStatusText(drawable, renderModes, fpsLabel.getQuality(), dpiV)); + final AABBox fbox = fontFPS.getGlyphBounds(scene.getStatusText(drawable, renderModes, fpsLabel.getAAQuality(), dpiV)); final float scale = sceneWidth / ( 1.4f * fbox.getWidth() ); // add 40% width fpsLabel.setScale(scale, scale, 1f); fpsLabel.moveTo(sceneBox.getMinX(), sceneBox.getMinY() + scale * ( fontFPS.getMetrics().getLineGap() - fontFPS.getMetrics().getDescent() ), 0f); @@ -1138,7 +1133,7 @@ public class UISceneDemo20 implements GLEventListener { if( fpsLabel.isVisible() ) { final String text; if( null == actionText ) { - text = scene.getStatusText(drawable, renderModes, fpsLabel.getQuality(), dpiV); + text = scene.getStatusText(drawable, renderModes, fpsLabel.getAAQuality(), dpiV); } else if( null != drawable.getAnimator() ) { text = Scene.getStatusText(drawable.getAnimator())+", "+actionText; } else { diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java index 8f51467d4..63fb63442 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java @@ -297,10 +297,10 @@ public class UIShapeDemo01 implements GLEventListener { System.err.println("XXX: txt_box_em "+txt_box_em); System.err.println("XXX: txt_box_e2 "+txt_box_em2); System.err.println("XXX: txt_box_rg "+txt_box_r); - once = false; } pmv.popMv(); } + once = false; renderer.enable(gl, false); } static boolean once = true; diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java index ff052ab1e..309f1d83f 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java @@ -330,7 +330,7 @@ public class UITypeDemo01 implements GLEventListener { if( null != glyph.getShape() ) { final GLRegion region = GLRegion.create(gl.getGLProfile(), renderModes, null, glyph.getShape()); region.addOutlineShape(glyph.getShape(), null, fg_color); - region.draw(gl, renderer, sampleCount); + region.draw(gl, renderer, Region.MAX_AA_QUALITY, sampleCount); region.destroy(gl); } if( once ) { |