diff options
| author | Sven Gothel <[email protected]> | 2014-03-25 15:49:42 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-03-25 15:49:42 +0100 |
| commit | ec5724493bb9398134553a7354e08497e778a9cb (patch) | |
| tree | 4c0619b262ac1eb6f2cfff22aac62106ba87af52 /src/jogl/classes/jogamp/graph/curve/opengl | |
| parent | dcb4a911a7df6caa0da71ebf8f77edc8d83b0c24 (diff) | |
Bug 801: Use allsamples 'brute force' for VBAA (best quality) ; Demos: Reduce text contrast by 1/10th allowing better AA ; GPUUISceneGLListener0A uses proportional window height font size and one label w/ 10pt
Diffstat (limited to 'src/jogl/classes/jogamp/graph/curve/opengl')
| -rw-r--r-- | src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa-weight.fp | 8 | ||||
| -rw-r--r-- | src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa.fp | 8 | ||||
| -rw-r--r-- | src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-vbaa_allsamples_equal.glsl (renamed from src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-vbaa_wholeedge_equalweight.glsl) | 4 | ||||
| -rw-r--r-- | src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-vbaa_allsamples_prop01.glsl (renamed from src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-vbaa_wholeedge_propweight1.glsl) | 0 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa-weight.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa-weight.fp index bc443061e..795215285 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa-weight.fp +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa-weight.fp @@ -28,9 +28,10 @@ void main (void) if( 0 < gcu_TextureSize.z ) { -// Quality: wholeedge > [flipquad,rgss, quincunx] > poles -#include curverenderer01-pass2-vbaa_flipquad3.glsl +// Quality: allsamples > [flipquad,rgss, quincunx] > poles +#include curverenderer01-pass2-vbaa_allsamples_equal.glsl +// #include curverenderer01-pass2-vbaa_flipquad3.glsl // #include curverenderer01-pass2-vbaa_flipquad2.glsl // #include curverenderer01-pass2-vbaa_flipquad.glsl // #include curverenderer01-pass2-vbaa_rgss.glsl @@ -39,8 +40,7 @@ void main (void) // #include curverenderer01-pass2-vbaa_poles_equalweight.glsl // #include curverenderer01-pass2-vbaa_poles_bilin1.glsl // #include curverenderer01-pass2-vbaa_poles_propweight1.glsl -// #include curverenderer01-pass2-vbaa_wholeedge_propweight1.glsl -// #include curverenderer01-pass2-vbaa_wholeedge_equalweight.glsl +// #include curverenderer01-pass2-vbaa_allsamples_prop01.glsl // #include curverenderer01-pass2-vbaa_fxaa3.glsl } else { diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa.fp index 6836b3ee0..e303f5c1b 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa.fp +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass_vbaa.fp @@ -28,9 +28,10 @@ void main (void) if( 0 < gcu_TextureSize.z ) { -// Quality: wholeedge > [flipquad,rgss, quincunx] > poles -#include curverenderer01-pass2-vbaa_flipquad3.glsl +// Quality: allsamples > [flipquad,rgss, quincunx] > poles +#include curverenderer01-pass2-vbaa_allsamples_equal.glsl +// #include curverenderer01-pass2-vbaa_flipquad3.glsl // #include curverenderer01-pass2-vbaa_flipquad2.glsl // #include curverenderer01-pass2-vbaa_flipquad.glsl // #include curverenderer01-pass2-vbaa_rgss.glsl @@ -39,8 +40,7 @@ void main (void) // #include curverenderer01-pass2-vbaa_poles_equalweight.glsl // #include curverenderer01-pass2-vbaa_poles_bilin1.glsl // #include curverenderer01-pass2-vbaa_poles_propweight1.glsl -// #include curverenderer01-pass2-vbaa_wholeedge_propweight1.glsl -// #include curverenderer01-pass2-vbaa_wholeedge_equalweight.glsl +// #include curverenderer01-pass2-vbaa_allsamples_prop01.glsl // #include curverenderer01-pass2-vbaa_fxaa3.glsl } else { diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-vbaa_wholeedge_equalweight.glsl b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-vbaa_allsamples_equal.glsl index 3c787b46e..068341b25 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-vbaa_wholeedge_equalweight.glsl +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-vbaa_allsamples_equal.glsl @@ -11,10 +11,10 @@ const vec2 texCoord = gcv_TexCoord.st; - vec4 t = vec4(0); + vec4 t; // SampleCount 2 -> 4x - t += texture2D(gcu_TextureUnit, texCoord + psize*(vec2(-0.5, -0.5)))*sample_weight; // NW + t = texture2D(gcu_TextureUnit, texCoord + psize*(vec2(-0.5, -0.5)))*sample_weight; // NW t += texture2D(gcu_TextureUnit, texCoord + psize*(vec2(-0.5, 0.5)))*sample_weight; // SW t += texture2D(gcu_TextureUnit, texCoord + psize*(vec2( 0.5, 0.5)))*sample_weight; // SE t += texture2D(gcu_TextureUnit, texCoord + psize*(vec2( 0.5, -0.5)))*sample_weight; // NE diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-vbaa_wholeedge_propweight1.glsl b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-vbaa_allsamples_prop01.glsl index 76227eba3..76227eba3 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-vbaa_wholeedge_propweight1.glsl +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-pass2-vbaa_allsamples_prop01.glsl |