[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11815] branches/soc-2007-maike/release/ glsl: Math node generic functions altered as they has variables with illegal names

[Miguel Torres Lima]

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

Log Message:
-----------
Math node generic functions altered as they has variables with illegal names

Modified Paths:
--------------
    branches/soc-2007-maike/release/glsl/node_math_acos.gsl
    branches/soc-2007-maike/release/glsl/node_math_asin.gsl
    branches/soc-2007-maike/release/glsl/node_math_atan.gsl
    branches/soc-2007-maike/release/glsl/node_math_cos.gsl
    branches/soc-2007-maike/release/glsl/node_math_max.gsl
    branches/soc-2007-maike/release/glsl/node_math_round.gsl
    branches/soc-2007-maike/release/glsl/node_math_sin.gsl
    branches/soc-2007-maike/release/glsl/node_math_tan.gsl

Modified: branches/soc-2007-maike/release/glsl/node_math_acos.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_math_acos.gsl	2007-08-24 18:12:07 UTC (rev 11814)
+++ branches/soc-2007-maike/release/glsl/node_math_acos.gsl	2007-08-24 18:32:30 UTC (rev 11815)
@@ -1,6 +1,6 @@
-void node_math_acos(float in, inout float val)
+void node_math_acos(float val1, inout float val)
 {
-  if(in <= 1 && in >= -1)
-    val = acos(in);
+  if(val1 <= 1 && val1 >= -1)
+    val = acos(val1);
   else val = 0.0;
 }

Modified: branches/soc-2007-maike/release/glsl/node_math_asin.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_math_asin.gsl	2007-08-24 18:12:07 UTC (rev 11814)
+++ branches/soc-2007-maike/release/glsl/node_math_asin.gsl	2007-08-24 18:32:30 UTC (rev 11815)
@@ -1,6 +1,6 @@
-void node_math_asin(float in, inout float val)
+void node_math_asin(float val1, inout float val)
 {
-  if(in <= 1 && in >= -1)
-    val = asin(in);
+  if(val1 <= 1 && val1 >= -1)
+    val = asin(val1);
   else val = 0.0;
 }

Modified: branches/soc-2007-maike/release/glsl/node_math_atan.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_math_atan.gsl	2007-08-24 18:12:07 UTC (rev 11814)
+++ branches/soc-2007-maike/release/glsl/node_math_atan.gsl	2007-08-24 18:32:30 UTC (rev 11815)
@@ -1,4 +1,4 @@
-void node_math_atan(float in, inout float val)
+void node_math_atan(float val1, inout float val)
 {
-  val = atan(in);
+  val = atan(val1);
 }

Modified: branches/soc-2007-maike/release/glsl/node_math_cos.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_math_cos.gsl	2007-08-24 18:12:07 UTC (rev 11814)
+++ branches/soc-2007-maike/release/glsl/node_math_cos.gsl	2007-08-24 18:32:30 UTC (rev 11815)
@@ -1,4 +1,4 @@
-void node_math_cos(float in, inout float val)
+void node_math_cos(float val1, inout float val)
 {
-  val = cos(in);
+  val = cos(val1);
 }

Modified: branches/soc-2007-maike/release/glsl/node_math_max.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_math_max.gsl	2007-08-24 18:12:07 UTC (rev 11814)
+++ branches/soc-2007-maike/release/glsl/node_math_max.gsl	2007-08-24 18:32:30 UTC (rev 11815)
@@ -1,3 +1,4 @@
 void node_math_max(float val1, float val2, inout float val)
+{
   val = max(val1, val2);
 }

Modified: branches/soc-2007-maike/release/glsl/node_math_round.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_math_round.gsl	2007-08-24 18:12:07 UTC (rev 11814)
+++ branches/soc-2007-maike/release/glsl/node_math_round.gsl	2007-08-24 18:32:30 UTC (rev 11815)
@@ -1,4 +1,4 @@
-void node_math_round(float in, inout float val)
+void node_math_round(float val1, inout float val)
 {
-  val = ceil(in);
+  val = ceil(val1);
 }

Modified: branches/soc-2007-maike/release/glsl/node_math_sin.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_math_sin.gsl	2007-08-24 18:12:07 UTC (rev 11814)
+++ branches/soc-2007-maike/release/glsl/node_math_sin.gsl	2007-08-24 18:32:30 UTC (rev 11815)
@@ -1,4 +1,4 @@
-void node_math_sin(float in, inout float val)
+void node_math_sin(float val1, inout float val)
 {
-  val = sin(in);
+  val = sin(val1);
 }

Modified: branches/soc-2007-maike/release/glsl/node_math_tan.gsl
===================================================================
--- branches/soc-2007-maike/release/glsl/node_math_tan.gsl	2007-08-24 18:12:07 UTC (rev 11814)
+++ branches/soc-2007-maike/release/glsl/node_math_tan.gsl	2007-08-24 18:32:30 UTC (rev 11815)
@@ -1,4 +1,4 @@
-void node_math_tan(float in, inout float val)
+void node_math_tan(float val1, inout float val)
 {
-  val = tan(in);
+  val = tan(val);
 }