[Octave-cvsupdate] octave-forge/main/vrml vrml_frame.m,1.8,1.9 vrml_lines.m,1.4,1.5 vrml_points.m,1.8,1.9

[<et...@pr...>]

Update of /cvsroot/octave/octave-forge/main/vrml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4504/main/vrml

Modified Files:
	vrml_frame.m vrml_lines.m vrml_points.m 
Log Message:
2.1.53 nargin changes; misc changes

Index: vrml_frame.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/vrml/vrml_frame.m,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- vrml_frame.m	27 Jan 2004 00:13:08 -0000	1.8
+++ vrml_frame.m	28 Jan 2004 16:57:59 -0000	1.9
@@ -33,8 +33,14 @@
 ######################################################################
 ## Read options
 numeric_args = 0;
+<<<<<<< vrml_frame.m
+nargin = nargin();
+
+while nargin && numeric_args<2,
+=======
 args = nargin; # nargin is now a function
 while args && numeric_args<2,
+>>>>>>> 1.8
 
 
   tmp = nth (varargin, numeric_args + 1);
@@ -97,41 +103,29 @@
 
 ## diam = diam.*scale ;
 ## d = diam = nan*scale;
-if 1
-  r2 = r;
-  n = sqrt (sum (r2.^2));
-  r2./= [1;1;1] * n;
-  sz(1,:) .*= n;
-  sz(3,:) ./= n;
-  sz(4,:) ./= n;
-
-  tmp = [r2(:,1), null (r2(:,1)')](:,[2,1,3])';
-  if det (tmp) < 0, tmp(3,:) *= -1; end
-  a1 = vrml_transfo (vrml_arrow(sz(:,1),[col(1,:);hcol(1,:)],0),\
-		     [0,0,0],tmp);
-  ## keyboard
-  tmp = [r2(:,2), null (r2(:,2)')](:,[2,1,3])';
-  if det (tmp) < 0, tmp(3,:) *= -1; end
-  a2 = vrml_transfo (vrml_arrow(sz(:,2),[col(2,:);hcol(2,:)],0),\
-		     [0,0,0],tmp);
+r2 = r;
+n = sqrt (sum (r2.^2));
+r2./= [1;1;1] * n;
+sz(1,:) .*= n;
+sz(3,:) ./= n;
+sz(4,:) ./= n;
 
-  tmp = [r2(:,3), null (r2(:,3)')](:,[2,1,3])';
-  if det (tmp) < 0, tmp(3,:) *= -1; end
-  a3 = vrml_transfo (vrml_arrow(sz(:,3),[col(3,:);hcol(3,:)],0),\
-		     [0,0,0],tmp);
+tmp = [r2(:,1), null(r2(:,1)')](:,[2,1,3])';
+if det (tmp) < 0, tmp(3,:) *= -1; end
+a1 = vrml_transfo (vrml_arrow(sz(:,1),[col(1,:);hcol(1,:)],0),\
+		   [0,0,0],tmp);
+## keyboard
+tmp = [r2(:,2), null(r2(:,2)')](:,[2,1,3])';
+if det (tmp) < 0, tmp(3,:) *= -1; end
+a2 = vrml_transfo (vrml_arrow(sz(:,2),[col(2,:);hcol(2,:)],0),\
+		   [0,0,0],tmp);
 
-  f0 = vrml_group (a1, a2, a3);
-  v = vrml_transfo (f0, t, nan);
+tmp = [r2(:,3), null(r2(:,3)')](:,[2,1,3])';
+if det (tmp) < 0, tmp(3,:) *= -1; end
+a3 = vrml_transfo (vrml_arrow(sz(:,3),[col(3,:);hcol(3,:)],0),\
+		   [0,0,0],tmp);
 
-else
-  a1 = vrml_transfo (vrml_arrow(sz(:,1),[col(1,:);hcol(1,:)],0),\
-		   [0,0,0],[0,-1,0;1,0,0;0,0,1]);
-  ## keyboard
-  a2 = vrml_arrow(sz(:,2),[col(2,:);hcol(2,:)],0);
-  a3 = vrml_transfo (vrml_arrow(sz(:,3),[col(3,:);hcol(3,:)],0),\
-		     [0,0,0],[1,0,0;0,0,1;0,-1,0]);
-  f0 = vrml_group (a1, a2, a3);
+f0 = vrml_group (a1, a2, a3);
+v = vrml_transfo (f0, t, nan);
 
-  v = vrml_transfo (f0, t, r);
-end
 

Index: vrml_lines.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/vrml/vrml_lines.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vrml_lines.m	27 Jan 2004 00:13:08 -0000	1.4
+++ vrml_lines.m	28 Jan 2004 16:57:59 -0000	1.5
@@ -27,7 +27,12 @@
 
 verbose = 0 ;
 
+<<<<<<< vrml_lines.m
+nargin = nargin();
+nargin -= 2 ;
+=======
 args -= 2 ;
+>>>>>>> 1.4
 i=1;
 
 while args>=i ,

Index: vrml_points.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/vrml/vrml_points.m,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- vrml_points.m	27 Jan 2004 00:13:08 -0000	1.8
+++ vrml_points.m	28 Jan 2004 16:57:59 -0000	1.9
@@ -49,7 +49,12 @@
 emit = 1;
 tran = 0;
 
+<<<<<<< vrml_points.m
+nargin = nargin();
+i = 1; nargin--;
+=======
 i = 1; 			# pos 2.1.39
+>>>>>>> 1.8
 
 
 while i <= nargin-1