updated bricks and base lib

- Added brick orientation output to bricks
- Added morphs, greyscale and customuv to base library
This commit is contained in:
RodZill4 2020-01-16 22:53:11 +01:00
parent 04a57b0c74
commit 954a9588c4
2 changed files with 70 additions and 0 deletions

View File

@ -857,6 +857,23 @@
"tree_item": "Simple/SDF/Operators/sdAnnularShape", "tree_item": "Simple/SDF/Operators/sdAnnularShape",
"type": "sdannularshape" "type": "sdannularshape"
}, },
{
"collapsed": true,
"icon": "simple_sdf_operators_sdmorph",
"name": "sdmorph",
"parameters": {
"amount": 0.5,
"bevel": 0,
"cx": 0,
"cy": 0,
"h": 0.08,
"op": 0,
"r": 0.3,
"w": 0.28
},
"tree_item": "Simple/SDF/Operators/sdMorph",
"type": "sdmorph"
},
{ {
"collapsed": false, "collapsed": false,
"tree_item": "Simple/SDF/Transforms" "tree_item": "Simple/SDF/Transforms"
@ -1147,6 +1164,24 @@
"tree_item": "3D/SDF/Operators/Revolution", "tree_item": "3D/SDF/Operators/Revolution",
"type": "sdf3d_revolution" "type": "sdf3d_revolution"
}, },
{
"collapsed": true,
"icon": "3d_sdf_operators_morph",
"name": "sdf3d_morph",
"parameters": {
"Amount": 0.5,
"amount": 0.5,
"bevel": 0,
"cx": 0,
"cy": 0,
"h": 0.08,
"op": 0,
"r": 0.3,
"w": 0.28
},
"tree_item": "3D/SDF/Operators/Morph",
"type": "sdf3d_morph"
},
{ {
"collapsed": false, "collapsed": false,
"tree_item": "3D/SDF/Transforms" "tree_item": "3D/SDF/Transforms"
@ -2090,6 +2125,19 @@
"tree_item": "Filter/AdjustHSV", "tree_item": "Filter/AdjustHSV",
"type": "adjust_hsv" "type": "adjust_hsv"
}, },
{
"collapsed": true,
"icon": "filter_greyscale",
"name": "greyscale",
"parameters": {
"brightness": 0,
"contrast": 1,
"mode": 2,
"steps": 6
},
"tree_item": "Filter/Greyscale",
"type": "greyscale"
},
{ {
"collapsed": true, "collapsed": true,
"icon": "filter_colorize", "icon": "filter_colorize",
@ -2328,6 +2376,16 @@
"tree_item": "Transform/CircleMap", "tree_item": "Transform/CircleMap",
"type": "circle_map" "type": "circle_map"
}, },
{
"collapsed": true,
"icon": "transform_customuv",
"name": "custom_uv",
"parameters": {
},
"tree_item": "Transform/CustomUV",
"type": "custom_uv"
},
{ {
"collapsed": false, "collapsed": false,
"tree_item": "Workflow" "tree_item": "Workflow"

View File

@ -47,6 +47,10 @@
{ {
"rgb": "brick_corner_uv($uv, $(name_uv)_rect.xy, $(name_uv)_rect.zw, $mortar, $corner)", "rgb": "brick_corner_uv($uv, $(name_uv)_rect.xy, $(name_uv)_rect.zw, $mortar, $corner)",
"type": "rgb" "type": "rgb"
},
{
"f": "0.5*(sign($(name_uv)_rect.z-$(name_uv)_rect.x-$(name_uv)_rect.w+$(name_uv)_rect.y)+1.0)",
"type": "f"
} }
], ],
"parameters": [ "parameters": [
@ -79,6 +83,7 @@
] ]
}, },
{ {
"control": "None",
"default": 1, "default": 1,
"label": "Repeat:", "label": "Repeat:",
"max": 8, "max": 8,
@ -88,6 +93,7 @@
"type": "float" "type": "float"
}, },
{ {
"control": "None",
"default": 6, "default": 6,
"label": "Rows:", "label": "Rows:",
"max": 64, "max": 64,
@ -97,6 +103,7 @@
"type": "float" "type": "float"
}, },
{ {
"control": "None",
"default": 3, "default": 3,
"label": "Columns:", "label": "Columns:",
"max": 64, "max": 64,
@ -106,6 +113,7 @@
"type": "float" "type": "float"
}, },
{ {
"control": "None",
"default": 0.5, "default": 0.5,
"label": "Offset:", "label": "Offset:",
"max": 1, "max": 1,
@ -115,6 +123,7 @@
"type": "float" "type": "float"
}, },
{ {
"control": "None",
"default": 0.1, "default": 0.1,
"label": "Mortar:", "label": "Mortar:",
"max": 0.5, "max": 0.5,
@ -124,6 +133,7 @@
"type": "float" "type": "float"
}, },
{ {
"control": "None",
"default": 0.1, "default": 0.1,
"label": "Bevel:", "label": "Bevel:",
"max": 0.5, "max": 0.5,
@ -133,6 +143,7 @@
"type": "float" "type": "float"
}, },
{ {
"control": "None",
"default": 0, "default": 0,
"label": "Round:", "label": "Round:",
"max": 0.5, "max": 0.5,
@ -142,6 +153,7 @@
"type": "float" "type": "float"
}, },
{ {
"control": "None",
"default": 0.1, "default": 0.1,
"label": "Corner:", "label": "Corner:",
"max": 0.5, "max": 0.5,