huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-19 01:29:49 +00:00
Code Issues Wiki Activity

vec2 support for shaders

Browse source 
Feature not exposed to the end user yet
This commit is contained in:
Manolis Papadeas 2022-04-09 23:28:57 +03:00
parent d579118bb1
commit c7f9f1d23b
1 changed files with 51 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/UI/Dialogs/ImageEffects/ShaderEffect.gd
View file

@ -135,11 +135,26 @@ func change_shader(shader_tmp: Shader, name: String) -> void:
hbox.add_child(label) hbox.add_child(label)
hbox.add_child(spinbox) hbox.add_child(spinbox)
shader_params.add_child(hbox) shader_params.add_child(hbox)
elif u_type == "vec2":
var label := Label.new()
label.text = u_name
var vector2 := _vec2str_to_vector2(u_value)
var spinbox1 := SpinBox.new()
spinbox1.value = vector2.x
spinbox1.connect("value_changed", self, "_set_vector2_shader_param", [u_name, true])
var spinbox2 := SpinBox.new()
spinbox2.value = vector2.y
spinbox2.connect("value_changed", self, "_set_vector2_shader_param", [u_name, false])
var hbox := HBoxContainer.new()
hbox.add_child(label)
hbox.add_child(spinbox1)
hbox.add_child(spinbox2)
shader_params.add_child(hbox)
elif u_type == "vec4": elif u_type == "vec4":
if "hint_color" in u_hint: if "hint_color" in u_hint:
var label := Label.new() var label := Label.new()
label.text = u_name label.text = u_name
var color = _vec4str_to_color(u_value) var color := _vec4str_to_color(u_value)
var color_button := ColorPickerButton.new() var color_button := ColorPickerButton.new()
color_button.rect_min_size = Vector2(20, 20) color_button.rect_min_size = Vector2(20, 20)
color_button.color = color color_button.color = color
@ -178,19 +193,31 @@ func change_shader(shader_tmp: Shader, name: String) -> void:
func set_shader_param(value, param: String) -> void: func set_shader_param(value, param: String) -> void:
preview.material.set_shader_param(param, value) var mat: ShaderMaterial = preview.material
mat.set_shader_param(param, value)
func _load_texture(path: String, param: String) -> void: func _set_vector2_shader_param(value: float, param: String, x: bool) -> void:
var image := Image.new() var mat: ShaderMaterial = preview.material
image.load(path) var vector2: Vector2 = mat.get_shader_param(param)
if !image: if x:
print("Error loading texture") vector2.x = value
return else:
var image_tex := ImageTexture.new() vector2.y = value
image_tex.create_from_image(image, 0) set_shader_param(vector2, param)
image_tex.flags = ImageTexture.FLAG_REPEAT
set_shader_param(image_tex, param)
func _vec2str_to_vector2(vec2: String) -> Vector2:
vec2 = vec2.replace("vec2(", "")
vec2 = vec2.replace(")", "")
var vec_values: PoolStringArray = vec2.split(",")
if vec_values.size() == 0:
return Vector2.ZERO
var y := float(vec_values[0])
if vec_values.size() == 2:
y = float(vec_values[1])
var vector2 := Vector2(float(vec_values[0]), y)
return vector2
func _vec4str_to_color(vec4: String) -> Color: func _vec4str_to_color(vec4: String) -> Color:
@ -212,3 +239,15 @@ func _vec4str_to_color(vec4: String) -> Color:
alpha = float(rgba_values[3]) alpha = float(rgba_values[3])
var color: Color = Color(red, green, blue, alpha) var color: Color = Color(red, green, blue, alpha)
return color return color
func _load_texture(path: String, param: String) -> void:
var image := Image.new()
image.load(path)
if !image:
print("Error loading texture")
return
var image_tex := ImageTexture.new()
image_tex.create_from_image(image, 0)
image_tex.flags = ImageTexture.FLAG_REPEAT
set_shader_param(image_tex, param)