[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1473] trunk/py/scripts/addons/ render_povray: povray script now passes the pep8 checker.
Campbell Barton
ideasman42 at gmail.com
Sat Jan 22 06:43:41 CET 2011
Revision: 1473
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=1473
Author: campbellbarton
Date: 2011-01-22 05:43:40 +0000 (Sat, 22 Jan 2011)
Log Message:
-----------
povray script now passes the pep8 checker.
noticed some strange code, added XXX FIXME.
Modified Paths:
--------------
trunk/py/scripts/addons/render_povray/__init__.py
trunk/py/scripts/addons/render_povray/render.py
trunk/py/scripts/addons/render_povray/ui.py
Modified: trunk/py/scripts/addons/render_povray/__init__.py
===================================================================
--- trunk/py/scripts/addons/render_povray/__init__.py 2011-01-22 04:48:15 UTC (rev 1472)
+++ trunk/py/scripts/addons/render_povray/__init__.py 2011-01-22 05:43:40 UTC (rev 1473)
@@ -16,6 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
+# <pep8 compliant>
+
bl_info = {
"name": "POV-Ray 3.7",
"author": "Campbell Barton, Silvio Falcinelli, Maurice Raybaud, Constantin Rahn",
@@ -43,6 +45,7 @@
from render_povray import ui
from render_povray import render
+
def register():
Scene = bpy.types.Scene
@@ -80,7 +83,7 @@
name="Quantity of spaces",
description="The number of spaces for indentation",
min=1, max=10, default=3)
-
+
Scene.pov_comments_enable = BoolProperty(
name="Enable Comments",
description="Add comments to pov file",
@@ -90,26 +93,26 @@
Scene.pov_command_line_switches = StringProperty(name="Command Line Switches",
description="Command line switches consist of a + (plus) or - (minus) sign, followed by one or more alphabetic characters and possibly a numeric value.",
default="", maxlen=500)
-
+
Scene.pov_antialias_enable = BoolProperty(
name="Anti-Alias", description="Enable Anti-Aliasing",
default=True)
-
+
Scene.pov_antialias_method = EnumProperty(
name="Method",
description="AA-sampling method. Type 1 is an adaptive, non-recursive, super-sampling method. Type 2 is an adaptive and recursive super-sampling method.",
items=(("0", "non-recursive AA", "Type 1 Sampling in POV-Ray"),
("1", "recursive AA", "Type 2 Sampling in POV-Ray")),
default="1")
-
+
Scene.pov_antialias_depth = IntProperty(
name="Antialias Depth", description="Depth of pixel for sampling",
min=1, max=9, default=3)
-
+
Scene.pov_antialias_threshold = FloatProperty(
name="Antialias Threshold", description="Tolerance for sub-pixels",
min=0.0, max=1.0, soft_min=0.05, soft_max=0.5, default=0.1)
-
+
Scene.pov_jitter_enable = BoolProperty(
name="Jitter", description="Enable Jittering. Adds noise into the sampling process (it should be avoided to use jitter in animation).",
default=True)
@@ -117,15 +120,15 @@
Scene.pov_jitter_amount = FloatProperty(
name="Jitter Amount", description="Amount of jittering.",
min=0.0, max=1.0, soft_min=0.01, soft_max=1.0, default=1.0)
-
+
Scene.pov_antialias_gamma = FloatProperty(
name="Antialias Gamma", description="POV-Ray compares gamma-adjusted values for super sampling. Antialias Gamma sets the Gamma before comparison.",
min=0.0, max=5.0, soft_min=0.01, soft_max=2.5, default=2.5)
-
+
Scene.pov_max_trace_level = IntProperty(
name="Max Trace Level", description="Number of reflections/refractions allowed on ray path",
min=1, max=256, default=5)
-
+
Scene.pov_radio_adc_bailout = FloatProperty(
name="ADC Bailout", description="The adc_bailout for radiosity rays. Use adc_bailout = 0.01 / brightest_ambient_object for good results",
min=0.0, max=1000.0, soft_min=0.0, soft_max=1.0, default=0.01, precision=3)
@@ -189,7 +192,7 @@
Mat.pov_irid_enable = BoolProperty(
name="Enable Iridescence",
description="Newton's thin film interference (like an oil slick on a puddle of water or the rainbow hues of a soap bubble.)",
- default=False)
+ default=False)
Mat.pov_mirror_use_IOR = BoolProperty(
name="Correct Reflection",
@@ -252,17 +255,17 @@
default=False)
Mat.pov_refraction_type = EnumProperty(
- items=[("0","None","use only reflective caustics"),
- ("1","Fake Caustics","use fake caustics"),
- ("2","Photons Caustics","use photons for refractive caustics"),
+ items=[("0", "None", "use only reflective caustics"),
+ ("1", "Fake Caustics", "use fake caustics"),
+ ("2", "Photons Caustics", "use photons for refractive caustics"),
],
name="Refractive",
description="use fake caustics (fast) or true photons for refractive Caustics",
- default="1")#ui.py has to be loaded before render.py with this.
-
+ default="1") # ui.py has to be loaded before render.py with this.
+
########################################################################################
#Custom texture gamma
- Tex = bpy.types.Texture
+ Tex = bpy.types.Texture
Tex.pov_tex_gamma_enable = BoolProperty(
name="Enable custom texture gamma",
description="Notify some custom gamma for which texture has been precorrected without the file format carrying it and only if it differs from your OS expected standard (see pov doc)",
@@ -278,15 +281,16 @@
name="Radiosity Importance",
description="Priority value relative to other objects for sampling radiosity rays. Increase to get more radiosity rays at comparatively small yet bright objects",
min=0.01, max=1.00, default=1.00)
-
+
######################################EndMR#####################################
+
def unregister():
import bpy
Scene = bpy.types.Scene
- Mat = bpy.types.Material # MR
- Tex = bpy.types.Texture # MR
- Obj = bpy.types.Object # MR
+ Mat = bpy.types.Material # MR
+ Tex = bpy.types.Texture # MR
+ Obj = bpy.types.Object # MR
del Scene.pov_radio_enable
del Scene.pov_radio_display_advanced
del Scene.pov_radio_adc_bailout
@@ -301,15 +305,15 @@
del Scene.pov_radio_nearest_count
del Scene.pov_radio_normal
del Scene.pov_radio_recursion_limit
- del Scene.pov_radio_pretrace_start # MR
- del Scene.pov_radio_pretrace_end # MR
- del Scene.pov_media_enable # MR
- del Scene.pov_media_samples # MR
- del Scene.pov_media_color # MR
- del Scene.pov_baking_enable # MR
- del Scene.pov_max_trace_level # MR
+ del Scene.pov_radio_pretrace_start # MR
+ del Scene.pov_radio_pretrace_end # MR
+ del Scene.pov_media_enable # MR
+ del Scene.pov_media_samples # MR
+ del Scene.pov_media_color # MR
+ del Scene.pov_baking_enable # MR
+ del Scene.pov_max_trace_level # MR
del Scene.pov_antialias_enable # CR
- del Scene.pov_antialias_method # CR
+ del Scene.pov_antialias_method # CR
del Scene.pov_antialias_depth # CR
del Scene.pov_antialias_threshold # CR
del Scene.pov_antialias_gamma # CR
@@ -319,23 +323,23 @@
del Scene.pov_indentation_character # CR
del Scene.pov_indentation_spaces # CR
del Scene.pov_comments_enable # CR
- del Mat.pov_irid_enable # MR
- del Mat.pov_mirror_use_IOR # MR
- del Mat.pov_mirror_metallic # MR
- del Mat.pov_conserve_energy # MR
- del Mat.pov_irid_amount # MR
- del Mat.pov_irid_thickness # MR
- del Mat.pov_irid_turbulence # MR
- del Mat.pov_caustics_enable # MR
- del Mat.pov_fake_caustics # MR
- del Mat.pov_fake_caustics_power # MR
- del Mat.pov_photons_refraction # MR
- del Mat.pov_photons_dispersion # MR
- del Mat.pov_photons_reflection # MR
- del Mat.pov_refraction_type # MR
- del Tex.pov_tex_gamma_enable # MR
- del Tex.pov_tex_gamma_value # MR
- del Obj.pov_importance_value # MR
+ del Mat.pov_irid_enable # MR
+ del Mat.pov_mirror_use_IOR # MR
+ del Mat.pov_mirror_metallic # MR
+ del Mat.pov_conserve_energy # MR
+ del Mat.pov_irid_amount # MR
+ del Mat.pov_irid_thickness # MR
+ del Mat.pov_irid_turbulence # MR
+ del Mat.pov_caustics_enable # MR
+ del Mat.pov_fake_caustics # MR
+ del Mat.pov_fake_caustics_power # MR
+ del Mat.pov_photons_refraction # MR
+ del Mat.pov_photons_dispersion # MR
+ del Mat.pov_photons_reflection # MR
+ del Mat.pov_refraction_type # MR
+ del Tex.pov_tex_gamma_enable # MR
+ del Tex.pov_tex_gamma_value # MR
+ del Obj.pov_importance_value # MR
if __name__ == "__main__":
register()
Modified: trunk/py/scripts/addons/render_povray/render.py
===================================================================
--- trunk/py/scripts/addons/render_povray/render.py 2011-01-22 04:48:15 UTC (rev 1472)
+++ trunk/py/scripts/addons/render_povray/render.py 2011-01-22 05:43:40 UTC (rev 1473)
@@ -16,6 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
+# <pep8 compliant>
+
import bpy
import subprocess
import os
@@ -32,64 +34,94 @@
##############################SF###########################
-##############find image texture
+##############find image texture
def splitExt(path):
dotidx = path.rfind('.')
if dotidx == -1:
return path, ''
else:
- return (path[dotidx:]).upper().replace('.','')
+ return path[dotidx:].upper().replace(".", "")
def imageFormat(imgF):
ext = ''
ext_orig = splitExt(imgF)
- if ext_orig == 'JPG' or ext_orig == 'JPEG': ext='jpeg'
- if ext_orig == 'GIF': ext = 'gif'
- if ext_orig == 'TGA': ext = 'tga'
- if ext_orig == 'IFF': ext = 'iff'
- if ext_orig == 'PPM': ext = 'ppm'
- if ext_orig == 'PNG': ext = 'png'
- if ext_orig == 'SYS': ext = 'sys'
- if ext_orig in ('TIFF', 'TIF'): ext = 'tiff'
- if ext_orig == 'EXR': ext = 'exr'#POV3.7 Only!
- if ext_orig == 'HDR': ext = 'hdr'#POV3.7 Only! --MR
+ if ext_orig == 'JPG' or ext_orig == 'JPEG':
+ ext = 'jpeg'
+ elif ext_orig == 'GIF':
+ ext = 'gif'
+ elif ext_orig == 'TGA':
+ ext = 'tga'
+ elif ext_orig == 'IFF':
+ ext = 'iff'
+ elif ext_orig == 'PPM':
+ ext = 'ppm'
+ elif ext_orig == 'PNG':
+ ext = 'png'
+ elif ext_orig == 'SYS':
+ ext = 'sys'
+ elif ext_orig in ('TIFF', 'TIF'):
+ ext = 'tiff'
+ elif ext_orig == 'EXR':
+ ext = 'exr' # POV3.7 Only!
+ elif ext_orig == 'HDR':
+ ext = 'hdr' # POV3.7 Only! --MR
+
print(imgF)
- if not ext: print(' WARNING: texture image format not supported ') # % (imgF , '')) #(ext_orig)))
+ if not ext:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list