diff options
| author | Sven Gothel <[email protected]> | 2011-06-11 05:50:18 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-06-11 05:50:18 +0200 |
| commit | 17e90844af05344e43588e97e947d1f540f9566f (patch) | |
| tree | f36ff98f2db0ec901c7cc853fb5678dca8c63a49 /src/test/com/jogamp/opengl | |
| parent | 090ea75c8e3e14fe7c68b5ed9a183c917e881258 (diff) | |
| parent | d23d1dd01cc7e3bb228d65feb8f781c4ff0e5e11 (diff) | |
Merge remote-tracking branch 'remotes/rsantina/master'
Diffstat (limited to 'src/test/com/jogamp/opengl')
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java | 1 | ||||
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java index e5e3c56e5..b8bb9ac14 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java @@ -32,7 +32,6 @@ import javax.media.opengl.GL; import javax.media.opengl.GL2ES2; import javax.media.opengl.GLAutoDrawable; 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.RegionRenderer; import com.jogamp.graph.curve.opengl.RenderState; diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java index 632b78d82..a837c56f8 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java @@ -277,7 +277,7 @@ public abstract class GPURendererListenerBase01 implements GLEventListener { autoDrawable.invoke(false, new GLRunnable() { public void run(GLAutoDrawable drawable) { try { - final String type = Region.isVBAA(renderModes) ? "vbaa0-msaa1" : "vbaa1-msaa0" + ( Region.usesVariableCurveWeight(renderModes) ? "-vc" : "-uc" ) ; + final String type = Region.isVBAA(renderModes) ? "vbaa0-msaa1" : "vbaa1-msaa0" + ( Region.isNonUniformWeight(renderModes) ? "-vc" : "-uc" ) ; printScreen(drawable, "./", "demo-"+type, "snap"+screenshot_num, false); screenshot_num++; } catch (GLException e) { |