Mercurial > hg > octave-lyh
annotate scripts/plot/surfl.m @ 17130:26589abbc78d
Don't pass axis handle unnecessarily from high level to low level plot functions.
* scripts/plot/comet.m, scripts/plot/comet3.m, scripts/plot/compass.m,
scripts/plot/contour.m, scripts/plot/contourf.m, scripts/plot/cylinder.m,
scripts/plot/ellipsoid.m, scripts/plot/errorbar.m, scripts/plot/feather.m,
scripts/plot/mesh.m, scripts/plot/meshc.m, scripts/plot/meshz.m,
scripts/plot/pcolor.m, scripts/plot/plot3.m, scripts/plot/rectangle.m,
scripts/plot/rose.m, scripts/plot/scatter3.m, scripts/plot/semilogxerr.m,
scripts/plot/semilogy.m, scripts/plot/semilogyerr.m, scripts/plot/slice.m,
scripts/plot/sphere.m, scripts/plot/stairs.m, scripts/plot/surf.m,
scripts/plot/surfc.m, scripts/plot/surfnorm.m, scripts/plot/trimesh.m,
scripts/plot/trisurf.m: Don't pass hax to lower level functions after
newplot() has been called.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 31 Jul 2013 18:42:17 -0700 |
parents | eaab03308c0b |
children | fd9a8b1a8768 |
rev | line source |
---|---|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
14092
diff
changeset
|
1 ## Copyright (C) 2009-2012 Kai Habel |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
2 ## |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
3 ## This file is part of Octave. |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
4 ## |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
5 ## Octave is free software; you can redistribute it and/or modify it |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
6 ## under the terms of the GNU General Public License as published by |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
7 ## the Free Software Foundation; either version 3 of the License, or (at |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
8 ## your option) any later version. |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
9 ## |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
10 ## Octave is distributed in the hope that it will be useful, but |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
13 ## General Public License for more details. |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
14 ## |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
15 ## You should have received a copy of the GNU General Public License |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
16 ## along with Octave; see the file COPYING. If not, see |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
17 ## <http://www.gnu.org/licenses/>. |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
18 |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
19 ## -*- texinfo -*- |
10793
be55736a0783
Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents:
10549
diff
changeset
|
20 ## @deftypefn {Function File} {} surfl (@var{x}, @var{y}, @var{z}) |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
21 ## @deftypefnx {Function File} {} surfl (@var{z}) |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
22 ## @deftypefnx {Function File} {} surfl (@var{x}, @var{y}, @var{z}, @var{L}) |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
23 ## @deftypefnx {Function File} {} surfl (@var{x}, @var{y}, @var{z}, @var{L}, @var{P}) |
11563
3c6e8aaa9555
Grammarcheck m-files before 3.4 release.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
24 ## @deftypefnx {Function File} {} surfl (@dots{}, "light") |
17126
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
25 ## @deftypefnx {Function File} {} surfl (@var{hax}, @dots{}) |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
26 ## @deftypefnx {Function File} {@var{h} =} surfl (@dots{}) |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
27 ## |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
28 ## Plot a 3-D surface using shading based on various lighting models. |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
29 ## |
17126
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
30 ## The surface mesh is plotted using shaded rectangles. The vertices of the |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
31 ## rectangles [@var{x}, @var{y}] are typically the output of @code{meshgrid}. |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
32 ## over a 2-D rectangular region in the x-y plane. @var{z} determines the |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
33 ## height above the plane of each vertex. If only a single @var{z} matrix is |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
34 ## given, then it is plotted over the meshgrid |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
35 ## @code{@var{x} = 1:columns (@var{z}), @var{y} = 1:rows (@var{z})}. |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
36 ## Thus, columns of @var{z} correspond to different @var{x} values and rows |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
37 ## of @var{z} correspond to different @var{y} values. |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
38 ## |
17126
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
39 ## The default lighting mode "cdata", changes the cdata property of the |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
40 ## surface object to give the impression of a lighted surface. |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
41 ## @strong{Warning:} The alternative mode "light" mode which creates a light |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
42 ## object to illuminate the surface is not implemented (yet). |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
43 ## |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
44 ## The light source location can be specified using @var{L}. It can be given |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
45 ## as a 2-element vector [azimuth, elevation] in degrees, or as a 3-element |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
46 ## vector [lx, ly, lz]. The default value is rotated 45 degrees |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
47 ## counterclockwise to the current view. |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
48 ## |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
49 ## The material properties of the surface can specified using a 4-element |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
50 ## vector @var{P} = [@var{AM} @var{D} @var{SP} @var{exp}] which defaults to |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
51 ## @var{p} = [0.55 0.6 0.4 10]. |
14248 | 52 ## |
11595
5ec6aa05638d
Prevent doubled quotes around @table items in Info.
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
53 ## @table @asis |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
54 ## @item "AM" strength of ambient light |
10821
693e22af08ae
Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
55 ## |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
56 ## @item "D" strength of diffuse reflection |
10821
693e22af08ae
Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
57 ## |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
58 ## @item "SP" strength of specular reflection |
10821
693e22af08ae
Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents:
10793
diff
changeset
|
59 ## |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
60 ## @item "EXP" specular exponent |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
61 ## @end table |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
62 ## |
17126
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
63 ## If the first argument @var{hax} is an axes handle, then plot into this axis, |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
64 ## rather than the current axes returned by @code{gca}. |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
65 ## |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
66 ## The optional return value @var{h} is a graphics handle to the created |
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
67 ## surface object. |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
68 ## |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
69 ## Example: |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
70 ## |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
71 ## @example |
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
9040
diff
changeset
|
72 ## @group |
14327
4d917a6a858b
doc: Use Octave coding conventions in @example blocks of docstrings.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
73 ## colormap (bone (64)); |
4d917a6a858b
doc: Use Octave coding conventions in @example blocks of docstrings.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
74 ## surfl (peaks); |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
75 ## shading interp; |
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
9040
diff
changeset
|
76 ## @end group |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
77 ## @end example |
17126
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17052
diff
changeset
|
78 ## @seealso{diffuse, specular, surf, shading, colormap, caxis} |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
79 ## @end deftypefn |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
80 |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
81 ## Author: Kai Habel <kai.habel@gmx.de> |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
82 |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
83 function retval = surfl (varargin) |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
84 |
17052
1118d566bcd4
surf.m, surfc.m, surfl.m, surfnorm.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
16754
diff
changeset
|
85 [hax, varargin] = __plt_get_axis_arg__ ("surfl", varargin{:}); |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
86 |
17052
1118d566bcd4
surf.m, surfc.m, surfl.m, surfnorm.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
16754
diff
changeset
|
87 oldfig = ifelse (isempty (hax), [], get (0, "currentfigure")); |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
88 unwind_protect |
17052
1118d566bcd4
surf.m, surfc.m, surfl.m, surfnorm.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
16754
diff
changeset
|
89 hax = newplot (hax); |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
90 |
8460
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
91 ## Check for lighting type. |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
92 use_cdata = true; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
93 if (ischar (varargin{end})) |
14225
f0d903879eaa
Replace unnecessary strcmpi calls with strcmp.
Rik <octave@nomad.inbox5.com>
parents:
14223
diff
changeset
|
94 lstr = tolower (varargin{end}); |
f0d903879eaa
Replace unnecessary strcmpi calls with strcmp.
Rik <octave@nomad.inbox5.com>
parents:
14223
diff
changeset
|
95 if (strncmp (lstr, "light", 5)) |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
96 warning ("light method not supported (yet), using cdata method instead"); |
10549 | 97 ## This can be implemented when light objects are supported. |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
98 use_cdata = false; |
14225
f0d903879eaa
Replace unnecessary strcmpi calls with strcmp.
Rik <octave@nomad.inbox5.com>
parents:
14223
diff
changeset
|
99 elseif (strncmp (lstr, "cdata", 5)) |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
100 use_cdata = true; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
101 else |
8460
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
102 error ("surfl: unknown lighting method"); |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
103 endif |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
104 varargin(end) = []; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
105 endif |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
106 |
8460
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
107 ## Check for reflection properties argument. |
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
108 ## |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
109 ## r = [ambient light strength, |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
110 ## diffuse reflection strength, |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
111 ## specular reflection strength, |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
112 ## specular shine] |
8460
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
113 if (length (varargin{end}) == 4 && isnumeric (varargin{end})) |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
114 r = varargin{end}; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
115 varargin(end) = []; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
116 else |
8460
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
117 ## Default values. |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
118 r = [0.55, 0.6, 0.4, 10]; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
119 endif |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
120 |
8460
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
121 ## Check for light vector (lv) argument. |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
122 have_lv = false; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
123 if (isnumeric (varargin{end})) |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
124 len = numel (varargin{end}); |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
125 lastarg = varargin{end}; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
126 if (len == 3) |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
127 lv = lastarg; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
128 varargin(end) = []; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
129 have_lv = true; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
130 elseif (len == 2) |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
131 [lv(1), lv(2), lv(3)] = sph2cart ((lastarg(1) - 90) * pi/180, lastarg(2) * pi/180, 1.0); |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
132 varargin(end) = []; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
133 have_lv = true; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
134 endif |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
135 endif |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
136 |
17052
1118d566bcd4
surf.m, surfc.m, surfl.m, surfnorm.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
16754
diff
changeset
|
137 htmp = surface ([varargin, "parent", hax]{:}); |
1118d566bcd4
surf.m, surfc.m, surfl.m, surfnorm.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
16754
diff
changeset
|
138 if (! ishold (hax)) |
1118d566bcd4
surf.m, surfc.m, surfl.m, surfnorm.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
16754
diff
changeset
|
139 set (hax, "view", [-37.5, 30], |
10549 | 140 "xgrid", "on", "ygrid", "on", "zgrid", "on", "clim", [0 1]); |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
141 endif |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
142 |
8460
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
143 ## Get view vector (vv). |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
144 a = axis; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
145 [az, el] = view; |
16754
022dba56de1e
eliminate unnecessary normalisation of view vector in surfl (bug #39241)
Andreas Weber <andy.weber.aw@googlemail.com>
parents:
14868
diff
changeset
|
146 vv = sph2cart ((az - 90) * pi/180.0, el * pi/180.0, 1.0); |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
147 |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
148 if (!have_lv) |
8460
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
149 ## Calculate light vector (lv) from view vector. |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
150 Phi = 45.0 / 180.0 * pi; |
8460
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
151 R = [cos(Phi), -sin(Phi), 0; |
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
152 sin(Phi), cos(Phi), 0; |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
153 0, 0, 1]; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
154 lv = (R * vv.').'; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
155 endif |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
156 |
14225
f0d903879eaa
Replace unnecessary strcmpi calls with strcmp.
Rik <octave@nomad.inbox5.com>
parents:
14223
diff
changeset
|
157 vn = get (htmp, "vertexnormals"); |
17052
1118d566bcd4
surf.m, surfc.m, surfl.m, surfnorm.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
16754
diff
changeset
|
158 dar = get (hax, "plotboxaspectratio"); |
8460
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
159 vn(:,:,1) *= dar(1); |
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
160 vn(:,:,2) *= dar(2); |
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
161 vn(:,:,3) *= dar(3); |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
162 |
8460
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
163 ## Normalize vn. |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
164 vn = vn ./ repmat (sqrt (sumsq (vn, 3)), [1, 1, 3]); |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14335
diff
changeset
|
165 [nr, nc] = size (get (htmp, "zdata")); |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
166 |
8460
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
167 ## Ambient, diffuse, and specular term. |
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
168 cdata = (r(1) * ones (nr, nc) |
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
169 + r(2) * diffuse (vn(:,:,1), vn(:,:,2), vn(:,:,3), lv) |
e4c9ecb64411
diffuse.m, specular.m, surfl.m: style fixes
John W. Eaton <jwe@octave.org>
parents:
8450
diff
changeset
|
170 + r(3) * specular (vn(:,:,1), vn(:,:,2), vn(:,:,3), lv, vv, r(4))); |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
171 |
14225
f0d903879eaa
Replace unnecessary strcmpi calls with strcmp.
Rik <octave@nomad.inbox5.com>
parents:
14223
diff
changeset
|
172 set (htmp, "cdata", cdata ./ sum (r(1:3))); |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
173 |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
174 unwind_protect_cleanup |
17052
1118d566bcd4
surf.m, surfc.m, surfl.m, surfnorm.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
16754
diff
changeset
|
175 if (! isempty (oldfig)) |
1118d566bcd4
surf.m, surfc.m, surfl.m, surfnorm.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
16754
diff
changeset
|
176 set (0, "currentfigure", oldfig); |
1118d566bcd4
surf.m, surfc.m, surfl.m, surfnorm.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
16754
diff
changeset
|
177 endif |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
178 end_unwind_protect |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
179 |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
180 if (nargout > 0) |
14225
f0d903879eaa
Replace unnecessary strcmpi calls with strcmp.
Rik <octave@nomad.inbox5.com>
parents:
14223
diff
changeset
|
181 retval = htmp; |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
182 endif |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
183 |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
184 endfunction |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
185 |
14223
ba7a26030214
Use Octave spacing convention in %!test blocks of surface plot functions.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
186 |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
187 %!demo |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14225
diff
changeset
|
188 %! clf; |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14225
diff
changeset
|
189 %! [X,Y,Z] = sombrero (); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14225
diff
changeset
|
190 %! colormap (copper (64)); |
14223
ba7a26030214
Use Octave spacing convention in %!test blocks of surface plot functions.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
191 %! surfl (X,Y,Z); |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
192 %! shading interp; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
193 |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
194 %!demo |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14225
diff
changeset
|
195 %! clf; |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14225
diff
changeset
|
196 %! [X,Y,Z] = sombrero (); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14225
diff
changeset
|
197 %! colormap (copper (64)); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14225
diff
changeset
|
198 %! [az, el] = view (); |
14223
ba7a26030214
Use Octave spacing convention in %!test blocks of surface plot functions.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
199 %! surfl (X,Y,Z, [az+225,el], [0.2 0.6 0.4 25]); |
8450
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
200 %! shading interp; |
6c4e2fc14beb
Add new 3D plotting function surfl. Add light functions diffuse and specular
Kai Habel
parents:
diff
changeset
|
201 |