summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-01-12 23:17:13 +0000
committerKarl Berry <karl@freefriends.org>2012-01-12 23:17:13 +0000
commit72bc6c7e927ea35a59459a05923355525de579e9 (patch)
treecec36946510c8a6f986258bff8f24d6ea6d8e907 /Master
parent302c07209d0fb0e21be8f0c1a02067ac1c9d180a (diff)
tikz-3dplot 2012-01-11 (11jan12)
git-svn-id: svn://tug.org/texlive/trunk@25087 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf-dist/doc/latex/tikz-3dplot/externalize_images.bat14
-rw-r--r--Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.pdfbin447589 -> 457400 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.tex4
-rw-r--r--Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation_figures.tex19
-rw-r--r--Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty38
5 files changed, 35 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/latex/tikz-3dplot/externalize_images.bat b/Master/texmf-dist/doc/latex/tikz-3dplot/externalize_images.bat
index 775bce70abe..027f298413e 100755
--- a/Master/texmf-dist/doc/latex/tikz-3dplot/externalize_images.bat
+++ b/Master/texmf-dist/doc/latex/tikz-3dplot/externalize_images.bat
@@ -1,7 +1,7 @@
-rem to externalize a figure, un-rem the figure you wish, and run this batch file.
-
-rem pdflatex --jobname=Figures/threedsurfaceplot tikz-3dplot_documentation.tex
-rem pdflatex --jobname=Figures/examplesurfaceplot tikz-3dplot_documentation.tex
-rem pdflatex --jobname=Figures/examplesurfaceplotrange tikz-3dplot_documentation.tex
-rem pdflatex --jobname=Figures/exampleshowargcolorguide tikz-3dplot_documentation.tex
-pdflatex --jobname=Figures/alphabetagamma tikz-3dplot_documentation.tex
+rem to externalize a figure, un-rem the figure you wish, and run this batch file.
+
+pdflatex --jobname=Figures/threedsurfaceplot tikz-3dplot_documentation.tex
+pdflatex --jobname=Figures/examplesurfaceplot tikz-3dplot_documentation.tex
+pdflatex --jobname=Figures/examplesurfaceplotrange tikz-3dplot_documentation.tex
+pdflatex --jobname=Figures/exampleshowargcolorguide tikz-3dplot_documentation.tex
+pdflatex --jobname=Figures/alphabetagamma tikz-3dplot_documentation.tex
diff --git a/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.pdf b/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.pdf
index 7f3a9c56b93..c6515f9c878 100644
--- a/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.pdf
+++ b/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.tex b/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.tex
index 5430a251dbf..785388f6065 100644
--- a/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.tex
+++ b/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.tex
@@ -1,5 +1,5 @@
%% tikz-3dplot_documentation.tex
-%% Copyright 2010 Jeffrey D. Hein
+%% Copyright 2010-2012 Jeffrey D. Hein
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -134,7 +134,7 @@
\vfill
\parindent=0pt
- Copyright 2010, 2011 Jeff Hein
+ Copyright 2010-2012 Jeff Hein
\medskip
Permission is granted to distribute and/or modify \emph{both
diff --git a/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation_figures.tex b/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation_figures.tex
index 605b1ce9e70..17bb4b993ce 100644
--- a/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation_figures.tex
+++ b/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation_figures.tex
@@ -1,5 +1,4 @@
\newcommand{\tdplotmainfig}{%
-\ifpdf
%Angle Definitions
%-----------------
%
@@ -86,22 +85,18 @@
\tdplotdrawarc[tdplot_rotated_coords,color=blue]{(0,0,0)}{0.2}{0}{55}{anchor=south west,color=black}{$\theta'$}
\end{tikzpicture}
-\fi
}
\newcommand{\threedcoord}[2]{%
-\ifpdf
\tdplotsetmaincoords{#1}{#2}
\begin{tikzpicture}[tdplot_main_coords]
\draw[thick,->] (0,0,0) -- (1,0,0) node[anchor=north east]{$x$};
\draw[thick,->] (0,0,0) -- (0,1,0) node[anchor=north west]{$y$};
\draw[thick,->] (0,0,0) -- (0,0,1) node[anchor=south]{$z$};
\end{tikzpicture}
-\fi
}
\newcommand{\threedrotcoordsystem}{%
-\ifpdf
\tdplotsetmaincoords{50}{140}
\begin{tikzpicture}[scale=5,tdplot_main_coords]
\draw[thick,->] (0,0,0) -- (1,0,0) node[anchor=north east]{$x$};
@@ -115,11 +110,9 @@
\draw[thick,color=blue,tdplot_rotated_coords,->] (0,0,0) -- (0,0,.5) node[anchor=south]{$z'$};
\end{tikzpicture}
-\fi
}
\newcommand{\threedconventions}{%
-\ifpdf
\tdplotsetmaincoords{50}{110}
\begin{tikzpicture}[scale=2,tdplot_main_coords]
\draw[thick,->] (0,0,0) -- (1,0,0) node[anchor=north east]{$x$};
@@ -130,12 +123,10 @@
\draw[color=blue,->] (.5,0,0) arc (0:45:.5);
\end{tikzpicture}
-\fi
}
\newcommand{\threedalphabetagamma}{%
-\ifpdf
\beginpgfgraphicnamed{Figures/alphabetagamma}
\tdplotsetmaincoords{50}{140}
%
@@ -198,11 +189,9 @@
\tdplotdrawarc[color=orange!50!black]{(0,0,0)}{.2}{0}{60}{anchor=north east}{$\alpha$}
\end{tikzpicture}
\endpgfgraphicnamed
-\fi
}
\newcommand{\threedthetaarc}{%
-\ifpdf
%
\tdplotsetmaincoords{70}{110}
%
@@ -230,11 +219,9 @@
\tdplotdrawarc[tdplot_rotated_coords,color=orange!50!black]{(0,0,0)}{.4}{0}{50}{anchor=north east}{$\theta$}
\end{tikzpicture}
-\fi
}
\newcommand{\threedparamplot}{%
-\ifpdf
%
\beginpgfgraphicnamed{Figures/threedparamplot}
\tdplotsetmaincoords{70}{110}
@@ -254,11 +241,9 @@
\end{tikzpicture}
\endpgfgraphicnamed
-\fi
}
\newcommand{\threedsurfaceplot}{%
-\ifpdf
\beginpgfgraphicnamed{Figures/threedsurfaceplot}
%
\tdplotsetmaincoords{70}{135}
@@ -279,11 +264,10 @@
\end{tikzpicture}
\endpgfgraphicnamed
-\fi
+
}
\newcommand{\colortest}{%
-\ifpdf
\begin{tikzpicture}
\foreach \thetawheel in {0,1,...,360}
{
@@ -294,5 +278,4 @@
\filldraw(\thetawheel:3) circle (1pt);
}
\end{tikzpicture}
-\fi
}
diff --git a/Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty b/Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty
index 357028b73f0..f06ed0091d1 100644
--- a/Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty
+++ b/Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty
@@ -470,11 +470,13 @@
%DEBUG: show the cross product
%\draw[->,blue] (\tdplotvertexx,\tdplotvertexy,\tdplotvertexz)
- % -- ++(\tdplotresx,\tdplotresy,\tdplotresz);
+ -- ++(\tdplotresx,\tdplotresy,\tdplotresz);
%get angles for this vector
\tdplotgetpolarcoords{\tdplotresx}{\tdplotresy}{\tdplotresz}
+ \typeout{angles for cross product: phi: \tdplotresphi theta: \tdplotrestheta}
+
%place the rotated coordinate system so that the z' axis points along this vector
\tdplotsetrotatedcoords{\tdplotresphi}{\tdplotrestheta}{0}
\coordinate (Vertex) at (\tdplotvertexx,\tdplotvertexy,\tdplotvertexz);
@@ -490,17 +492,21 @@
\tdplotgetpolarcoords{\tdplotresx}{\tdplotresy}{\tdplotresz}
\pgfmathsetmacro{\tdplotstartphi}{\tdplotresphi}
+
%calculate the end angle of the arc
\tdplottransformmainrot{\bx}{\by}{\bz}
\tdplotgetpolarcoords{\tdplotresx}{\tdplotresy}{\tdplotresz}
%draw the arc
\pgfmathparse{\tdplotstartphi < \tdplotresphi}
- \ifthenelse{\equal{\pgfmathresult}{1.0}}%
+ \ifthenelse{\equal{\pgfmathresult}{1}}%
{}%
{
\pgfmathsetmacro{\tdplotstartphi}{\tdplotstartphi - 360}
}
+
+ %\typeout{startphi: \tdplotstartphi}
+ %\typeout{endphi: \tdplotresphi}
\draw[tdplot_rotated_coords,#1] (0,0,0) + (\tdplotstartphi:#2) arc (\tdplotstartphi:\tdplotresphi:#2);
@@ -663,7 +669,7 @@
\pgfmathsetmacro{\tdplotphi}{mod(\curphi,360)}
\pgfmathparse{\tdplotphi < 0}
- \ifthenelse{\equal{\pgfmathresult}{1.0}}{
+ \ifthenelse{\equal{\pgfmathresult}{1}}{
\pgfmathsetmacro{\tdplotphi}{\tdplotphi + 360}
}{}%
@@ -690,7 +696,7 @@
\pgfmathsetmacro{\tdplotphi}{\tdplotphi + \viewphistep}
\pgfmathparse{\tdplotphi < 0}
- \ifthenelse{\equal{\pgfmathresult}{1.0}}{
+ \ifthenelse{\equal{\pgfmathresult}{1}}{
\pgfmathsetmacro{\tdplotphi}{\tdplotphi + 360}
}{}%
@@ -819,7 +825,7 @@
%
%check for angles larger than 90
\pgfmathparse{\vzcalc < 0}
- \ifthenelse{\equal{\pgfmathresult}{1.0}}%
+ \ifthenelse{\equal{\pgfmathresult}{1}}%
{%
\pgfmathsetmacro{\tdplotrestheta}{180 - \tdplotrestheta}
}
@@ -830,18 +836,20 @@
{%
%check the sign of vy, and set angle appropriately
\pgfmathparse{\vycalc < 0}
- \ifthenelse{\equal{\pgfmathresult}{1.0}}%
+ \ifthenelse{\equal{\pgfmathresult}{1}}%
{%
\pgfmathsetmacro{\tdplotresphi}{270}
}
{%
- \pgfmathparse{\vycalc == 0}
- \ifthenelse{\equal{\pgfmathresult}{1.0}}%
+ \pgfmathparse{\vycalc > 0}
+ \ifthenelse{\equal{\pgfmathresult}{1}}%
{%
- \pgfmathsetmacro{\tdplotresphi}{0}
+ %\typeout{\vycalc}
+ \pgfmathsetmacro{\tdplotresphi}{90}
}
{%
- \pgfmathsetmacro{\tdplotresphi}{90}
+ %\typeout{OVER HERE!!!!}
+ \pgfmathsetmacro{\tdplotresphi}{0}
}
}
}
@@ -851,16 +859,20 @@
%
%check if vx is less than zero, to properly identify the quadrant
\pgfmathparse{\vxcalc < 0}
- \ifthenelse{\equal{\pgfmathresult}{1.0}}%
+ %\typeout{x: \vxcalc\ y: \vycalc\ Raw phi: \tdplotresphi\ math result: \pgfmathresult}
+ \ifthenelse{\equal{\pgfmathresult}{1}}%
{%
+ %\typeout{HERE!}
%increase by half a rotation if necessary
\pgfmathsetmacro{\tdplotresphi}{\tdplotresphi+180}
}
- {}
+ {
+ %\typeout{SPOON!}
+ }
%ensure the angle lies between 0 and 360 degrees
\pgfmathparse{\tdplotresphi < 0}
- \ifthenelse{\equal{\pgfmathresult}{1.0}}%
+ \ifthenelse{\equal{\pgfmathresult}{1}}%
{%
\pgfmathsetmacro{\tdplotresphi}{\tdplotresphi+360}
}