[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11827] branches/soc-2007-maike/source/ blender/src/glsl_node_util.c: Added squeeze node

[Miguel Torres Lima]

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

Log Message:
-----------
Added squeeze node

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 16:49:10 UTC (rev 11826)
+++ branches/soc-2007-maike/source/blender/src/glsl_node_util.c	2007-08-25 16:57:39 UTC (rev 11827)
@@ -1473,6 +1473,15 @@
 {
   char *code = NULL;
 
+  files->squeeze = 1;
+
+  code = glsl_string(9, 0, "node_squeeze(",
+		     GFREE, glsl_generate_node_in_vars(node, name, 0),
+		     0, ", ", GFREE, glsl_generate_node_in_vars(node, name, 1),
+		     0, ", ", GFREE, glsl_generate_node_in_vars(node, name, 2),
+		     0, ", ", GFREE, glsl_generate_node_out_vars(node, name, 0),
+		     0, ");\n");
+
   return code;
 }
 
@@ -2076,6 +2085,7 @@
   char *mapping_funcs = NULL;
   char *math_funcs = NULL;
   char *vectmath_funcs = NULL;
+  char *squeeze_funcs = NULL;
   char *tex_funcs = NULL;
   char *tex_blend_funcs = NULL;
   char *tex_blendval_funcs = NULL;
@@ -2202,6 +2212,17 @@
 					  GFREE, vectmath_funcs,
 					  GFREE, nodecode->node_code);
   }
+  
+  if(files->squeeze){
+    if(!(squeeze_funcs = glsl_get_func("node_squeeze.gsl"))){
+      MEM_freeN(nodecode->uniform_code);
+      MEM_freeN(nodecode->node_code);
+      MEM_freeN(nodecode);
+      return NULL;
+    }
+    else
+      nodecode->node_code = glsl_string(2, GFREE, squeeze_funcs, GFREE, nodecode->node_code);
+  }
 
   glsl_free_node_hash();
   glsl_free_nodefiles();