Moved node scripts to a specific directory

RodZill4 · Jul 12, 2023 · 5ac1fa1 · 5ac1fa1
1 parent d8579b8
commit 5ac1fa1
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 5 deletions.
diff --git a/addons/material_maker/engine/gen_base.gd → ...s/material_maker/engine/nodes/gen_base.gd b/addons/material_maker/engine/gen_base.gd → ...s/material_maker/engine/nodes/gen_base.gd
diff --git a/addons/material_maker/engine/gen_brush.gd → .../material_maker/engine/nodes/gen_brush.gd b/addons/material_maker/engine/gen_brush.gd → .../material_maker/engine/nodes/gen_brush.gd
diff --git a/addons/material_maker/engine/gen_buffer.gd → ...material_maker/engine/nodes/gen_buffer.gd b/addons/material_maker/engine/gen_buffer.gd → ...material_maker/engine/nodes/gen_buffer.gd
@@ -104,7 +104,7 @@ func do_update_shader() -> void:
 	if version == VERSION_COMPLEX:
 		f32 = get_parameter("f32")
 	await shader_compute.set_shader_from_shadercode(source, f32)
-	var new_is_greyscale = ((shader_compute.texture_type & 1) == 0)
+	var new_is_greyscale = ((shader_compute.get_texture_type() & 1) == 0)
 	if new_is_greyscale != is_greyscale:
 		is_greyscale = new_is_greyscale
 		notify_output_change(0)
@@ -122,7 +122,7 @@ func on_dep_update_buffer(buffer_name : String) -> bool:
 		return false
 	var status = await shader_compute.render(texture, pow(2, get_parameter("size")))
 	if status:
-		emit_signal("rendering_time", shader_compute.render_time)
+		emit_signal("rendering_time", shader_compute.get_render_time())
 		mm_deps.dependency_update(buffer_name, texture, true)
 		return true
 	return false

diff --git a/addons/material_maker/engine/gen_comment.gd → ...aterial_maker/engine/nodes/gen_comment.gd b/addons/material_maker/engine/gen_comment.gd → ...aterial_maker/engine/nodes/gen_comment.gd
diff --git a/addons/material_maker/engine/gen_context.gd → ...aterial_maker/engine/nodes/gen_context.gd b/addons/material_maker/engine/gen_context.gd → ...aterial_maker/engine/nodes/gen_context.gd
diff --git a/addons/material_maker/engine/gen_debug.gd → .../material_maker/engine/nodes/gen_debug.gd b/addons/material_maker/engine/gen_debug.gd → .../material_maker/engine/nodes/gen_debug.gd
diff --git a/addons/material_maker/engine/gen_export.gd → ...material_maker/engine/nodes/gen_export.gd b/addons/material_maker/engine/gen_export.gd → ...material_maker/engine/nodes/gen_export.gd
diff --git a/addons/material_maker/engine/gen_graph.gd → .../material_maker/engine/nodes/gen_graph.gd b/addons/material_maker/engine/gen_graph.gd → .../material_maker/engine/nodes/gen_graph.gd
diff --git a/addons/material_maker/engine/gen_image.gd → .../material_maker/engine/nodes/gen_image.gd b/addons/material_maker/engine/gen_image.gd → .../material_maker/engine/nodes/gen_image.gd
diff --git a/addons/material_maker/engine/gen_ios.gd → ...ns/material_maker/engine/nodes/gen_ios.gd b/addons/material_maker/engine/gen_ios.gd → ...ns/material_maker/engine/nodes/gen_ios.gd
diff --git a/...terial_maker/engine/gen_iterate_buffer.gd → ..._maker/engine/nodes/gen_iterate_buffer.gd b/...terial_maker/engine/gen_iterate_buffer.gd → ..._maker/engine/nodes/gen_iterate_buffer.gd
@@ -123,7 +123,7 @@ func do_update_shader(input_port_index : int) -> void:
 		await shader_compute.set_shader_from_shadercode(source, f32, texture)
 	else:
 		await shader_compute.set_shader_from_shadercode(source, f32)
-	var new_is_greyscale = ((shader_compute.texture_type & 1) == 0)
+	var new_is_greyscale = ((shader_compute.get_texture_type() & 1) == 0)
 	if new_is_greyscale != is_greyscale[input_port_index]:
 		is_greyscale[input_port_index] = new_is_greyscale
 		notify_output_change(input_port_index)

diff --git a/addons/material_maker/engine/gen_material.gd → ...terial_maker/engine/nodes/gen_material.gd b/addons/material_maker/engine/gen_material.gd → ...terial_maker/engine/nodes/gen_material.gd
diff --git a/addons/material_maker/engine/gen_remote.gd → ...material_maker/engine/nodes/gen_remote.gd b/addons/material_maker/engine/gen_remote.gd → ...material_maker/engine/nodes/gen_remote.gd
diff --git a/addons/material_maker/engine/gen_reroute.gd → ...aterial_maker/engine/nodes/gen_reroute.gd b/addons/material_maker/engine/gen_reroute.gd → ...aterial_maker/engine/nodes/gen_reroute.gd
diff --git a/addons/material_maker/engine/gen_sdf.gd → ...ns/material_maker/engine/nodes/gen_sdf.gd b/addons/material_maker/engine/gen_sdf.gd → ...ns/material_maker/engine/nodes/gen_sdf.gd
diff --git a/addons/material_maker/engine/gen_shader.gd → ...material_maker/engine/nodes/gen_shader.gd b/addons/material_maker/engine/gen_shader.gd → ...material_maker/engine/nodes/gen_shader.gd
diff --git a/addons/material_maker/engine/gen_switch.gd → ...material_maker/engine/nodes/gen_switch.gd b/addons/material_maker/engine/gen_switch.gd → ...material_maker/engine/nodes/gen_switch.gd
diff --git a/addons/material_maker/engine/gen_text.gd → ...s/material_maker/engine/nodes/gen_text.gd b/addons/material_maker/engine/gen_text.gd → ...s/material_maker/engine/nodes/gen_text.gd
diff --git a/addons/material_maker/engine/gen_texture.gd → ...aterial_maker/engine/nodes/gen_texture.gd b/addons/material_maker/engine/gen_texture.gd → ...aterial_maker/engine/nodes/gen_texture.gd
diff --git a/material_maker/windows/material_editor/export_editor.gd b/material_maker/windows/material_editor/export_editor.gd
@@ -19,7 +19,7 @@ var data : Dictionary = {}
 var exports : Dictionary = {}
 
 
-const GEN_MATERIAL = preload("res://addons/material_maker/engine/gen_material.gd")
+const GEN_MATERIAL = preload("res://addons/material_maker/engine/nodes/gen_material.gd")
 
 
 signal node_changed(model_data)
@@ -96,7 +96,7 @@ func select_file(i : int) -> void:
 					for p in f.file_params.keys():
 						file_export_context["$(file_param:"+p+")"] = f.file_params[p]
 					f.erase("file_params")
-				var template : String = GEN_MATERIAL.process_template(GEN_MATERIAL.get_template_text(f.template), file_export_context)
+				var template : String = MMGenMaterial.process_template(MMGenMaterial.get_template_text(f.template), file_export_context)
 				if template != f.template:
 					f.template = template
 				export_file_template.text = template