Merge chnages with sgothel

4 files changed, 507 insertions, 0 deletions

diff --git a/src/jogamp/graph/curve/opengl/RegionRendererImpl01.java b/src/jogamp/graph/curve/opengl/RegionRendererImpl01.java
new file mode 100755
index 000000000..c1f293fff
--- /dev/null
+++ b/src/jogamp/graph/curve/opengl/RegionRendererImpl01.java
@@ -0,0 +1,206 @@
+/**

+ * Copyright 2010 JogAmp Community. All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without modification, are

+ * permitted provided that the following conditions are met:

+ *

+ *    1. Redistributions of source code must retain the above copyright notice, this list of

+ *       conditions and the following disclaimer.

+ *

+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list

+ *       of conditions and the following disclaimer in the documentation and/or other materials

+ *       provided with the distribution.

+ *

+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED

+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR

+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * The views and conclusions contained in the software and documentation are those of the

+ * authors and should not be interpreted as representing official policies, either expressed

+ * or implied, of JogAmp Community.

+ */

+package jogamp.graph.curve.opengl;

+

+import java.nio.FloatBuffer;

+import javax.media.opengl.GL2ES2;

+import javax.media.opengl.GLException;

+import javax.media.opengl.GLUniformData;

+import javax.media.opengl.fixedfunc.GLMatrixFunc;

+

+import com.jogamp.graph.curve.OutlineShape;

+import com.jogamp.graph.curve.Region;

+import com.jogamp.graph.curve.opengl.RegionRenderer;

+import com.jogamp.graph.geom.Vertex;

+import com.jogamp.opengl.util.glsl.ShaderCode;

+import com.jogamp.opengl.util.glsl.ShaderProgram;

+import com.jogamp.opengl.util.glsl.ShaderState;

+

+

+public class RegionRendererImpl01 extends RegionRenderer {

+	/**Sharpness is equivalent to the value of t value of texture coord

+	 * on the off-curve vertex. The high value of sharpness will 

+	 * result in high curvature.

+	 */

+    private GLUniformData mgl_sharpness = new GLUniformData("p1y", 0.5f);

+    GLUniformData mgl_alpha = new GLUniformData("g_alpha", 1.0f);

+    private GLUniformData mgl_color = new GLUniformData("g_color", 3, FloatBuffer.allocate(3));

+    private GLUniformData mgl_strength = new GLUniformData("a_strength", 3.0f);

+    

+    public RegionRendererImpl01(Vertex.Factory<? extends Vertex> factory, int type) {

+        super(factory, type);

+    }

+    

+    protected boolean initImpl(GL2ES2 gl) {

+        boolean VBOsupported = gl.isFunctionAvailable("glGenBuffers") &&

+            gl.isFunctionAvailable("glBindBuffer") &&

+            gl.isFunctionAvailable("glBufferData") &&

+            gl.isFunctionAvailable("glDrawElements") &&

+            gl.isFunctionAvailable("glVertexAttribPointer") &&

+            gl.isFunctionAvailable("glDeleteBuffers");

+        

+        if(DEBUG) {

+            System.err.println("RegionRenderer: VBO Supported = " + VBOsupported);

+        }

+        

+        if(!VBOsupported){

+            return false;

+        }

+        

+        gl.glEnable(GL2ES2.GL_BLEND);

+        gl.glBlendFunc(GL2ES2.GL_SRC_ALPHA, GL2ES2.GL_ONE_MINUS_SRC_ALPHA);

+        

+        ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, RegionRendererImpl01.class,

+                "shader", "shader/bin", "curverenderer01");

+        ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, RegionRendererImpl01.class,

+                "shader", "shader/bin", "curverenderer01");

+    

+        ShaderProgram sp = new ShaderProgram();

+        sp.add(rsVp);

+        sp.add(rsFp);

+    

+        if(!sp.link(gl, System.err)) {

+            throw new GLException("RegionRenderer: Couldn't link program: "+sp);

+        }

+    

+        st = new ShaderState();

+        st.attachShaderProgram(gl, sp);

+        gl.glBindAttribLocation(sp.id(), 0, "v_position");

