Menu
▾
▴
octave-cvsupdate
|
From: <et...@us...> - 2009-08-04 05:01:59
|
Revision: 6073
http://octave.svn.sourceforge.net/octave/?rev=6073&view=rev
Author: etienne
Date: 2009-08-04 05:01:52 +0000 (Tue, 04 Aug 2009)
Log Message:
-----------
Fixes to probs pointed out by Roessli Bertrand and Soren Hauberg
Modified Paths:
--------------
trunk/octave-forge/main/vrml/inst/vrml_text.m
trunk/octave-forge/main/vrml/inst/vrml_transfo.m
Modified: trunk/octave-forge/main/vrml/inst/vrml_text.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_text.m 2009-08-02 21:17:03 UTC (rev 6072)
+++ trunk/octave-forge/main/vrml/inst/vrml_text.m 2009-08-04 05:01:52 UTC (rev 6073)
@@ -46,7 +46,7 @@
df = tars (col, size, family, justify, style, verbose);
- s = read_options (varargin{:}, "op1",op1,"op0",op0, "default",df);
+ s = read_options (varargin, "op1",op1,"op0",op0, "default",df);
col= s.col;
size= s.size;
family= s.family;
Modified: trunk/octave-forge/main/vrml/inst/vrml_transfo.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_transfo.m 2009-08-02 21:17:03 UTC (rev 6072)
+++ trunk/octave-forge/main/vrml/inst/vrml_transfo.m 2009-08-04 05:01:52 UTC (rev 6073)
@@ -57,7 +57,7 @@
if prod(size(c))==1, c = [c;c;c]; end
if all(size(r) == 3)
- if abs (det (r) - 1) > sqrt (eps), r2 = orthogonalize (r);
+ if abs (det (r) - 1) > sqrt (eps), r2 = orth (r);
else r2 = r;
end
[axis,ang] = rotparams (r2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2009-10-11 00:58:24
|
Revision: 6299
http://octave.svn.sourceforge.net/octave/?rev=6299&view=rev
Author: etienne
Date: 2009-10-11 00:58:13 +0000 (Sun, 11 Oct 2009)
Log Message:
-----------
Add 'steps' and 'bars' surface plotting styles to vmesh() and vrml_surf(); Plus small fixes
Modified Paths:
--------------
trunk/octave-forge/main/vrml/inst/vmesh.m
trunk/octave-forge/main/vrml/inst/vrml_PointLight.m
trunk/octave-forge/main/vrml/inst/vrml_browse.m
trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_1.m
trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_4.m
trunk/octave-forge/main/vrml/inst/vrml_surf.m
Modified: trunk/octave-forge/main/vrml/inst/vmesh.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vmesh.m 2009-10-09 10:23:23 UTC (rev 6298)
+++ trunk/octave-forge/main/vrml/inst/vmesh.m 2009-10-11 00:58:13 UTC (rev 6299)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann. All rights reserved.
+## Copyright (C) 2002-2009 Etienne Grossmann. All rights reserved.
##
## This program is free software; you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
@@ -38,6 +38,8 @@
## or (R-1)*(C-1)
## : Reflectivity of facets.
##
+## RGB and reflectivity values should be in the [0,1] interval.
+##
## "checker", c : 1x2 : Color as a checker. If c(1) is positive, checker has
## c(1) rows. If it is negative, each checker row is
## c(1) facets high. c(2) does the same for columns.
@@ -52,8 +54,11 @@
## "zcol", zcol : Mx3 : Color is linearly interpolated between the RGB
## values specified by the rows of zcol.
##
-## RGB and reflectivity values should be in the [0,1] interval.
+## "steps" : Represent surface as a piecewise constant Z = f(X,Y)
+## function
##
+## "bars" : Represent surface as a bar plot
+##
## "level", l : 1xN : Display one or more horizontal translucent plane(s)
##
## z == l(i) (1 <= i <= length(l))
@@ -78,28 +83,32 @@
zz = x ;
[R,C] = size (zz);
[xx,yy] = meshgrid (linspace (-1,1,C), linspace (-1,1,R));
-
- if nargin >=3,
- s = vmesh ( xx, yy, zz, y, z, varargin{:} );
- if ! nargout, clear s; end; return
- elseif nargin >=2,
- s = vmesh ( xx, yy, zz, y, varargin{:} );
- if ! nargout, clear s; end; return
+
+ if nargin >= 3
+ varargin = {y, z, varargin{:}};
+ elseif nargin >= 2
+ varargin = {y, varargin{:}};
end
+## if nargin >=3,
+## s = vmesh ( xx, yy, zz, y, z, varargin{:} );
+## if ! nargout, clear s; end; return
+## elseif nargin >=2,
+## s = vmesh ( xx, yy, zz, y, varargin{:} );
+## if ! nargout, clear s; end; return
+## end
x = xx ; y = yy ; z = zz ;
end
-
frame = 1;
## surf_args = list (x,y,z); # Arguments that'll be passed to vrml_surf
surf_args = {x,y,z}; # Arguments that'll be passed to vrml_surf
-if nargin > 3,
+if numel (varargin)
op1 = [" tran col checker creaseAngle emit colorPerVertex tex zcol",\
" level lcol ltran "];
- op0 = " smooth zgrey zrb normalize ";
+ op0 = " smooth zgray zrb normalize steps bars ";
df = tars (level, lcol, ltran, normalize);
@@ -108,10 +117,10 @@
# Identify options for vrml_surf()
# all_surf_opts = list ("tran", "col", "checker", "creaseAngle", "emit", \
# "colorPerVertex", "smooth", "tex",\
-# "zgrey","zrb","zcol");
+# "zgray","zrb","zcol");
all_surf_opts = {"tran", "col", "checker", "creaseAngle", "emit", \
- "colorPerVertex", "smooth", "tex",\
- "zgrey","zrb","zcol"};
+ "colorPerVertex", "smooth", "steps", "bars", "tex",\
+ "zgray","zrb","zcol"};
for i = 1:length(all_surf_opts)
## optname = nth (all_surf_opts, i);
@@ -147,22 +156,29 @@
surf_args{3} = z;
end
-## s = leval ("vrml_surf", surf_args);
-s = feval ("vrml_surf", surf_args{:});
+s = vrml_surf (surf_args{:});
pts = [x(:)';y(:)';z(:)'];
ii = find (all (isfinite (pts)));
pt2 = pts(:,ii); x2 = x(:)(ii); y2 = y(:)(ii); z2 = z(:)(ii);
## Add 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)];
+# scl = max (max(pt2') - min(pt2'));
-pl = vrml_PointLight ("location", lpos, "intensity", 0.7);
+# lpos = [min(x2) - 0.5*scl, mean(y2), max(z2)+scl]
+# pl1 = vrml_PointLight ("location", lpos, "intensity", 0.7);
+# lpos = [mean(x2), min(y2) - 0.5*scl, max(z2)+scl]
+# pl2 = vrml_PointLight ("location", lpos, "intensity", 0.7);
+
+# pl = [pl1 pl2];
+
+pl = [vrml_DirectionalLight("direction",[-1,-1,-1],"intensity",0.9),\
+ vrml_DirectionalLight("direction",[-1, 1,-1],"intensity",0.7),\
+ vrml_DirectionalLight("direction",[ 1,-1,-1],"intensity",0.7),\
+ vrml_DirectionalLight("direction",[ 1, 1,-1],"intensity",0.5)];
+
# distance = max ([max (x(:)) - min (x(:)),\
# max (y(:)) - min (y(:)),\
# max (z(:)) - min (z(:))])
@@ -239,7 +255,7 @@
%! vmesh (z,"checker",-[6,5]);
%! printf ("Press a key.\n"); pause;
%!
-%! ##### With z-dependent coloring - 'zrb', 'zgrey' and'zcol' options. #####
+%! ##### With z-dependent coloring - 'zrb', 'zgray' and'zcol' options. #####
%! vmesh (z,"zrb");
%! printf ("That's it!\n");
@@ -247,5 +263,8 @@
## %! test_vmesh
+
+return
+
endfunction
Modified: trunk/octave-forge/main/vrml/inst/vrml_PointLight.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_PointLight.m 2009-10-09 10:23:23 UTC (rev 6298)
+++ trunk/octave-forge/main/vrml/inst/vrml_PointLight.m 2009-10-11 00:58:13 UTC (rev 6299)
@@ -62,7 +62,7 @@
body = [body,\
- sprintf(" %-20s %s\n",key,
+ sprintf(" %-20s %s\n",key, \
sprintf (getfield (tpl,key), val))];
end
end
Modified: trunk/octave-forge/main/vrml/inst/vrml_browse.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_browse.m 2009-10-09 10:23:23 UTC (rev 6298)
+++ trunk/octave-forge/main/vrml/inst/vrml_browse.m 2009-10-11 00:58:13 UTC (rev 6299)
@@ -80,9 +80,11 @@
s = varargin{length (varargin)};
end
+if ! index (s, "Background")
+ s = [s, vrml_Background("skyColor",[.7 .7 .9])];
+end
-
vrml_b_name = "freewrl" ;
##vrml_b_name = "/home/etienne/bin/my_freewrl.sh";
Modified: trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_1.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_1.m 2009-10-09 10:23:23 UTC (rev 6298)
+++ trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_1.m 2009-10-11 00:58:13 UTC (rev 6299)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann. All rights reserved.
+## Copyright (C) 2002-2009 Etienne Grossmann. All rights reserved.
##
## This program is free software; you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
@@ -15,12 +15,13 @@
printf (["\n",\
" VRML Mini-HOWTO's first listing\n",\
- " Display the surface of a quadratic surface\n\n"]);
+ " Display a quadratic surface w/ 31 x 31 points\n\n"]);
printf ([" Reminder of FreeWRL keystrokes and mouse actions :\n"\
" q : quit\n",\
" w : switch to walk mode\n",\
" e : switch to examine mode\n",\
+ " h : toggle headlights on or off\n",\
" drag left mouse : rotate (examine mode) or translate\n",\
" (walk mode).\n",\
" drag right mouse : zoom (examine mode) or translate\n",\
@@ -43,7 +44,22 @@
pause
-vmesh (zz,"checker",[5,-2],"col",[1 0 0;0.7 0.7 0.7]');
+vmesh (zz,"checker",[5,-2],"col",[1 0 0;0.7 0.7 0.7]', "emit",0);
+vmesh (zz,"checker",[5,-2],"col",[1 0 0;0.7 0.7 0.7]', "emit",0);
-vmesh (zz,"checker",[5,-2],"col",[1 0 0;0.7 0.7 0.7]');
+printf (" Another one, just with 7 x 7 points\n");
+
+x = linspace (-1,1,7);
+
+[xx,yy] = meshgrid (x,x);
+
+zz = 2 - xx.^2 - yy.^2;
+
+printf (" Now, with steps, then barss\n");
+
+vmesh (zz);
+
+vmesh (zz,"steps");
+
+vmesh (zz,"bars");
Modified: trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_4.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_4.m 2009-10-09 10:23:23 UTC (rev 6298)
+++ trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_4.m 2009-10-11 00:58:13 UTC (rev 6299)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann. All rights reserved.
+## Copyright (C) 2002-2009 Etienne Grossmann. All rights reserved.
##
## This program is free software; you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
@@ -21,6 +21,7 @@
" q : quit\n",\
" w : switch to walk mode\n",\
" e : switch to examine mode\n",\
+ " h : toggle headlights on or off\n",\
" drag left mouse : rotate (examine mode) or translate\n",\
" (walk mode).\n",\
" drag right mouse : zoom (examine mode) or translate\n",\
Modified: trunk/octave-forge/main/vrml/inst/vrml_surf.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_surf.m 2009-10-09 10:23:23 UTC (rev 6298)
+++ trunk/octave-forge/main/vrml/inst/vrml_surf.m 2009-10-11 00:58:13 UTC (rev 6299)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann. All rights reserved.
+## Copyright (C) 2002-2009 Etienne Grossmann. All rights reserved.
##
## This program is free software; you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by the
@@ -49,9 +49,14 @@
## "zcol", zc : 3xN : Specify a colormap. The color of each vertex is
## interpolated according to its height (z).
##
-## "zgrey" : Black-to-white colormap. Same as "zcol", [0 1;0 1;0 1].
+## "zgray" : Black-to-white colormap. Same as "zcol", [0 1;0 1;0 1].
+##
## "zrb" : Red-to-blue. Same as "zcol", [0 7 10;0 0 2;7 19 2]/10.
##
+## "steps" : Represent surface as a piecewise constant Z = f(X,Y) function
+##
+## "bars" : Represent surface as a bar plot
+##
## "tran", tran : 1x1 : Transparency, default = 0
##
## "creaseAngle", a
@@ -63,25 +68,30 @@
## See also: vmesh(), vrml_faces(), test_moving_surf()
## Author: Etienne Grossmann <et...@is...>
-## Last modified: Setembro 2002
+## Last modified: October 2009
function s = vrml_surf (x, y, z,varargin)
-
if (nargin <= 1) || ischar(y), # Cruft to allow not passing x and y
zz = x ;
[R,C] = size (zz);
[xx,yy] = meshgrid (linspace (-1,1,C), linspace (-1,1,R));
## ones(R,1)*[1:C] ;
## yy = ## [1:R]'*ones(1,C) ;
- if nargin >=3,
- s = vrml_surf ( xx, yy, zz, y, z, varargin{:} );
- return
- elseif nargin >=2,
- s = vrml_surf ( xx, yy, zz, y, varargin{:} );
- return
+ ##if nargin >=3,
+ ## s = vrml_surf ( xx, yy, zz, y, z, varargin{:} );
+ ## return
+ ##elseif nargin >=2,
+ ## s = vrml_surf ( xx, yy, zz, y, varargin{:} );
+ ## return
+ ##end
+ if nargin >= 3
+ varargin = {y, z, varargin{:}};
+ elseif nargin >= 2
+ varargin = {y, varargin{:}};
end
+
x = xx ; y = yy ; z = zz ;
end
@@ -93,18 +103,20 @@
col = [0.3, 0.4, 0.9] ; # Color
checker = 0; # Checkered coloring
colorPerVertex = 1; # Color vertices or faces
-zrb = zgrey = zcol = 0; # Color by elevation
+zrb = zgray = zcol = 0; # Color by elevation
emit = 0; # emissiveColor or diffuse only
smooth = creaseAngle = nan ;
+steps = 0;
+bars = 0;
DEFcoord = DEFcol = ""; # Give a name to VRML objects
-if nargin > 3,
+if numel (varargin)
op1 = " tran col creaseAngle emit colorPerVertex checker DEFcoord DEFcol zcol ";
- op0 = " smooth zgrey zrb " ;
+ op0 = " smooth zgray zrb steps bars " ;
- default = tars (tran, col, creaseAngle, emit, colorPerVertex, \
- DEFcoord, DEFcol, zcol, smooth, checker, zgrey, zrb);
+ default = tars (tran, col, creaseAngle, emit, colorPerVertex, steps, bars, \
+ DEFcoord, DEFcol, zcol, smooth, checker, zgray, zrb);
s = read_options (varargin,"op0",op0,"op1",op1,"default",default);
@@ -117,18 +129,76 @@
DEFcol= s.DEFcol;
zcol= s.zcol;
smooth= s.smooth;
+ steps= s.steps;
+ bars= s.bars;
checker= s.checker;
- zgrey= s.zgrey;
+ zgray= s.zgray;
zrb= s.zrb;
end
## keyboard
if ! isnan (smooth), creaseAngle = pi ; end
-
[R,C] = size(z);
if any (size (x) == 1), x = ones(R,1)*x(:)' ; end
if any (size (y) == 1), y = y(:)*ones(1,C) ; end
+if bars
+
+ R4 = 4*R;
+ C4 = 4*C;
+ x2 = y2 = z2 = zeros (R4,C4);
+
+ x2(:,1) = x2(:,2) = kron ((4*x(:,1)-x(:,2))/3, [1;1;1;1]);
+ x2(:,C4-1) = x2(:,C4) = kron ((4*x(:,C)-x(:,C-1))/3, [1;1;1;1]);
+ x2(:,5:4:C4) = x2(:,6:4:C4) = kron ((2*x(:,2:C)+x(:,1:C-1))/3, [1;1;1;1]);
+ x2(:,3:4:C4-4) = x2(:,4:4:C4-4) = kron ((2*x(:,1:C-1)+x(:,2:C))/3, [1;1;1;1]);
+
+ y2(1,:) = y2(2,:) = kron ((4*y(1,:)-y(2,:))/3, [1 1 1 1]);
+ y2(R4-1,:) = y2(R4,:) = kron ((4*y(R,:)-y(R-1,:))/3, [1 1 1 1]);
+ y2(5:4:R4,:) = y2(6:4:R4,:) = kron ((2*y(2:R,:)+y(1:R-1,:))/3, [1 1 1 1]);
+ y2(3:4:R4-4,:) = y2(4:4:R4-4,:) = kron ((2*y(1:R-1,:)+y(2:R,:))/3, [1 1 1 1]);
+
+ z2([2:4:R4;3:4:R4],[2:4:C4;3:4:C4]) = kron(z,ones(2));
+
+ x = x2;
+ y = y2;
+ z = z2;
+ R = R4;
+ C = C4;
+
+elseif steps # Constant by parts
+
+ # Intermediate coordinates (R+1) x (C+1)
+ x2 = (x([1,1:R],[1,1:C]) + x([1,1:R],[1:C,C])) / 2;
+ y2 = (y([1,1:R],[1:C,C]) + y([1:R,R],[1:C,C])) / 2;
+
+ # Extend extremities so all patches have same size
+ x2(1,:) = 2*x2(1,:) - x2(2,:);
+ x2(:,1) = 2*x2(:,1) - x2(:,2);
+ x2(R+1,:) = 2*x2(R+1,:) - x2(R,:);
+ x2(:,C+1) = 2*x2(:,C+1) - x2(:,C);
+
+ y2(1,:) = 2*y2(1,:) - y2(2,:);
+ y2(:,1) = 2*y2(:,1) - y2(:,2);
+ y2(R+1,:) = 2*y2(R+1,:) - y2(R,:);
+ y2(:,C+1) = 2*y2(:,C+1) - y2(:,C);
+
+ # Duplicate intermediate values 2R x 2C
+ ii = [1,([1;1]*(2:R))(:)',R+1];
+ jj = [1,([1;1]*(2:C))(:)',C+1];
+
+ x2 = x2(ii,jj);
+ y2 = y2(ii,jj);
+
+ z2 = z([1;1]*(1:R),[1;1]*(1:C));;
+ x = x2;
+ y = y2;
+ z = z2;
+
+ R *= 2;
+ C *= 2;
+end
+
pts = [x(:)';y(:)';z(:)'];
keepp = all (!isnan(pts) & finite(pts)) ;
@@ -219,10 +289,10 @@
col = [1;1;1]*col(:)';
end
-if zgrey || zrb || any (zcol(:)) # Treat zgrey zrb and zcol options
+if zgray || zrb || any (zcol(:)) # Treat zgray zrb and zcol options
zx = max (z(keepip));
zn = min (z(keepip));
- if zgrey, zcol = [0 0 0; 1 1 1]';
+ if zgray, zcol = [0 0 0; 1 1 1]';
elseif zrb , zcol = [0 0 0.7; 0.5 0 0.8; 1 0 0]';
end
@@ -234,7 +304,7 @@
col(:,keepip) = \
zcol(:,ci) .* ([1;1;1]*(1-cw)) + zcol(:,ci+1) .* ([1;1;1]*cw);
-end # EOF zgrey zrb and zcol options
+end # EOF zgray zrb and zcol options
if checker
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2012-04-16 09:53:56
|
Revision: 10241
http://octave.svn.sourceforge.net/octave/?rev=10241&view=rev
Author: carandraug
Date: 2012-04-16 09:53:45 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
vrml: replace calls to usage by print_usage (uysage is redundant and going to be deprecated in 3.8)
Modified Paths:
--------------
trunk/octave-forge/main/vrml/inst/vrml_PointLight.m
trunk/octave-forge/main/vrml/inst/vrml_Viewpoint.m
Modified: trunk/octave-forge/main/vrml/inst/vrml_PointLight.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_PointLight.m 2012-04-16 09:50:24 UTC (rev 10240)
+++ trunk/octave-forge/main/vrml/inst/vrml_PointLight.m 2012-04-16 09:53:45 UTC (rev 10241)
@@ -37,7 +37,7 @@
function s = vrml_PointLight (varargin)
-if mod(nargin,2) != 0, usage("vrml_PointLight('key',val,...)"); end
+if mod(nargin,2) != 0, print_usage; end
h = struct (varargin{:});
tpl = struct ("ambientIntensity", "%8.3f",\
Modified: trunk/octave-forge/main/vrml/inst/vrml_Viewpoint.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_Viewpoint.m 2012-04-16 09:50:24 UTC (rev 10240)
+++ trunk/octave-forge/main/vrml/inst/vrml_Viewpoint.m 2012-04-16 09:53:45 UTC (rev 10241)
@@ -38,7 +38,7 @@
function s = vrml_Viewpoint (varargin)
-if mod(nargin,2) != 0, usage("vrml_Viewpoint('key',val,...)"); end
+if mod(nargin,2) != 0, print_usage; end
h = struct (varargin{:});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2012-06-08 18:12:40
|
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.
|
|
From: <et...@us...> - 2012-06-24 05:16:32
|
Revision: 10677
http://octave.svn.sourceforge.net/octave/?rev=10677&view=rev
Author: etienne
Date: 2012-06-24 05:16:24 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Fixes
Modified Paths:
--------------
trunk/octave-forge/main/vrml/inst/vrml_browse.m
trunk/octave-forge/main/vrml/inst/vrml_set_browser.m
Modified: trunk/octave-forge/main/vrml/inst/vrml_browse.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_browse.m 2012-06-24 04:18:55 UTC (rev 10676)
+++ trunk/octave-forge/main/vrml/inst/vrml_browse.m 2012-06-24 05:16:24 UTC (rev 10677)
@@ -32,7 +32,7 @@
## 's' : Save a snapshot in files 'octave.snapshot.NNNN.ppm'
## 'q' : Quit
##
-## WARNING : FreeWRL >0.25 (http://www.crc.ca/FreeWRL/) must be installed.
+## WARNING: vrml_browse() only works if a vrml browser is available. See vrml_set_browser().
##
## BUG : The vrml browser is not killed when octave exits. Sometimes the
## vrml browser does not get raised or gets raised improperly
@@ -85,9 +85,11 @@
s = [s, vrml_Background("skyColor",[.7 .7 .9])];
end
+if isempty (vrml_b_name)
+ vrml_set_browser();
+endif
-vrml_b_name = "freewrl" ;
-##vrml_b_name = "/home/etienne/bin/my_freewrl.sh";
+## vrml_b_name = "freewrl" ;
##b_opt = [out_option," ",bop," ",best_option," --server --snapb octave.snap "]
##;
@@ -165,7 +167,7 @@
# ####################################
# ####################################
- # Eventually start browser ###########
+ # If needed, start browser ###########
if vrml_b_pid <= 0
new_browser = 1 ;
if verbose,
Modified: trunk/octave-forge/main/vrml/inst/vrml_set_browser.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_set_browser.m 2012-06-24 04:18:55 UTC (rev 10676)
+++ trunk/octave-forge/main/vrml/inst/vrml_set_browser.m 2012-06-24 05:16:24 UTC (rev 10677)
@@ -35,7 +35,7 @@
##
function full_path = vrml_set_browser (proposed_browser_name)
-global vrml_b_name;
+global vrml_b_name = [];
full_path = vrml_b_name;
@@ -46,8 +46,11 @@
for i = 1:numel(browser_list)
## TODO: Test this under windows
- [status, full_path] = system (sprintf ("which %s", b{i}));
+ [status, full_path] = system (sprintf ("which %s", browser_list{i}));
if status != 1
+ if full_path(length(full_path)) == "\n",
+ full_path = full_path(1:end-1);
+ end
vrml_b_name = full_path;
return;
endif
@@ -61,4 +64,7 @@
if status == 1
error (sprintf ("VRML browser `%s' is not available", proposed_browser_name));
endif
+if full_path(length(full_path)) == "\n",
+ full_path = full_path(1:end-1);
+end
vrml_b_name = full_path;
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2010-04-27 05:17:26
|
Revision: 7267
http://octave.svn.sourceforge.net/octave/?rev=7267&view=rev
Author: etienne
Date: 2010-04-27 05:17:20 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Remove broken files
Removed Paths:
-------------
trunk/octave-forge/main/vrml/inst/select_3D_points.m
trunk/octave-forge/main/vrml/inst/vrml_select_points.m
Deleted: trunk/octave-forge/main/vrml/inst/select_3D_points.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/select_3D_points.m 2010-04-27 05:16:17 UTC (rev 7266)
+++ trunk/octave-forge/main/vrml/inst/select_3D_points.m 2010-04-27 05:17:20 UTC (rev 7267)
@@ -1,147 +0,0 @@
-## Copyright (C) 2002 Etienne Grossmann. All rights reserved.
-##
-## This program is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
-##
-## This is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-## for more details.
-##
-
-## sel2 = select_3D_points (x, sel1, deco) - select 3D points
-##
-## x : 3 x P : 3D points
-## sel1 : P : 0-1 matrix specifying currently selected points
-## or Q1 : List of indices of currently selected points
-## Default=zeros(1,P)
-## deco : string : Vrml code for decorating set of 3D points
-## Default=""
-##
-## sel2 : P : 0-1 matrix or list of selected points (default)
-## or Q2 List of selected points
-
-## Author : Etienne Grossmann <et...@is...>
-
-function sel2 = select_3D_points (x, sel1, varargin)
-
-P = columns (x);
-global vrml_b_pid = 0;
-
-opts = struct ("frame", 1,\
- "deco", "",\
- "balls", 0);
-
-if nargin > 2
- op1 = " frame deco balls ";
-
- opts = read_options (varargin, "op1", op1,"default",opts);
-end
-frame = opts.frame;
-deco = opts.deco;
-balls = opts.balls;
-
-want_list = 0; # Return list of selected points or 0-1
- # matrix
-
-
-
-if nargin >=2 && length (sel1(:)) == P && all (sel1==0 || sel1==1),
- # sel1 has been passed
- sel1 = sel1(:)';
- if columns (sel1) != P || (!isempty (sel1) && any (sel1!=1 & sel1!=0)),
- want_list = 1;
- tmp = zeros (1,P);
- tmp(state) = 1;
- sel1 = tmp;
- ## sel1 = loose (sel1, P)';
- end
-else
- sel1 = zeros (1,P); # Default : nothing pre-selected
-end
- # NOTE : this filename hardcoded in
- # vrml_browse()
-data_out = "/tmp/octave_browser_out.txt";
-
-x -= mean(x')' * ones(1,P);
-x ./= sqrt (mean (x(:).^2));
-
-s = vrml_select_points (x, sel1, balls);
-
-## vrml_browse ("-kill"); # Stop previous browser, if any
-
-sbg = vrml_Background ("skyColor", [0.5 0.5 0.6]);
-
- # Clean data file ####################
-[st,err,msg] = stat (data_out);
-if ! err, # There's a file : clean it
- [err,msg] = unlink (data_out);
- if err,
- error ("select_3D_points : Can't remove data file '%s'",data_out);
- end
- # There's no file, but there's a pid.
-elseif vrml_b_pid,
- # assume browser died. kill it for sure
- vrml_browse ("-kill");
-end
-
-if frame
- sframe = vrml_frame ([0 0 0],[0 0 0],"col",0.5*(eye(3) + ones (3)));
-else
- sframe = "";
-end
-
- # Start browser ######################
-vrml_browse ([sbg, sframe, s, deco]);
-
-printf ("\nMenu: (R)estart browser. Other key : done. ");
-inch = upper (kbhit());
-
-## while my_menu ("\nMenu: (R)estart browser. Other key : done") == "R",
-while inch == "R",
- vrml_browse ("-kill");
- vrml_browse ([s,deco]);
- printf ("\nMenu: (R)estart browser. Other key : done. ");
- inch = upper (kbhit());
-end
-printf ("\n");
-
-## printf ("press <CR> when done selecting points\n");
-## pause
-
-## vrml_browse ("-kill"); # Stop browser #######################
-
- # Retrieve history of clicks #########
-perlcmd = "print qq{$1,$2;} if /^TAG:\\s*(\\d+)\\s*STATE:\\s*(\\d+)/";
-cmd = sprintf ("perl -ne '%s' %s", perlcmd, data_out);
-
-[status, res] = system (cmd, 1);
-res = res(1:length(res)-1); # Remove last ";"
-stl = eval (["[",res,"];"])'; # List of clicks
-
-sel2 = sel1 ;
-
- # Build new selection matrix
-## HERE I trust octave to behave as
-## for i=1:columns(stl), sel2(stl(1,:)) = stl(2,i); end
-
-if ! isempty (stl), sel2(stl(1,:)) = stl(2,:); end
-
- # Eventually transform 0-1 matrix into
- # list of selected points.
-if want_list, sel2 = find (sel2); end
-
-[st,err,msg] = stat (data_out);
-if !err,
- [err, msg] = unlink (data_out);
- if err,
- printf (["select_3D_points :\n",\
- " error '%s'\n",\
- " while removing temp file %s\n"],\
- msg,err);
- end
-end
-endfunction
-
Deleted: trunk/octave-forge/main/vrml/inst/vrml_select_points.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_select_points.m 2010-04-27 05:16:17 UTC (rev 7266)
+++ trunk/octave-forge/main/vrml/inst/vrml_select_points.m 2010-04-27 05:17:20 UTC (rev 7267)
@@ -1,71 +0,0 @@
-## Copyright (C) 2002 Etienne Grossmann. All rights reserved.
-##
-## This program is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by the
-## Free Software Foundation; either version 2, or (at your option) any
-## later version.
-##
-## This is distributed in the hope that it will be useful, but WITHOUT
-## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-## for more details.
-
-## s = vrml_select_points (x, state) - vrml code for selecting 3D points
-##
-## x : 3 x P : 3D points
-## state : P : 0-1 matrix specifying currently selected points
-## or Q : List of indices of currently selected points
-## Default=zeros(1,P)
-## sphere: bool : If true represent points as spheres instead of cubes.
-##
-## s : string : vrml code representing points in x as spheres that
-## change color (green to/from blue) when clicked upon.
-##
-## See select_3D_points() for complete 3D point selection interface.
-
-## Author : Etienne Grossmann <et...@is...>
-function s = vrml_select_points (x, state, sphere)
-
-printf("vrml_select_points does not work any more. Sorry\n");
-return
-P = columns (x);
-
-if nargin < 2,
- state = zeros (1,P); # Default : nothing pre-selected
-else
- state = state(:)';
- if length (state) != P || any (state != 1 & state != 0),
- tmp = zeros (1,P);
- tmp(state) = 1;
- state = tmp;
- ## state = loose (state, P)';
- end
-end
-if nargin < 3, sphere = 0; end
-
-diam = 0.1 * mean (sqrt (sum ((x-mean(x')'*ones(1,P)).^2))) ;
-
-## For odb
-## Depends: defSpeakSphere.wrl defSpeakBox.wrl
-
-if sphere
- proto = "data/defSpeakSphere.wrl" ;
-else
- proto = "data/defSpeakBox.wrl" ;
-end
-
-s0 = slurp_file (proto);
-
- # Pre-selected spheres will be lighter-colored
-col1 = [0.4;0.4;0.9]*ones(1,P);
-if any (state),
- col1(:,find(state)) = [0.6;0.6;0.8]*ones(1,sum(state));
-end
-
-tp = "SpeakSphere {col1 %8.3f %8.3f %8.3f state %i pos %8.3g %8.3g %8.3g scale %8.3g %8.3g %8.3g tag \"%i\"}\n";
-
-s1 = sprintf (tp, [col1; state; x; diam*ones(3,P);1:P]);
-
-s = [s0,s1];
-endfunction
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2010-06-03 17:19:18
|
Revision: 7396
http://octave.svn.sourceforge.net/octave/?rev=7396&view=rev
Author: etienne
Date: 2010-06-03 17:19:11 +0000 (Thu, 03 Jun 2010)
Log Message:
-----------
s/list/cell/g
Modified Paths:
--------------
trunk/octave-forge/main/vrml/inst/vrml_group.m
trunk/octave-forge/main/vrml/inst/vrml_parallelogram.m
Modified: trunk/octave-forge/main/vrml/inst/vrml_group.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_group.m 2010-06-03 16:15:17 UTC (rev 7395)
+++ trunk/octave-forge/main/vrml/inst/vrml_group.m 2010-06-03 17:19:11 UTC (rev 7396)
@@ -25,13 +25,13 @@
s = "";
# beginpre 2.1.38
-# if (nargin > 0)
-# varargin = list(varargin, all_va_args);
-# end
+## if (nargin > 0)
+## varargin = list(varargin, all_va_args);
+## end
# endpre 2.1.38
-if nargin > 0, s = nth (varargin, 1); end
+if nargin > 0, s = varargin{1}; end
if nargin > 1
- for i = 2:nargin, s = [s,",\n", nth(varargin, i)]; end
+ for i = 2:nargin, s = [s,",\n", varargin{i}]; end
end
## indent s
ni = 4;
Modified: trunk/octave-forge/main/vrml/inst/vrml_parallelogram.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_parallelogram.m 2010-06-03 16:15:17 UTC (rev 7395)
+++ trunk/octave-forge/main/vrml/inst/vrml_parallelogram.m 2010-06-03 17:19:11 UTC (rev 7396)
@@ -63,8 +63,9 @@
x = [x(:,1:3), x(:,1)-x(:,2)+x(:,3)];
# The facet
-s = vrml_faces (x,list (1:4),"col",col, "tran", tran,"emit",emit);
+s = vrml_faces (x, (1:4)', "col",col, "tran", tran,"emit",emit);
+
# Decoration : balls on vertices
if balls
if isnan (bemit), bemit = emit; end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2012-04-13 09:44:41
|
Revision: 10207
http://octave.svn.sourceforge.net/octave/?rev=10207&view=rev
Author: carandraug
Date: 2012-04-13 09:44:31 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
vrml: removal of deprecated function nth
Modified Paths:
--------------
trunk/octave-forge/main/vrml/inst/save_vrml.m
trunk/octave-forge/main/vrml/inst/vrml_frame.m
Modified: trunk/octave-forge/main/vrml/inst/save_vrml.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/save_vrml.m 2012-04-13 09:28:27 UTC (rev 10206)
+++ trunk/octave-forge/main/vrml/inst/save_vrml.m 2012-04-13 09:44:31 UTC (rev 10207)
@@ -75,7 +75,7 @@
args = nargin; # nargin is now a function
while --args,
- tmp = nth (varargin, i++);
+ tmp = varargin{i++};
if strcmp (tmp, "nobg"),
bg_node = "";
elseif strcmp (tmp, "nolight"),
@@ -111,7 +111,7 @@
if verbose, printf ("save_vrml : %i'th string\n",i); end
- fprintf (fid,"%s", nth (varargin, i)) ;
+ fprintf (fid,"%s", varargin{i}) ;
i++ ;
end
Modified: trunk/octave-forge/main/vrml/inst/vrml_frame.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_frame.m 2012-04-13 09:28:27 UTC (rev 10206)
+++ trunk/octave-forge/main/vrml/inst/vrml_frame.m 2012-04-13 09:44:31 UTC (rev 10207)
@@ -48,7 +48,7 @@
while args && numeric_args<2,
- tmp = nth (varargin, numeric_args + 1);
+ tmp = varargin{numeric_args + 1};
if ischar (tmp), break; end
--args;
numeric_args++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <car...@us...> - 2012-04-16 09:50:35
|
Revision: 10240
http://octave.svn.sourceforge.net/octave/?rev=10240&view=rev
Author: carandraug
Date: 2012-04-16 09:50:24 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
vrml: make use of nargin function rather than replacing it by a var as it was before
Modified Paths:
--------------
trunk/octave-forge/main/vrml/inst/save_vrml.m
trunk/octave-forge/main/vrml/inst/vrml_faces.m
trunk/octave-forge/main/vrml/inst/vrml_group.m
trunk/octave-forge/main/vrml/inst/vrml_lines.m
Modified: trunk/octave-forge/main/vrml/inst/save_vrml.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/save_vrml.m 2012-04-16 09:40:34 UTC (rev 10239)
+++ trunk/octave-forge/main/vrml/inst/save_vrml.m 2012-04-16 09:50:24 UTC (rev 10240)
@@ -67,10 +67,8 @@
lightstr = "";
# Read eventual options
-nargin = nargin();
ninit = nargin;
-
i = 1;
args = nargin; # nargin is now a function
while --args,
Modified: trunk/octave-forge/main/vrml/inst/vrml_faces.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_faces.m 2012-04-16 09:40:34 UTC (rev 10239)
+++ trunk/octave-forge/main/vrml/inst/vrml_faces.m 2012-04-16 09:50:24 UTC (rev 10240)
@@ -89,7 +89,6 @@
opt0 = " smooth convex " ;
verbose = 0 ;
-# nargin -= 2 ;
i = 1;
while (nargin -2) >= i
Modified: trunk/octave-forge/main/vrml/inst/vrml_group.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_group.m 2012-04-16 09:40:34 UTC (rev 10239)
+++ trunk/octave-forge/main/vrml/inst/vrml_group.m 2012-04-16 09:50:24 UTC (rev 10240)
@@ -17,7 +17,6 @@
function v = vrml_group ( varargin )
-nargin = nargin();
if nargin == 0, return end
s = "";
Modified: trunk/octave-forge/main/vrml/inst/vrml_lines.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_lines.m 2012-04-16 09:40:34 UTC (rev 10239)
+++ trunk/octave-forge/main/vrml/inst/vrml_lines.m 2012-04-16 09:50:24 UTC (rev 10240)
@@ -30,7 +30,6 @@
function s = vrml_lines(x,f,varargin)
if nargin < 2, f = ones (1,columns(x)); end
-args = nargin; # nargin is now a function
col = [1, 0, 0] ;
opt1 = " col " ;
@@ -38,10 +37,9 @@
verbose = 0 ;
-args -= 2 ;
i=1;
-while args>=i ,
+while (nargin -2) >=i ,
tmp = varargin{i++} ; # pos 2.1.39
if ! ischar(tmp) ,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <et...@us...> - 2012-04-17 05:02:26
|
Revision: 10253
http://octave.svn.sourceforge.net/octave/?rev=10253&view=rev
Author: etienne
Date: 2012-04-17 05:02:15 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Copyright notices
Modified Paths:
--------------
trunk/octave-forge/main/vrml/inst/checker_color.m
trunk/octave-forge/main/vrml/inst/test_moving_surf.m
trunk/octave-forge/main/vrml/inst/vrml_Box.m
trunk/octave-forge/main/vrml/inst/vrml_DirectionalLight.m
trunk/octave-forge/main/vrml/inst/vrml_ROUTE.m
trunk/octave-forge/main/vrml/inst/vrml_Sphere.m
trunk/octave-forge/main/vrml/inst/vrml_TimeSensor.m
trunk/octave-forge/main/vrml/inst/vrml_anim.m
trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_2.m
trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_3.m
trunk/octave-forge/main/vrml/inst/vrml_faces.m
trunk/octave-forge/main/vrml/inst/vrml_interp.m
trunk/octave-forge/main/vrml/inst/vrml_newname.m
Modified: trunk/octave-forge/main/vrml/inst/checker_color.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/checker_color.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/checker_color.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2010 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2010-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
Modified: trunk/octave-forge/main/vrml/inst/test_moving_surf.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/test_moving_surf.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/test_moving_surf.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2005-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
Modified: trunk/octave-forge/main/vrml/inst/vrml_Box.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_Box.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/vrml_Box.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2010 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2010-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
Modified: trunk/octave-forge/main/vrml/inst/vrml_DirectionalLight.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_DirectionalLight.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/vrml_DirectionalLight.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2005-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
Modified: trunk/octave-forge/main/vrml/inst/vrml_ROUTE.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_ROUTE.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/vrml_ROUTE.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2005-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
Modified: trunk/octave-forge/main/vrml/inst/vrml_Sphere.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_Sphere.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/vrml_Sphere.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2010 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2010-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
Modified: trunk/octave-forge/main/vrml/inst/vrml_TimeSensor.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_TimeSensor.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/vrml_TimeSensor.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2005-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
Modified: trunk/octave-forge/main/vrml/inst/vrml_anim.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_anim.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/vrml_anim.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2005-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
Modified: trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_2.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_2.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_2.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2002-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
Modified: trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_3.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_3.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_3.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2002-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
Modified: trunk/octave-forge/main/vrml/inst/vrml_faces.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_faces.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/vrml_faces.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2002-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
Modified: trunk/octave-forge/main/vrml/inst/vrml_interp.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_interp.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/vrml_interp.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2005-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
Modified: trunk/octave-forge/main/vrml/inst/vrml_newname.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_newname.m 2012-04-17 03:39:11 UTC (rev 10252)
+++ trunk/octave-forge/main/vrml/inst/vrml_newname.m 2012-04-17 05:02:15 UTC (rev 10253)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@eg...>
+## Copyright (C) 2005-2012 Etienne Grossmann <et...@eg...>
##
## This program is free software; you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free Software
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X