[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4089] contrib/py/scripts/addons/ online_mat_lib/material-library/bundled/cycles: remove osl folder & woven_wool.bcm
Brendon Murphy
meta.androcto1 at gmail.com
Sat Dec 22 02:25:47 CET 2012
Revision: 4089
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4089
Author: meta-androcto
Date: 2012-12-22 01:25:46 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
remove osl folder & woven_wool.bcm
add patterns folder & barbwire_osl.bcm & hex tile updated
added textiles/hessian_osl.bcm & textiles/weave_osl.bcm & wood/parquete_tile_osl.bcm
Modified Paths:
--------------
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/index.xml
Added Paths:
-----------
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/barbwire_osl.bcm
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/barbwire_osl.jpg
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/hex_color.bcm
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/hex_color.jpg
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/hex_tile.bcm
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/hex_tile.jpg
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/hex_wire.bcm
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/hex_wire.jpg
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/textiles/hessian_osl.bcm
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/textiles/hessian_osl.jpg
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/textiles/weave_osl.bcm
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/textiles/weave_osl.jpg
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/wood/parquete_tile_osl.bcm
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/wood/parquete_tile_osl.jpg
Removed Paths:
-------------
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/osl_textures/
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/textiles/woven_wool.bcm
contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/textiles/woven_wool.jpg
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 2012-12-21 15:21:08 UTC (rev 4088)
+++ contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/index.xml 2012-12-22 01:25:46 UTC (rev 4089)
@@ -41,7 +41,8 @@
<material name="Pearl" href="pearl" by="moony" stars="4" addon="0.4" />
<material name="Forest" href="forest" by="Jonathan L" stars="4" complexity="complex" addon="0.4" />
</category>
- <category title="OSL_Textures" folder="osl_textures" addon="0.4">
+ <category title="Patterns" folder="patterns" addon="0.4">
+ <material name="Barb Wire OSL" href="barbwire_osl" by="varkenvarken" stars="4" complexity="complex" addon="0.4" />
<material name="Hex Tile" href="hex_tile" by="varkenvarken" stars="4" addon="0.4" />
<material name="Hex Wire" href="hex_wire" by="varkenvarken" stars="4" complexity="complex" addon="0.4" />
<material name="Hex Color" href="hex_color" by="varkenvarken" stars="4" complexity="complex" addon="0.4" />
@@ -65,11 +66,13 @@
</category>
<category title="Textiles" folder="textiles" addon="0.4">
<material name="Denim" href="denim" by="Peter Cassetta" stars="4" complexity="complex" addon="0.4" />
+ <material name="Hessian OSL" href="hessian_osl" by="varkenvarken" stars="4" complexity="complex" addon="0.4" />
<material name="Velvet (Edged)" href="velvet_edged" stars="4" addon="0.4" />
+ <material name="Weave OSL" href="weave_osl" by="varkenvarken" stars="4" complexity="complex" addon="0.4" />
<material name="Weave Test" href="weave_test" by="niabot" stars="4" complexity="complex" addon="0.4" />
- <material name="Woven Wool" href="woven_wool" by="meta-androcto" stars="3" addon="0.4" />
</category>
<category title="Wood" folder="wood" addon="0.4">
+ <material name="Parquete Tile Osl" href="parquete_tile_osl" by="sambler" stars="4" complexity="intermediate" addon="0.4" />
<material name="Polished Walnut" href="polished_walnut" by="Peter Cassetta" stars="4" complexity="intermediate" addon="0.4" />
<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" />
Added: contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/barbwire_osl.bcm
===================================================================
--- contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/barbwire_osl.bcm (rev 0)
+++ contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/barbwire_osl.bcm 2012-12-22 01:25:46 UTC (rev 4089)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<material view_color="rgb(0.80000, 0.80000, 0.80000)" sample_lamp="True">
+ <nodes>
+ <node type="SCRIPT" mode="INTERNAL" script="0" width="0.05000" turns="2" spiketurns="2" xscale="1.0" pos="Vector(0.0, 0.0, 0.0)" loc="-219, 356" />
+ <node type="BSDF_TRANSPARENT" color="rgba(1.0, 1.0, 1.0, 1.0)" loc="-224, 120" />
+ <node type="BSDF_GLOSSY" distribution="BECKMANN" color="rgba(0.48658, 0.48658, 0.48658, 1.0)" roughness="0.20000" loc="-222, 41" />
+ <node type="MAPPING" translation="Vector(0.0, 0.0, 0.0)" rotation="Vector(0.0, 0.0, 0.0)" scale="Vector(15.0, 15.0, 15.0)" use_min="False" use_max="False" vector="Vector(0.0, 0.0, 0.0)" loc="-503, 315" />
+ <node type="TEX_COORD" dupli="False" loc="-702, 259" />
+ <node type="MIX_SHADER" fac="0.5" loc="-31, 231" />
+ <node type="OUTPUT_MATERIAL" loc="165, 323" />
+ </nodes>
+ <links>
+ <link to="6" input="0" from="5" output="0" />
+ <link to="6" input="2" from="0" output="1" />
+ <link to="5" input="0" from="0" output="0" />
+ <link to="0" input="4" from="3" output="0" />
+ <link to="3" input="0" from="4" output="2" />
+ <link to="5" input="1" from="1" output="0" />
+ <link to="5" input="2" from="2" output="0" />
+ </links>
+ <scripts>
+ <script name="MABarbWire.osl" id="0">
+/*<br /> Barbwire shader by Michel J. Anders (c)2012<br /> license: cc-by-sa<br /> http://blenderthings.blogspot.com.au/2012/12/a-barbwire-osl-shader-for-blender-cycles.html<br />*/<br /><br />#include "stdosl.h"<br /><br />float arc(float r){ return sqrt(0.25-(r-0.5)*(r-0.5)); }<br /><br />shader barbwire(<br /> float Width = 0.05,<br /> int Turns = 2,<br /> int Spiketurns = 2,<br /> float Xscale = 1,<br /> point Pos = P,<br /> output float Fac = 0,<br /> output float Displ = 0 )<br />{<br /> float x = mod(Pos[0],1);<br /> float y = mod(Pos[1],1);<br /><br /> if ( x > 0.5 ) {<br /> x = 1 - x;<br /> y = 1 - y;<br /> }<br /><br /> float w = Width/2;<br /> float t = M_2PI*x*Turns;<br /><br /> float c = cos(t);<br /> float h = c*w+w;<br /> float l = c*w-w;<br /><br /> y -= 0.5;<br /> // the barb part<br /> float BWidth = Width*Xscale;<br /> float Lw = BWid
th*(Spiketurns-1);<br /> float Hw = BWidth*Spiketurns;<br /> if ( x > Lw && x < Hw && y > 1.5*Width && y<4*Width ) { // the spikey part<br /> if( y<3*Width || y-3*Width < x-Width){<br /> Fac = 1;<br /> Displ = arc(mod(x,BWidth)/BWidth);<br /> }<br /> } else if ( x < Hw && abs(y) < 2*Width ){<br /> if ( abs(y) > 1.5*Width) { // the rounded top and bottom parts<br /> if ( abs(y) - 1.5*Width < w*arc(mod(x,BWidth)/BWidth) ){<br /> Fac = 1;<br /> Displ = arc(mod(x,BWidth)/BWidth);<br /> }<br /> } else { // the main part<br /> Fac = 1;<br /> Displ = arc(mod(x,BWidth)/BWidth);<br /> }<br /> }<br /> // the wire part<br /> else {<br /> // alternating top/bottom checks to get correct crossings<br /> if ( (int)(t/M_PI) % 2 == 1 ){<br /><br /> if ( y >
l && y < h ) {<br /> Fac = 1;<br /> Displ = arc((y-l)/Width);<br /> } else if ( -y > l && -y < h ) {<br /> Fac = 1;<br /> Displ = arc((-y-l)/Width);<br /> }<br /><br /> } else {<br /><br /> if ( -y > l && -y < h ) {<br /> Fac = 1;<br /> Displ = arc((-y-l)/Width);<br /> } else if ( y > l && y < h ) {<br /> Fac = 1;<br /> Displ = arc((y-l)/Width);<br /> }<br /> }<br /> }<br />}<br /><br />
+ </script>
+ </scripts>
+</material>
\ No newline at end of file
Added: contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/barbwire_osl.jpg
===================================================================
(Binary files differ)
Property changes on: contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/barbwire_osl.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/hex_color.bcm
===================================================================
--- contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/hex_color.bcm (rev 0)
+++ contrib/py/scripts/addons/online_mat_lib/material-library/bundled/cycles/patterns/hex_color.bcm 2012-12-22 01:25:46 UTC (rev 4089)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<material view_color="rgb(0.80000, 0.80000, 0.80000)" sample_lamp="True">
+ <nodes>
+ <node type="OUTPUT_MATERIAL" loc="546, 298" />
+ <node type="MIX_SHADER" fac="0.20000" loc="326, 327" />
+ <node type="SCRIPT" mode="INTERNAL" script="0" diffuse_color1="rgba(0.20000, 0.80000, 0.20000, 1.0)" diffuse_color2="rgba(0.80000, 0.20000, 0.20000, 1.0)" diffuse_color3="rgba(0.20000, 0.20000, 0.80000, 1.0)" coordinates="Vector(0.0, 0.0, 0.0)" loc="-106, 239" />
+ <node type="MAPPING" translation="Vector(0.0, 0.0, 0.0)" rotation="Vector(0.0, 0.0, 0.0)" scale="Vector(50.0, 50.0, 200.0)" use_min="False" use_max="False" vector="Vector(0.0, 0.0, 0.0)" loc="-402, 295" />
+ <node type="BSDF_GLOSSY" distribution="BECKMANN" color="rgba(0.80000, 0.80000, 0.80000, 1.0)" roughness="0.20000" loc="117, 162" />
+ <node type="BSDF_DIFFUSE" color="rgba(0.80000, 0.80000, 0.80000, 1.0)" roughness="0.0" loc="122, 305" />
+ <node type="TEX_COORD" dupli="False" loc="-615, 279" />
+ </nodes>
+ <links>
+ <link to="1" input="1" from="5" output="0" />
+ <link to="0" input="0" from="1" output="0" />
+ <link to="1" input="2" from="4" output="0" />
+ <link to="5" input="0" from="2" output="0" />
+ <link to="0" input="2" from="2" output="2" />
+ <link to="2" input="3" from="3" output="0" />
+ <link to="3" input="0" from="6" output="2" />
+ </links>
+ <scripts>
+ <script name="Hexagon_Color_.osl" id="0">
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list