[MERGE] merged in latest release branch changes

src/modules/modules-dependencies.cmake

@@ -17,7 +17,7 @@
 # Teem: http://teem.sourceforge.org
 #  - NOTE: you need the SVN version
 
-FIND_PACKAGE( Teem PATHS /usr/local/lib /opt/teem/lib QUIET )
+FIND_PACKAGE( Teem PATHS /usr/local/lib /opt/teem/lib $ENV{TEEM_LIB_DIR}  QUIET )
 IF( Teem_FOUND )    # we need to add the include path and lib path to allow the compiler and linker to find teem even if it was not installed to
                     # /usr/local
     INCLUDE_DIRECTORIES( ${Teem_INCLUDE_DIRS} )

src/modules/teemGlyphs/shaders/WMTeemGlyphs-fragment.glsl

@@ -22,40 +22,13 @@
 //
 //---------------------------------------------------------------------------
 
-#include "WGEColorMaps.glsl"
-#include "WGELighting-fragment.glsl"
 #include "WGEShadingTools.glsl"
 
-// The ray's starting point in texture space
-varying vec3 v_rayStart;
-
-// The ray direction in texture space
-varying vec3 v_ray;
-
 // the Surface normal at this point
 varying vec3 v_normal;
 
-// The light source in local coordinates
-varying vec3 v_lightSource;
-
-
 void main()
 {
-    vec4 col;
-
-    float light = blinnPhongIlluminationIntensity(
-        0.1,                                // material ambient
-        0.75,                               // material diffuse
-        1.3,                                // material specular
-        10.0,                               // shinines
-        1.0,                                // light diffuse
-        0.75,                               // light ambient
-        normalize( v_normal ),              // normal
-        normalize( v_ray ),                 // view direction
-        normalize( v_lightSource )          // light source position
-        );
-
-    col = light * gl_Color;
-    col.a = 1.0;
-    gl_FragColor = col;
+    float light = blinnPhongIlluminationIntensity( normalize( v_normal ) );
+    gl_FragColor = vec4( gl_Color.xyz * light, gl_Color.a );
 }

src/modules/teemGlyphs/shaders/WMTeemGlyphs-vertex.glsl

@@ -22,37 +22,15 @@
 //
 //---------------------------------------------------------------------------
 
-#include "WGELighting-vertex.glsl"
-
-#include "WGETransformationTools.glsl"
-// The ray's starting point in texture space
-varying vec3 v_rayStart;
-
-// The ray direction in texture space
-varying vec3 v_ray;
+#version 120
 
 // the Surface normal at this point
 varying vec3 v_normal;
 
-// The light source in local coordinates
-varying vec3 v_lightSource;
-
 void main()
 {
-    prepareLight();
-    v_normal = gl_Normal;
+    v_normal = gl_NormalMatrix * gl_Normal;
 
-    // transform the ray direction to texture space, which equals object space
-    // Therefore use two points, as we transform a vector
-    vec4 camLookAt = vec4( 0.0, 0.0, -1.0, 1.0 );
-    vec4 camPos    = vec4( 0.0, 0.0, 0.0, 1.0 );
-    v_ray = worldToLocal( camLookAt, camPos ).xyz;
-
-    // also get the coordinates of the light
-    vec4 lpos = gl_LightSource[0].position;
-    lpos = vec4( 0.0, 0.0, 1000.0, 1.0 );
-    v_lightSource = worldToLocal( lpos ).xyz;
     gl_FrontColor = gl_Color;
-
     gl_Position = ftransform();
 }

tools/release/owbuildchroot

@@ -192,7 +192,7 @@ chroot_setup_suite()
     # NOTE: I tested only debian sid and ubuntu natty and maverick. Maverick currently has some problem with libopenscenegraph.
     #       Please add others here if needed
     case "$SUITE" in
-        precise | oneiric | natty | maverick )
+        quantal | precise | oneiric | natty | maverick )
             # multiverse and universe needed for several packs
             echo "deb http://de.archive.ubuntu.com/ubuntu $SUITE restricted universe multiverse" > ./$CHROOTDIR/etc/apt/sources.list.d/universeMultiverse.sources.list
 
@@ -225,7 +225,7 @@ chroot_finalize_suite()
 {
     # handle some special suites
     case "$SUITE" in
-        precise | oneiric | natty | maverick | lucid )
+        quantal | precise | oneiric | natty | maverick | lucid )
             # ubuntu hack: kill this xapian-index stuff. If not done, chroot_umount will fail
             chroot_do killall -q update-apt-xapian-index | echo
         ;;

tools/release/owrelease

@@ -29,7 +29,7 @@
 #############################################################################################################
 
 # Which version?
-VERSION_BASE=1.3.0
+VERSION_BASE=1.3.1
 
 # Any additonal tags?
 VERSION_TAGS=""
@@ -51,7 +51,7 @@ PACKAGES="deb src"
 
 # As we only need a source DEB, we do not build the deb for all supported distributions. The NeuroDebian project is doing this.
 # DISTRIBUTIONS_DEB="sid wheezy squeeze lucid maverick natty"
-DISTRIBUTIONS_DEB="sid wheezy precise oneiric"
+DISTRIBUTIONS_DEB="sid wheezy quantal precise oneiric"
 
 # use these distributions to build binary tgz
 #DISTRIBUTIONS_TGZ="sid wheezy squeeze lucid maverick natty"

tools/release/packaging/debian/changelog

 openwalnut (OWPACK_VERSION-1) unstable; urgency=low
 
+  * Minor changes compared to 1.3.0 but included several bug fixes.
+  * See http://www.openwalnut.org/versions/4
+
+ -- Sebastian Eichelbaum <eichelbaum@informatik.uni-leipzig.de>  Tue, 12 Dec 2012 11:26:32 +0100
+
+openwalnut (1.3.0-1) unstable; urgency=low
+
   * A lot of fixes and added functionality. 
   * See http://www.openwalnut.org/versions/1