diff options
| author | Sven Gothel <[email protected]> | 2011-04-02 15:10:00 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-04-02 15:10:00 +0200 |
| commit | a550afe604d8a1e63110d9f76ef04e2b493271c9 (patch) | |
| tree | d150c9819506589b58f4b4f226e2f9ff015c05b9 | |
| parent | a6d0578e1ef46b835906ab290161cff3baa51ef8 (diff) | |
Jogl build: Rebuild jar files if shaders were updated
| -rw-r--r-- | make/build-jogl.xml | 10 | ||||
| -rw-r--r-- | src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.fp | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 28b5c4956..b708ae0dc 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1396,7 +1396,15 @@ <!-- - Build the jogl.jar files. --> - <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase" /> + <target name="build-jars-dependset" depends="gluegen.cpptasks.detect.os,build-jars-javase" > + <dependset> + <srcfileset dir="${src.java}" + includes="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> + <targetfileset dir="." + includes="${jogl.all.jar} ${jogl.all-noawt.jar} ${jogl.util.jar} ${jogl.util.fixedfuncemu.jar}" /> + </dependset> + </target> + <target name="build-jars" depends="build-jars-dependset" /> <target name="setup-manifestfile" depends="common.init"> <property name="manifestfile" value="joglversion"/> diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.fp index 745ca5ea1..6f75c3e69 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.fp +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01.fp @@ -85,7 +85,8 @@ void main (void) alpha = g_alpha; } else if (a <= 0.0) { - alpha = 0.0;//discard; + alpha = 0.0; + // discard; // should work but generates artifacts, dimples ? } else { alpha = g_alpha*a; |