1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-03-16 08:15:18 +00:00

Compare commits

..

1 commit

Author SHA1 Message Date
Emmanouil Papadeas
bace34795a
Merge de6a30e85d into 360aa250c4 2024-12-19 16:57:23 +08:00
5 changed files with 6 additions and 9 deletions

View file

@ -236,8 +236,8 @@ func display_effects(cel: BaseCel, image_override: Image = null) -> Image:
continue
var params := effect.params
params["PXO_time"] = cel.get_frame(project).position_in_seconds(project)
params["PXO_frame_index"] = project.frames.find(cel.get_frame(project))
params["PXO_layer_index"] = index
params["PXO_frame"] = project.frames.find(cel.get_frame(project))
params["PXO_layer"] = index
var shader_image_effect := ShaderImageEffect.new()
shader_image_effect.generate_image(image, effect.shader, params, image_size)
# Inherit effects from the parents, if their blend mode is set to pass through

View file

@ -63,7 +63,7 @@ static func create_ui_for_shader_uniforms(
var u_init := u_left_side[0].split(" ")
var u_type := u_init[1]
var u_name := u_init[2]
if u_name in ["PXO_time", "PXO_frame_index", "PXO_layer_index"]:
if u_name in ["PXO_time", "PXO_frame", "PXO_layer"]:
continue
# Find custom data of the uniform, if any exists
# Right now it only checks if a uniform should have another type of node

View file

@ -83,9 +83,7 @@ func _set_node_values() -> void:
elif node is CheckBox:
node.button_pressed = value
elif node is GradientEditNode:
var gradient_tex := GradientTexture2D.new()
gradient_tex.gradient = value
node.set_gradient_texture(gradient_tex)
node.gradient = value
func _set_value_from_node(value, prop: String) -> void:

View file

@ -166,7 +166,6 @@ func _gui_input(event: InputEvent) -> void:
else:
if event.ctrl_pressed:
value = roundf(value / snap_step) * snap_step
get_viewport().set_input_as_handled()
func _setup_nodes() -> void: ## Only called once on _ready()

View file

@ -180,8 +180,8 @@ func _apply_effect(layer: BaseLayer, effect: LayerEffect) -> void:
var image_size := cel_image.get_size()
var params := effect.params
params["PXO_time"] = frame.position_in_seconds(project)
params["PXO_frame_index"] = i
params["PXO_layer_index"] = layer.index
params["PXO_frame"] = i
params["PXO_layer"] = layer.index
var shader_image_effect := ShaderImageEffect.new()
shader_image_effect.generate_image(cel_image, effect.shader, params, image_size)