diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-07 23:13:37 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-07 23:13:37 +0300 |
commit | f1c55295b0d95307559c1f8b09d6b8bd6c8bbbf0 (patch) | |
tree | 79ca0b7e815bc7e181171b4a5f4cb515ac107b08 /presets | |
parent | 1a935298b9a3dddba50955591ace31bb91a56e84 (diff) |
Cleanup: trailing space
Diffstat (limited to 'presets')
19 files changed, 23 insertions, 25 deletions
diff --git a/presets/pov/lamp/01_(5400K)_Direct_Sun.py b/presets/pov/lamp/01_(5400K)_Direct_Sun.py index 7f53ce06..6d281837 100644 --- a/presets/pov/lamp/01_(5400K)_Direct_Sun.py +++ b/presets/pov/lamp/01_(5400K)_Direct_Sun.py @@ -7,4 +7,4 @@ lampdata = bpy.context.object.data lampdata.color = (1.0, 1.0, 0.9843137264251709) lampdata.energy = 1.2 #100 000lux #lampdata.distance = 0.001 -#lampdata.falloff_type = 'INVERSE_SQUARE'
\ No newline at end of file +#lampdata.falloff_type = 'INVERSE_SQUARE' diff --git a/presets/pov/lamp/02_(5400K)_High_Noon_Sun.py b/presets/pov/lamp/02_(5400K)_High_Noon_Sun.py index 6d3083a6..47499b52 100644 --- a/presets/pov/lamp/02_(5400K)_High_Noon_Sun.py +++ b/presets/pov/lamp/02_(5400K)_High_Noon_Sun.py @@ -14,4 +14,3 @@ lampdata.shadow_ray_samples_x = 2 lampdata.color = (1.0, 1.0, 1.0) lampdata.energy = 1.094316#91193 #lux lampdata.distance =695699968 - diff --git a/presets/pov/lamp/04_(6000K)_2500W_HMI_(Halogen_Metal_Iodide).py b/presets/pov/lamp/04_(6000K)_2500W_HMI_(Halogen_Metal_Iodide).py index 0bfa95d8..b48b2ec6 100644 --- a/presets/pov/lamp/04_(6000K)_2500W_HMI_(Halogen_Metal_Iodide).py +++ b/presets/pov/lamp/04_(6000K)_2500W_HMI_(Halogen_Metal_Iodide).py @@ -11,4 +11,4 @@ lampdata.spot_blend = 0.9 lampdata.color = (0.99, 0.9882352948188782, 0.998) lampdata.energy = 223.81796 #240000lm/21.446(=lux)*0.004*2.5(distance) *2 for distance is the point of half strength lampdata.distance = 0.001 -lampdata.falloff_type = 'INVERSE_SQUARE'
\ No newline at end of file +lampdata.falloff_type = 'INVERSE_SQUARE' diff --git a/presets/pov/lamp/05_(4000K)_100W_Metal_Halide.py b/presets/pov/lamp/05_(4000K)_100W_Metal_Halide.py index e91d3f9a..2a0ba8c1 100644 --- a/presets/pov/lamp/05_(4000K)_100W_Metal_Halide.py +++ b/presets/pov/lamp/05_(4000K)_100W_Metal_Halide.py @@ -11,4 +11,4 @@ lampdata.spot_blend = 0.9 lampdata.color = (0.9490196108818054, 0.9882352948188782, 1.0) lampdata.energy = 20.98293#9000lm/21.446(=lux)*0.004*6.25(distance) *2 for distance is the point of half strength lampdata.distance = 0.025 -lampdata.falloff_type = 'INVERSE_SQUARE'
\ No newline at end of file +lampdata.falloff_type = 'INVERSE_SQUARE' diff --git a/presets/pov/lamp/06_(3200K)_100W_Quartz_Halogen.py b/presets/pov/lamp/06_(3200K)_100W_Quartz_Halogen.py index b58edf17..366cbed6 100644 --- a/presets/pov/lamp/06_(3200K)_100W_Quartz_Halogen.py +++ b/presets/pov/lamp/06_(3200K)_100W_Quartz_Halogen.py @@ -1,7 +1,7 @@ #since 1960, no longer manufactured since 2016 #8mm projectors #used in many automobiles headlamps ; outdoor lighting systems ; watercraft ; desktop lamps (smaller power). -#theatrical and studio (film and television) fixtures, including Ellipsoidal reflector spotlights, Source Four, and Fresnels; PAR Cans +#theatrical and studio (film and television) fixtures, including Ellipsoidal reflector spotlights, Source Four, and Fresnels; PAR Cans import bpy bpy.context.object.data.type = 'SPOT' diff --git a/presets/pov/lamp/07_(2850K)_100w_Tungsten.py b/presets/pov/lamp/07_(2850K)_100w_Tungsten.py index 72675de3..a77e3616 100644 --- a/presets/pov/lamp/07_(2850K)_100w_Tungsten.py +++ b/presets/pov/lamp/07_(2850K)_100w_Tungsten.py @@ -7,4 +7,4 @@ lampdata = bpy.context.object.data lampdata.color = (1.0, 0.8392156958580017, 0.6666666865348816) lampdata.energy = 7.46060#3.7303#1000/21.446/(lampdistance/candledistance) #lumen values/21.446 or lux when available used as a basis lampdata.distance = 0.05 -lampdata.falloff_type = 'INVERSE_SQUARE'
\ No newline at end of file +lampdata.falloff_type = 'INVERSE_SQUARE' diff --git a/presets/pov/lamp/08_(2600K)_40w_Tungsten.py b/presets/pov/lamp/08_(2600K)_40w_Tungsten.py index 88ef46a0..66a4e383 100644 --- a/presets/pov/lamp/08_(2600K)_40w_Tungsten.py +++ b/presets/pov/lamp/08_(2600K)_40w_Tungsten.py @@ -7,4 +7,4 @@ lampdata = bpy.context.object.data lampdata.color = (1.0, 0.8196078431372549, 0.6980392156862745) lampdata.energy = 2.98424#400/21.446 #lumen values/21.446 or lux when available used as a basis lampdata.distance = 0.05 -lampdata.falloff_type = 'INVERSE_SQUARE'
\ No newline at end of file +lampdata.falloff_type = 'INVERSE_SQUARE' diff --git a/presets/pov/lamp/09_(5000K)_75W_Full_Spectrum_Fluorescent_T12.py b/presets/pov/lamp/09_(5000K)_75W_Full_Spectrum_Fluorescent_T12.py index b0a23eda..78fa29cb 100644 --- a/presets/pov/lamp/09_(5000K)_75W_Full_Spectrum_Fluorescent_T12.py +++ b/presets/pov/lamp/09_(5000K)_75W_Full_Spectrum_Fluorescent_T12.py @@ -11,4 +11,4 @@ lampdata.shadow_ray_samples_y = 2 lampdata.color = (1.0, 0.95686274766922, 0.9490200281143188) lampdata.energy = 4.45304#4775lm/21.446(=lux)*0.004(distance) *2 for distance is the point of half strength 6200lm? lampdata.distance = 1.0 #dist values multiplied by 10 for area lights for same power as bulb/spot/... -#lampdata.falloff_type = 'INVERSE_SQUARE'
\ No newline at end of file +#lampdata.falloff_type = 'INVERSE_SQUARE' diff --git a/presets/pov/lamp/10_(4300K)_40W_Vintage_Fluorescent_T12.py b/presets/pov/lamp/10_(4300K)_40W_Vintage_Fluorescent_T12.py index d03ce6fd..dc78bc5c 100644 --- a/presets/pov/lamp/10_(4300K)_40W_Vintage_Fluorescent_T12.py +++ b/presets/pov/lamp/10_(4300K)_40W_Vintage_Fluorescent_T12.py @@ -11,4 +11,4 @@ lampdata.shadow_ray_samples_y = 2 lampdata.color = (0.901, 1.0, 0.979) lampdata.energy = 2.14492#2300lm/21.446(=lux)*0.004*2.5(distance) *2 for distance is the point of half strength lampdata.distance = 1.0 #dist values multiplied by 10 for area lights for same power as bulb/spot/... -#lampdata.falloff_type = 'INVERSE_SQUARE'
\ No newline at end of file +#lampdata.falloff_type = 'INVERSE_SQUARE' diff --git a/presets/pov/lamp/11_(5000K)_18W_Standard_Fluorescent_T8.py b/presets/pov/lamp/11_(5000K)_18W_Standard_Fluorescent_T8.py index 6fef1763..a70cda3f 100644 --- a/presets/pov/lamp/11_(5000K)_18W_Standard_Fluorescent_T8.py +++ b/presets/pov/lamp/11_(5000K)_18W_Standard_Fluorescent_T8.py @@ -1,4 +1,4 @@ -#since 1973 +#since 1973 import bpy bpy.context.object.data.type = 'AREA' diff --git a/presets/pov/lamp/12_(4200K)_18W_Cool_White_Fluorescent_T8.py b/presets/pov/lamp/12_(4200K)_18W_Cool_White_Fluorescent_T8.py index 83f8dd4e..c2a0d65d 100644 --- a/presets/pov/lamp/12_(4200K)_18W_Cool_White_Fluorescent_T8.py +++ b/presets/pov/lamp/12_(4200K)_18W_Cool_White_Fluorescent_T8.py @@ -12,4 +12,4 @@ lampdata.shadow_ray_samples_y = 2 lampdata.color = (0.8313725590705872, 0.9215686321258545, 1.0) lampdata.energy = 1.25898#1350lm/21.446(=lux)*0.004*2.5(distance) *2 for distance is the point of half strength lampdata.distance = 1.0 #dist values multiplied by 10 for area lights for same power as bulb/spot/... -#lampdata.falloff_type = 'INVERSE_SQUARE'
\ No newline at end of file +#lampdata.falloff_type = 'INVERSE_SQUARE' diff --git a/presets/pov/lamp/15_(3200K)_40W_Induction_ Fluorescent.py b/presets/pov/lamp/15_(3200K)_40W_Induction_ Fluorescent.py index 1d0851e5..66477ab7 100644 --- a/presets/pov/lamp/15_(3200K)_40W_Induction_ Fluorescent.py +++ b/presets/pov/lamp/15_(3200K)_40W_Induction_ Fluorescent.py @@ -1,4 +1,4 @@ -#since the 1990's, +#since the 1990's, #Often circular or rectangular closed loop electrodeless fluorescent lamps import bpy diff --git a/presets/pov/lamp/19_(5200K)_700W_Carbon_Arc.py b/presets/pov/lamp/19_(5200K)_700W_Carbon_Arc.py index 139dc8bb..64a5bcb5 100644 --- a/presets/pov/lamp/19_(5200K)_700W_Carbon_Arc.py +++ b/presets/pov/lamp/19_(5200K)_700W_Carbon_Arc.py @@ -1,8 +1,8 @@ #Starting from 1876 (first type of commercial lamps developed with electricity) -#Carbon arc lamps were being phased out after the 1910s. -#For general lighting the lamp was replaced by the 1920s and 30s in most cities. +#Carbon arc lamps were being phased out after the 1910s. +#For general lighting the lamp was replaced by the 1920s and 30s in most cities. #The lamp continued to be used for spot lights, film production lighting and film projector lamps. -#Most of the remaining carbon arc lamps ceased production by the 1980s +#Most of the remaining carbon arc lamps ceased production by the 1980s import bpy bpy.context.object.data.type = 'SPOT' @@ -15,4 +15,4 @@ lampdata.spot_blend = 0.3 lampdata.color = (1.0, 0.9803921580314636, 0.95686274766922) lampdata.energy = 51.29162#55000lm/21.446(=lux)*0.004*2.5(distance) *2 for distance is the point of half strength lampdata.distance = 0.01 -lampdata.falloff_type = 'INVERSE_SQUARE'
\ No newline at end of file +lampdata.falloff_type = 'INVERSE_SQUARE' diff --git a/presets/pov/lamp/22_(30000K)_40W_Black_Light_Fluorescent.py b/presets/pov/lamp/22_(30000K)_40W_Black_Light_Fluorescent.py index ef6b4725..d389807c 100644 --- a/presets/pov/lamp/22_(30000K)_40W_Black_Light_Fluorescent.py +++ b/presets/pov/lamp/22_(30000K)_40W_Black_Light_Fluorescent.py @@ -1,4 +1,4 @@ -#Starting from 1939 (World War II Byler's tubes) +#Starting from 1939 (World War II Byler's tubes) import bpy bpy.context.object.data.type = 'AREA' @@ -9,4 +9,3 @@ lampdata.size_y = 1.2192 lampdata.color = (0.6549019813537598, 0.0, 1.0) lampdata.energy = 1.86515#100/21.446 #lumen values/21.446 or lux when available used as a basis lampdata.distance = 0.4 #dist values multiplied by 10 for area lights for same power as bulb/spot/... - diff --git a/presets/pov/lamp/23_(30000K)_40W_Black_Light_Bulb.py b/presets/pov/lamp/23_(30000K)_40W_Black_Light_Bulb.py index baad8234..2cdf83fe 100644 --- a/presets/pov/lamp/23_(30000K)_40W_Black_Light_Bulb.py +++ b/presets/pov/lamp/23_(30000K)_40W_Black_Light_Bulb.py @@ -1,4 +1,4 @@ -#Starting from 1918 (World War I Wood's glass) +#Starting from 1918 (World War I Wood's glass) import bpy bpy.context.object.data.type = 'POINT' diff --git a/presets/pov/lamp/24_(1850K)_Candle.py b/presets/pov/lamp/24_(1850K)_Candle.py index 5d7ac61d..31e960fc 100644 --- a/presets/pov/lamp/24_(1850K)_Candle.py +++ b/presets/pov/lamp/24_(1850K)_Candle.py @@ -1,4 +1,4 @@ -#Starting from 1825 (stearin) +#Starting from 1825 (stearin) import bpy bpy.context.object.data.type = 'POINT' diff --git a/presets/pov/world/1_Clear_Blue_Sky.py b/presets/pov/world/1_Clear_Blue_Sky.py index 0dcd5e05..3ec2c33e 100644 --- a/presets/pov/world/1_Clear_Blue_Sky.py +++ b/presets/pov/world/1_Clear_Blue_Sky.py @@ -2,14 +2,14 @@ import bpy scene = bpy.context.scene scene.world.use_sky_blend = True -#below multiplied by two for a better proportion Clear vs Overcast sky +#below multiplied by two for a better proportion Clear vs Overcast sky #since Clear sky is 19807 lux vs 2000 for overcast (sun is min 32000 max 100000) #http://www.pssurvival.com/PS/Lighting/Typical_LUX_Intensities_for_Day_and_Night-2017.pdf #https://en.wikipedia.org/wiki/Daylight #https://www.engineeringtoolbox.com/light-level-rooms-d_708.html #https://www.cactus2000.de/fr/unit/masslux.shtml #https://blendergrid.com/news/cycles-physically-correct-brightness -#researched result blue is +#researched result blue is #Hue: 0.6 #Saturation: 0.533 #Lightness: 0.7 diff --git a/presets/pov/world/2_Partly_Hazy_Sky.py b/presets/pov/world/2_Partly_Hazy_Sky.py index 2f6b628d..3102d0ab 100644 --- a/presets/pov/world/2_Partly_Hazy_Sky.py +++ b/presets/pov/world/2_Partly_Hazy_Sky.py @@ -2,14 +2,14 @@ import bpy scene = bpy.context.scene scene.world.use_sky_blend = True -#below multiplied by two for a better proportion Clear vs Overcast sky +#below multiplied by two for a better proportion Clear vs Overcast sky #since Clear sky is 19807 lux vs 2000 for overcast (sun is min 32000 max 100000) #http://www.pssurvival.com/PS/Lighting/Typical_LUX_Intensities_for_Day_and_Night-2017.pdf #https://en.wikipedia.org/wiki/Daylight #https://www.engineeringtoolbox.com/light-level-rooms-d_708.html #https://www.cactus2000.de/fr/unit/masslux.shtml #https://blendergrid.com/news/cycles-physically-correct-brightness -#researched result blue is +#researched result blue is #Hue: 0.6 #Saturation: 0.533 #Lightness: 0.7 diff --git a/presets/pov/world/3_Overcast_Sky.py b/presets/pov/world/3_Overcast_Sky.py index 013a5d40..605f879d 100644 --- a/presets/pov/world/3_Overcast_Sky.py +++ b/presets/pov/world/3_Overcast_Sky.py @@ -3,7 +3,7 @@ scene = bpy.context.scene scene.world.use_sky_blend = True scene.world.horizon_color = (0.477, 0.536, 0.604) -#below divided by ten for a better proportion Clear vs Overcast sky +#below divided by ten for a better proportion Clear vs Overcast sky #since Clear sky is 20000 lux vs 2000 up to 10000 for overcast scene.world.zenith_color = (0.034, 0.043, 0.047) scene.world.ambient_color = (0.0, 0.0, 0.0) |