[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26675] trunk/blender: sunsky presets
Campbell Barton
ideasman42 at gmail.com
Sun Feb 7 14:56:36 CET 2010
Revision: 26675
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26675
Author: campbellbarton
Date: 2010-02-07 14:56:36 +0100 (Sun, 07 Feb 2010)
Log Message:
-----------
sunsky presets
* Mountain: low turbidity, well-defined sun, blue-ish (high sun energy)
* Desert: high turbidity (dust), big, diluted sun, red-ish
* Classic: average turbidity (water vapor), small, diluted sun.
also fixed a bug with saving string presets
Modified Paths:
--------------
trunk/blender/release/scripts/op/presets.py
trunk/blender/release/scripts/ui/properties_data_lamp.py
trunk/blender/release/scripts/ui/properties_material.py
trunk/blender/source/blender/makesrna/intern/rna_lamp.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
Added Paths:
-----------
trunk/blender/release/scripts/presets/sunsky/
trunk/blender/release/scripts/presets/sunsky/classic.py
trunk/blender/release/scripts/presets/sunsky/desert.py
trunk/blender/release/scripts/presets/sunsky/mountain.py
Modified: trunk/blender/release/scripts/op/presets.py
===================================================================
--- trunk/blender/release/scripts/op/presets.py 2010-02-07 13:49:43 UTC (rev 26674)
+++ trunk/blender/release/scripts/op/presets.py 2010-02-07 13:56:36 UTC (rev 26675)
@@ -49,8 +49,12 @@
file_preset = open(os.path.join(target_path, filename), 'w')
for rna_path in self.preset_values:
- file_preset.write("%s = %s\n" % (rna_path, eval(rna_path)))
+ value = eval(rna_path)
+ if type(value) == str:
+ value = "'%s'" % value
+ file_preset.write("%s = %s\n" % (rna_path, value))
+
file_preset.close()
return {'FINISHED'}
@@ -125,6 +129,34 @@
preset_subdir = "cloth"
+
+class AddPresetSunSky(AddPresetBase):
+ '''Add a Cloth Preset.'''
+ bl_idname = "lamp.sunsky_preset_add"
+ bl_label = "Add Sunsky Preset"
+ name = AddPresetBase.name
+
+ preset_values = [
+ "bpy.context.object.data.sky.atmosphere_turbidity",
+ "bpy.context.object.data.sky.sky_blend_type",
+ "bpy.context.object.data.sky.sky_blend",
+ "bpy.context.object.data.sky.horizon_brightness",
+ "bpy.context.object.data.sky.spread",
+ "bpy.context.object.data.sky.sky_color_space",
+ "bpy.context.object.data.sky.sky_exposure",
+ "bpy.context.object.data.sky.sun_brightness",
+ "bpy.context.object.data.sky.sun_size",
+ "bpy.context.object.data.sky.backscattered_light",
+ "bpy.context.object.data.sky.sun_intensity",
+ "bpy.context.object.data.sky.atmosphere_distance_factor",
+ "bpy.context.object.data.sky.atmosphere_inscattering",
+ "bpy.context.object.data.sky.atmosphere_extinction",
+ ]
+
+ preset_subdir = "sunsky"
+
+
bpy.types.register(AddPresetRender)
bpy.types.register(AddPresetSSS)
bpy.types.register(AddPresetCloth)
+bpy.types.register(AddPresetSunSky)
Added: trunk/blender/release/scripts/presets/sunsky/classic.py
===================================================================
--- trunk/blender/release/scripts/presets/sunsky/classic.py (rev 0)
+++ trunk/blender/release/scripts/presets/sunsky/classic.py 2010-02-07 13:56:36 UTC (rev 26675)
@@ -0,0 +1,14 @@
+bpy.context.object.data.sky.atmosphere_turbidity = 4.0
+bpy.context.object.data.sky.sky_blend_type = 'ADD'
+bpy.context.object.data.sky.sky_blend = 1.0
+bpy.context.object.data.sky.horizon_brightness = 10.0
+bpy.context.object.data.sky.spread = 1.49011614159e-09
+bpy.context.object.data.sky.sky_color_space = 'SMPTE'
+bpy.context.object.data.sky.sky_exposure = 1.0
+bpy.context.object.data.sky.sun_brightness = 1.00000011921
+bpy.context.object.data.sky.sun_size = 1.00000166893
+bpy.context.object.data.sky.backscattered_light = 0.0
+bpy.context.object.data.sky.sun_intensity = 4.0
+bpy.context.object.data.sky.atmosphere_distance_factor = 0.0
+bpy.context.object.data.sky.atmosphere_inscattering = 1.0
+bpy.context.object.data.sky.atmosphere_extinction = 1.0
Property changes on: trunk/blender/release/scripts/presets/sunsky/classic.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/blender/release/scripts/presets/sunsky/desert.py
===================================================================
--- trunk/blender/release/scripts/presets/sunsky/desert.py (rev 0)
+++ trunk/blender/release/scripts/presets/sunsky/desert.py 2010-02-07 13:56:36 UTC (rev 26675)
@@ -0,0 +1,14 @@
+bpy.context.object.data.sky.atmosphere_turbidity = 6.0
+bpy.context.object.data.sky.sky_blend_type = 'ADD'
+bpy.context.object.data.sky.sky_blend = 1.0
+bpy.context.object.data.sky.horizon_brightness = 4.99999761581
+bpy.context.object.data.sky.spread = 1.49011614159e-09
+bpy.context.object.data.sky.sky_color_space = 'SMPTE'
+bpy.context.object.data.sky.sky_exposure = 1.0
+bpy.context.object.data.sky.sun_brightness = 1.00000011921
+bpy.context.object.data.sky.sun_size = 4.0
+bpy.context.object.data.sky.backscattered_light = 1.0
+bpy.context.object.data.sky.sun_intensity = 1.0
+bpy.context.object.data.sky.atmosphere_distance_factor = 0.0
+bpy.context.object.data.sky.atmosphere_inscattering = 1.0
+bpy.context.object.data.sky.atmosphere_extinction = 1.0
Property changes on: trunk/blender/release/scripts/presets/sunsky/desert.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/blender/release/scripts/presets/sunsky/mountain.py
===================================================================
--- trunk/blender/release/scripts/presets/sunsky/mountain.py (rev 0)
+++ trunk/blender/release/scripts/presets/sunsky/mountain.py 2010-02-07 13:56:36 UTC (rev 26675)
@@ -0,0 +1,14 @@
+bpy.context.object.data.sky.atmosphere_turbidity = 2.00000023842
+bpy.context.object.data.sky.sky_blend_type = 'ADD'
+bpy.context.object.data.sky.sky_blend = 1.0
+bpy.context.object.data.sky.horizon_brightness = 0.100000016391
+bpy.context.object.data.sky.spread = 1.0
+bpy.context.object.data.sky.sky_color_space = 'SMPTE'
+bpy.context.object.data.sky.sky_exposure = 1.0
+bpy.context.object.data.sky.sun_brightness = 1.99999988079
+bpy.context.object.data.sky.sun_size = 4.0
+bpy.context.object.data.sky.backscattered_light = -1.0
+bpy.context.object.data.sky.sun_intensity = 10.0
+bpy.context.object.data.sky.atmosphere_distance_factor = 0.0
+bpy.context.object.data.sky.atmosphere_inscattering = 1.0
+bpy.context.object.data.sky.atmosphere_extinction = 1.0
Property changes on: trunk/blender/release/scripts/presets/sunsky/mountain.py
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/blender/release/scripts/ui/properties_data_lamp.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_lamp.py 2010-02-07 13:49:43 UTC (rev 26674)
+++ trunk/blender/release/scripts/ui/properties_data_lamp.py 2010-02-07 13:56:36 UTC (rev 26675)
@@ -23,6 +23,13 @@
narrowui = 180
+class LAMP_MT_sunsky_presets(bpy.types.Menu):
+ bl_label = "Render Presets"
+ preset_subdir = "sunsky"
+ preset_operator = "script.python_file_run"
+ draw = bpy.types.Menu.draw_preset
+
+
class DataButtonsPanel(bpy.types.Panel):
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
@@ -129,16 +136,19 @@
lamp = context.lamp.sky
wide_ui = context.region.width > narrowui
- layout.prop(lamp, "sky")
+ row = layout.row(align=True)
+ row.prop(lamp, "use_sky")
+ row.menu("LAMP_MT_sunsky_presets", text="Presets")
+ row.operator("lamp.sunsky_preset_add", text="Add")
row = layout.row()
- row.active = lamp.sky or lamp.atmosphere
+ row.active = lamp.use_sky or lamp.use_atmosphere
row.prop(lamp, "atmosphere_turbidity", text="Turbidity")
split = layout.split()
col = split.column()
- col.active = lamp.sky
+ col.active = lamp.use_sky
col.label(text="Blending:")
sub = col.column()
sub.prop(lamp, "sky_blend_type", text="")
@@ -151,7 +161,7 @@
if wide_ui:
col = split.column()
- col.active = lamp.sky
+ col.active = lamp.use_sky
col.label(text="Horizon:")
sub = col.column()
sub.prop(lamp, "horizon_brightness", text="Brightness")
@@ -165,19 +175,19 @@
layout.separator()
- layout.prop(lamp, "atmosphere")
+ layout.prop(lamp, "use_atmosphere")
split = layout.split()
col = split.column()
- col.active = lamp.atmosphere
+ col.active = lamp.use_atmosphere
col.label(text="Intensity:")
col.prop(lamp, "sun_intensity", text="Sun")
col.prop(lamp, "atmosphere_distance_factor", text="Distance")
if wide_ui:
col = split.column()
- col.active = lamp.atmosphere
+ col.active = lamp.use_atmosphere
col.label(text="Scattering:")
sub = col.column(align=True)
sub.prop(lamp, "atmosphere_inscattering", slider=True, text="Inscattering")
@@ -381,6 +391,8 @@
self.layout.template_curve_mapping(lamp, "falloff_curve")
+bpy.types.register(LAMP_MT_sunsky_presets)
+
bpy.types.register(DATA_PT_context_lamp)
bpy.types.register(DATA_PT_preview)
bpy.types.register(DATA_PT_lamp)
Modified: trunk/blender/release/scripts/ui/properties_material.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_material.py 2010-02-07 13:49:43 UTC (rev 26674)
+++ trunk/blender/release/scripts/ui/properties_material.py 2010-02-07 13:56:36 UTC (rev 26675)
@@ -274,7 +274,7 @@
col = split.column()
col.prop(mat, "traceable")
col.prop(mat, "full_oversampling")
- col.prop(mat, "sky")
+ col.prop(mat, "use_sky")
col.prop(mat, "exclude_mist")
col.prop(mat, "invert_z")
sub = col.row()
Modified: trunk/blender/source/blender/makesrna/intern/rna_lamp.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_lamp.c 2010-02-07 13:49:43 UTC (rev 26674)
+++ trunk/blender/source/blender/makesrna/intern/rna_lamp.c 2010-02-07 13:56:36 UTC (rev 26675)
@@ -307,12 +307,12 @@
/* boolean */
- prop= RNA_def_property(srna, "sky", PROP_BOOLEAN, PROP_NONE);
+ prop= RNA_def_property(srna, "use_sky", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "sun_effect_type", LA_SUN_EFFECT_SKY);
RNA_def_property_ui_text(prop, "Sky", "Apply sun effect on sky.");
RNA_def_property_update(prop, 0, "rna_Lamp_sky_update");
- prop= RNA_def_property(srna, "atmosphere", PROP_BOOLEAN, PROP_NONE);
+ prop= RNA_def_property(srna, "use_atmosphere", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "sun_effect_type", LA_SUN_EFFECT_AP);
RNA_def_property_ui_text(prop, "Atmosphere", "Apply sun effect on atmosphere.");
RNA_def_property_update(prop, 0, "rna_Lamp_sky_update");
Modified: trunk/blender/source/blender/makesrna/intern/rna_material.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list