changeset 968:1f27b0d3c4d4 octave-forge

remove do_fortran_indexing assumption
author pkienzle
date Tue, 10 Jun 2003 20:37:35 +0000
parents 11f59da1a4ec
children cc49f2be13c1
files main/vrml/vmesh.m main/vrml/vrml_arrow.m
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/main/vrml/vmesh.m	Tue Jun 10 20:35:18 2003 +0000
+++ b/main/vrml/vmesh.m	Tue Jun 10 20:37:35 2003 +0000
@@ -107,13 +107,13 @@
 
 pts = [x(:)';y(:)';z(:)'];
 ii = find (all (isfinite (pts)));
-pt2 = pts(:,ii); x2 = x(ii); y2 = y(ii); z2 = z(ii);
+pt2 = pts(:,ii); x2 = x(:)(ii); y2 = y(:)(ii); z2 = z(:)(ii);
 ## Addd a point light
 scl = nanstd ((pt2-mean (pt2')'*ones(1,columns (pt2)))(:));
 
-lpos = [min (x2(:)) - 1.1*scl* max (max(x2(:))-min(x2(:)), 1),
-	mean (y2(:)),
-	max (z2(:))];
+lpos = [min (x2) - 1.1*scl* max (max(x2)-min(x2), 1),
+	mean (y2),
+	max (z2)];
 
 pl = vrml_PointLight ("location", lpos, "intensity", 0.7);
 
--- a/main/vrml/vrml_arrow.m	Tue Jun 10 20:35:18 2003 +0000
+++ b/main/vrml/vrml_arrow.m	Tue Jun 10 20:37:35 2003 +0000
@@ -27,7 +27,7 @@
 elseif prod (size (col)) == 3,    col = [1;1]*col(:)';
 elseif all (size (col) == [3,2]), col = col';
 elseif any (size (col) != [2,3]),
-  error("vrml_arrow : col has size %dx%d (should be 3 or 3x3)\n",size(col));
+  error("vrml_arrow : col has size %dx%d (should be 3 or 3x2)\n",size(col));
   ## keyboard
 end
 col = col' ;
@@ -48,8 +48,8 @@
 sz .*= [1, sz([1 1 1])]; 
 
 				# Do material nodes
-smat1 = vrml_material (col(1:3), emit);
-smat2 = vrml_material (col(4:6), emit);
+smat1 = vrml_material (col(:,1), emit);
+smat2 = vrml_material (col(:,2), emit);
 
 v = sprintf (["Group {\n",\
               "  children [\n",\