[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11812] branches/soc-2007-maike/release/ glsl: Altered mapping node generic function

[Miguel Torres Lima]

Revision: 11812
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11812
Author:   maike
Date:     2007-08-24 19:34:45 +0200 (Fri, 24 Aug 2007)

Log Message:
-----------
Altered mapping node generic function
Altered math node add generic function

Modified Paths:
--------------
    branches/soc-2007-maike/release/glsl/node_mapping.gsl
    branches/soc-2007-maike/release/glsl/node_math_add.gsl

Modified: branches/soc-2007-maike/release/glsl/node_mapping.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_mapping.gsl	2007-08-24 17:20:34 UTC (rev 11811)
+++ branches/soc-2007-maike/release/glsl/node_mapping.gsl	2007-08-24 17:34:45 UTC (rev 11812)
@@ -1,6 +1,8 @@
-void node_mapping(vec3 vect1, mat3 matr, vec3 min, vec3 max, float minflag, float maxflag, inout vec3 vect)
+void node_mapping(vec3 vect1, mat4 matr, vec3 min, vec3 max, float minflag, float maxflag, inout vec3 vect)
 {
-  vect = matr * vect1;
+  vect[0] = vect1[0] * matr[0][0] + vect1[1] * matr[1][0] + vect1[2] * matr[2][0] + matr[3][0];
+  vect[1] = vect1[0] * matr[0][1] + vect1[1] * matr[1][1] + vect1[2] * matr[2][1] + matr[3][1];
+  vect[2] = vect1[0] * matr[0][2] + vect1[1] * matr[1][2] + vect1[2] * matr[2][2] + matr[3][2];
 
   if(minflag > 0.0){
     if(vect.x < min.x) vect.x = min.x;

Modified: branches/soc-2007-maike/release/glsl/node_math_add.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_math_add.gsl	2007-08-24 17:20:34 UTC (rev 11811)
+++ branches/soc-2007-maike/release/glsl/node_math_add.gsl	2007-08-24 17:34:45 UTC (rev 11812)
@@ -1,6 +1,6 @@
-void node_math_add(float val1, float val2)
+void node_math_add(float val1, float val2, inout float val)
 {
-  return(val1 + val2);
+  val = val1 + val2;
 }