From 5145dd3aa0c02c9fc496d1432fc4410674206e1d Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 20 Feb 2017 00:05:31 -0800 Subject: Import Upstream version 3a2 --- daylight.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'daylight.scm') diff --git a/daylight.scm b/daylight.scm index 6c989b2..9151f99 100644 --- a/daylight.scm +++ b/daylight.scm @@ -245,17 +245,11 @@ (vector-set! data (quotient (- wl 380) 10) (* (solCurve wl) tauR tauA tauO tauG tauWA)))))) -;;@body Returns (unnormalized) XYZ values for color of sunlight for a -;;given @1 and @2. -(define (sunlight-XYZ turbidity theta_s) - (define spectrum (sunlight-spectrum turbidity theta_s)) - (and spectrum (spectrum->XYZ spectrum 380.e-9 780.e-9))) - ;;@body Given @1 and @2, @0 returns the CIEXYZ triple for color of ;;sunlight scaled to be just inside the RGB709 gamut. -(define (sunlight-CIEXYZ turbidity theta_s) +(define (sunlight-chromaticity turbidity theta_s) (define spectrum (sunlight-spectrum turbidity theta_s)) - (and spectrum (spectrum->CIEXYZ spectrum 380.e-9 780.e-9))) + (and spectrum (spectrum->chromaticity spectrum 380.e-9 780.e-9))) ;; Arguments and result in radians (define (angle-between theta phi theta_s phi_s) -- cgit v1.2.3