mirror of
https://github.com/Relintai/material-maker.git
synced 2024-12-23 21:16:54 +01:00
Moved histogram to a separate scene (so it can become a panel later)
This commit is contained in:
RodZill4
parent
08f5d007ae
commit
d3a3fabc31
@ -7,7 +7,6 @@ class Cursor:
|
||||
var top : bool = true
|
||||
var position : float
|
||||
|
||||
|
||||
const WIDTH : int = 8
|
||||
const HEIGHT : int = 8
|
||||
|
||||
@ -89,7 +88,7 @@ func on_parameter_changed(p, v) -> void:
|
||||
var result = source.generator.render(source.output_index, 128, true)
|
||||
while result is GDScriptFunctionState:
|
||||
result = yield(result, "completed")
|
||||
result.copy_to_texture($ViewportImage/ColorRect.material.get_shader_param("tex"))
|
||||
result.copy_to_texture($Histogram.get_image_texture())
|
||||
result.release()
|
||||
|
||||
func set_parameter(n : String, v : float, d : float) -> void:
|
||||
|
||||
@ -1,97 +1,7 @@
|
||||
[gd_scene load_steps=14 format=2]
|
||||
[gd_scene load_steps=3 format=2]
|
||||
|
||||
[ext_resource path="res://material_maker/nodes/tones.gd" type="Script" id=1]
|
||||
|
||||
[sub_resource type="Shader" id=1]
|
||||
code = "shader_type canvas_item;
|
||||
render_mode blend_disabled;
|
||||
|
||||
uniform sampler2D tex;
|
||||
|
||||
void fragment() {
|
||||
COLOR = texture(tex, UV);
|
||||
}
|
||||
"
|
||||
|
||||
[sub_resource type="ImageTexture" id=2]
|
||||
|
||||
[sub_resource type="ShaderMaterial" id=3]
|
||||
resource_local_to_scene = true
|
||||
shader = SubResource( 1 )
|
||||
shader_param/tex = SubResource( 2 )
|
||||
|
||||
[sub_resource type="Shader" id=4]
|
||||
code = "shader_type canvas_item;
|
||||
render_mode blend_disabled;
|
||||
|
||||
uniform sampler2D tex;
|
||||
|
||||
void fragment() {
|
||||
vec4 sum = vec4(0.0);
|
||||
for (int i = 0; i < 128; ++i) {
|
||||
sum += step(abs(texture(tex, vec2(UV.x, float(i)/127.0))-UV.y), vec4(0.02));
|
||||
}
|
||||
COLOR = sum/255.0;
|
||||
}
|
||||
"
|
||||
|
||||
[sub_resource type="ViewportTexture" id=5]
|
||||
viewport_path = NodePath("ViewportImage")
|
||||
|
||||
[sub_resource type="ShaderMaterial" id=6]
|
||||
resource_local_to_scene = true
|
||||
shader = SubResource( 4 )
|
||||
shader_param/tex = SubResource( 5 )
|
||||
|
||||
[sub_resource type="Shader" id=7]
|
||||
code = "shader_type canvas_item;
|
||||
render_mode blend_disabled;
|
||||
|
||||
uniform sampler2D tex;
|
||||
|
||||
void fragment() {
|
||||
vec4 sum = vec4(0.0);
|
||||
for (int i = 0; i < 128; ++i) {
|
||||
sum += texture(tex, vec2(float(i)/127.0, UV.x));
|
||||
}
|
||||
COLOR = sum/255.0;
|
||||
}"
|
||||
|
||||
[sub_resource type="ViewportTexture" id=8]
|
||||
viewport_path = NodePath("ViewportHistogram1")
|
||||
|
||||
[sub_resource type="ShaderMaterial" id=9]
|
||||
resource_local_to_scene = true
|
||||
shader = SubResource( 7 )
|
||||
shader_param/tex = SubResource( 8 )
|
||||
|
||||
[sub_resource type="Shader" id=10]
|
||||
code = "shader_type canvas_item;
|
||||
|
||||
uniform sampler2D tex;
|
||||
render_mode blend_disabled;
|
||||
|
||||
void fragment() {
|
||||
if (abs(fract(UV.y+0.05)) < 0.1) {
|
||||
COLOR = vec4(vec3(UV.x), 1.0);
|
||||
} else {
|
||||
vec4 highest = vec4(0.0);
|
||||
for (int i = 0; i < 128; ++i) {
|
||||
highest = max(highest, texture(tex, vec2(float(i)/128.0, 0.0)));
|
||||
}
|
||||
vec4 value = step(vec4(0.95-UV.y)*highest/0.9, 0.5*(texture(tex, vec2(max(0.0, UV.x-0.015), 0.0))+texture(tex, vec2(min(1.0, UV.x+0.015), 0.0))));
|
||||
float alpha = step(0.1, dot(value, vec4(1.0)));
|
||||
COLOR = vec4(mix(value.rgb, vec3(0.5), 0.3*value.a), alpha);
|
||||
}
|
||||
}"
|
||||
|
||||
[sub_resource type="ViewportTexture" id=11]
|
||||
viewport_path = NodePath("ViewportHistogram2")
|
||||
|
||||
[sub_resource type="ShaderMaterial" id=12]
|
||||
resource_local_to_scene = true
|
||||
shader = SubResource( 10 )
|
||||
shader_param/tex = SubResource( 11 )
|
||||
[ext_resource path="res://material_maker/widgets/histogram/histogram.tscn" type="PackedScene" id=2]
|
||||
|
||||
[node name="Tones" type="GraphNode"]
|
||||
anchor_right = 1.0
|
||||
@ -131,50 +41,6 @@ __meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="ViewportImage" type="Viewport" parent="."]
|
||||
size = Vector2( 256, 256 )
|
||||
transparent_bg = true
|
||||
hdr = false
|
||||
usage = 0
|
||||
render_target_v_flip = true
|
||||
render_target_update_mode = 3
|
||||
|
||||
[node name="ColorRect" type="ColorRect" parent="ViewportImage"]
|
||||
material = SubResource( 3 )
|
||||
margin_right = 256.0
|
||||
margin_bottom = 128.0
|
||||
rect_min_size = Vector2( 256, 256 )
|
||||
|
||||
[node name="ViewportHistogram1" type="Viewport" parent="."]
|
||||
size = Vector2( 128, 128 )
|
||||
own_world = true
|
||||
transparent_bg = true
|
||||
hdr = false
|
||||
usage = 0
|
||||
render_target_v_flip = true
|
||||
render_target_update_mode = 3
|
||||
|
||||
[node name="ColorRect" type="ColorRect" parent="ViewportHistogram1"]
|
||||
material = SubResource( 6 )
|
||||
margin_right = 128.0
|
||||
margin_bottom = 128.0
|
||||
rect_min_size = Vector2( 128, 128 )
|
||||
|
||||
[node name="ViewportHistogram2" type="Viewport" parent="."]
|
||||
size = Vector2( 128, 2 )
|
||||
transparent_bg = true
|
||||
disable_3d = true
|
||||
keep_3d_linear = true
|
||||
usage = 0
|
||||
render_target_v_flip = true
|
||||
render_target_update_mode = 3
|
||||
|
||||
[node name="ColorRect" type="ColorRect" parent="ViewportHistogram2"]
|
||||
material = SubResource( 9 )
|
||||
margin_right = 128.0
|
||||
margin_bottom = 2.0
|
||||
rect_min_size = Vector2( 128, 2 )
|
||||
|
||||
[node name="Mode" type="OptionButton" parent="."]
|
||||
margin_left = 16.0
|
||||
margin_top = 24.0
|
||||
@ -194,8 +60,7 @@ __meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="Histogram" type="ColorRect" parent="."]
|
||||
material = SubResource( 12 )
|
||||
[node name="Histogram" parent="." instance=ExtResource( 2 )]
|
||||
margin_left = 16.0
|
||||
margin_top = 50.0
|
||||
margin_right = 208.0
|
||||
|
||||
7
material_maker/widgets/histogram/histogram.gd
Normal file
7
material_maker/widgets/histogram/histogram.gd
Normal file
@ -0,0 +1,7 @@
|
||||
extends Control
|
||||
|
||||
func update_histogram() -> void:
|
||||
pass
|
||||
|
||||
func get_image_texture() -> ImageTexture:
|
||||
return $ViewportImage/ColorRect.material.get_shader_param("tex")
|
||||
157
material_maker/widgets/histogram/histogram.tscn
Normal file
157
material_maker/widgets/histogram/histogram.tscn
Normal file
@ -0,0 +1,157 @@
|
||||
[gd_scene load_steps=14 format=2]
|
||||
|
||||
[ext_resource path="res://material_maker/widgets/histogram/histogram.gd" type="Script" id=1]
|
||||
|
||||
[sub_resource type="Shader" id=1]
|
||||
resource_local_to_scene = true
|
||||
code = "shader_type canvas_item;
|
||||
render_mode blend_disabled;
|
||||
|
||||
uniform sampler2D tex;
|
||||
|
||||
void fragment() {
|
||||
COLOR = texture(tex, UV);
|
||||
}
|
||||
"
|
||||
|
||||
[sub_resource type="ImageTexture" id=2]
|
||||
resource_local_to_scene = true
|
||||
|
||||
[sub_resource type="ShaderMaterial" id=3]
|
||||
resource_local_to_scene = true
|
||||
shader = SubResource( 1 )
|
||||
shader_param/tex = SubResource( 2 )
|
||||
|
||||
[sub_resource type="Shader" id=4]
|
||||
code = "shader_type canvas_item;
|
||||
render_mode blend_disabled;
|
||||
|
||||
uniform sampler2D tex;
|
||||
|
||||
void fragment() {
|
||||
vec4 sum = vec4(0.0);
|
||||
for (int i = 0; i < 128; ++i) {
|
||||
sum += step(abs(texture(tex, vec2(UV.x, float(i)/127.0))-UV.y), vec4(0.02));
|
||||
}
|
||||
COLOR = sum/255.0;
|
||||
}
|
||||
"
|
||||
|
||||
[sub_resource type="ViewportTexture" id=5]
|
||||
viewport_path = NodePath("ViewportImage")
|
||||
|
||||
[sub_resource type="ShaderMaterial" id=6]
|
||||
resource_local_to_scene = true
|
||||
shader = SubResource( 4 )
|
||||
shader_param/tex = SubResource( 5 )
|
||||
|
||||
[sub_resource type="Shader" id=7]
|
||||
code = "shader_type canvas_item;
|
||||
render_mode blend_disabled;
|
||||
|
||||
uniform sampler2D tex;
|
||||
|
||||
void fragment() {
|
||||
vec4 sum = vec4(0.0);
|
||||
for (int i = 0; i < 128; ++i) {
|
||||
sum += texture(tex, vec2(float(i)/127.0, UV.x));
|
||||
}
|
||||
COLOR = sum/255.0;
|
||||
}"
|
||||
|
||||
[sub_resource type="ViewportTexture" id=8]
|
||||
viewport_path = NodePath("ViewportHistogram1")
|
||||
|
||||
[sub_resource type="ShaderMaterial" id=9]
|
||||
resource_local_to_scene = true
|
||||
shader = SubResource( 7 )
|
||||
shader_param/tex = SubResource( 8 )
|
||||
|
||||
[sub_resource type="Shader" id=10]
|
||||
code = "shader_type canvas_item;
|
||||
|
||||
uniform sampler2D tex;
|
||||
render_mode blend_disabled;
|
||||
|
||||
void fragment() {
|
||||
if (abs(fract(UV.y+0.05)) < 0.1) {
|
||||
COLOR = vec4(vec3(UV.x), 1.0);
|
||||
} else {
|
||||
vec4 highest = vec4(0.0);
|
||||
for (int i = 0; i < 128; ++i) {
|
||||
highest = max(highest, texture(tex, vec2(float(i)/128.0, 0.0)));
|
||||
}
|
||||
vec4 value = step(vec4(0.95-UV.y)*highest/0.9, 0.5*(texture(tex, vec2(max(0.0, UV.x-0.015), 0.0))+texture(tex, vec2(min(1.0, UV.x+0.015), 0.0))));
|
||||
float alpha = step(0.1, dot(value, vec4(1.0)));
|
||||
COLOR = vec4(mix(value.rgb, vec3(0.5), 0.3*value.a), alpha);
|
||||
}
|
||||
}"
|
||||
|
||||
[sub_resource type="ViewportTexture" id=11]
|
||||
flags = 4
|
||||
viewport_path = NodePath("ViewportHistogram2")
|
||||
|
||||
[sub_resource type="ShaderMaterial" id=12]
|
||||
resource_local_to_scene = true
|
||||
shader = SubResource( 10 )
|
||||
shader_param/tex = SubResource( 11 )
|
||||
|
||||
[node name="Histogram" type="Control"]
|
||||
margin_right = 64.0
|
||||
margin_bottom = 64.0
|
||||
script = ExtResource( 1 )
|
||||
__meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="ViewportImage" type="Viewport" parent="."]
|
||||
size = Vector2( 256, 256 )
|
||||
transparent_bg = true
|
||||
hdr = false
|
||||
usage = 0
|
||||
render_target_v_flip = true
|
||||
render_target_update_mode = 3
|
||||
|
||||
[node name="ColorRect" type="ColorRect" parent="ViewportImage"]
|
||||
material = SubResource( 3 )
|
||||
margin_right = 256.0
|
||||
margin_bottom = 128.0
|
||||
rect_min_size = Vector2( 256, 256 )
|
||||
|
||||
[node name="ViewportHistogram1" type="Viewport" parent="."]
|
||||
size = Vector2( 128, 128 )
|
||||
own_world = true
|
||||
transparent_bg = true
|
||||
hdr = false
|
||||
usage = 0
|
||||
render_target_v_flip = true
|
||||
render_target_update_mode = 3
|
||||
|
||||
[node name="ColorRect" type="ColorRect" parent="ViewportHistogram1"]
|
||||
material = SubResource( 6 )
|
||||
margin_right = 128.0
|
||||
margin_bottom = 128.0
|
||||
rect_min_size = Vector2( 128, 128 )
|
||||
|
||||
[node name="ViewportHistogram2" type="Viewport" parent="."]
|
||||
size = Vector2( 128, 2 )
|
||||
transparent_bg = true
|
||||
disable_3d = true
|
||||
keep_3d_linear = true
|
||||
usage = 0
|
||||
render_target_v_flip = true
|
||||
render_target_update_mode = 3
|
||||
|
||||
[node name="ColorRect" type="ColorRect" parent="ViewportHistogram2"]
|
||||
material = SubResource( 9 )
|
||||
margin_right = 128.0
|
||||
margin_bottom = 2.0
|
||||
rect_min_size = Vector2( 128, 2 )
|
||||
|
||||
[node name="Control" type="ColorRect" parent="."]
|
||||
material = SubResource( 12 )
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
__meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user