From 14d387c32ae87060c0adbd9f430193f58811c6b1 Mon Sep 17 00:00:00 2001 From: Josef Date: Sun, 19 Apr 2026 15:33:54 +0200 Subject: [PATCH] Quick PlaySound Fixes --- Runtime/Actions/Node3D/PlaySound.cs | 11 ++++++ Runtime/Animation/Flash/Flash.cs | 4 +-- .../Blur/Overlayed Bokeh Blur .tres | 25 +++++++------ .../Character/Drunken.tres | 10 +++--- .../Glow/Blue Cinematic Bloom.tres | 14 ++++---- .../Glow/Rainbow Star Glow.tres | 26 +++++++------- .../Glow/Red Cinematic Bloom.tres | 36 +++++++++++-------- .../Glow/Yellow Cinematic Bloom.tres | 8 ++--- .../Physical/Frozen Ice.tres | 10 +++--- .../Physical/Super Speed.tres | 22 +++++++----- .../Screen/Analog Tube TV .tres | 12 +++---- .../Screen/Digital Compression.tres | 20 +++++------ .../FlareVFXPresets/Red Orange Classic.tres | 11 +++--- 13 files changed, 117 insertions(+), 92 deletions(-) diff --git a/Runtime/Actions/Node3D/PlaySound.cs b/Runtime/Actions/Node3D/PlaySound.cs index 4d01817..48f693e 100644 --- a/Runtime/Actions/Node3D/PlaySound.cs +++ b/Runtime/Actions/Node3D/PlaySound.cs @@ -50,9 +50,20 @@ namespace Rokojori List players = new List(); + AudioStreamPlayer3D _cached = null; + AudioStreamPlayer3D GetFreePlayer() { + if ( _cached == null || _cached != player ) + { + players.ForEach( p => p.DeleteSelf() ); + players.Clear(); + _cached = player; + } + + + if ( players.Count == 0 ) { players.Add( player ); diff --git a/Runtime/Animation/Flash/Flash.cs b/Runtime/Animation/Flash/Flash.cs index 167e594..7e0817f 100644 --- a/Runtime/Animation/Flash/Flash.cs +++ b/Runtime/Animation/Flash/Flash.cs @@ -181,7 +181,7 @@ namespace Rokojori - this.LogInfo( "Applying Targets:", currentTargets ); + // this.LogInfo( "Applying Targets:", currentTargets ); OmniLight3D light; @@ -281,7 +281,7 @@ namespace Rokojori var phaseColor = color; phaseColor.A = value * initialAlpha; - this.LogInfo( phase, value ); + // this.LogInfo( phase, value ); // debugMaterial.AlbedoColor = phaseColor; diff --git a/Runtime/Rendering/Compositor/CompositorVFXPresets/Blur/Overlayed Bokeh Blur .tres b/Runtime/Rendering/Compositor/CompositorVFXPresets/Blur/Overlayed Bokeh Blur .tres index 59dc7a3..e8dd4e7 100644 --- a/Runtime/Rendering/Compositor/CompositorVFXPresets/Blur/Overlayed Bokeh Blur .tres +++ b/Runtime/Rendering/Compositor/CompositorVFXPresets/Blur/Overlayed Bokeh Blur .tres @@ -18,14 +18,14 @@ member = "intensity" curve = SubResource("Curve_p64cs") metadata/_custom_type_script = "uid://dvvfvlutisecy" -[sub_resource type="Resource" id="Resource_008mr"] +[sub_resource type="Resource" id="Resource_ip7kd"] script = ExtResource("2_7bkgv") [sub_resource type="Resource" id="Resource_22k1k"] script = ExtResource("3_pjafb") -owner = SubResource("Resource_008mr") +owner = SubResource("Resource_ip7kd") -[sub_resource type="CompositorEffect" id="CompositorEffect_hpfyh"] +[sub_resource type="CompositorEffect" id="CompositorEffect_bkqil"] resource_local_to_scene = false resource_name = "" enabled = true @@ -33,6 +33,7 @@ effect_callback_type = 4 needs_motion_vectors = false needs_normal_roughness = false script = ExtResource("4_yrk01") +intensity = 0.0 noise = 20.7254 kernelOffset = 4 iterations = 1 @@ -52,9 +53,9 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy" [sub_resource type="Resource" id="Resource_gxlxg"] script = ExtResource("3_pjafb") -owner = SubResource("Resource_008mr") +owner = SubResource("Resource_ip7kd") -[sub_resource type="CompositorEffect" id="CompositorEffect_4n83u"] +[sub_resource type="CompositorEffect" id="CompositorEffect_rjlrx"] resource_local_to_scene = false resource_name = "" enabled = true @@ -62,6 +63,7 @@ effect_callback_type = 4 needs_motion_vectors = false needs_normal_roughness = false script = ExtResource("4_yrk01") +intensity = 0.0 noise = 8.3491 kernelOffset = 1 iterations = 3 @@ -81,7 +83,7 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy" [sub_resource type="Resource" id="Resource_cxc3f"] script = ExtResource("3_pjafb") -owner = SubResource("Resource_008mr") +owner = SubResource("Resource_ip7kd") [sub_resource type="Curve" id="Curve_8b3wv"] _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0] @@ -91,7 +93,7 @@ point_count = 2 width = 64 curve = SubResource("Curve_8b3wv") -[sub_resource type="CompositorEffect" id="CompositorEffect_h2kd5"] +[sub_resource type="CompositorEffect" id="CompositorEffect_7bkgv"] resource_local_to_scene = false resource_name = "" enabled = true @@ -99,7 +101,7 @@ effect_callback_type = 4 needs_motion_vectors = false needs_normal_roughness = false script = ExtResource("7_be0li") -amount = 1.0 +amount = 0.0 ringSizeXY = 1.034 ringResolution = 32 zRange = Vector2(0, 1000) @@ -131,9 +133,9 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy" [sub_resource type="Resource" id="Resource_pl7u1"] script = ExtResource("3_pjafb") -owner = SubResource("Resource_008mr") +owner = SubResource("Resource_ip7kd") -[sub_resource type="CompositorEffect" id="CompositorEffect_4k7mp"] +[sub_resource type="CompositorEffect" id="CompositorEffect_pjafb"] resource_local_to_scene = false resource_name = "" enabled = true @@ -141,6 +143,7 @@ effect_callback_type = 4 needs_motion_vectors = false needs_normal_roughness = false script = ExtResource("6_bkqil") +amount = 0.0 smearingFrames = 8.0 animationTargets = [SubResource("Resource_5wyb8")] compositorEffectID = SubResource("Resource_pl7u1") @@ -148,5 +151,5 @@ metadata/_custom_type_script = "uid://cowk70ifagygb" [resource] script = ExtResource("8_h2u0p") -effects = [SubResource("CompositorEffect_hpfyh"), SubResource("CompositorEffect_4n83u"), SubResource("CompositorEffect_h2kd5"), SubResource("CompositorEffect_4k7mp")] +effects = [SubResource("CompositorEffect_bkqil"), SubResource("CompositorEffect_rjlrx"), SubResource("CompositorEffect_7bkgv"), SubResource("CompositorEffect_pjafb")] metadata/_custom_type_script = "uid://ckixweetchlo0" diff --git a/Runtime/Rendering/Compositor/CompositorVFXPresets/Character/Drunken.tres b/Runtime/Rendering/Compositor/CompositorVFXPresets/Character/Drunken.tres index 081e0e5..04aca50 100644 --- a/Runtime/Rendering/Compositor/CompositorVFXPresets/Character/Drunken.tres +++ b/Runtime/Rendering/Compositor/CompositorVFXPresets/Character/Drunken.tres @@ -9,12 +9,12 @@ [ext_resource type="Script" uid="uid://cowk70ifagygb" path="res://addons/rokojori_action_library/Runtime/Rendering/Compositor/CompositorEffects/Blur&Sharpen/TemporalBlur/TemporalBlurEffect.cs" id="7_wx28p"] [ext_resource type="Script" uid="uid://ckixweetchlo0" path="res://addons/rokojori_action_library/Runtime/Rendering/Compositor/CompositorEffectReferences/CompositorVFXPreset.cs" id="9_srrpj"] -[sub_resource type="Resource" id="Resource_fy8er"] +[sub_resource type="Resource" id="Resource_ip7kd"] script = ExtResource("2_ysy1a") [sub_resource type="Resource" id="Resource_p64cs"] script = ExtResource("3_fp4l4") -owner = SubResource("Resource_fy8er") +owner = SubResource("Resource_ip7kd") [sub_resource type="CompositorEffect" id="CompositorEffect_ifhyp"] resource_local_to_scene = false @@ -45,7 +45,7 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy" [sub_resource type="Resource" id="Resource_63qv8"] script = ExtResource("3_fp4l4") -owner = SubResource("Resource_fy8er") +owner = SubResource("Resource_ip7kd") [sub_resource type="CompositorEffect" id="CompositorEffect_wx28p"] resource_local_to_scene = false @@ -70,7 +70,7 @@ metadata/_custom_type_script = "uid://cidk0x7sb1pxl" [sub_resource type="Resource" id="Resource_72jau"] script = ExtResource("3_fp4l4") -owner = SubResource("Resource_fy8er") +owner = SubResource("Resource_ip7kd") [sub_resource type="CompositorEffect" id="CompositorEffect_ysy1a"] resource_local_to_scene = false @@ -96,7 +96,7 @@ metadata/_custom_type_script = "uid://b2oxy6ln560ys" [sub_resource type="Resource" id="Resource_3tnad"] script = ExtResource("3_fp4l4") -owner = SubResource("Resource_fy8er") +owner = SubResource("Resource_ip7kd") [sub_resource type="CompositorEffect" id="CompositorEffect_fp4l4"] resource_local_to_scene = false diff --git a/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Blue Cinematic Bloom.tres b/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Blue Cinematic Bloom.tres index 931cd3d..b8e853b 100644 --- a/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Blue Cinematic Bloom.tres +++ b/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Blue Cinematic Bloom.tres @@ -20,12 +20,12 @@ script = ExtResource("1_nq6ls") member = "amount" curve = SubResource("Curve_sdunf") -[sub_resource type="Resource" id="Resource_0c48d"] +[sub_resource type="Resource" id="Resource_ip7kd"] script = ExtResource("2_k18aw") [sub_resource type="Resource" id="Resource_3tnad"] script = ExtResource("3_oydfn") -owner = SubResource("Resource_0c48d") +owner = SubResource("Resource_ip7kd") [sub_resource type="Curve" id="Curve_y3g14"] _data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.087378636, 0.16842103), 8.476556, 8.476556, 0, 0, Vector2(0.17475727, 1), 0.0, 0.0, 0, 0, Vector2(0.43203884, 0.2842105), -1.1083043, -1.1083043, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] @@ -74,7 +74,7 @@ curve = SubResource("Curve_seli3") [sub_resource type="Resource" id="Resource_qrakr"] script = ExtResource("3_oydfn") -owner = SubResource("Resource_0c48d") +owner = SubResource("Resource_ip7kd") [sub_resource type="CompositorEffect" id="CompositorEffect_k18aw"] resource_local_to_scene = false @@ -117,7 +117,7 @@ curveScale = 4.0 [sub_resource type="Resource" id="Resource_6a7ab"] script = ExtResource("3_oydfn") -owner = SubResource("Resource_0c48d") +owner = SubResource("Resource_ip7kd") [sub_resource type="Gradient" id="Gradient_jpti0"] offsets = PackedFloat32Array(0.16666667, 0.54901963, 0.79617834, 1) @@ -205,7 +205,7 @@ curve = SubResource("Curve_4k7mp") [sub_resource type="Resource" id="Resource_ie6m2"] script = ExtResource("3_oydfn") -owner = SubResource("Resource_0c48d") +owner = SubResource("Resource_ip7kd") [sub_resource type="Gradient" id="Gradient_p64cs"] offsets = PackedFloat32Array(0.09477124, 0.6092437, 1) @@ -275,7 +275,7 @@ curveScale = 2.0 [sub_resource type="Resource" id="Resource_y3g14"] script = ExtResource("3_oydfn") -owner = SubResource("Resource_0c48d") +owner = SubResource("Resource_ip7kd") [sub_resource type="Gradient" id="Gradient_cxc3f"] offsets = PackedFloat32Array(0.0147929, 0.4733728) @@ -340,7 +340,7 @@ curve = SubResource("Curve_7owh2") [sub_resource type="Resource" id="Resource_sdunf"] script = ExtResource("3_oydfn") -owner = SubResource("Resource_0c48d") +owner = SubResource("Resource_ip7kd") [sub_resource type="CompositorEffect" id="CompositorEffect_ll4h8"] resource_local_to_scene = false diff --git a/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Rainbow Star Glow.tres b/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Rainbow Star Glow.tres index f636fde..caf9175 100644 --- a/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Rainbow Star Glow.tres +++ b/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Rainbow Star Glow.tres @@ -28,12 +28,12 @@ script = ExtResource("1_e74ec") member = "opacity" curve = SubResource("Curve_xhmdb") -[sub_resource type="Resource" id="Resource_mdsx3"] +[sub_resource type="Resource" id="Resource_bfksq"] script = ExtResource("2_bfksq") [sub_resource type="Resource" id="Resource_5jnfl"] script = ExtResource("3_eyvih") -owner = SubResource("Resource_mdsx3") +owner = SubResource("Resource_bfksq") [sub_resource type="Gradient" id="Gradient_qf8q3"] offsets = PackedFloat32Array(0.60144925, 1) @@ -44,7 +44,7 @@ use_hdr = true fill = 1 fill_from = Vector2(0.5, 0.50427353) -[sub_resource type="CompositorEffect" id="CompositorEffect_wpvj8"] +[sub_resource type="CompositorEffect" id="CompositorEffect_eyvih"] resource_local_to_scene = false resource_name = "" enabled = true @@ -79,7 +79,7 @@ curve = SubResource("Curve_xhmdb") [sub_resource type="Resource" id="Resource_qf8q3"] script = ExtResource("3_eyvih") -owner = SubResource("Resource_mdsx3") +owner = SubResource("Resource_bfksq") [sub_resource type="Gradient" id="Gradient_7ucn0"] offsets = PackedFloat32Array(0.08171206, 0.57587546, 1) @@ -91,7 +91,7 @@ use_hdr = true fill = 1 fill_from = Vector2(0.5, 0.50427353) -[sub_resource type="CompositorEffect" id="CompositorEffect_ysmsc"] +[sub_resource type="CompositorEffect" id="CompositorEffect_chktd"] resource_local_to_scene = false resource_name = "" enabled = true @@ -123,9 +123,9 @@ curve = SubResource("Curve_nxurn") [sub_resource type="Resource" id="Resource_slvrs"] script = ExtResource("3_eyvih") -owner = SubResource("Resource_mdsx3") +owner = SubResource("Resource_bfksq") -[sub_resource type="CompositorEffect" id="CompositorEffect_t5au6"] +[sub_resource type="CompositorEffect" id="CompositorEffect_1gqhf"] resource_local_to_scene = false resource_name = "" enabled = true @@ -152,9 +152,9 @@ curveScale = 0.2 [sub_resource type="Resource" id="Resource_bhyc7"] script = ExtResource("3_eyvih") -owner = SubResource("Resource_mdsx3") +owner = SubResource("Resource_bfksq") -[sub_resource type="CompositorEffect" id="CompositorEffect_ixqtu"] +[sub_resource type="CompositorEffect" id="CompositorEffect_t8xaw"] resource_local_to_scene = false resource_name = "" enabled = true @@ -162,7 +162,7 @@ effect_callback_type = 4 needs_motion_vectors = false needs_normal_roughness = false script = ExtResource("7_g2w8j") -amount = 0.1691 +amount = 0.2 num = 3 distortionAmount = 0.4369 distortionAngle = 168.8496 @@ -194,9 +194,9 @@ curve = SubResource("Curve_su8gi") [sub_resource type="Resource" id="Resource_7jt2s"] script = ExtResource("3_eyvih") -owner = SubResource("Resource_mdsx3") +owner = SubResource("Resource_bfksq") -[sub_resource type="CompositorEffect" id="CompositorEffect_m7r8b"] +[sub_resource type="CompositorEffect" id="CompositorEffect_g2w8j"] resource_local_to_scene = false resource_name = "" enabled = true @@ -215,5 +215,5 @@ metadata/_custom_type_script = "uid://pevgspwywsxi" [resource] script = ExtResource("9_fgrt2") -effects = [SubResource("CompositorEffect_wpvj8"), SubResource("CompositorEffect_ysmsc"), SubResource("CompositorEffect_t5au6"), SubResource("CompositorEffect_ixqtu"), SubResource("CompositorEffect_m7r8b")] +effects = [SubResource("CompositorEffect_eyvih"), SubResource("CompositorEffect_chktd"), SubResource("CompositorEffect_1gqhf"), SubResource("CompositorEffect_t8xaw"), SubResource("CompositorEffect_g2w8j")] metadata/_custom_type_script = "uid://ckixweetchlo0" diff --git a/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Red Cinematic Bloom.tres b/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Red Cinematic Bloom.tres index 719dc5a..8dd8963 100644 --- a/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Red Cinematic Bloom.tres +++ b/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Red Cinematic Bloom.tres @@ -1,6 +1,7 @@ -[gd_resource type="Resource" script_class="CompositorVFXPreset" load_steps=40 format=3 uid="uid://c63le61ap244y"] +[gd_resource type="Resource" script_class="CompositorVFXPreset" load_steps=41 format=3 uid="uid://c63le61ap244y"] [ext_resource type="Script" uid="uid://dvvfvlutisecy" path="res://addons/rokojori_action_library/Runtime/Rendering/Compositor/AnimationTargets/CompFXMemberCurveTarget.cs" id="1_1rohx"] +[ext_resource type="Resource" uid="uid://b0cwrx25ct7ht" path="res://PostFX-Compositor-Layer.tres" id="2_tdlfo"] [ext_resource type="Script" uid="uid://cx5qcow1mmd11" path="res://addons/rokojori_action_library/Runtime/Rendering/Compositor/CompositorEffectReferences/CompositorEffectOwner.cs" id="2_yywgn"] [ext_resource type="Script" uid="uid://comuvej4dr22k" path="res://addons/rokojori_action_library/Runtime/Rendering/Compositor/CompositorEffectReferences/RokojoriCompositorEffectID.cs" id="3_tdlfo"] [ext_resource type="Script" uid="uid://6jkixa201wux" path="res://addons/rokojori_action_library/Runtime/Rendering/Compositor/CompositorEffects/Glow/ChromaticBloom/ChromaticBloomEffect.cs" id="4_2f4vr"] @@ -19,14 +20,15 @@ member = "amount" curve = SubResource("Curve_ysmsc") metadata/_custom_type_script = "uid://dvvfvlutisecy" -[sub_resource type="Resource" id="Resource_5rqpk"] +[sub_resource type="Resource" id="Resource_geea8"] script = ExtResource("2_yywgn") [sub_resource type="Resource" id="Resource_i5utj"] script = ExtResource("3_tdlfo") -owner = SubResource("Resource_5rqpk") +owner = SubResource("Resource_geea8") +layer = ExtResource("2_tdlfo") -[sub_resource type="CompositorEffect" id="CompositorEffect_yywgn"] +[sub_resource type="CompositorEffect" id="CompositorEffect_2f4vr"] resource_local_to_scene = false resource_name = "" enabled = true @@ -34,7 +36,7 @@ effect_callback_type = 4 needs_motion_vectors = false needs_normal_roughness = false script = ExtResource("4_2f4vr") -amount = 0.0 +amount = 0.0035 num = 1 blendMode = 0.7098 distortionAmount = 0.069 @@ -59,9 +61,10 @@ metadata/_custom_type_script = "uid://6jkixa201wux" [sub_resource type="Resource" id="Resource_jpti0"] script = ExtResource("3_tdlfo") -owner = SubResource("Resource_5rqpk") +owner = SubResource("Resource_geea8") +layer = ExtResource("2_tdlfo") -[sub_resource type="CompositorEffect" id="CompositorEffect_tdlfo"] +[sub_resource type="CompositorEffect" id="CompositorEffect_xv23r"] resource_local_to_scene = false resource_name = "" enabled = true @@ -69,7 +72,7 @@ effect_callback_type = 4 needs_motion_vectors = false needs_normal_roughness = false script = ExtResource("4_2f4vr") -amount = 0.0 +amount = 0.0035 num = 1 blendMode = 0.0 distortionAmount = 0.069 @@ -104,7 +107,8 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy" [sub_resource type="Resource" id="Resource_krf45"] script = ExtResource("3_tdlfo") -owner = SubResource("Resource_5rqpk") +owner = SubResource("Resource_geea8") +layer = ExtResource("2_tdlfo") [sub_resource type="Gradient" id="Gradient_a4g6s"] offsets = PackedFloat32Array(0, 0.9745455) @@ -160,7 +164,7 @@ frequency = 0.0232 [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_027rg"] noise = SubResource("FastNoiseLite_tn5uv") -[sub_resource type="CompositorEffect" id="CompositorEffect_2f4vr"] +[sub_resource type="CompositorEffect" id="CompositorEffect_ypk1d"] resource_local_to_scene = false resource_name = "" enabled = true @@ -185,9 +189,10 @@ metadata/_custom_type_script = "uid://c3ipi4e85bp0r" [sub_resource type="Resource" id="Resource_8vqmt"] script = ExtResource("3_tdlfo") -owner = SubResource("Resource_5rqpk") +owner = SubResource("Resource_geea8") +layer = ExtResource("2_tdlfo") -[sub_resource type="CompositorEffect" id="CompositorEffect_xv23r"] +[sub_resource type="CompositorEffect" id="CompositorEffect_3gufn"] resource_local_to_scene = false resource_name = "" enabled = false @@ -230,7 +235,8 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy" [sub_resource type="Resource" id="Resource_22k1k"] script = ExtResource("3_tdlfo") -owner = SubResource("Resource_5rqpk") +owner = SubResource("Resource_geea8") +layer = ExtResource("2_tdlfo") [sub_resource type="Gradient" id="Gradient_hpfyh"] offsets = PackedFloat32Array(0.70414203, 1) @@ -266,7 +272,7 @@ noise = SubResource("FastNoiseLite_4n83u") color_ramp = SubResource("Gradient_gxlxg") seamless = true -[sub_resource type="CompositorEffect" id="CompositorEffect_ypk1d"] +[sub_resource type="CompositorEffect" id="CompositorEffect_eqk10"] resource_local_to_scene = false resource_name = "" enabled = true @@ -297,5 +303,5 @@ metadata/_custom_type_script = "uid://b7dy5mtxvj22k" [resource] script = ExtResource("7_3gufn") -effects = [SubResource("CompositorEffect_yywgn"), SubResource("CompositorEffect_tdlfo"), SubResource("CompositorEffect_2f4vr"), SubResource("CompositorEffect_xv23r"), SubResource("CompositorEffect_ypk1d")] +effects = [SubResource("CompositorEffect_2f4vr"), SubResource("CompositorEffect_xv23r"), SubResource("CompositorEffect_ypk1d"), SubResource("CompositorEffect_3gufn"), SubResource("CompositorEffect_eqk10")] metadata/_custom_type_script = "uid://ckixweetchlo0" diff --git a/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Yellow Cinematic Bloom.tres b/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Yellow Cinematic Bloom.tres index 092d4f0..b3352ff 100644 --- a/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Yellow Cinematic Bloom.tres +++ b/Runtime/Rendering/Compositor/CompositorVFXPresets/Glow/Yellow Cinematic Bloom.tres @@ -20,12 +20,12 @@ curve = SubResource("Curve_4545n") curveScale = 0.1 metadata/_custom_type_script = "uid://dvvfvlutisecy" -[sub_resource type="Resource" id="Resource_d1ujc"] +[sub_resource type="Resource" id="Resource_ip7kd"] script = ExtResource("2_nnbdi") [sub_resource type="Resource" id="Resource_mdsx3"] script = ExtResource("3_c6fon") -owner = SubResource("Resource_d1ujc") +owner = SubResource("Resource_ip7kd") [sub_resource type="Gradient" id="Gradient_c05wc"] offsets = PackedFloat32Array(0.70414203, 1) @@ -103,7 +103,7 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy" [sub_resource type="Resource" id="Resource_frwbc"] script = ExtResource("3_c6fon") -owner = SubResource("Resource_d1ujc") +owner = SubResource("Resource_ip7kd") [sub_resource type="Gradient" id="Gradient_w6tyf"] offsets = PackedFloat32Array(0, 0.75443786) @@ -177,7 +177,7 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy" [sub_resource type="Resource" id="Resource_hpfyh"] script = ExtResource("3_c6fon") -owner = SubResource("Resource_d1ujc") +owner = SubResource("Resource_ip7kd") [sub_resource type="CompositorEffect" id="CompositorEffect_qyiel"] resource_local_to_scene = false diff --git a/Runtime/Rendering/Compositor/CompositorVFXPresets/Physical/Frozen Ice.tres b/Runtime/Rendering/Compositor/CompositorVFXPresets/Physical/Frozen Ice.tres index 9bb316f..139bd24 100644 --- a/Runtime/Rendering/Compositor/CompositorVFXPresets/Physical/Frozen Ice.tres +++ b/Runtime/Rendering/Compositor/CompositorVFXPresets/Physical/Frozen Ice.tres @@ -26,12 +26,12 @@ script = ExtResource("1_dw6h6") member = "opacity" curve = SubResource("Curve_uhxun") -[sub_resource type="Resource" id="Resource_6xf1f"] +[sub_resource type="Resource" id="Resource_ip7kd"] script = ExtResource("2_dsqqr") [sub_resource type="Resource" id="Resource_gwku0"] script = ExtResource("3_wy4el") -owner = SubResource("Resource_6xf1f") +owner = SubResource("Resource_ip7kd") [sub_resource type="Gradient" id="Gradient_fy8er"] offsets = PackedFloat32Array(0.51592356, 1) @@ -96,7 +96,7 @@ curve = SubResource("Curve_r64p5") [sub_resource type="Resource" id="Resource_msay1"] script = ExtResource("3_wy4el") -owner = SubResource("Resource_6xf1f") +owner = SubResource("Resource_ip7kd") [sub_resource type="FastNoiseLite" id="FastNoiseLite_a5aan"] noise_type = 2 @@ -158,7 +158,7 @@ curve = SubResource("Curve_cqn6v") [sub_resource type="Resource" id="Resource_e7hhx"] script = ExtResource("3_wy4el") -owner = SubResource("Resource_6xf1f") +owner = SubResource("Resource_ip7kd") [sub_resource type="Gradient" id="Gradient_3764n"] offsets = PackedFloat32Array(0.59624416, 1) @@ -221,7 +221,7 @@ curve = SubResource("Curve_7ucn0") [sub_resource type="Resource" id="Resource_44rrc"] script = ExtResource("3_wy4el") -owner = SubResource("Resource_6xf1f") +owner = SubResource("Resource_ip7kd") [sub_resource type="CompositorEffect" id="CompositorEffect_e3oac"] resource_local_to_scene = false diff --git a/Runtime/Rendering/Compositor/CompositorVFXPresets/Physical/Super Speed.tres b/Runtime/Rendering/Compositor/CompositorVFXPresets/Physical/Super Speed.tres index d805d56..8c336e1 100644 --- a/Runtime/Rendering/Compositor/CompositorVFXPresets/Physical/Super Speed.tres +++ b/Runtime/Rendering/Compositor/CompositorVFXPresets/Physical/Super Speed.tres @@ -1,6 +1,7 @@ -[gd_resource type="Resource" script_class="CompositorVFXPreset" load_steps=32 format=3 uid="uid://d1uubsqnvu1qe"] +[gd_resource type="Resource" script_class="CompositorVFXPreset" load_steps=33 format=3 uid="uid://d1uubsqnvu1qe"] [ext_resource type="Script" uid="uid://dvvfvlutisecy" path="res://addons/rokojori_action_library/Runtime/Rendering/Compositor/AnimationTargets/CompFXMemberCurveTarget.cs" id="1_x2b2j"] +[ext_resource type="Resource" uid="uid://b0cwrx25ct7ht" path="res://PostFX-Compositor-Layer.tres" id="2_7oha2"] [ext_resource type="Script" uid="uid://cx5qcow1mmd11" path="res://addons/rokojori_action_library/Runtime/Rendering/Compositor/CompositorEffectReferences/CompositorEffectOwner.cs" id="2_kelqw"] [ext_resource type="Script" uid="uid://comuvej4dr22k" path="res://addons/rokojori_action_library/Runtime/Rendering/Compositor/CompositorEffectReferences/RokojoriCompositorEffectID.cs" id="3_7oha2"] [ext_resource type="Script" uid="uid://cqkrgyuerq50a" path="res://addons/rokojori_action_library/Runtime/Rendering/Compositor/CompositorEffects/Distortion/EllispeDistortion/EllipseDistortionEffect.cs" id="4_pflfa"] @@ -26,12 +27,13 @@ member = "opacity" curve = SubResource("Curve_vn1sn") metadata/_custom_type_script = "uid://dvvfvlutisecy" -[sub_resource type="Resource" id="Resource_diigt"] +[sub_resource type="Resource" id="Resource_geea8"] script = ExtResource("2_kelqw") [sub_resource type="Resource" id="Resource_7oha2"] script = ExtResource("3_7oha2") -owner = SubResource("Resource_diigt") +owner = SubResource("Resource_geea8") +layer = ExtResource("2_7oha2") [sub_resource type="Gradient" id="Gradient_pflfa"] offsets = PackedFloat32Array(0.2090909, 0.94545454) @@ -57,7 +59,7 @@ noise = SubResource("FastNoiseLite_8gn8u") color_ramp = SubResource("Gradient_g7p6u") seamless = true -[sub_resource type="CompositorEffect" id="CompositorEffect_x2b2j"] +[sub_resource type="CompositorEffect" id="CompositorEffect_pflfa"] resource_local_to_scene = false resource_name = "" enabled = true @@ -92,9 +94,10 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy" [sub_resource type="Resource" id="Resource_1qvce"] script = ExtResource("3_7oha2") -owner = SubResource("Resource_diigt") +owner = SubResource("Resource_geea8") +layer = ExtResource("2_7oha2") -[sub_resource type="CompositorEffect" id="CompositorEffect_kelqw"] +[sub_resource type="CompositorEffect" id="CompositorEffect_6d3w2"] resource_local_to_scene = false resource_name = "" enabled = true @@ -124,7 +127,8 @@ curve = SubResource("Curve_rtqyr") [sub_resource type="Resource" id="Resource_rit7v"] script = ExtResource("3_7oha2") -owner = SubResource("Resource_diigt") +owner = SubResource("Resource_geea8") +layer = ExtResource("2_7oha2") [sub_resource type="Gradient" id="Gradient_7q50q"] offsets = PackedFloat32Array(0, 0.6311111) @@ -148,7 +152,7 @@ noise = SubResource("FastNoiseLite_akcsj") color_ramp = SubResource("Gradient_ml7cv") seamless = true -[sub_resource type="CompositorEffect" id="CompositorEffect_7oha2"] +[sub_resource type="CompositorEffect" id="CompositorEffect_g7p6u"] resource_local_to_scene = false resource_name = "" enabled = true @@ -171,5 +175,5 @@ metadata/_custom_type_script = "uid://t5g1g1uv5yrj" [resource] script = ExtResource("6_g7p6u") -effects = [SubResource("CompositorEffect_x2b2j"), SubResource("CompositorEffect_kelqw"), SubResource("CompositorEffect_7oha2")] +effects = [SubResource("CompositorEffect_pflfa"), SubResource("CompositorEffect_6d3w2"), SubResource("CompositorEffect_g7p6u")] metadata/_custom_type_script = "uid://ckixweetchlo0" diff --git a/Runtime/Rendering/Compositor/CompositorVFXPresets/Screen/Analog Tube TV .tres b/Runtime/Rendering/Compositor/CompositorVFXPresets/Screen/Analog Tube TV .tres index d27aa70..ce3dc35 100644 --- a/Runtime/Rendering/Compositor/CompositorVFXPresets/Screen/Analog Tube TV .tres +++ b/Runtime/Rendering/Compositor/CompositorVFXPresets/Screen/Analog Tube TV .tres @@ -20,12 +20,12 @@ member = "amount" curve = SubResource("Curve_p64cs") curveScale = 0.2 -[sub_resource type="Resource" id="Resource_4n83u"] +[sub_resource type="Resource" id="Resource_ip7kd"] script = ExtResource("2_uexx8") [sub_resource type="Resource" id="Resource_a3id7"] script = ExtResource("3_qf8os") -owner = SubResource("Resource_4n83u") +owner = SubResource("Resource_ip7kd") [sub_resource type="CompositorEffect" id="CompositorEffect_075h3"] resource_local_to_scene = false @@ -62,7 +62,7 @@ curve = SubResource("Curve_pl7u1") [sub_resource type="Resource" id="Resource_ixn1d"] script = ExtResource("3_qf8os") -owner = SubResource("Resource_4n83u") +owner = SubResource("Resource_ip7kd") [sub_resource type="CompositorEffect" id="CompositorEffect_cf0ae"] resource_local_to_scene = false @@ -96,7 +96,7 @@ curve = SubResource("Curve_1ntwo") [sub_resource type="Resource" id="Resource_027rg"] script = ExtResource("3_qf8os") -owner = SubResource("Resource_4n83u") +owner = SubResource("Resource_ip7kd") [sub_resource type="Gradient" id="Gradient_6kf7p"] offsets = PackedFloat32Array(0.35329342, 0.5449102, 0.6047904, 0.70658684, 0.73652697, 1) @@ -147,7 +147,7 @@ curve = SubResource("Curve_ixn1d") [sub_resource type="Resource" id="Resource_e2s3r"] script = ExtResource("3_qf8os") -owner = SubResource("Resource_4n83u") +owner = SubResource("Resource_ip7kd") [sub_resource type="Gradient" id="Gradient_uhxun"] offsets = PackedFloat32Array(0.35329342, 0.57894737, 0.6157895, 0.66842103, 0.7, 1) @@ -199,7 +199,7 @@ curve = SubResource("Curve_yfwqk") [sub_resource type="Resource" id="Resource_5ifxw"] script = ExtResource("3_qf8os") -owner = SubResource("Resource_4n83u") +owner = SubResource("Resource_ip7kd") [sub_resource type="Curve" id="Curve_r14qv"] _data = [Vector2(0, 0), 0.0, 1.0, 0, 1, Vector2(1, 1), 1.0, 0.0, 1, 0] diff --git a/Runtime/Rendering/Compositor/CompositorVFXPresets/Screen/Digital Compression.tres b/Runtime/Rendering/Compositor/CompositorVFXPresets/Screen/Digital Compression.tres index abda4a3..8d8b081 100644 --- a/Runtime/Rendering/Compositor/CompositorVFXPresets/Screen/Digital Compression.tres +++ b/Runtime/Rendering/Compositor/CompositorVFXPresets/Screen/Digital Compression.tres @@ -17,14 +17,14 @@ script = ExtResource("1_o7k2r") member = "intensity" curve = SubResource("Curve_h2kd5") -[sub_resource type="Resource" id="Resource_oqkh4"] +[sub_resource type="Resource" id="Resource_ip7kd"] script = ExtResource("2_l025j") [sub_resource type="Resource" id="Resource_a4g6s"] script = ExtResource("3_ppfcw") -owner = SubResource("Resource_oqkh4") +owner = SubResource("Resource_ip7kd") -[sub_resource type="CompositorEffect" id="CompositorEffect_xp4g8"] +[sub_resource type="CompositorEffect" id="CompositorEffect_qef0q"] resource_local_to_scene = false resource_name = "" enabled = true @@ -60,9 +60,9 @@ curve = SubResource("Curve_6a7ab") [sub_resource type="Resource" id="Resource_adfmi"] script = ExtResource("3_ppfcw") -owner = SubResource("Resource_oqkh4") +owner = SubResource("Resource_ip7kd") -[sub_resource type="CompositorEffect" id="CompositorEffect_8fuac"] +[sub_resource type="CompositorEffect" id="CompositorEffect_15weo"] resource_local_to_scene = false resource_name = "" enabled = true @@ -113,9 +113,9 @@ targetType = 1 [sub_resource type="Resource" id="Resource_ade2u"] script = ExtResource("3_ppfcw") -owner = SubResource("Resource_oqkh4") +owner = SubResource("Resource_ip7kd") -[sub_resource type="CompositorEffect" id="CompositorEffect_es78x"] +[sub_resource type="CompositorEffect" id="CompositorEffect_xp4g8"] resource_local_to_scene = false resource_name = "" enabled = true @@ -148,9 +148,9 @@ curve = SubResource("Curve_yynim") [sub_resource type="Resource" id="Resource_a0x8j"] script = ExtResource("3_ppfcw") -owner = SubResource("Resource_oqkh4") +owner = SubResource("Resource_ip7kd") -[sub_resource type="CompositorEffect" id="CompositorEffect_buv7p"] +[sub_resource type="CompositorEffect" id="CompositorEffect_8fuac"] resource_local_to_scene = false resource_name = "" enabled = true @@ -174,5 +174,5 @@ metadata/_custom_type_script = "uid://lytit04mgc2d" [resource] script = ExtResource("7_nca4q") -effects = [SubResource("CompositorEffect_xp4g8"), SubResource("CompositorEffect_8fuac"), SubResource("CompositorEffect_es78x"), SubResource("CompositorEffect_buv7p")] +effects = [SubResource("CompositorEffect_qef0q"), SubResource("CompositorEffect_15weo"), SubResource("CompositorEffect_xp4g8"), SubResource("CompositorEffect_8fuac")] metadata/_custom_type_script = "uid://ckixweetchlo0" diff --git a/Runtime/VFX/FlareVFX/FlareVFXPresets/Red Orange Classic.tres b/Runtime/VFX/FlareVFX/FlareVFXPresets/Red Orange Classic.tres index 07f10f2..4e0dda0 100644 --- a/Runtime/VFX/FlareVFX/FlareVFXPresets/Red Orange Classic.tres +++ b/Runtime/VFX/FlareVFX/FlareVFXPresets/Red Orange Classic.tres @@ -96,6 +96,7 @@ curve = SubResource("Curve_a4g6s") [sub_resource type="Resource" id="Resource_nuxa8"] script = ExtResource("4_1hsao") layerName = "Core" +hide = true flareType = SubResource("Resource_krf45") overwriteColor = Color(2.343, 2.343, 2.343, 1) overwriteAmount = 0.2568 @@ -103,7 +104,6 @@ opacityCurvePerLayer = SubResource("CurveTexture_xxny3") tint = Color(4.8530827, 4.8530827, 4.8530827, 1) lighntessShift = -10.3896 size = 4.0 -sizeScale = 0.6026 randomScaleMin = 0.6503 randomScaleMax = 2.0 screenOffsetLayerScale = 0.153 @@ -205,6 +205,7 @@ curve = SubResource("Curve_ymqbv") [sub_resource type="Resource" id="Resource_jvxnt"] script = ExtResource("4_1hsao") layerName = "Small Circles Ghosts" +hide = true opacity = 0.3343 numLayers = 50 flareType = SubResource("Resource_0y4dn") @@ -428,15 +429,15 @@ curve = SubResource("Curve_fy8er") [sub_resource type="Resource" id="Resource_8vqmt"] script = ExtResource("4_1hsao") -layerName = "Big Horizontal Streak" -opacity = 0.0227 +layerName = "Big Glow" +opacity = 0.02 flareType = SubResource("Resource_gwku0") opacityCurvePerLayer = SubResource("CurveTexture_ls5mq") temparatureShift = 8.4706 saturationShift = -68.8168 size = 1000.0 -sizeScale = 0.075 -sizeYScale = 0.0765 +sizeScale = 0.089 +sizeYScale = 0.1464 screenSizeScale = 0.616 fading = SubResource("Resource_4qtqc") metadata/_custom_type_script = "uid://u3g0mlwlpd6s"