[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11830] branches/soc-2007-maike/source/ blender/src/glsl_node_util.c: Changed node values conversion rgba, vector to value from value = 0.333333 (x+y+z) to value = x

[Miguel Torres Lima]

Revision: 11830
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11830
Author:   maike
Date:     2007-08-25 19:59:38 +0200 (Sat, 25 Aug 2007)

Log Message:
-----------
Changed node values conversion rgba, vector to value from value = 0.333333 (x+y+z) to value = x

Modified Paths:
--------------
    branches/soc-2007-maike/source/blender/src/glsl_node_util.c

Modified: branches/soc-2007-maike/source/blender/src/glsl_node_util.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_node_util.c	2007-08-25 17:09:53 UTC (rev 11829)
+++ branches/soc-2007-maike/source/blender/src/glsl_node_util.c	2007-08-25 17:59:38 UTC (rev 11830)
@@ -1189,6 +1189,7 @@
 	code = glsl_string(8, GFREE, var, 0, " = vec3(", GFLOAT, stack->vec[0], 0, ", ", GFLOAT, stack->vec[1], 0, ", ", GFLOAT, stack->vec[2], 0, ");\n");
 	break;
       default:
+	printf("\n rgb: %f, %f, %f\n", stack->vec[0], stack->vec[1], stack->vec[2]);
 	code = glsl_string(10, GFREE, var, 0, " = vec4(", GFLOAT, stack->vec[0], 0, ", ", GFLOAT, stack->vec[1], 0, ", ", GFLOAT, stack->vec[2], 0, ", ", GFLOAT, stack->vec[3], 0, ");\n");
 	break;
       }
@@ -1641,7 +1642,8 @@
   }
   else{
     if(intype == SOCK_VALUE){
-      rslt = glsl_string(9, GFREE, code, GFREE, tovar, 0, " = 0.333333 * (", 0, fromvar, 0, ".x + ", 0, fromvar, 0, ".y + ", GFREE, fromvar, 0, ".z);\n");
+      rslt = glsl_string(5, GFREE, code, GFREE, tovar, 0, " = ", GFREE, fromvar, 0, ".x;\n");
+      /*rslt = glsl_string(9, GFREE, code, GFREE, tovar, 0, " = 0.33333333 * (", 0, fromvar, 0, ".x + ", 0, fromvar, 0, ".y + ", GFREE, fromvar, 0, ".z);\n");*/
     }
     else if(intype == SOCK_VECTOR){
       if(outtype == SOCK_VALUE){