From a69c9fb665459e2bfdbda1bf80741a0af31a7faf Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 20 Feb 2017 00:06:40 -0800 Subject: New upstream version 3b5 --- solid.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 solid.scm (limited to 'solid.scm') diff --git a/solid.scm b/solid.scm old mode 100644 new mode 100755 index 990fa3d..d794332 --- 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 -- cgit v1.2.3