From 3df63d046dc1712fbb518d005219561af2fb7de9 Mon Sep 17 00:00:00 2001 From: Rodz Labs Date: Mon, 21 Nov 2022 16:59:33 +0100 Subject: [PATCH] Removed default renderer material, and create one whenever required --- addons/material_maker/engine/renderer.gd | 9 +++------ addons/material_maker/engine/renderer.tscn | 14 +------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/addons/material_maker/engine/renderer.gd b/addons/material_maker/engine/renderer.gd index 7dc76b46..e44a5f43 100644 --- a/addons/material_maker/engine/renderer.gd +++ b/addons/material_maker/engine/renderer.gd @@ -10,9 +10,6 @@ var texture : Texture signal done -func _ready() -> void: - $ColorRect.material = $ColorRect.material.duplicate(true) - func request(object : Object) -> Object: assert(render_owner == null) render_owner = object @@ -51,7 +48,6 @@ func render_material(object : Object, material : Material, render_size : int, wi assert(render_owner == object, "Invalid renderer use") if mm_renderer.max_buffer_size != 0 and render_size > mm_renderer.max_buffer_size: render_size = mm_renderer.max_buffer_size - var shader_material = $ColorRect.material var chunk_count : int = 1 var render_scale : float = 1.0 var max_viewport_size : int = mm_renderer.max_viewport_size @@ -87,11 +83,12 @@ func render_material(object : Object, material : Material, render_size : int, wi image.blit_rect(get_texture().get_data(), Rect2(0, 0, size.x, size.y), Vector2(x*size.x, y*size.y)) texture = ImageTexture.new() texture.create_from_image(image) - $ColorRect.material = shader_material + $ColorRect.material = null return self func render_shader(object : Object, shader : String, render_size : int, with_hdr : bool = true) -> Object: - var shader_material = $ColorRect.material + var shader_material = ShaderMaterial.new() + shader_material.shader = Shader.new() shader_material.shader.code = shader mm_deps.material_update_params(shader_material) var status = render_material(object, shader_material, render_size, with_hdr) diff --git a/addons/material_maker/engine/renderer.tscn b/addons/material_maker/engine/renderer.tscn index 8e96531f..5fa9df46 100644 --- a/addons/material_maker/engine/renderer.tscn +++ b/addons/material_maker/engine/renderer.tscn @@ -1,18 +1,7 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://addons/material_maker/engine/renderer.gd" type="Script" id=1] -[sub_resource type="Shader" id=1] -code = "shader_type canvas_item; - -void fragment() { - COLOR = vec4(1.0); -} -" - -[sub_resource type="ShaderMaterial" id=2] -shader = SubResource( 1 ) - [sub_resource type="DynamicFontData" id=3] font_path = "res://material_maker/fonts/vegur_regular.otf" @@ -32,7 +21,6 @@ gui_disable_input = true script = ExtResource( 1 ) [node name="ColorRect" type="ColorRect" parent="."] -material = SubResource( 2 ) margin_right = 40.0 margin_bottom = 40.0