summaryrefslogtreecommitdiffstats
path: root/solid.scm
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:06:40 -0800
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:06:40 -0800
commita69c9fb665459e2bfdbda1bf80741a0af31a7faf (patch)
treef0bc974f8805049e6b9a4e6864886298fbaa05a4 /solid.scm
parent4684239efa63dc1b2c1cbe37ef7d3062029f5532 (diff)
downloadslib-a69c9fb665459e2bfdbda1bf80741a0af31a7faf.tar.gz
slib-a69c9fb665459e2bfdbda1bf80741a0af31a7faf.zip
New upstream version 3b5upstream/3b5upstream
Diffstat (limited to 'solid.scm')
-rwxr-xr-x[-rw-r--r--]solid.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/solid.scm b/solid.scm
index 990fa3d..d794332 100644..100755
--- a/solid.scm
+++ b/solid.scm
@@ -20,6 +20,7 @@
(require 'printf)
(require 'array)
(require 'array-for-each)
+(require 'multiarg-apply)
(require 'color)
(require 'color-space) ;for xyY:normalize-colors
(require-if 'compiling 'daylight)
@@ -36,7 +37,7 @@
;;@ftindex solid-modeling
;;
;;@noindent
-;;@uref{http://swiss.csail.mit.edu/~jaffer/Solid/#Example} gives an
+;;@uref{http://people.csail.mit.edu/jaffer/Solid/#Example} gives an
;;example use of this package.
(define pi/180 (/ (* 4 (atan 1)) 180))
@@ -317,7 +318,6 @@
(let* ((theta_s (solar-polar (solar-declination julian-day)
latitude
(solar-hour julian-day hour)))
- (phi_s (cadr theta_s))
(sun-chroma (sunlight-chromaticity turbidity (car theta_s)))
(sun-color (and sun-chroma
(CIEXYZ->color (apply chromaticity->CIEXYZ sun-chroma))))
@@ -487,8 +487,8 @@
(define nargs (length args))
(let ((color (and (>= nargs 1) (color->vrml-field (car args))))
(intensity (and (>= nargs 2) (cadr args)))
- (beamwidth (and (>= nargs 3) (car (caddr args))))
- (cutoffangle (and (>= nargs 3) (cadr (caddr args))))
+ ;;(beamwidth (and (>= nargs 3) (car (caddr args))))
+ ;;(cutoffangle (and (>= nargs 3) (cadr (caddr args))))
(attenuation (and (>= nargs 3) (caddr (caddr args))))
(radius (and (>= nargs 3) (cadddr (caddr args)))))
(replicate-for-strength