+        gl.glBindAttribLocation(sp.id(), 1, "texCoord");

+        

+        st.glUseProgram(gl, true);

+    

+        pmvMatrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION);

+        pmvMatrix.glLoadIdentity();

+        pmvMatrix.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);

+        pmvMatrix.glLoadIdentity();

+        

+        pmvMatrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION);

+        pmvMatrix.glLoadIdentity();

+        resetModelview(null);

+    

+        mgl_PMVMatrix = new GLUniformData("mgl_PMVMatrix", 4, 4, pmvMatrix.glGetPMvMatrixf());                  

+        if(!st.glUniform(gl, mgl_PMVMatrix)) {

+            if(DEBUG){

+                System.err.println("Error setting PMVMatrix in shader: "+st);

+            }

+            return false;

+        }

+        

+        if(!st.glUniform(gl, mgl_sharpness)) {

+            if(DEBUG){

+                System.err.println("Error setting sharpness in shader: "+st);

+            }

+            return false;

+        }

+                

+        if(!st.glUniform(gl, mgl_alpha)) {

+            if(DEBUG){

+                System.err.println("Error setting global alpha in shader: "+st);

+            }

+            return false;

+        }       

+        

+        if(!st.glUniform(gl, mgl_color)) {

+            if(DEBUG){

+                System.err.println("Error setting global color in shader: "+st);

+            }

+            return false;

+        }       

+        

+        if(!st.glUniform(gl, mgl_strength)) {

+            System.err.println("Error setting antialias strength in shader: "+st);

+        }

+        

+        if(DEBUG) {

+            System.err.println("RegionRendererImpl01 initialized: " + Thread.currentThread()+" "+st);

+        }

+        return true;

+    }

+

+    @Override

+    protected void disposeImpl(GL2ES2 gl) {

+    }

+    

+    

+    @Override

+    public float getAlpha() {

+        return mgl_alpha.floatValue();

+    }

+

+    @Override

+    public void setAlpha(GL2ES2 gl, float alpha_t) {

+        mgl_alpha.setData(alpha_t);

+        if(null != gl && st.inUse()) {

+            st.glUniform(gl, mgl_alpha);

+        }

+    }

+    

+    @Override

+    public void setColor(GL2ES2 gl, float r, float g, float b){

+        FloatBuffer fb = (FloatBuffer) mgl_color.getBuffer();

+        fb.put(0, r);

+        fb.put(1, r);

+        fb.put(2, r);

+        if(null != gl && st.inUse()) {

+            st.glUniform(gl, mgl_color);

+        }

+    }

+    

+	

+	@Override

+    public void renderOutlineShape(GL2ES2 gl, OutlineShape outlineShape, float[] position, int texSize) {

+		if(!isInitialized()){

+			throw new GLException("RegionRendererImpl01: not initialized!");

+		}

+		int hashCode = getHashCode(outlineShape);

+		Region region = regions.get(hashCode);

+		

+		if(null == region) {

+			region = createRegion(gl, outlineShape, mgl_sharpness.floatValue());

+			regions.put(hashCode, region);

+		}		

+		region.render(pmvMatrix, vp_width, vp_height, texSize);

+	}

+	

+	@Override

+    public void renderOutlineShapes(GL2ES2 gl, OutlineShape[] outlineShapes, float[] position, int texSize) {

+        if(!isInitialized()){

+            throw new GLException("RegionRendererImpl01: not initialized!");

+        }

+		

+		int hashCode = getHashCode(outlineShapes);

+		Region region = regions.get(hashCode);

+		

+		if(null == region) {

+            region = createRegion(gl, outlineShapes, mgl_sharpness.floatValue());

+			regions.put(hashCode, region);

+		}		

+        region.render(pmvMatrix, vp_width, vp_height, texSize);

+	}	

+}

