diff --git a/addons/material_maker/nodes/tex3d_distort.mmg b/addons/material_maker/nodes/tex3d_distort.mmg index a3a5a63..8ec2811 100644 --- a/addons/material_maker/nodes/tex3d_distort.mmg +++ b/addons/material_maker/nodes/tex3d_distort.mmg @@ -34,13 +34,13 @@ "global": "", "inputs": [ { - "default": "0.0", + "default": "vec3(1.0)", "label": "", "name": "in1", "type": "tex3d" }, { - "default": "0.0", + "default": "vec3(0.0)", "label": "", "name": "in2", "type": "tex3d" diff --git a/addons/material_maker/nodes/tex3d_from2d.mmg b/addons/material_maker/nodes/tex3d_from2d.mmg new file mode 100644 index 0000000..6333853 --- /dev/null +++ b/addons/material_maker/nodes/tex3d_from2d.mmg @@ -0,0 +1,34 @@ +{ + "name": "tex3d_from2d", + "node_position": { + "x": 0, + "y": 0 + }, + "parameters": { + + }, + "shader_model": { + "code": "", + "global": "", + "inputs": [ + { + "default": "vec3(0.5)", + "label": "", + "name": "in", + "type": "rgb" + } + ], + "instance": "", + "name": "TEX3D From2D", + "outputs": [ + { + "tex3d": "$in($uv.xy+vec2(0.5))", + "type": "tex3d" + } + ], + "parameters": [ + + ] + }, + "type": "shader" +} \ No newline at end of file diff --git a/material_maker/library/base.json b/material_maker/library/base.json index db21c49..c3252e4 100644 --- a/material_maker/library/base.json +++ b/material_maker/library/base.json @@ -1228,6 +1228,134 @@ "tree_item": "3D/SDF/Transforms/Rotate", "type": "sdf3d_rotate" }, + { + "collapsed": true, + "tree_item": "3D/Texture" + }, + { + "collapsed": true, + "icon": "3d_texture_apply", + "name": "tex3d_apply", + "parameters": { + + }, + "tree_item": "3D/Texture/Apply", + "type": "tex3d_apply" + }, + { + "collapsed": true, + "icon": "3d_texture_select", + "name": "tex3d_select", + "parameters": { + "t": 0.01, + "v": 1 + }, + "tree_item": "3D/Texture/Select", + "type": "tex3d_select" + }, + { + "collapsed": true, + "icon": "3d_texture_from2d", + "name": "tex3d_from2d", + "parameters": { + + }, + "tree_item": "3D/Texture/From2D", + "type": "tex3d_from2d" + }, + { + "collapsed": true, + "icon": "3d_texture_pattern", + "name": "tex3d_pattern_2", + "parameters": { + "mix": 4, + "x_scale": 2, + "x_wave": 2, + "y_scale": 2, + "y_wave": 2, + "z_scale": 2, + "z_wave": 2 + }, + "tree_item": "3D/Texture/Pattern", + "type": "tex3d_pattern" + }, + { + "collapsed": true, + "icon": "3d_texture_fbm", + "name": "tex3d_fbm_4", + "parameters": { + "iterations": 1, + "noise": 0, + "persistence": 0.5, + "scale_x": 8, + "scale_y": 8, + "scale_z": 8 + }, + "tree_item": "3D/Texture/FBM", + "type": "tex3d_fbm" + }, + { + "collapsed": true, + "icon": "3d_texture_blend", + "name": "tex3d_blend_2", + "parameters": { + "amount": 0.5, + "blend_type": 0 + }, + "tree_item": "3D/Texture/Blend", + "type": "tex3d_blend" + }, + { + "collapsed": true, + "icon": "3d_texture_colorize", + "name": "tex3d_colorize_3", + "parameters": { + "g": { + "interpolation": 1, + "points": [ + { + "a": 1, + "b": 1, + "g": 0, + "pos": 0, + "r": 0 + }, + { + "a": 1, + "b": 0, + "g": 0.46875, + "pos": 1, + "r": 1 + } + ], + "type": "Gradient" + } + }, + "tree_item": "3D/Texture/Colorize", + "type": "tex3d_colorize" + }, + { + "collapsed": true, + "icon": "3d_texture_rotate", + "name": "tex3d_rotate", + "parameters": { + "ax": 0, + "ay": 0, + "az": 0 + }, + "tree_item": "3D/Texture/Rotate", + "type": "tex3d_rotate" + }, + { + "collapsed": true, + "icon": "3d_texture_distort", + "name": "tex3d_distort_2", + "parameters": { + "Distort": 0.3 + }, + "tree_item": "3D/Texture/Distort", + "type": "tex3d_distort" + }, { "collapsed": false, "tree_item": "Pattern" diff --git a/material_maker/library/base/3d_texture_apply.png b/material_maker/library/base/3d_texture_apply.png new file mode 100644 index 0000000..5b29ef6 Binary files /dev/null and b/material_maker/library/base/3d_texture_apply.png differ diff --git a/material_maker/library/base/3d_texture_blend.png b/material_maker/library/base/3d_texture_blend.png new file mode 100644 index 0000000..a67168f Binary files /dev/null and b/material_maker/library/base/3d_texture_blend.png differ diff --git a/material_maker/library/base/3d_texture_colorize.png b/material_maker/library/base/3d_texture_colorize.png new file mode 100644 index 0000000..39fa360 Binary files /dev/null and b/material_maker/library/base/3d_texture_colorize.png differ diff --git a/material_maker/library/base/3d_texture_distort.png b/material_maker/library/base/3d_texture_distort.png new file mode 100644 index 0000000..8fe4e6a Binary files /dev/null and b/material_maker/library/base/3d_texture_distort.png differ diff --git a/material_maker/library/base/3d_texture_fbm.png b/material_maker/library/base/3d_texture_fbm.png new file mode 100644 index 0000000..e02ef0c Binary files /dev/null and b/material_maker/library/base/3d_texture_fbm.png differ diff --git a/material_maker/library/base/3d_texture_from2d.png b/material_maker/library/base/3d_texture_from2d.png new file mode 100644 index 0000000..b00fdcb Binary files /dev/null and b/material_maker/library/base/3d_texture_from2d.png differ diff --git a/material_maker/library/base/3d_texture_pattern.png b/material_maker/library/base/3d_texture_pattern.png new file mode 100644 index 0000000..138b086 Binary files /dev/null and b/material_maker/library/base/3d_texture_pattern.png differ diff --git a/material_maker/library/base/3d_texture_rotate.png b/material_maker/library/base/3d_texture_rotate.png new file mode 100644 index 0000000..da41ae1 Binary files /dev/null and b/material_maker/library/base/3d_texture_rotate.png differ diff --git a/material_maker/library/base/3d_texture_select.png b/material_maker/library/base/3d_texture_select.png new file mode 100644 index 0000000..58afbb1 Binary files /dev/null and b/material_maker/library/base/3d_texture_select.png differ