[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4265] contrib/py/scripts/addons/ online_mat_lib: Small bugfix and new material
Peter Cassetta
peter at fingertipsoft.com
Wed Feb 13 05:20:03 CET 2013
Revision: 4265
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4265
Author: petercassetta
Date: 2013-02-13 04:20:00 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
Small bugfix and new material
I fixed a small problem when writing and reading group node input values.
Now values for an input named "Bump Strength" will be correctly written in XML as 'bump_strength="value"', instead of 'bump strength="value"'.
The latter would result in invalid XML.
I also fixed a material which was referencing a non-existent script, and added a new material, "Pool Tiles" by elbrujodelatribu, which uses a nodegroup stored in the "/groups/" folder.
This nodegroup ("Square Tiles") is also displayed in the library category "Nodegroups", and can be added into materials from there.
Modified Paths:
--------------
contrib/py/scripts/addons/online_mat_lib/__init__.py
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/index.xml
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/textiles/woven_fabric.bcm
Added Paths:
-----------
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/groups/
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/groups/square_tiles.bcg
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/stones/pool_tiles.bcm
Modified: contrib/py/scripts/addons/online_mat_lib/__init__.py
===================================================================
--- contrib/py/scripts/addons/online_mat_lib/__init__.py 2013-02-13 02:51:28 UTC (rev 4264)
+++ contrib/py/scripts/addons/online_mat_lib/__init__.py 2013-02-13 04:20:00 UTC (rev 4265)
@@ -4577,19 +4577,19 @@
node = node_tree.nodes.new(node_type, node_group)
if node.inputs:
for input in node.inputs:
- if input.name.lower() in node_data:
+ if input.name.lower().replace(" ", "_") in node_data:
if input.type == 'RGBA':
- input.default_value = color(node_data[input.name.lower()].value)
+ input.default_value = color(node_data[input.name.lower().replace(" ", "_")].value)
elif input.type == 'VECTOR':
- input.default_value = vector(node_data[input.name.lower()].value)
+ input.default_value = vector(node_data[input.name.lower().replace(" ", "_")].value)
elif input.type == 'VALUE':
- input.default_value = float(node_data[input.name.lower()].value)
+ input.default_value = float(node_data[input.name.lower().replace(" ", "_")].value)
elif input.type == 'INT':
- input.default_value = int(node_data[input.name.lower()].value)
+ input.default_value = int(node_data[input.name.lower().replace(" ", "_")].value)
elif input.type == 'BOOL':
- input.default_value = boolean(node_data[input.name.lower()].value)
+ input.default_value = boolean(node_data[input.name.lower().replace(" ", "_")].value)
elif input.type != 'SHADER':
- input.default_value = str(node_data[input.name.lower()].value)
+ input.default_value = str(node_data[input.name.lower().replace(" ", "_")].value)
elif input.type != 'SHADER':
node_message = ['WARNING', "There was no value specified for input \"%s\", leaving at default." % input.name]
print(input.type)
@@ -4819,7 +4819,7 @@
input_value = str(input.default_value)
if input.type != 'SHADER':
- write(" %s=\"%s\"" % (input.name.lower(), input_value))
+ write(" %s=\"%s\"" % (input.name.lower().replace(" ", "_"), input_value))
write(getLocation(node))
write(" />")
Added: contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/groups/square_tiles.bcg
===================================================================
--- contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/groups/square_tiles.bcg (rev 0)
+++ contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/groups/square_tiles.bcg 2013-02-13 04:20:00 UTC (rev 4265)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<group>
+ <groupnodes>
+ <groupnode type="MIX_RGB" blend_type="MIX" use_clamp="False" fac="0.5" color1="rgba(0.62394, 0.61712, 0.67723, 1.0)" color2="rgba(0.67032, 0.66959, 0.62479, 1.0)" loc="127, 159" />
+ <groupnode type="MIX_SHADER" fac="0.5" loc="473, -48" />
+ <groupnode type="TEX_MUSGRAVE" musgrave="FBM" scale="5.0" detail="2.0" dimension="2.0" lacunarity="1.0" offset="0.0" gain="1.0" loc="-79, 240" />
+ <groupnode type="MIX_SHADER" fac="0.5" loc="671, -82" />
+ <groupnode type="LAYER_WEIGHT" blend="0.25" loc="481, 79" />
+ <groupnode type="TEX_BRICK" label="Pattern Brick" offset="1.0" offset_freq="1" squash="1.0" squash_freq="1" color1="rgba(1.0, 1.0, 1.0, 1.0)" color2="rgba(0.99999, 1.0, 0.99999, 1.0)" mortar="rgba(0.0, 0.0, 0.0, 1.0)" scale="5.0" mortar_size="0.10000" bias="3.72529" width="1.0" height="1.0" loc="-500, -70" />
+ <groupnode type="INVERT" fac="1.0" color="rgba(0.0, 0.0, 0.0, 1.0)" loc="-299, -202" />
+ <groupnode type="BSDF_DIFFUSE" color="rgba(0.82242, 0.84451, 0.85430, 1.0)" roughness="0.0" loc="267, 43" />
+ <groupnode type="BSDF_GLOSSY" distribution="BECKMANN" color="rgba(0.80000, 0.80000, 0.80000, 1.0)" roughness="0.03500" loc="111, -266" />
+ <groupnode type="MIX_SHADER" fac="0.10000" loc="303, -160" />
+ <groupnode type="BUMP" strength="0.10000" loc="-180, -209" />
+ <groupnode type="BSDF_DIFFUSE" color="rgba(1.0, 1.0, 1.0, 1.0)" roughness="0.0" loc="113, -143" />
+ <groupnode type="TEX_BRICK" label="Color Brick" offset="1.0" offset_freq="1" squash="1.0" squash_freq="1" color1="rgba(0.80000, 0.80000, 0.80000, 1.0)" color2="rgba(0.20000, 0.20000, 0.20000, 1.0)" mortar="rgba(0.61442, 0.64262, 0.68360, 1.0)" scale="5.0" mortar_size="0.10000" bias="0.40000" width="1.0" height="1.0" loc="-285, 263" />
+ </groupnodes>
+ <groupinputs>
+ <groupinput name="Color1" type="RGBA" value="rgba(0.80000, 0.80000, 0.80000, 1.0)" />
+ <groupinput name="Color2" type="RGBA" value="rgba(0.20000, 0.20000, 0.20000, 1.0)" />
+ <groupinput name="Vector" type="VECTOR" value="Vector(0.0, 0.0, 0.0)" />
+ <groupinput name="Scale" type="VALUE" value="5.0" />
+ <groupinput name="Bump Strength" type="VALUE" value="0.10000" />
+ </groupinputs>
+ <groupoutputs>
+ <groupoutput name="Shader" type="SHADER" />
+ </groupoutputs>
+ <grouplinks>
+ <grouplink to="12" input="1" from="i" output="0" />
+ <grouplink to="12" input="0" from="i" output="2" />
+ <grouplink to="5" input="0" from="i" output="2" />
+ <grouplink to="12" input="4" from="i" output="3" />
+ <grouplink to="5" input="4" from="i" output="3" />
+ <grouplink to="3" input="1" from="1" output="0" />
+ <grouplink to="9" input="2" from="8" output="0" />
+ <grouplink to="1" input="0" from="5" output="0" />
+ <grouplink to="1" input="2" from="9" output="0" />
+ <grouplink to="9" input="1" from="11" output="0" />
+ <grouplink to="11" input="0" from="12" output="0" />
+ <grouplink to="6" input="1" from="5" output="1" />
+ <grouplink to="1" input="1" from="7" output="0" />
+ <grouplink to="7" input="0" from="0" output="0" />
+ <grouplink to="0" input="0" from="2" output="1" />
+ <grouplink to="2" input="0" from="i" output="2" />
+ <grouplink to="2" input="1" from="i" output="3" />
+ <grouplink to="12" input="2" from="i" output="1" />
+ <grouplink to="o" input="0" from="3" output="0" />
+ <grouplink to="3" input="0" from="4" output="0" />
+ <grouplink to="3" input="2" from="8" output="0" />
+ <grouplink to="10" input="1" from="6" output="0" />
+ <grouplink to="10" input="0" from="i" output="4" />
+ <grouplink to="7" input="2" from="10" output="0" />
+ <grouplink to="8" input="2" from="10" output="0" />
+ <grouplink to="11" input="2" from="10" output="0" />
+ </grouplinks>
+</group>
\ No newline at end of file
Property changes on: contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/groups/square_tiles.bcg
___________________________________________________________________
Added: svn:executable
+ *
Modified: contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/index.xml
===================================================================
--- contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/index.xml 2013-02-13 02:51:28 UTC (rev 4264)
+++ contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/index.xml 2013-02-13 04:20:00 UTC (rev 4265)
@@ -60,6 +60,7 @@
<!--<material name="Hexagonal Tiles" href="hexagonal_tiles" by="varkenvarken" stars="4" scripts="1" addon="0.5" bl="2.65-" />-->
<material name="Malachite" href="malachite" by="moony" stars="3" addon="0.4" />
<material name="Polished Haematite" href="polished_haematite" by="moony" stars="5" complexity="intermediate" addon="0.4" />
+ <material name="Pool Tiles" href="pool_tiles" by="elbrujodelatribu" stars="5" fireflies="medium" groups="1" addon="0.4" />
<!--<material name="Veined Marble" href="veined_marble" by="sambler" stars="4" complexity="intermediate" scripts="1" addon="0.5" bl="2.65-" />-->
</category>
<category title="Synthetic" folder="synthetic" addon="0.4">
@@ -82,6 +83,9 @@
<material name="Rough Pine" href="rough_pine" by="Peter Cassetta" stars="4" complexity="intermediate" addon="0.4" />
<material name="Rough Walnut" href="rough_walnut" by="Peter Cassetta" stars="3" complexity="intermediate" addon="0.4" />
</category>
+ <category title="Nodegroups" folder="groups" addon="0.6">
+ <group name="Square Tiles" href="square_tiles.bcg" by="elbrujodelatribu" filesize="3.7kB" complexity="intermediate" tileable="yes" addon="0.6" bl="2.64-" />
+ </category>
<category title="OSL Scripts" folder="scripts" addon="0.6">
<script name="Barbwire Texture" href="barbwire_texture.osl" by="varkenvarken" filesize="2.0kB" complexity="complex" lines="75" addon="0.6" />
<script name="Chain Link Texture" href="chain_link_texture.osl" by="varkenvarken" filesize="0.9kB" complexity="intermediate" lines="38" addon="0.6" />
Added: contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/stones/pool_tiles.bcm
===================================================================
--- contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/stones/pool_tiles.bcm (rev 0)
+++ contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/stones/pool_tiles.bcm 2013-02-13 04:20:00 UTC (rev 4265)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<material view_color="rgb(0.14995, 0.41788, 0.96468)" sample_lamp="True">
+ <nodes>
+ <node type="OUTPUT_MATERIAL" loc="430, 191" />
+ <node type="RGB" color="rgba(0.17798, 0.87590, 1.0, 1.0)" loc="-181, 369" />
+ <node type="RGB" color="rgba(0.05106, 0.25651, 1.0, 1.0)" loc="-470, 228" />
+ <node type="MAPPING" translation="Vector(0.0, 0.0, 0.0)" rotation="Vector(0.0, 0.0, 0.0)" scale="Vector(1.0, 1.0, 1.0)" use_min="False" use_max="False" vector="Vector(0.0, 0.0, 0.0)" loc="-286, 131" />
+ <node type="TEX_COORD" dupli="False" loc="-537, 8" />
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list