diff --git a/src/jogamp/graph/curve/opengl/TextRendererImpl01.java b/src/jogamp/graph/curve/opengl/TextRendererImpl01.java
new file mode 100644
index 000000000..aa3202805
--- /dev/null
+++ b/src/jogamp/graph/curve/opengl/TextRendererImpl01.java
@@ -0,0 +1,189 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+package jogamp.graph.curve.opengl;
+
+import java.nio.FloatBuffer;
+
+import javax.media.opengl.GL2ES2;
+import javax.media.opengl.GLException;
+import javax.media.opengl.GLUniformData;
+import javax.media.opengl.fixedfunc.GLMatrixFunc;
+
+import jogamp.graph.curve.text.GlyphString;
+
+import com.jogamp.graph.curve.opengl.TextRenderer;
+import com.jogamp.graph.font.Font;
+import com.jogamp.graph.geom.Vertex;
+import com.jogamp.opengl.util.glsl.ShaderCode;
+import com.jogamp.opengl.util.glsl.ShaderProgram;
+
+public class TextRendererImpl01 extends TextRenderer {    
+	/**Sharpness is equivalent to the value of t value of texture coord
+	 * on the off-curve vertex. The high value of sharpness will 
+	 * result in high curvature.
+	 */
+    private GLUniformData mgl_sharpness = new GLUniformData("p1y", 0.5f);
+    GLUniformData mgl_alpha = new GLUniformData("g_alpha", 1.0f);
+    private GLUniformData mgl_color = new GLUniformData("g_color", 3, FloatBuffer.allocate(3));
+    private GLUniformData mgl_strength = new GLUniformData("a_strength", 1.8f);
+    	
+	public TextRendererImpl01(Vertex.Factory<? extends Vertex> factory, int type) {
+	    super(factory, type);
+	}
+
+	@Override
+    protected boolean initImpl(GL2ES2 gl){
+		boolean VBOsupported = gl.isFunctionAvailable("glGenBuffers") &&
+			gl.isFunctionAvailable("glBindBuffer") &&
+			gl.isFunctionAvailable("glBufferData") &&
+			gl.isFunctionAvailable("glDrawElements") &&
+			gl.isFunctionAvailable("glVertexAttribPointer") &&
+			gl.isFunctionAvailable("glDeleteBuffers");
+		
+		if(DEBUG) {
+			System.err.println("TextRendererImpl01: VBO Supported = " + VBOsupported);
+		}
+		
+		if(!VBOsupported){
+			return false;
+		}
+		
+		gl.glEnable(GL2ES2.GL_BLEND);
+		gl.glBlendFunc(GL2ES2.GL_SRC_ALPHA, GL2ES2.GL_ONE_MINUS_SRC_ALPHA);
+		
+        ShaderCode rsVp = ShaderCode.create(gl, GL2ES2.GL_VERTEX_SHADER, 1, TextRendererImpl01.class,
+                "shader", "shader/bin", "curverenderer01");
+        ShaderCode rsFp = ShaderCode.create(gl, GL2ES2.GL_FRAGMENT_SHADER, 1, TextRendererImpl01.class,
+                "shader", "shader/bin", "curverenderer01");
+
+        ShaderProgram sp = new ShaderProgram();
+        sp.add(rsVp);
+        sp.add(rsFp);
+
+        if(!sp.link(gl, System.err)) {
+            throw new GLException("TextRendererImpl01: Couldn't link program: "+sp);
+        }
+
+        st.attachShaderProgram(gl, sp);
+        gl.glBindAttribLocation(sp.id(), 0, "v_position");
+        gl.glBindAttribLocation(sp.id(), 1, "texCoord");
+		
+		st.glUseProgram(gl, true);
+
+		pmvMatrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION);
+		pmvMatrix.glLoadIdentity();
+		pmvMatrix.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
+		pmvMatrix.glLoadIdentity();
+		
+		pmvMatrix.glMatrixMode(GLMatrixFunc.GL_PROJECTION);
+		pmvMatrix.glLoadIdentity();
+		resetModelview(null);
+		
+		mgl_PMVMatrix = new GLUniformData("mgl_PMVMatrix", 4, 4, pmvMatrix.glGetPMvMatrixf());		    		
+		if(!st.glUniform(gl, mgl_PMVMatrix)) {
+			if(DEBUG){
+				System.err.println("Error setting PMVMatrix in shader: "+st);
+			}
+			return false;
+		}
+		
+		if(!st.glUniform(gl, mgl_sharpness)) {
+			if(DEBUG){
+				System.err.println("Error setting sharpness in shader: "+st);
+			}
+			return false;
+		}
+				
+		if(!st.glUniform(gl, mgl_alpha)) {
+			if(DEBUG){
+				System.err.println("Error setting global alpha in shader: "+st);
+			}
+			return false;
+		}		
+		
+		if(!st.glUniform(gl, mgl_color)) {
+			if(DEBUG){
+				System.err.println("Error setting global color in shader: "+st);
+			}
+			return false;
+		}		
+		
+		if(!st.glUniform(gl, mgl_strength)) {
+			System.err.println("Error setting antialias strength in shader: "+st);
+		}
+		
+		if(DEBUG) {
+			System.err.println("TextRendererImpl01 initialized: " + Thread.currentThread()+" "+st);
+		}
+		return true;
+	}
+	
+	@Override
+    protected void disposeImpl(GL2ES2 gl) {
+	}
+	
+    @Override
+    public float getAlpha() {
+        return mgl_alpha.floatValue();
+    }
+
+    @Override
+    public void setAlpha(GL2ES2 gl, float alpha_t) {
+        mgl_alpha.setData(alpha_t);
+        if(null != gl && st.inUse()) {
+            st.glUniform(gl, mgl_alpha);
+        }
+    }
+	
+	@Override
+    public void setColor(GL2ES2 gl, float r, float g, float b){
+	    FloatBuffer fb = (FloatBuffer) mgl_color.getBuffer();
+	    fb.put(0, r);
+	    fb.put(1, r);
+	    fb.put(2, r);
+	    if(null != gl && st.inUse()) {
+	        st.glUniform(gl, mgl_color);
+	    }
+	}
+	
+	@Override
+    public void renderString3D(GL2ES2 gl, Font font, String str, float[] position, int fontSize, int texSize) {
+		if(!isInitialized()){
+			throw new GLException("TextRendererImpl01: not initialized!");
+		}
+		String fontStrHash = getTextHashCode(font, str, fontSize);
+		GlyphString glyphString = strings.get(fontStrHash);
+		if(null == glyphString) {
+			glyphString = createString(gl, font, fontSize, str, mgl_sharpness.floatValue());
+			strings.put(fontStrHash, glyphString);
+		}
+		
+		glyphString.renderString3D(pmvMatrix, vp_width, vp_height, texSize);
+	}
+	
+}
diff --git a/src/jogamp/graph/curve/opengl/shader/curverenderer01.fp b/src/jogamp/graph/curve/opengl/shader/curverenderer01.fp
new file mode 100644
index 000000000..2b3a0ce1d
--- /dev/null
+++ b/src/jogamp/graph/curve/opengl/shader/curverenderer01.fp
@@ -0,0 +1,99 @@
+//#version 100
+
+uniform float p1y;
+uniform float g_alpha;
+uniform vec3 g_color;
+uniform float a_strength;
+
+varying vec2 v_texCoord;
+
+vec3 b_color = vec3(0.0, 0.0, 0.0);
+
+uniform sampler2D texture;
+vec4 weights = vec4(0.075, 0.06, 0.045, 0.025);
+
+void main (void)
+{
+	vec2 rtex = vec2(abs(v_texCoord.x),abs(v_texCoord.y));
+	vec3 c = g_color;
+	
+	float alpha = 0.0;
+	
+	if((v_texCoord.x == 0.0) && (v_texCoord.y == 0.0)){
+	 	alpha = g_alpha;
+	}
+	else if((v_texCoord.x >= 5.0)){
+		vec2 dfx = dFdx(v_texCoord);
+		vec2 dfy = dFdy(v_texCoord);
+		
+		vec2 size = 1.0/textureSize(texture,0); //version 130
+		rtex -= 5.0;
+		vec4 t = texture2D(texture, rtex)* 0.18;
+
+		t += texture2D(texture, rtex + size*(vec2(1, 0)))*weights.x;
+		t +=  texture2D(texture, rtex - size*(vec2(1, 0)))*weights.x;
+		t +=  texture2D(texture, rtex + size*(vec2(0, 1)))*weights.x;
+		t +=  texture2D(texture, rtex - size*(vec2(0, 1)))*weights.x;
+		
+		t += texture2D(texture, rtex + 2.0*size*(vec2(1, 0))) *weights.y;
+		t +=  texture2D(texture, rtex - 2.0*size*(vec2(1, 0)))*weights.y;
+		t +=  texture2D(texture, rtex + 2.0*size*(vec2(0, 1)))*weights.y; 
+		t +=  texture2D(texture, rtex - 2.0*size*(vec2(0, 1)))*weights.y;
+		
+		t += texture2D(texture, rtex + 3.0*size*(vec2(1, 0))) *weights.z;
+		t +=  texture2D(texture, rtex - 3.0*size*(vec2(1, 0)))*weights.z;
+		t +=  texture2D(texture, rtex + 3.0*size*(vec2(0, 1)))*weights.z;
+		t +=  texture2D(texture, rtex - 3.0*size*(vec2(0, 1)))*weights.z;
+		
+		t += texture2D(texture, rtex + 4.0*size*(vec2(1, 0))) *weights.w;
+		t +=  texture2D(texture, rtex - 4.0*size*(vec2(1, 0)))*weights.w;
+		t +=  texture2D(texture, rtex + 4.0*size*(vec2(0, 1)))*weights.w;
+		t +=  texture2D(texture, rtex - 4.0*size*(vec2(0, 1)))*weights.w;
+		
+		if(t.w == 0.0){
+			discard;
+		}
+		
+		c = t.xyz;
+		alpha = g_alpha* t.w;
+	}
+	///////////////////////////////////////////////////////////
+	else if ((v_texCoord.x > 0.0) && (rtex.y > 0.0 || rtex.x == 1.0)){
+  		vec2 dtx = dFdx(rtex);
+  		vec2 dty = dFdy(rtex);
+  		
+  		rtex.y -= 0.1;
+  		if(rtex.y < 0.0) {
+  			if(v_texCoord.y < 0.0)
+  				discard;
+  			else{
+  				rtex.y = 0.0;
+  			}
+  		}
+  		
+  		vec2 f = vec2((dtx.y - 2.0*p1y*dtx.x + 4.0*p1y*rtex.x*dtx.x), (dty.y - 2.0*p1y*dty.x + 4.0*p1y*rtex.x*dty.x));
+  		
+  		float position = rtex.y - ((2.0 * rtex.x * p1y) * (1.0 - rtex.x));
+  		float d = position/(length(f));
+
+		float a = (0.5 - d * sign(v_texCoord.y));  
+		
+		
+		if (a >= 1.0)  { 
+	    	alpha = g_alpha;
+	    //	c = vec3(1.0,1.0,1.0);
+    	} 
+  		else if (a <= 0.0) {
+   			alpha = 0.0;//discard;
+   		//	c = vec3(0.0,0.0,0.0);
+   			
+   		}
+  		else {           
+    		alpha = g_alpha*a;
+    	//	c = vec3(a,a,a);
+    		mix(b_color,g_color, a);
+    	}  
+	}
+	
+    gl_FragColor = vec4(c, alpha);
+}
diff --git a/src/jogamp/graph/curve/opengl/shader/curverenderer01.vp b/src/jogamp/graph/curve/opengl/shader/curverenderer01.vp
new file mode 100644
index 000000000..bc9ecb41e
--- /dev/null
+++ b/src/jogamp/graph/curve/opengl/shader/curverenderer01.vp
@@ -0,0 +1,13 @@
+//#version 100
+
+uniform mat4 mgl_PMVMatrix[2];
+attribute vec4 v_position;
+attribute vec2 texCoord; 
+
+varying vec2 v_texCoord;
+
+void main(void)
+{
+  gl_Position = mgl_PMVMatrix[0] * mgl_PMVMatrix[1] * v_position;
+  v_texCoord = texCoord.st;
+}
\ No newline at end of file