--- ray/doc/ray.html 2025/05/30 16:35:52 1.42 +++ ray/doc/ray.html 2025/08/14 18:16:17 1.46 @@ -1,8 +1,8 @@ - + -The RADIANCE 6.0 Synthetic Imaging System +The RADIANCE 6.1 Synthetic Imaging System @@ -10,7 +10,7 @@ The RADIANCE 6.0 Synthetic Imaging System

-The RADIANCE 6.0 Synthetic Imaging System +The RADIANCE 6.1 Synthetic Imaging System

@@ -75,10 +75,8 @@ in graphic arts, lighting design, computer-aided engineering and architecture.

- +

-Figure 1 -

The diagram in Figure 1 shows the flow between programs (boxes) and data (ovals). The central program is rpict, which produces a picture from a scene @@ -1357,7 +1355,7 @@ A texture is a perturbation of the surface normal, an

         mod texdata id
-        8+ xfunc yfunc zfunc xdfname ydfname zdfname vfname x0 x1 .. xf
+        8+ xfunc yfunc zfunc xdfname ydfname zdfname funcfile x0 x1 .. xf
         0
         n A1 A2 .. An
 
@@ -2002,9 +2000,9 @@ sign ('#') and continuing to the end of line. All numbers are decimal integers:
-        code n
-                x0 y0
+        code N
                 x1 y1
+                x2 y2
                  ...
                 xn yn
          ...
@@ -2150,54 +2148,49 @@ or converted a standard image format using one of the 
 
 
 
-The Radiance Software License, Version 1.0
+The Radiance Software License, Version 2.0
 
-Copyright (c) 1990 - 2021 The Regents of the University of California,
-through Lawrence Berkeley National Laboratory.   All rights reserved.
+Radiance v6.0 Copyright (c) 1990 to 2025, The Regents of the University of
+California, through Lawrence Berkeley National Laboratory (subject to receipt
+of any required approvals from the U.S. Dept. of Energy).  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+modification, are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
+(1) Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the
-      distribution.
+(2) Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
 
-3. The end-user documentation included with the redistribution,
-          if any, must include the following acknowledgment:
-            "This product includes Radiance software
-                (http://radsite.lbl.gov/)
-                developed by the Lawrence Berkeley National Laboratory
-              (http://www.lbl.gov/)."
-      Alternately, this acknowledgment may appear in the software itself,
-      if and wherever such third-party acknowledgments normally appear.
+(3) Neither the name of the University of California, Lawrence Berkeley
+National Laboratory, U.S. Dept. of Energy nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
 
-4. The names "Radiance," "Lawrence Berkeley National Laboratory"
-      and "The Regents of the University of California" must
-      not be used to endorse or promote products derived from this
-      software without prior written permission. For written
-      permission, please contact radiance@radsite.lbl.gov.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
 
-5. Products derived from this software may not be called "Radiance",
-      nor may "Radiance" appear in their name, without prior written
-      permission of Lawrence Berkeley National Laboratory.
-
-THIS SOFTWARE IS PROVIDED ``AS IS" AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+You are under no obligation whatsoever to provide any bug fixes, patches,
+or upgrades to the features, functionality or performance of the source
+code ("Enhancements") to anyone; however, if you choose to make your
+Enhancements available either publicly, or directly to Lawrence Berkeley
+National Laboratory, without imposing a separate written license agreement
+for such Enhancements, then you hereby grant the following license: a
+non-exclusive, royalty-free perpetual license to install, use, modify,
+prepare derivative works, incorporate into other computer software,
+distribute, and sublicense such enhancements or derivative works thereof,
+in binary and source code form.