tikz-3dplot update (13apr10)

git-svn-id: svn://tug.org/texlive/trunk@17852 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 8 insertions, 6 deletions

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 6b92c48a855..b5a8ae8fad1 100644
--- a/Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty
+++ b/Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty
@@ -20,7 +20,7 @@
 
 %tikz-3dplot.sty - package for plotting three dimensional axes and coordinates in TikZ.  The user can specify orientation of the display, and also define rotated coordinate systems within the 3d display coordinate system.  
 
-%Created 2009-11-07 by Jeff Hein.  Last updated: 2010-01-20
+%Created 2009-11-07 by Jeff Hein.  Last updated: 2010-04-03
 %----------------------------------------------------------
 
 %Requirements
@@ -107,9 +107,9 @@
 \pgfmathsetmacro{\tdplotmaintheta}{#1}
 \pgfmathsetmacro{\tdplotmainphi}{#2}
 %
-
+%
 \tdplotcalctransformmainscreen
-
+%
 %now here is where the output is performed
 \tikzset{tdplot_main_coords/.style={x={(\raarot cm,\rbarot cm)},y={(\rabrot cm, \rbbrot cm)},z={(\racrot cm, \rbcrot cm)}}}%
 }
@@ -117,7 +117,7 @@
 
 %This performs the calculation to define the main coordinate frame orientation style, and is also used to transform a coordinate from the main coordinate frame the the screen coordinate frame
 \newcommand{\tdplotcalctransformmainscreen}{%
-
+%
 %TODO: choose less obvious macro names?  or look into scoping?
 \tdplotsinandcos{\sintheta}{\costheta}{\tdplotmaintheta}%
 \tdplotsinandcos{\sinphi}{\cosphi}{\tdplotmainphi}%
@@ -140,8 +140,6 @@
 \pgfmathsetmacro{\rcbrot}{-\stcp}%
 \pgfmathsetmacro{\rccrot}{\costheta}%
 %
-
-
 }
 
 
@@ -696,6 +694,8 @@
 
 		%if using fill color parametric to angles
 		\ifthenelse{\equal{#6}{parametricfill}}{%
+			%and, if it's being plotted
+			\ifthenelse{\equal{\logictest}{1.0}}{%
 			\pgfmathsetmacro{\radius}{#1}
 			\pgfmathsetmacro{\tdplotr}{\radius*360}  %factor of 360 lets the radius change hue through one full cycle for each unit radius
 			
@@ -712,6 +712,7 @@
 			\pgfmathdivide{\colorarg}{360}
 			\definecolor{tdplotfillcolor}{hsb}{\pgfmathresult, 1, 1}
 			\color{tdplotfillcolor}
+			}{}%
 		}%
 		{%
 			\pgfsetfillcolor{#5}
@@ -724,6 +725,7 @@
 			}{}
 		%\fi
 
+		%if this section is being plotted
 		\ifthenelse{\equal{\logictest}{1.0}}{%
 		\pgfmathsetmacro{\radius}{abs(#1)}
 		\pgfpathmoveto{\pgfpointspherical{\curlongitude}{\curlatitude}{\radius}}