[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13583] trunk/blender/source/blender/ render/intern: Removed some files that Zaghaghi accidentally committed ( sunsky stuff ; ) )
Joshua Leung
aligorith at gmail.com
Tue Feb 5 21:53:44 CET 2008
Revision: 13583
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13583
Author: aligorith
Date: 2008-02-05 21:53:43 +0100 (Tue, 05 Feb 2008)
Log Message:
-----------
Removed some files that Zaghaghi accidentally committed (sunsky stuff ;) )
Removed Paths:
-------------
trunk/blender/source/blender/render/intern/include/spectrum.h
trunk/blender/source/blender/render/intern/include/spectrum_constants.h
trunk/blender/source/blender/render/intern/include/sunsky.h
trunk/blender/source/blender/render/intern/source/spectrum.c
trunk/blender/source/blender/render/intern/source/sunsky.c
Deleted: trunk/blender/source/blender/render/intern/include/spectrum.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/spectrum.h 2008-02-05 20:40:06 UTC (rev 13582)
+++ trunk/blender/source/blender/render/intern/include/spectrum.h 2008-02-05 20:53:43 UTC (rev 13583)
@@ -1,47 +0,0 @@
-/**
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * Contributor(s):
- *
- * ***** END GPL LICENSE BLOCK *****/
-
-#ifndef SPECTRUM_H_
-#define SPECTRUM_H_
-
-#define SPECTRUM_MAX_COMPONENTS 100
-#define SPECTRUM_START 350.0
-#define SPECTRUM_END 800.0
-
-float GetOzoneSample(float lambda);
-float GetWaterSample(float lambda);
-float GetGasSample(float lambda);
-float GetSolarSample(float lambda);
-
-float GetSampleFromIrregularSpectralCurve(float *amplitudes, float *wavelengths, int divisions, float lambda);
-float GetSampleFromRegularSpectralCurve(float *amplitudes, int waveStart, int waveEnd, int divisions, float lambda);
-float GetSampleFromChromaticitySpectrum(float x, float y, float lambda);
-void GetSpectrumDataFromRegularSpectralCurve(float *amplitudes, int waveStart, int waveEnd, int divisions,
- float spectrumData[SPECTRUM_MAX_COMPONENTS]);
-void GetSpectrumDataFromChromaticitySpectrum(float x, float y, float spectrumData[SPECTRUM_MAX_COMPONENTS]);
-void ConvertSpectrumDataToCIEXYZ(float spectrumData[SPECTRUM_MAX_COMPONENTS], float color[3]);
-
-float mix(float a, float b, float s);
-#endif /*SPECTRUM_H_*/
Deleted: trunk/blender/source/blender/render/intern/include/spectrum_constants.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/spectrum_constants.h 2008-02-05 20:40:06 UTC (rev 13582)
+++ trunk/blender/source/blender/render/intern/include/spectrum_constants.h 2008-02-05 20:53:43 UTC (rev 13583)
@@ -1,237 +0,0 @@
-/**
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * Contributor(s):
- *
- * ***** END GPL LICENSE BLOCK *****/
-
-#ifndef SPECTRUM_CONSTANTS_H_
-#define SPECTRUM_CONSTANTS_H_
-
-// k_o Spectrum table from pg 127, MI.
-static float k_oWavelengths[64] =
-{
- 300, 305, 310, 315, 320,
- 325, 330, 335, 340, 345,
- 350, 355,
-
- 445, 450, 455, 460, 465,
- 470, 475, 480, 485, 490,
- 495,
-
- 500, 505, 510, 515, 520,
- 525, 530, 535, 540, 545,
- 550, 555, 560, 565, 570,
- 575, 580, 585, 590, 595,
-
- 600, 605, 610, 620, 630,
- 640, 650, 660, 670, 680,
- 690,
-
- 700, 710, 720, 730, 740,
- 750, 760, 770, 780, 790,
-};
-
-static float k_oAmplitudes[65] = {
- 10.0, 4.8, 2.7, 1.35, .8, .380, .160, .075, .04, .019, .007, .0,
-
- .003, .003, .004, .006, .008, .009, .012, .014, .017, .021, .025,
-
- .03, .035, .04, .045, .048, .057, .063, .07, .075, .08, .085, .095,
- .103, .110, .12, .122, .12, .118, .115, .12, .125, .130, .12, .105,
- .09, .079, .067, .057, .048, .036, .028,
-
- .023, .018, .014, .011, .010, .009, .007, .004, .0, .0
-};
-
-
-// k_g Spectrum table from pg 130, MI.
-static float k_gWavelengths[4] = {
- 759,
- 760,
- 770,
- 771
-};
-
-static float k_gAmplitudes[4] = {
- 0,
- 3.0,
- 0.210,
- 0
-};
-
-// k_wa Spectrum table from pg 130, MI.
-static float k_waWavelengths[13] = {
- 689, 690, 700, 710,
- 720, 730, 740, 750,
- 760, 770, 780, 790, 800};
-
-static float k_waAmplitudes[13] = {
- 0,
- 0.160e-1,
- 0.240e-1,
- 0.125e-1,
- 0.100e+1,
- 0.870,
- 0.610e-1,
- 0.100e-2,
- 0.100e-4,
- 0.100e-4,
- 0.600e-3,
- 0.175e-1,
- 0.360e-1
-};
-
-// 380-750 by 10nm
-static float solAmplitudes[38] =
-{
- 165.5, 162.3, 211.2, 258.8, 258.2,
- 242.3, 267.6, 296.6, 305.4, 300.6,
- 306.6, 288.3, 287.1, 278.2, 271.0,
- 272.3, 263.6, 255.0, 250.6, 253.1,
- 253.5, 251.3, 246.3, 241.7, 236.8,
- 232.1, 228.2, 223.4, 219.7, 215.3,
- 211.0, 207.3, 202.4, 198.7, 194.3,
- 190.7, 186.3, 182.6
-};
-
-// 300-830 10nm
-static float tS0Amplitudes[54] =
-{
- 0.04,6.0,29.6,55.3,57.3,
- 61.8,61.5,68.8,63.4,65.8,
- 94.8,104.8,105.9,96.8,113.9,
- 125.6,125.5,121.3,121.3,113.5,
- 113.1,110.8,106.5,108.8,105.3,
- 104.4,100.0,96.0,95.1,89.1,
- 90.5,90.3,88.4,84.0,85.1,
- 81.9,82.6,84.9,81.3,71.9,
- 74.3,76.4,63.3,71.7,77.0,
- 65.2,47.7,68.6,65.0,66.0,
- 61.0,53.3,58.9,61.9
-};
-
-static float tS1Amplitudes[54] =
-{
- 0.02,4.5,22.4,42.0,40.6,
- 41.6,38.0,42.4,38.5,35.0,
- 43.4,46.3,43.9,37.1,36.7,
- 35.9,32.6,27.9,24.3,20.1,
- 16.2,13.2,8.6,6.1,4.2,
- 1.9,0.0,-1.6,-3.5,-3.5,
- -5.8,-7.2,-8.6,-9.5,-10.9,
- -10.7,-12.0,-14.0,-13.6,-12.0,
- -13.3,-12.9,-10.6,-11.6,-12.2,
- -10.2,-7.8,-11.2,-10.4,-10.6,
- -9.7,-8.3,-9.3,-9.8
-};
-
-static float tS2Amplitudes[54] =
-{
- 0.0,2.0,4.0,8.5,7.8,
- 6.7,5.3,6.1,3.0,1.2,
- -1.1,-0.5,-0.7,-1.2,-2.6,
- -2.9,-2.8,-2.6,-2.6,-1.8,
- -1.5,-1.3,-1.2,-1.0,-0.5,
- -0.3,0.0,0.2,0.5,2.1,
- 3.2,4.1,4.7,5.1,6.7,
- 7.3,8.6,9.8,10.2,8.3,
- 9.6,8.5,7.0,7.6,8.0,
- 6.7,5.2,7.4,6.8,7.0,
- 6.4,5.5,6.1,6.5
-};
-
-static float tCIE_xbar[95] =
-{
-/* 360-830nm in steps of 5nm */
-0.000129900000, 0.000232100000, 0.000414900000, 0.000741600000, 0.001368000000,
-0.002236000000, 0.004243000000, 0.007650000000, 0.014310000000, 0.023190000000,
-0.043510000000, 0.077630000000, 0.134380000000, 0.214770000000, 0.283900000000,
-0.328500000000, 0.348280000000, 0.348060000000, 0.336200000000, 0.318700000000,
-0.290800000000, 0.251100000000, 0.195360000000, 0.142100000000, 0.095640000000,
-0.057950010000, 0.032010000000, 0.014700000000, 0.004900000000, 0.002400000000,
-0.009300000000, 0.029100000000, 0.063270000000, 0.109600000000, 0.165500000000,
-0.225749900000, 0.290400000000, 0.359700000000, 0.433449900000, 0.512050100000,
-0.594500000000, 0.678400000000, 0.762100000000, 0.842500000000, 0.916300000000,
-0.978600000000, 1.026300000000, 1.056700000000, 1.062200000000, 1.045600000000,
-1.002600000000, 0.938400000000, 0.854449900000, 0.751400000000, 0.642400000000,
-0.541900000000, 0.447900000000, 0.360800000000, 0.283500000000, 0.218700000000,
-0.164900000000, 0.121200000000, 0.087400000000, 0.063600000000, 0.046770000000,
-0.032900000000, 0.022700000000, 0.015840000000, 0.011359160000, 0.008110916000,
-0.005790346000, 0.004106457000, 0.002899327000, 0.002049190000, 0.001439971000,
-0.000999949300, 0.000690078600, 0.000476021300, 0.000332301100, 0.000234826100,
-0.000166150500, 0.000117413000, 0.000083075270, 0.000058706520, 0.000041509940,
-0.000029353260, 0.000020673830, 0.000014559770, 0.000010253980, 0.000007221456,
-0.000005085868, 0.000003581652, 0.000002522525, 0.000001776509, 0.000001251141
-};
-
-static float tCIE_ybar[95] =
-{
-/* 360-830nm in steps of 5nm */
-
-0.000003917000, 0.000006965000, 0.000012390000, 0.000022020000, 0.000039000000,
-0.000064000000, 0.000120000000, 0.000217000000, 0.000396000000, 0.000640000000,
-0.001210000000, 0.002180000000, 0.004000000000, 0.007300000000, 0.011600000000,
-0.016840000000, 0.023000000000, 0.029800000000, 0.038000000000, 0.048000000000,
-0.060000000000, 0.073900000000, 0.090980000000, 0.112600000000, 0.139020000000,
-0.169300000000, 0.208020000000, 0.258600000000, 0.323000000000, 0.407300000000,
-0.503000000000, 0.608200000000, 0.710000000000, 0.793200000000, 0.862000000000,
-0.914850100000, 0.954000000000, 0.980300000000, 0.994950100000, 1.000000000000,
-0.995000000000, 0.978600000000, 0.952000000000, 0.915400000000, 0.870000000000,
-0.816300000000, 0.757000000000, 0.694900000000, 0.631000000000, 0.566800000000,
-0.503000000000, 0.441200000000, 0.381000000000, 0.321000000000, 0.265000000000,
-0.217000000000, 0.175000000000, 0.138200000000, 0.107000000000, 0.081600000000,
-0.061000000000, 0.044580000000, 0.032000000000, 0.023200000000, 0.017000000000,
-0.011920000000, 0.008210000000, 0.005723000000, 0.004102000000, 0.002929000000,
-0.002091000000, 0.001484000000, 0.001047000000, 0.000740000000, 0.000520000000,
-0.000361100000, 0.000249200000, 0.000171900000, 0.000120000000, 0.000084800000,
-0.000060000000, 0.000042400000, 0.000030000000, 0.000021200000, 0.000014990000,
-0.000010600000, 0.000007465700, 0.000005257800, 0.000003702900, 0.000002607800,
-0.000001836600, 0.000001293400, 0.000000910930, 0.000000641530, 0.000000451810
-};
-
-static float tCIE_zbar[95] =
-{
-/* 360-830nm in steps of 5nm */
-
-0.000606100000, 0.001086000000, 0.001946000000, 0.003486000000, 0.006450001000,
-0.010549990000, 0.020050010000, 0.036210000000, 0.067850010000, 0.110200000000,
-0.207400000000, 0.371300000000, 0.645600000000, 1.039050100000, 1.385600000000,
-1.622960000000, 1.747060000000, 1.782600000000, 1.772110000000, 1.744100000000,
-1.669200000000, 1.528100000000, 1.287640000000, 1.041900000000, 0.812950100000,
-0.616200000000, 0.465180000000, 0.353300000000, 0.272000000000, 0.212300000000,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list