Mercurial > forge

changeset 1238:85617a3eb1ca octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2.1.53 nargin changes; misc changes
author etienne
date Wed, 28 Jan 2004 16:57:59 +0000
parents 2fd9cb5e8445
children 68c2b06beacb
files main/miscellaneous/read_options.m main/vrml/vrml_frame.m main/vrml/vrml_lines.m main/vrml/vrml_points.m
diffstat 4 files changed, 44 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/main/miscellaneous/read_options.m	Wed Jan 28 16:54:07 2004 +0000
+++ b/main/miscellaneous/read_options.m	Wed Jan 28 16:57:59 2004 +0000
@@ -56,8 +56,14 @@
 op0 = op1 = " ";
 skipnan = prefix = quiet = nocase = quiet = 0;
 
+<<<<<<< read_options.m
+nargin = nargin();
+nargin--;
+if rem (nargin, 2), error ("odd number of optional args"); end
+=======
 args = nargin-1;  # nargin is now a function
 if rem (args, 2), error ("odd number of optional args"); end
+>>>>>>> 1.9
 
 
 ## beginpos 2.1.39
--- a/main/vrml/vrml_frame.m	Wed Jan 28 16:54:07 2004 +0000
+++ b/main/vrml/vrml_frame.m	Wed Jan 28 16:57:59 2004 +0000
@@ -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);
-
-  f0 = vrml_group (a1, a2, a3);
-  v = vrml_transfo (f0, t, nan);
+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);
 
-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);
+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);
 
-  v = vrml_transfo (f0, t, r);
-end
+f0 = vrml_group (a1, a2, a3);
+v = vrml_transfo (f0, t, nan);
 
+
--- a/main/vrml/vrml_lines.m	Wed Jan 28 16:54:07 2004 +0000
+++ b/main/vrml/vrml_lines.m	Wed Jan 28 16:57:59 2004 +0000
@@ -27,7 +27,12 @@
 
 verbose = 0 ;
 
+<<<<<<< vrml_lines.m
+nargin = nargin();
+nargin -= 2 ;
+=======
 args -= 2 ;
+>>>>>>> 1.4
 i=1;
 
 while args>=i ,
--- a/main/vrml/vrml_points.m	Wed Jan 28 16:54:07 2004 +0000
+++ b/main/vrml/vrml_points.m	Wed Jan 28 16:57:59 2004 +0000
@@ -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