[Octave-cvsupdate] SF.net SVN: octave:[10602] trunk/octave-forge/main/vrml/inst

[<et...@us...>]

Revision: 10602
          http://octave.svn.sourceforge.net/octave/?rev=10602&view=rev
Author:   etienne
Date:     2012-06-08 18:12:34 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
Fix bugs

Modified Paths:
--------------
    trunk/octave-forge/main/vrml/inst/test_moving_surf.m
    trunk/octave-forge/main/vrml/inst/vrml_TimeSensor.m

Modified: trunk/octave-forge/main/vrml/inst/test_moving_surf.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/test_moving_surf.m	2012-06-08 18:09:31 UTC (rev 10601)
+++ trunk/octave-forge/main/vrml/inst/test_moving_surf.m	2012-06-08 18:12:34 UTC (rev 10602)
@@ -33,8 +33,7 @@
 
   s2 = vrml_anim ("Coordinate",[a,b,a],"foo.set_point",[0 0.5 1],5);
 
-  s3 = vrml_faces ([-1 -1 1 1;-1 1 1 -1;0.1 0.1 0.1 0.1],\
-		   list ([1 2 3 4]),"tran",0.4,"col",[0.3 0.9 0.4]);
+  s3 = vrml_faces ([-1 -1 1 1;-1 1 1 -1;0.1 0.1 0.1 0.1], {[1 2 3 4]}, "tran",0.4,"col",[0.3 0.9 0.4]);
 
   vrml_browse ([s1,s2,s3])
 
@@ -57,7 +56,7 @@
   s4 = vrml_anim ("Coordinate",[a,b,a],"foo.set_point",[0 0.5 1],tn);
 
   s3 = vrml_faces ([-1 -1 1 1;-1 1 1 -1;0.1 0.1 0.1 0.1],\
-		 list ([1 2 3 4]),"tran",0.4,"col",[0.9 0.4 0.4]);
+				   {[1 2 3 4]},"tran",0.4,"col",[0.9 0.4 0.4]);
 
   vrml_browse ([s1,s2,s3,s4])
   printf ("Press a key. \n"); pause ();

Modified: trunk/octave-forge/main/vrml/inst/vrml_TimeSensor.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_TimeSensor.m	2012-06-08 18:09:31 UTC (rev 10601)
+++ trunk/octave-forge/main/vrml/inst/vrml_TimeSensor.m	2012-06-08 18:12:34 UTC (rev 10602)
@@ -75,11 +75,10 @@
   end
 end
 
+DEF = 0;
 
 if rem (length (varargin), 2), error ("vrml_TimeSensor : Odd n. of arguments"); end
 
-DEF = 0;
-
 l = {"TimeSensor {\n"};
 i = 1;
 while i < length (varargin)
@@ -102,8 +101,7 @@
     if verbose, printf ("vrml_TimeSensor : Defining node '%s'\n",v); end
 
     if DEF, error ("vrml_TimeSensor : Multiple DEFs found"); end
-    ##l = splice (l,1,0,{"DEF ",v," "});
-    varargin = {"DEF ",v," ",l};
+    l = {sprintf("DEF %s ", v), l{:}};
     DEF = 1;
 
   else				# Add data field
@@ -151,7 +149,14 @@
   end
   
 end
+
 l{end+1} = "}\n";
-s = feval ("strcat", l{:});
+
+s = "";
+for i=1:numel(l)
+  s = [s, sprintf(l{i})];
+endfor
+### Stupid strcat removes trailing spaces in l's elements
+### s = strcat (l{:});
 endfunction
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.