Cleanup and renaming
Moved Material Spray to another repository. Renamed the addon directory to material_maker
24
.gitignore
vendored
@ -1,24 +1,8 @@
|
|||||||
.import
|
.import
|
||||||
generated_image.png
|
generated_image.png
|
||||||
generated_image.png
|
addons/material_maker/models/Material.material
|
||||||
doc/bricks.png.import
|
addons/material_maker/models/models.blend1
|
||||||
doc/perlin.png.import
|
addons/material_maker/models/models.dae
|
||||||
doc/screenshot.png.import
|
addons/material_maker/models/models.dae.import
|
||||||
doc/sine.png.import
|
|
||||||
doc/voronoi.png.import
|
|
||||||
examples/test.ptex
|
|
||||||
examples/test_blend.ptex
|
|
||||||
addons/procedural_material/models/Material.material
|
|
||||||
addons/procedural_material/models/models.blend1
|
|
||||||
addons/procedural_material/models/models.dae
|
|
||||||
addons/procedural_material/models/models.dae.import
|
|
||||||
/examples/*.png
|
|
||||||
/examples/*.import
|
|
||||||
examples/input_image.png.import
|
|
||||||
examples/input_image.png.import
|
|
||||||
*.import
|
*.import
|
||||||
*.import
|
|
||||||
*.import
|
|
||||||
*.import
|
|
||||||
/addons/procedural_material/nodes/godot_logo.png.import
|
|
||||||
_build
|
_build
|
||||||
|
@ -4,5 +4,5 @@ Its user interface is based on Godot's GraphEditor: textures are described as in
|
|||||||
|
|
||||||
More details in the [user manual](https://rodzill4.github.io/godot-procedural-textures/doc/).
|
More details in the [user manual](https://rodzill4.github.io/godot-procedural-textures/doc/).
|
||||||
|
|
||||||
![Screenshot](addons/procedural_material/doc/images/screenshot.png)
|
![Screenshot](addons/material_maker/doc/images/screenshot.png)
|
||||||
|
|
||||||
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 132 KiB After Width: | Height: | Size: 132 KiB |
Before Width: | Height: | Size: 506 KiB After Width: | Height: | Size: 506 KiB |
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
Before Width: | Height: | Size: 132 KiB After Width: | Height: | Size: 132 KiB |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 6.0 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 7.7 KiB |
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.0 KiB |
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 325 KiB After Width: | Height: | Size: 325 KiB |
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
Before Width: | Height: | Size: 163 KiB After Width: | Height: | Size: 163 KiB |
@ -114,7 +114,7 @@ func create_nodes(data, position = null):
|
|||||||
if data == null:
|
if data == null:
|
||||||
return
|
return
|
||||||
if data.has("type"):
|
if data.has("type"):
|
||||||
var node_type = load("res://addons/procedural_material/nodes/"+data.type+".tscn")
|
var node_type = load("res://addons/material_maker/nodes/"+data.type+".tscn")
|
||||||
if node_type != null:
|
if node_type != null:
|
||||||
var node = node_type.instance()
|
var node = node_type.instance()
|
||||||
if data.has("name") && !has_node(data.name):
|
if data.has("name") && !has_node(data.name):
|
@ -1,7 +1,7 @@
|
|||||||
[gd_scene load_steps=6 format=2]
|
[gd_scene load_steps=6 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://addons/procedural_material/graph_edit.gd" type="Script" id=1]
|
[ext_resource path="res://addons/material_maker/graph_edit.gd" type="Script" id=1]
|
||||||
[ext_resource path="res://addons/procedural_material/nodes/material.tscn" type="PackedScene" id=2]
|
[ext_resource path="res://addons/material_maker/nodes/material.tscn" type="PackedScene" id=2]
|
||||||
|
|
||||||
[sub_resource type="Theme" id=1]
|
[sub_resource type="Theme" id=1]
|
||||||
|
|
@ -30,7 +30,7 @@ func _ready():
|
|||||||
var lib_path = OS.get_executable_path()
|
var lib_path = OS.get_executable_path()
|
||||||
lib_path = lib_path.left(max(lib_path.rfind("\\"), lib_path.rfind("/"))+1)+"library/base.json"
|
lib_path = lib_path.left(max(lib_path.rfind("\\"), lib_path.rfind("/"))+1)+"library/base.json"
|
||||||
if !add_library(lib_path):
|
if !add_library(lib_path):
|
||||||
add_library("res://addons/procedural_material/library/base.json")
|
add_library("res://addons/material_maker/library/base.json")
|
||||||
add_library("user://library/user.json")
|
add_library("user://library/user.json")
|
||||||
|
|
||||||
func add_library(filename):
|
func add_library(filename):
|
@ -18,7 +18,7 @@
|
|||||||
{
|
{
|
||||||
"tree_item":"Generators/Image",
|
"tree_item":"Generators/Image",
|
||||||
"type":"image",
|
"type":"image",
|
||||||
"file_path":"res://addons/procedural_material/nodes/godot_logo.png"
|
"file_path":"res://addons/material_maker/nodes/godot_logo.png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"tree_item":"Generators/Pattern",
|
"tree_item":"Generators/Pattern",
|
Before Width: | Height: | Size: 294 B After Width: | Height: | Size: 294 B |
Before Width: | Height: | Size: 455 B After Width: | Height: | Size: 455 B |
Before Width: | Height: | Size: 241 B After Width: | Height: | Size: 241 B |
Before Width: | Height: | Size: 298 B After Width: | Height: | Size: 298 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 643 B After Width: | Height: | Size: 643 B |
Before Width: | Height: | Size: 646 B After Width: | Height: | Size: 646 B |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 326 B After Width: | Height: | Size: 326 B |
Before Width: | Height: | Size: 244 B After Width: | Height: | Size: 244 B |
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
@ -75,7 +75,7 @@ func menu_about_to_show(name, menu):
|
|||||||
menu.set_item_disabled(menu.get_item_index(i), is_disabled)
|
menu.set_item_disabled(menu.get_item_index(i), is_disabled)
|
||||||
|
|
||||||
func new_pane():
|
func new_pane():
|
||||||
var graph_edit = preload("res://addons/procedural_material/graph_edit.tscn").instance()
|
var graph_edit = preload("res://addons/material_maker/graph_edit.tscn").instance()
|
||||||
$VBoxContainer/HBoxContainer/Projects.add_child(graph_edit)
|
$VBoxContainer/HBoxContainer/Projects.add_child(graph_edit)
|
||||||
$VBoxContainer/HBoxContainer/Projects.current_tab = graph_edit.get_index()
|
$VBoxContainer/HBoxContainer/Projects.current_tab = graph_edit.get_index()
|
||||||
return graph_edit
|
return graph_edit
|
||||||
@ -179,7 +179,7 @@ func add_to_user_library():
|
|||||||
if n is GraphNode and n.selected:
|
if n is GraphNode and n.selected:
|
||||||
selected_nodes.append(n)
|
selected_nodes.append(n)
|
||||||
if !selected_nodes.empty():
|
if !selected_nodes.empty():
|
||||||
var dialog = preload("res://addons/procedural_material/widgets/line_dialog.tscn").instance()
|
var dialog = preload("res://addons/material_maker/widgets/line_dialog.tscn").instance()
|
||||||
add_child(dialog)
|
add_child(dialog)
|
||||||
dialog.connect("ok", self, "do_add_to_user_library", [ selected_nodes ])
|
dialog.connect("ok", self, "do_add_to_user_library", [ selected_nodes ])
|
||||||
dialog.popup_centered()
|
dialog.popup_centered()
|
||||||
@ -217,7 +217,7 @@ func bug_report():
|
|||||||
OS.shell_open("https://github.com/RodZill4/godot-procedural-textures/issues")
|
OS.shell_open("https://github.com/RodZill4/godot-procedural-textures/issues")
|
||||||
|
|
||||||
func about():
|
func about():
|
||||||
var about_box = preload("res://addons/procedural_material/widgets/about.tscn").instance()
|
var about_box = preload("res://addons/material_maker/widgets/about.tscn").instance()
|
||||||
add_child(about_box)
|
add_child(about_box)
|
||||||
about_box.popup_centered()
|
about_box.popup_centered()
|
||||||
|
|
@ -1,9 +1,9 @@
|
|||||||
[gd_scene load_steps=5 format=2]
|
[gd_scene load_steps=5 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://addons/procedural_material/main_window.gd" type="Script" id=1]
|
[ext_resource path="res://addons/material_maker/main_window.gd" type="Script" id=1]
|
||||||
[ext_resource path="res://addons/procedural_material/library.gd" type="Script" id=2]
|
[ext_resource path="res://addons/material_maker/library.gd" type="Script" id=2]
|
||||||
[ext_resource path="res://addons/procedural_material/preview.tscn" type="PackedScene" id=3]
|
[ext_resource path="res://addons/material_maker/preview.tscn" type="PackedScene" id=3]
|
||||||
[ext_resource path="res://addons/procedural_material/widgets/tabs.gd" type="Script" id=4]
|
[ext_resource path="res://addons/material_maker/widgets/tabs.gd" type="Script" id=4]
|
||||||
|
|
||||||
[node name="MainWindow" type="Panel" index="0"]
|
[node name="MainWindow" type="Panel" index="0"]
|
||||||
|
|
@ -159,7 +159,7 @@ func do_generate_shader(src_code):
|
|||||||
var code
|
var code
|
||||||
code = "shader_type canvas_item;\n"
|
code = "shader_type canvas_item;\n"
|
||||||
var file = File.new()
|
var file = File.new()
|
||||||
file.open("res://addons/procedural_material/common.shader", File.READ)
|
file.open("res://addons/material_maker/common.shader", File.READ)
|
||||||
code += file.get_as_text()
|
code += file.get_as_text()
|
||||||
code += "\n"
|
code += "\n"
|
||||||
var shader_code = src_code.defs
|
var shader_code = src_code.defs
|
@ -1,5 +1,5 @@
|
|||||||
tool
|
tool
|
||||||
extends "res://addons/procedural_material/node_base.gd"
|
extends "res://addons/material_maker/node_base.gd"
|
||||||
|
|
||||||
var hue
|
var hue
|
||||||
var saturation
|
var saturation
|
@ -1,6 +1,6 @@
|
|||||||
[gd_scene load_steps=3 format=2]
|
[gd_scene load_steps=3 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://addons/procedural_material/nodes/adjust_hsv.gd" type="Script" id=1]
|
[ext_resource path="res://addons/material_maker/nodes/adjust_hsv.gd" type="Script" id=1]
|
||||||
|
|
||||||
[sub_resource type="Theme" id=1]
|
[sub_resource type="Theme" id=1]
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
tool
|
tool
|
||||||
extends "res://addons/procedural_material/node_base.gd"
|
extends "res://addons/material_maker/node_base.gd"
|
||||||
|
|
||||||
var blend_type = 0
|
var blend_type = 0
|
||||||
var amount = 0.0
|
var amount = 0.0
|
@ -1,6 +1,6 @@
|
|||||||
[gd_scene load_steps=3 format=2]
|
[gd_scene load_steps=3 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://addons/procedural_material/nodes/blend.gd" type="Script" id=1]
|
[ext_resource path="res://addons/material_maker/nodes/blend.gd" type="Script" id=1]
|
||||||
|
|
||||||
[sub_resource type="Theme" id=1]
|
[sub_resource type="Theme" id=1]
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
tool
|
tool
|
||||||
extends "res://addons/procedural_material/node_base.gd"
|
extends "res://addons/material_maker/node_base.gd"
|
||||||
|
|
||||||
var size = 5
|
var size = 5
|
||||||
var direction = 0
|
var direction = 0
|
@ -1,6 +1,6 @@
|
|||||||
[gd_scene load_steps=3 format=2]
|
[gd_scene load_steps=3 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://addons/procedural_material/nodes/blur.gd" type="Script" id=1]
|
[ext_resource path="res://addons/material_maker/nodes/blur.gd" type="Script" id=1]
|
||||||
|
|
||||||
[sub_resource type="Theme" id=1]
|
[sub_resource type="Theme" id=1]
|
||||||
|
|