StopMusic + Fixes
This commit is contained in:
parent
9dbfc054a5
commit
2bc8a8e68e
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
importer="texture"
|
importer="texture"
|
||||||
type="CompressedTexture2D"
|
type="CompressedTexture2D"
|
||||||
uid="uid://bujyx7ltsi40k"
|
uid="uid://cpawvk3xd268q"
|
||||||
path="res://.godot/imported/TimelineManager.svg-deb996f134b015aad25457e6b0de530f.ctex"
|
path="res://.godot/imported/TimelineManager.svg-deb996f134b015aad25457e6b0de530f.ctex"
|
||||||
metadata={
|
metadata={
|
||||||
"vram_texture": false
|
"vram_texture": false
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
|
||||||
|
using Godot;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
using Rokojori.Extensions;
|
||||||
|
namespace Rokojori
|
||||||
|
{
|
||||||
|
[Tool][GlobalClass]
|
||||||
|
public partial class StopMusic:Action
|
||||||
|
{
|
||||||
|
[Export]
|
||||||
|
public AudioStreamPlayer music;
|
||||||
|
|
||||||
|
[ExportToolButton( "Set Reference Name" )]
|
||||||
|
public Callable setReferencedNameButton => Callable.From(
|
||||||
|
()=>
|
||||||
|
{
|
||||||
|
if ( music == null )
|
||||||
|
{
|
||||||
|
this.Name = "Stop (nothing)";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
this.Name = "Stop " + music.Name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
protected override void _OnTrigger()
|
||||||
|
{
|
||||||
|
music.Stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
uid://biq088t6s6ohf
|
||||||
|
|
@ -30,7 +30,7 @@ namespace Rokojori
|
||||||
if ( type == TimelineSpanUpdateType.End )
|
if ( type == TimelineSpanUpdateType.End )
|
||||||
{
|
{
|
||||||
DispatchEnd( sequenceID );
|
DispatchEnd( sequenceID );
|
||||||
this.LogInfo( "time:", Godot.Time.GetTicksMsec() / 1000f );
|
// this.LogInfo( "time:", Godot.Time.GetTicksMsec() / 1000f );
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
this
|
this
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ namespace Rokojori
|
||||||
|
|
||||||
protected override void _OnTrigger()
|
protected override void _OnTrigger()
|
||||||
{
|
{
|
||||||
this.LogInfo( "Started Float Tween" );
|
// this.LogInfo( "Started Float Tween" );
|
||||||
|
|
||||||
|
|
||||||
// if ( Engine.IsEditorHint() )
|
// if ( Engine.IsEditorHint() )
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ namespace Rokojori
|
||||||
() =>
|
() =>
|
||||||
{
|
{
|
||||||
var from = MaterialSurfaceContainer.GetMaterialInSlot<Material>( target, index, slot );
|
var from = MaterialSurfaceContainer.GetMaterialInSlot<Material>( target, index, slot );
|
||||||
this.LogInfo( "Delta", MaterialDelta.Create( from, toMaterial ) );
|
// this.LogInfo( "Delta", MaterialDelta.Create( from, toMaterial ) );
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -196,7 +196,7 @@ namespace Rokojori
|
||||||
info = bm.AlbedoColor;
|
info = bm.AlbedoColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.LogInfo( "Setting:", slot, toMaterial, info, prop.Get( toMaterial ) );
|
// this.LogInfo( "Setting:", slot, toMaterial, info, prop.Get( toMaterial ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
DispatchEnd( sequenceID );
|
DispatchEnd( sequenceID );
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,8 @@
|
||||||
[gd_resource type="Resource" script_class="FlashEffect" load_steps=8 format=3 uid="uid://bfxwx0fiejnk3"]
|
[gd_resource type="Resource" script_class="FlashEffect" load_steps=7 format=3 uid="uid://bfxwx0fiejnk3"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://dncqth3uf3tb3" path="res://addons/rokojori_action_library/Runtime/Animation/HDRColor.cs" id="1_ejko8"]
|
[ext_resource type="Script" uid="uid://dncqth3uf3tb3" path="res://addons/rokojori_action_library/Runtime/Animation/HDRColor.cs" id="1_ejko8"]
|
||||||
[ext_resource type="Script" uid="uid://c5tm02yj1bhhx" path="res://addons/rokojori_action_library/Runtime/Animation/AnimationCurve.cs" id="2_3i2og"]
|
[ext_resource type="Script" uid="uid://c5tm02yj1bhhx" path="res://addons/rokojori_action_library/Runtime/Animation/AnimationCurve.cs" id="2_3i2og"]
|
||||||
[ext_resource type="Script" uid="uid://cupnq55n3nimc" path="res://addons/rokojori_action_library/Runtime/Animation/Flash/FlashEffect.cs" id="3_65ipm"]
|
[ext_resource type="Script" uid="uid://cupnq55n3nimc" path="res://addons/rokojori_action_library/Runtime/Animation/Flash/FlashEffect.cs" id="3_65ipm"]
|
||||||
[ext_resource type="Resource" uid="uid://ch5nsa6yafs5l" path="res://addons/rokojori_action_library/Runtime/Time/Timelines/Game Time.tres" id="4_nyaof"]
|
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_54hj8"]
|
[sub_resource type="Resource" id="Resource_54hj8"]
|
||||||
script = ExtResource("1_ejko8")
|
script = ExtResource("1_ejko8")
|
||||||
|
|
@ -21,7 +20,6 @@ curve = SubResource("Curve_tp3r5")
|
||||||
[resource]
|
[resource]
|
||||||
script = ExtResource("3_65ipm")
|
script = ExtResource("3_65ipm")
|
||||||
flashCurve = SubResource("Resource_pwp07")
|
flashCurve = SubResource("Resource_pwp07")
|
||||||
timeline = ExtResource("4_nyaof")
|
|
||||||
color = SubResource("Resource_54hj8")
|
color = SubResource("Resource_54hj8")
|
||||||
lightMode = 1
|
lightMode = 1
|
||||||
lightRange = 5.0
|
lightRange = 5.0
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,8 @@
|
||||||
[gd_resource type="Resource" script_class="FlashEffect" load_steps=8 format=3 uid="uid://drjdsp2qnceql"]
|
[gd_resource type="Resource" script_class="FlashEffect" load_steps=7 format=3 uid="uid://drjdsp2qnceql"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://dncqth3uf3tb3" path="res://addons/rokojori_action_library/Runtime/Animation/HDRColor.cs" id="1_yrhv1"]
|
[ext_resource type="Script" uid="uid://dncqth3uf3tb3" path="res://addons/rokojori_action_library/Runtime/Animation/HDRColor.cs" id="1_yrhv1"]
|
||||||
[ext_resource type="Script" uid="uid://c5tm02yj1bhhx" path="res://addons/rokojori_action_library/Runtime/Animation/AnimationCurve.cs" id="2_cdv3p"]
|
[ext_resource type="Script" uid="uid://c5tm02yj1bhhx" path="res://addons/rokojori_action_library/Runtime/Animation/AnimationCurve.cs" id="2_cdv3p"]
|
||||||
[ext_resource type="Script" uid="uid://cupnq55n3nimc" path="res://addons/rokojori_action_library/Runtime/Animation/Flash/FlashEffect.cs" id="3_87ql1"]
|
[ext_resource type="Script" uid="uid://cupnq55n3nimc" path="res://addons/rokojori_action_library/Runtime/Animation/Flash/FlashEffect.cs" id="3_87ql1"]
|
||||||
[ext_resource type="Resource" uid="uid://ch5nsa6yafs5l" path="res://addons/rokojori_action_library/Runtime/Time/Timelines/Game Time.tres" id="4_2na64"]
|
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_54hj8"]
|
[sub_resource type="Resource" id="Resource_54hj8"]
|
||||||
script = ExtResource("1_yrhv1")
|
script = ExtResource("1_yrhv1")
|
||||||
|
|
@ -22,7 +21,6 @@ curve = SubResource("Curve_tp3r5")
|
||||||
[resource]
|
[resource]
|
||||||
script = ExtResource("3_87ql1")
|
script = ExtResource("3_87ql1")
|
||||||
flashCurve = SubResource("Resource_pwp07")
|
flashCurve = SubResource("Resource_pwp07")
|
||||||
timeline = ExtResource("4_2na64")
|
|
||||||
color = SubResource("Resource_54hj8")
|
color = SubResource("Resource_54hj8")
|
||||||
lightMode = 1
|
lightMode = 1
|
||||||
lightRange = 5.0
|
lightRange = 5.0
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
[ext_resource type="Script" uid="uid://dncqth3uf3tb3" path="res://addons/rokojori_action_library/Runtime/Animation/HDRColor.cs" id="1_c8lnw"]
|
[ext_resource type="Script" uid="uid://dncqth3uf3tb3" path="res://addons/rokojori_action_library/Runtime/Animation/HDRColor.cs" id="1_c8lnw"]
|
||||||
[ext_resource type="Script" uid="uid://c5tm02yj1bhhx" path="res://addons/rokojori_action_library/Runtime/Animation/AnimationCurve.cs" id="2_w323b"]
|
[ext_resource type="Script" uid="uid://c5tm02yj1bhhx" path="res://addons/rokojori_action_library/Runtime/Animation/AnimationCurve.cs" id="2_w323b"]
|
||||||
[ext_resource type="Script" uid="uid://cupnq55n3nimc" path="res://addons/rokojori_action_library/Runtime/Animation/Flash/FlashEffect.cs" id="3_eqd4c"]
|
[ext_resource type="Script" uid="uid://cupnq55n3nimc" path="res://addons/rokojori_action_library/Runtime/Animation/Flash/FlashEffect.cs" id="3_eqd4c"]
|
||||||
[ext_resource type="Resource" uid="uid://ch5nsa6yafs5l" path="res://addons/rokojori_action_library/Runtime/Time/Timelines/Game Time.tres" id="4_cs6ks"]
|
[ext_resource type="Resource" uid="uid://h6oi6vkj4c2m" path="res://addons/rokojori_action_library/Runtime/Time/Timelines/Real Time.tres" id="4_g1i77"]
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_ny3sx"]
|
[sub_resource type="Resource" id="Resource_ny3sx"]
|
||||||
script = ExtResource("1_c8lnw")
|
script = ExtResource("1_c8lnw")
|
||||||
|
|
@ -22,7 +22,7 @@ curve = SubResource("Curve_tp3r5")
|
||||||
[resource]
|
[resource]
|
||||||
script = ExtResource("3_eqd4c")
|
script = ExtResource("3_eqd4c")
|
||||||
flashCurve = SubResource("Resource_pwp07")
|
flashCurve = SubResource("Resource_pwp07")
|
||||||
timeline = ExtResource("4_cs6ks")
|
timeline = ExtResource("4_g1i77")
|
||||||
color = SubResource("Resource_ny3sx")
|
color = SubResource("Resource_ny3sx")
|
||||||
lightMode = 1
|
lightMode = 1
|
||||||
lightRange = 4.0
|
lightRange = 4.0
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,8 @@
|
||||||
[gd_resource type="Resource" script_class="FlashEffect" load_steps=8 format=3 uid="uid://cwdnm658q3jta"]
|
[gd_resource type="Resource" script_class="FlashEffect" load_steps=7 format=3 uid="uid://cwdnm658q3jta"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://dncqth3uf3tb3" path="res://addons/rokojori_action_library/Runtime/Animation/HDRColor.cs" id="1_nmdum"]
|
[ext_resource type="Script" uid="uid://dncqth3uf3tb3" path="res://addons/rokojori_action_library/Runtime/Animation/HDRColor.cs" id="1_nmdum"]
|
||||||
[ext_resource type="Script" uid="uid://c5tm02yj1bhhx" path="res://addons/rokojori_action_library/Runtime/Animation/AnimationCurve.cs" id="2_0sgd7"]
|
[ext_resource type="Script" uid="uid://c5tm02yj1bhhx" path="res://addons/rokojori_action_library/Runtime/Animation/AnimationCurve.cs" id="2_0sgd7"]
|
||||||
[ext_resource type="Script" uid="uid://cupnq55n3nimc" path="res://addons/rokojori_action_library/Runtime/Animation/Flash/FlashEffect.cs" id="3_7qcuh"]
|
[ext_resource type="Script" uid="uid://cupnq55n3nimc" path="res://addons/rokojori_action_library/Runtime/Animation/Flash/FlashEffect.cs" id="3_7qcuh"]
|
||||||
[ext_resource type="Resource" uid="uid://ch5nsa6yafs5l" path="res://addons/rokojori_action_library/Runtime/Time/Timelines/Game Time.tres" id="4_rkq1j"]
|
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_54hj8"]
|
[sub_resource type="Resource" id="Resource_54hj8"]
|
||||||
script = ExtResource("1_nmdum")
|
script = ExtResource("1_nmdum")
|
||||||
|
|
@ -22,5 +21,4 @@ curve = SubResource("Curve_tp3r5")
|
||||||
[resource]
|
[resource]
|
||||||
script = ExtResource("3_7qcuh")
|
script = ExtResource("3_7qcuh")
|
||||||
flashCurve = SubResource("Resource_pwp07")
|
flashCurve = SubResource("Resource_pwp07")
|
||||||
timeline = ExtResource("4_rkq1j")
|
|
||||||
color = SubResource("Resource_54hj8")
|
color = SubResource("Resource_54hj8")
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
[gd_resource type="Resource" script_class="HighlightEffect" load_steps=7 format=3 uid="uid://di1vy33cwab4s"]
|
[gd_resource type="Resource" script_class="HighlightEffect" load_steps=6 format=3 uid="uid://di1vy33cwab4s"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://dncqth3uf3tb3" path="res://addons/rokojori_action_library/Runtime/Animation/HDRColor.cs" id="1_3edxo"]
|
[ext_resource type="Script" uid="uid://dncqth3uf3tb3" path="res://addons/rokojori_action_library/Runtime/Animation/HDRColor.cs" id="1_3edxo"]
|
||||||
[ext_resource type="Script" uid="uid://dkbln8rf5p0pu" path="res://addons/rokojori_action_library/Runtime/Animation/Highlight/HighlightEffect.cs" id="2_itc7c"]
|
[ext_resource type="Script" uid="uid://dkbln8rf5p0pu" path="res://addons/rokojori_action_library/Runtime/Animation/Highlight/HighlightEffect.cs" id="2_itc7c"]
|
||||||
[ext_resource type="Resource" uid="uid://h6oi6vkj4c2m" path="res://addons/rokojori_action_library/Runtime/Time/Timelines/Real Time.tres" id="3_ttsky"]
|
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_27v41"]
|
[sub_resource type="Resource" id="Resource_27v41"]
|
||||||
script = ExtResource("1_3edxo")
|
script = ExtResource("1_3edxo")
|
||||||
|
|
@ -18,7 +17,6 @@ point_count = 2
|
||||||
|
|
||||||
[resource]
|
[resource]
|
||||||
script = ExtResource("2_itc7c")
|
script = ExtResource("2_itc7c")
|
||||||
timeline = ExtResource("3_ttsky")
|
|
||||||
inDuration = 0.083
|
inDuration = 0.083
|
||||||
inCurve = SubResource("Curve_vqio6")
|
inCurve = SubResource("Curve_vqio6")
|
||||||
outDuration = 0.167
|
outDuration = 0.167
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://bec6skfqkb2ci" path="res://addons/rokojori_action_library/Runtime/Animation/Shake/ShakeEffect.cs" id="1_grbkn"]
|
[ext_resource type="Script" uid="uid://bec6skfqkb2ci" path="res://addons/rokojori_action_library/Runtime/Animation/Shake/ShakeEffect.cs" id="1_grbkn"]
|
||||||
[ext_resource type="Script" uid="uid://c5tm02yj1bhhx" path="res://addons/rokojori_action_library/Runtime/Animation/AnimationCurve.cs" id="2_825l5"]
|
[ext_resource type="Script" uid="uid://c5tm02yj1bhhx" path="res://addons/rokojori_action_library/Runtime/Animation/AnimationCurve.cs" id="2_825l5"]
|
||||||
[ext_resource type="Resource" uid="uid://h6oi6vkj4c2m" path="res://addons/rokojori_action_library/Runtime/Time/Timelines/Real Time.tres" id="3_h78cr"]
|
[ext_resource type="Resource" uid="uid://h6oi6vkj4c2m" path="res://addons/rokojori_action_library/Runtime/Time/Timelines/Real Time.tres" id="3_grbkn"]
|
||||||
|
|
||||||
[sub_resource type="Curve" id="Curve_63bh3"]
|
[sub_resource type="Curve" id="Curve_63bh3"]
|
||||||
_data = [Vector2(0, 1), 0.0, -1.3770282, 0, 0, Vector2(1, 0), -0.00696731, 0.0, 0, 0]
|
_data = [Vector2(0, 1), 0.0, -1.3770282, 0, 0, Vector2(1, 0), -0.00696731, 0.0, 0, 0]
|
||||||
|
|
@ -26,7 +26,7 @@ scaleY = 60.0
|
||||||
script = ExtResource("1_grbkn")
|
script = ExtResource("1_grbkn")
|
||||||
shakeAmountCurve = SubResource("Resource_lnhr4")
|
shakeAmountCurve = SubResource("Resource_lnhr4")
|
||||||
shakeChangeFPSCurve = SubResource("Resource_sn0rc")
|
shakeChangeFPSCurve = SubResource("Resource_sn0rc")
|
||||||
timeline = ExtResource("3_h78cr")
|
timeline = ExtResource("3_grbkn")
|
||||||
smoothingStrength = 0.477
|
smoothingStrength = 0.477
|
||||||
positionShake = Vector3(0.2, 0, 0.2)
|
positionShake = Vector3(0.2, 0, 0.2)
|
||||||
globalPosition = false
|
globalPosition = false
|
||||||
|
|
|
||||||
|
|
@ -250,6 +250,22 @@ namespace Rokojori
|
||||||
var forward = vForward;
|
var forward = vForward;
|
||||||
var fov = c.GetCameraFOV();
|
var fov = c.GetCameraFOV();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// RJLog.Log( "Set Cam", position );
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// camera.GlobalPosition = position;
|
||||||
|
// camera.LookAt( position - forward, up );
|
||||||
|
// camera.Fov = fov;
|
||||||
|
|
||||||
|
AssignCameraValues( position, forward, up, fov );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void AssignCameraValues( Vector3 position, Vector3 forward, Vector3 up, float fov )
|
||||||
|
{
|
||||||
if ( forward.LengthSquared() == 0 )
|
if ( forward.LengthSquared() == 0 )
|
||||||
{
|
{
|
||||||
forward = camera.Basis.Z;
|
forward = camera.Basis.Z;
|
||||||
|
|
@ -266,15 +282,19 @@ namespace Rokojori
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
up = up.Normalized();
|
up = up.Normalized();
|
||||||
}
|
}
|
||||||
|
|
||||||
// RJLog.Log( "Set Cam", position );
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
camera.GlobalPosition = position;
|
camera.GlobalPosition = position;
|
||||||
camera.LookAt( position - forward, up );
|
camera.LookAt( position - forward, up );
|
||||||
camera.Fov = fov;
|
camera.Fov = fov;
|
||||||
|
|
||||||
|
// if ( lastFOV != fov )
|
||||||
|
// {
|
||||||
|
// lastFOV = fov;
|
||||||
|
// // this.LogInfo( "FOV change:", fov );
|
||||||
|
// fovs.Add( fov );
|
||||||
|
// fovHistory = fovs.ToArray();
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetSingleCamera( CameraSlot c, double delta )
|
void SetSingleCamera( CameraSlot c, double delta )
|
||||||
|
|
@ -302,31 +322,18 @@ namespace Rokojori
|
||||||
var forward = vForward;
|
var forward = vForward;
|
||||||
var fov = c.GetCameraFOV();
|
var fov = c.GetCameraFOV();
|
||||||
|
|
||||||
if ( forward.LengthSquared() == 0 )
|
// this.LogInfo( "Single Cam:", c.Name, "fov:", c.GetCameraFOV() );
|
||||||
{
|
|
||||||
forward = camera.Basis.Z;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
forward = forward.Normalized();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( up.LengthSquared() == 0 )
|
|
||||||
{
|
|
||||||
up = camera.Basis.Y;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
up = up.Normalized();
|
|
||||||
}
|
|
||||||
|
|
||||||
// RJLog.Log( "Set Cam", position );
|
// RJLog.Log( "Set Cam", position );
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
camera.GlobalPosition = position;
|
// camera.GlobalPosition = position;
|
||||||
camera.LookAt( position - forward, up );
|
// camera.LookAt( position - forward, up );
|
||||||
camera.Fov = fov;
|
// camera.Fov = fov;
|
||||||
|
|
||||||
|
AssignCameraValues( position, forward, up, fov );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -374,6 +381,7 @@ namespace Rokojori
|
||||||
|
|
||||||
refreshSlots = false;
|
refreshSlots = false;
|
||||||
_cameraSlots = Nodes.GetDirectChildren<CameraSlot>( this );
|
_cameraSlots = Nodes.GetDirectChildren<CameraSlot>( this );
|
||||||
|
_cameraSlots.ForEach( c => c.Reset() );
|
||||||
StartLerping();
|
StartLerping();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -468,37 +476,45 @@ namespace Rokojori
|
||||||
up += priority * vUp;
|
up += priority * vUp;
|
||||||
forward += priority * vForward;
|
forward += priority * vForward;
|
||||||
fov += priority * c.GetCameraFOV();
|
fov += priority * c.GetCameraFOV();
|
||||||
|
|
||||||
|
// this.LogInfo( "Multicam", c.Name, "fov:", c.GetCameraFOV(), c.smoothedPriority );
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
position /= sumPriority;
|
position /= sumPriority;
|
||||||
fov /= sumPriority;
|
fov = fov == 0f ? 60f : fov/sumPriority;
|
||||||
|
|
||||||
if ( forward.LengthSquared() == 0 )
|
// this.LogInfo( "Multicam", "fov combined:", fov, sumPriority );
|
||||||
{
|
|
||||||
forward = camera.Basis.Z;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
forward = forward.Normalized();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( up.LengthSquared() == 0 )
|
// if ( forward.LengthSquared() == 0 )
|
||||||
{
|
// {
|
||||||
up = camera.Basis.Y;
|
// forward = camera.Basis.Z;
|
||||||
}
|
// }
|
||||||
else
|
// else
|
||||||
{
|
// {
|
||||||
up = up.Normalized();
|
// forward = forward.Normalized();
|
||||||
}
|
// }
|
||||||
|
|
||||||
// RJLog.Log( "Set Cam", position );
|
// if ( up.LengthSquared() == 0 )
|
||||||
|
// {
|
||||||
|
// up = camera.Basis.Y;
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// up = up.Normalized();
|
||||||
|
// }
|
||||||
|
|
||||||
|
// // RJLog.Log( "Set Cam", position );
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
camera.GlobalPosition = position;
|
// camera.GlobalPosition = position;
|
||||||
camera.LookAt( position - forward, up );
|
// camera.LookAt( position - forward, up );
|
||||||
camera.Fov = fov;
|
// camera.Fov = fov;
|
||||||
|
|
||||||
|
AssignCameraValues( position, forward, up, fov );
|
||||||
|
|
||||||
|
// this.LogInfo( fov, ">>", camera.Fov );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,11 @@ namespace Rokojori
|
||||||
|
|
||||||
Smoother smoother = new Smoother();
|
Smoother smoother = new Smoother();
|
||||||
|
|
||||||
|
public void Reset()
|
||||||
|
{
|
||||||
|
_smoothedPriority = priority;
|
||||||
|
}
|
||||||
|
|
||||||
public void Update( double delta, CameraManager manager )
|
public void Update( double delta, CameraManager manager )
|
||||||
{
|
{
|
||||||
if ( cameraEffectRunner != null )
|
if ( cameraEffectRunner != null )
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,11 @@ namespace Rokojori
|
||||||
if ( Engine.IsEditorHint() )
|
if ( Engine.IsEditorHint() )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( target == null || timeLine == null )
|
||||||
|
{
|
||||||
|
this.LogInfo( "Missing target or timeline", target, timeLine );
|
||||||
}
|
}
|
||||||
|
|
||||||
var lookAtPosition = smoothing.Smooth( target.GlobalPosition, timeLine.delta );
|
var lookAtPosition = smoothing.Smooth( target.GlobalPosition, timeLine.delta );
|
||||||
|
|
|
||||||
|
|
@ -29,9 +29,14 @@ namespace Rokojori
|
||||||
[Export]
|
[Export]
|
||||||
public CharacterController.CharacterUpdateMode updateMode = CharacterController.CharacterUpdateMode.Physics_Process;
|
public CharacterController.CharacterUpdateMode updateMode = CharacterController.CharacterUpdateMode.Physics_Process;
|
||||||
|
|
||||||
|
[Export]
|
||||||
|
public bool processInEditor = false;
|
||||||
|
|
||||||
|
public bool canProcess => processInEditor || ! Engine.IsEditorHint();
|
||||||
|
|
||||||
public override void _Process( double delta )
|
public override void _Process( double delta )
|
||||||
{
|
{
|
||||||
if ( CharacterController.CharacterUpdateMode.Process == updateMode )
|
if ( canProcess && CharacterController.CharacterUpdateMode.Process == updateMode )
|
||||||
{
|
{
|
||||||
_ProcessCamera( delta );
|
_ProcessCamera( delta );
|
||||||
}
|
}
|
||||||
|
|
@ -39,7 +44,7 @@ namespace Rokojori
|
||||||
|
|
||||||
public override void _PhysicsProcess( double delta )
|
public override void _PhysicsProcess( double delta )
|
||||||
{
|
{
|
||||||
if ( CharacterController.CharacterUpdateMode.Physics_Process == updateMode )
|
if ( canProcess && CharacterController.CharacterUpdateMode.Physics_Process == updateMode )
|
||||||
{
|
{
|
||||||
_ProcessCamera( delta );
|
_ProcessCamera( delta );
|
||||||
}
|
}
|
||||||
|
|
@ -115,7 +120,7 @@ namespace Rokojori
|
||||||
cameraRotation = new Quaternion( basis );
|
cameraRotation = new Quaternion( basis );
|
||||||
}
|
}
|
||||||
|
|
||||||
[Export,ReadOnly]
|
// [Export,ReadOnly]
|
||||||
public Vector3 cameraPosition;
|
public Vector3 cameraPosition;
|
||||||
|
|
||||||
public override Vector3 GetCameraPosition()
|
public override Vector3 GetCameraPosition()
|
||||||
|
|
@ -123,10 +128,10 @@ namespace Rokojori
|
||||||
return cameraPosition;
|
return cameraPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
[Export,ReadOnly]
|
// [Export,ReadOnly]
|
||||||
public Vector3 cameraForward;
|
public Vector3 cameraForward;
|
||||||
|
|
||||||
[Export,ReadOnly]
|
// [Export,ReadOnly]
|
||||||
public Quaternion cameraRotation;
|
public Quaternion cameraRotation;
|
||||||
|
|
||||||
public override Quaternion GetCameraRotation()
|
public override Quaternion GetCameraRotation()
|
||||||
|
|
@ -135,8 +140,8 @@ namespace Rokojori
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
[Export,ReadOnly]
|
[Export]
|
||||||
public float FOV;
|
public float FOV = 60f;
|
||||||
|
|
||||||
public override float GetCameraFOV()
|
public override float GetCameraFOV()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ namespace Rokojori
|
||||||
|
|
||||||
public void _OnSensor( SensorEvent se )
|
public void _OnSensor( SensorEvent se )
|
||||||
{
|
{
|
||||||
|
this.LogInfo( "SensorEvent:", se );
|
||||||
if ( pointer == null || pointer.pointable == null )
|
if ( pointer == null || pointer.pointable == null )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
|
@ -42,14 +42,20 @@ namespace Rokojori
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var interactable = Nodes.Find<Interactable>( pointer.pointable.GetParent() );
|
var interactable = Nodes.Find<Interactable>( pointer.pointable.GetParent() );
|
||||||
|
|
||||||
|
this.LogInfo( "Pressed:", HierarchyName.Of( interactable ), HierarchyName.Of( pointer ) );
|
||||||
|
|
||||||
if ( interactable == null )
|
if ( interactable == null )
|
||||||
{
|
{
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.LogInfo( "Triggering:", HierarchyName.Of( interactable.onInteraction ) );
|
||||||
|
|
||||||
Action.TriggerSafe( interactable.onInteraction );
|
Action.TriggerSafe( interactable.onInteraction );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -168,6 +168,14 @@ namespace Rokojori
|
||||||
|
|
||||||
var effects = preset.effects;
|
var effects = preset.effects;
|
||||||
|
|
||||||
|
var cm = Unique<CameraManager>.Get();
|
||||||
|
|
||||||
|
if ( cm == null )
|
||||||
|
{
|
||||||
|
this.LogInfo( cm );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var currentLayout = layout != null ? layout : Unique<CameraManager>.Get().compositorLayout;
|
var currentLayout = layout != null ? layout : Unique<CameraManager>.Get().compositorLayout;
|
||||||
|
|
||||||
if ( _driverValue == 0 || ( _driverValue == 1 && managingMode == ManagingMode.Remove_On_NonIntermediate_Insert_Else ) )
|
if ( _driverValue == 0 || ( _driverValue == 1 && managingMode == ManagingMode.Remove_On_NonIntermediate_Insert_Else ) )
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
[gd_resource type="Resource" script_class="CompositorVFXPreset" load_steps=41 format=3 uid="uid://c63le61ap244y"]
|
[gd_resource type="Resource" script_class="CompositorVFXPreset" load_steps=40 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="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://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://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"]
|
[ext_resource type="Script" uid="uid://6jkixa201wux" path="res://addons/rokojori_action_library/Runtime/Rendering/Compositor/CompositorEffects/Glow/ChromaticBloom/ChromaticBloomEffect.cs" id="4_2f4vr"]
|
||||||
|
|
@ -26,7 +25,6 @@ script = ExtResource("2_yywgn")
|
||||||
[sub_resource type="Resource" id="Resource_i5utj"]
|
[sub_resource type="Resource" id="Resource_i5utj"]
|
||||||
script = ExtResource("3_tdlfo")
|
script = ExtResource("3_tdlfo")
|
||||||
owner = SubResource("Resource_geea8")
|
owner = SubResource("Resource_geea8")
|
||||||
layer = ExtResource("2_tdlfo")
|
|
||||||
|
|
||||||
[sub_resource type="CompositorEffect" id="CompositorEffect_2f4vr"]
|
[sub_resource type="CompositorEffect" id="CompositorEffect_2f4vr"]
|
||||||
resource_local_to_scene = false
|
resource_local_to_scene = false
|
||||||
|
|
@ -62,7 +60,6 @@ metadata/_custom_type_script = "uid://6jkixa201wux"
|
||||||
[sub_resource type="Resource" id="Resource_jpti0"]
|
[sub_resource type="Resource" id="Resource_jpti0"]
|
||||||
script = ExtResource("3_tdlfo")
|
script = ExtResource("3_tdlfo")
|
||||||
owner = SubResource("Resource_geea8")
|
owner = SubResource("Resource_geea8")
|
||||||
layer = ExtResource("2_tdlfo")
|
|
||||||
|
|
||||||
[sub_resource type="CompositorEffect" id="CompositorEffect_xv23r"]
|
[sub_resource type="CompositorEffect" id="CompositorEffect_xv23r"]
|
||||||
resource_local_to_scene = false
|
resource_local_to_scene = false
|
||||||
|
|
@ -108,7 +105,6 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy"
|
||||||
[sub_resource type="Resource" id="Resource_krf45"]
|
[sub_resource type="Resource" id="Resource_krf45"]
|
||||||
script = ExtResource("3_tdlfo")
|
script = ExtResource("3_tdlfo")
|
||||||
owner = SubResource("Resource_geea8")
|
owner = SubResource("Resource_geea8")
|
||||||
layer = ExtResource("2_tdlfo")
|
|
||||||
|
|
||||||
[sub_resource type="Gradient" id="Gradient_a4g6s"]
|
[sub_resource type="Gradient" id="Gradient_a4g6s"]
|
||||||
offsets = PackedFloat32Array(0, 0.9745455)
|
offsets = PackedFloat32Array(0, 0.9745455)
|
||||||
|
|
@ -190,7 +186,6 @@ metadata/_custom_type_script = "uid://c3ipi4e85bp0r"
|
||||||
[sub_resource type="Resource" id="Resource_8vqmt"]
|
[sub_resource type="Resource" id="Resource_8vqmt"]
|
||||||
script = ExtResource("3_tdlfo")
|
script = ExtResource("3_tdlfo")
|
||||||
owner = SubResource("Resource_geea8")
|
owner = SubResource("Resource_geea8")
|
||||||
layer = ExtResource("2_tdlfo")
|
|
||||||
|
|
||||||
[sub_resource type="CompositorEffect" id="CompositorEffect_3gufn"]
|
[sub_resource type="CompositorEffect" id="CompositorEffect_3gufn"]
|
||||||
resource_local_to_scene = false
|
resource_local_to_scene = false
|
||||||
|
|
@ -236,7 +231,6 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy"
|
||||||
[sub_resource type="Resource" id="Resource_22k1k"]
|
[sub_resource type="Resource" id="Resource_22k1k"]
|
||||||
script = ExtResource("3_tdlfo")
|
script = ExtResource("3_tdlfo")
|
||||||
owner = SubResource("Resource_geea8")
|
owner = SubResource("Resource_geea8")
|
||||||
layer = ExtResource("2_tdlfo")
|
|
||||||
|
|
||||||
[sub_resource type="Gradient" id="Gradient_hpfyh"]
|
[sub_resource type="Gradient" id="Gradient_hpfyh"]
|
||||||
offsets = PackedFloat32Array(0.70414203, 1)
|
offsets = PackedFloat32Array(0.70414203, 1)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
[gd_resource type="Resource" script_class="CompositorVFXPreset" load_steps=33 format=3 uid="uid://d1uubsqnvu1qe"]
|
[gd_resource type="Resource" script_class="CompositorVFXPreset" load_steps=32 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="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://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://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"]
|
[ext_resource type="Script" uid="uid://cqkrgyuerq50a" path="res://addons/rokojori_action_library/Runtime/Rendering/Compositor/CompositorEffects/Distortion/EllispeDistortion/EllipseDistortionEffect.cs" id="4_pflfa"]
|
||||||
|
|
@ -33,7 +32,6 @@ script = ExtResource("2_kelqw")
|
||||||
[sub_resource type="Resource" id="Resource_7oha2"]
|
[sub_resource type="Resource" id="Resource_7oha2"]
|
||||||
script = ExtResource("3_7oha2")
|
script = ExtResource("3_7oha2")
|
||||||
owner = SubResource("Resource_geea8")
|
owner = SubResource("Resource_geea8")
|
||||||
layer = ExtResource("2_7oha2")
|
|
||||||
|
|
||||||
[sub_resource type="Gradient" id="Gradient_pflfa"]
|
[sub_resource type="Gradient" id="Gradient_pflfa"]
|
||||||
offsets = PackedFloat32Array(0.2090909, 0.94545454)
|
offsets = PackedFloat32Array(0.2090909, 0.94545454)
|
||||||
|
|
@ -95,7 +93,6 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy"
|
||||||
[sub_resource type="Resource" id="Resource_1qvce"]
|
[sub_resource type="Resource" id="Resource_1qvce"]
|
||||||
script = ExtResource("3_7oha2")
|
script = ExtResource("3_7oha2")
|
||||||
owner = SubResource("Resource_geea8")
|
owner = SubResource("Resource_geea8")
|
||||||
layer = ExtResource("2_7oha2")
|
|
||||||
|
|
||||||
[sub_resource type="CompositorEffect" id="CompositorEffect_6d3w2"]
|
[sub_resource type="CompositorEffect" id="CompositorEffect_6d3w2"]
|
||||||
resource_local_to_scene = false
|
resource_local_to_scene = false
|
||||||
|
|
@ -128,7 +125,6 @@ curve = SubResource("Curve_rtqyr")
|
||||||
[sub_resource type="Resource" id="Resource_rit7v"]
|
[sub_resource type="Resource" id="Resource_rit7v"]
|
||||||
script = ExtResource("3_7oha2")
|
script = ExtResource("3_7oha2")
|
||||||
owner = SubResource("Resource_geea8")
|
owner = SubResource("Resource_geea8")
|
||||||
layer = ExtResource("2_7oha2")
|
|
||||||
|
|
||||||
[sub_resource type="Gradient" id="Gradient_7q50q"]
|
[sub_resource type="Gradient" id="Gradient_7q50q"]
|
||||||
offsets = PackedFloat32Array(0, 0.6311111)
|
offsets = PackedFloat32Array(0, 0.6311111)
|
||||||
|
|
|
||||||
|
|
@ -19,12 +19,12 @@ member = "amount"
|
||||||
curve = SubResource("Curve_btbfg")
|
curve = SubResource("Curve_btbfg")
|
||||||
metadata/_custom_type_script = "uid://dvvfvlutisecy"
|
metadata/_custom_type_script = "uid://dvvfvlutisecy"
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_4xviq"]
|
[sub_resource type="Resource" id="Resource_dryyw"]
|
||||||
script = ExtResource("1_0ail8")
|
script = ExtResource("1_0ail8")
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_p64cs"]
|
[sub_resource type="Resource" id="Resource_p64cs"]
|
||||||
script = ExtResource("2_tc21q")
|
script = ExtResource("2_tc21q")
|
||||||
owner = SubResource("Resource_4xviq")
|
owner = SubResource("Resource_dryyw")
|
||||||
|
|
||||||
[sub_resource type="Curve" id="Curve_7axlu"]
|
[sub_resource type="Curve" id="Curve_7axlu"]
|
||||||
_data = [Vector2(0, 1), 0.0, -18.573792, 0, 0, Vector2(0.07774799, 0.15679264), -0.687919, -0.687919, 0, 0, Vector2(1, 0), -0.069252, 0.0, 0, 0]
|
_data = [Vector2(0, 1), 0.0, -18.573792, 0, 0, Vector2(0.07774799, 0.15679264), -0.687919, -0.687919, 0, 0, Vector2(1, 0), -0.069252, 0.0, 0, 0]
|
||||||
|
|
@ -88,7 +88,7 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy"
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_hpfyh"]
|
[sub_resource type="Resource" id="Resource_hpfyh"]
|
||||||
script = ExtResource("2_tc21q")
|
script = ExtResource("2_tc21q")
|
||||||
owner = SubResource("Resource_4xviq")
|
owner = SubResource("Resource_dryyw")
|
||||||
|
|
||||||
[sub_resource type="Gradient" id="Gradient_frwbc"]
|
[sub_resource type="Gradient" id="Gradient_frwbc"]
|
||||||
offsets = PackedFloat32Array(1)
|
offsets = PackedFloat32Array(1)
|
||||||
|
|
@ -131,7 +131,7 @@ metadata/_custom_type_script = "uid://dvvfvlutisecy"
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_gxlxg"]
|
[sub_resource type="Resource" id="Resource_gxlxg"]
|
||||||
script = ExtResource("2_tc21q")
|
script = ExtResource("2_tc21q")
|
||||||
owner = SubResource("Resource_4xviq")
|
owner = SubResource("Resource_dryyw")
|
||||||
|
|
||||||
[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_4n83u"]
|
[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_4n83u"]
|
||||||
load_path = "res://.godot/imported/RGB 3D Noise.png-daebfe00d2f3fcd5d3bc528f8a3972e1.ctex"
|
load_path = "res://.godot/imported/RGB 3D Noise.png-daebfe00d2f3fcd5d3bc528f8a3972e1.ctex"
|
||||||
|
|
@ -167,7 +167,7 @@ metadata/_custom_type_script = "uid://balixgskgouhm"
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_3tnad"]
|
[sub_resource type="Resource" id="Resource_3tnad"]
|
||||||
script = ExtResource("2_tc21q")
|
script = ExtResource("2_tc21q")
|
||||||
owner = SubResource("Resource_4xviq")
|
owner = SubResource("Resource_dryyw")
|
||||||
|
|
||||||
[sub_resource type="CompositorEffect" id="CompositorEffect_hdnet"]
|
[sub_resource type="CompositorEffect" id="CompositorEffect_hdnet"]
|
||||||
resource_local_to_scene = false
|
resource_local_to_scene = false
|
||||||
|
|
|
||||||
|
|
@ -418,7 +418,7 @@ namespace Rokojori
|
||||||
|
|
||||||
cs.sensors.ForEach( s =>
|
cs.sensors.ForEach( s =>
|
||||||
{
|
{
|
||||||
this.LogInfo( "Adding Combine Sensor:", s );
|
// this.LogInfo( "Adding Combine Sensor:", s );
|
||||||
AddSensor( s );
|
AddSensor( s );
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
@ -445,17 +445,17 @@ namespace Rokojori
|
||||||
|
|
||||||
var sensors = ReflectionHelper.GetDataMemberValues<Sensor>( obj );
|
var sensors = ReflectionHelper.GetDataMemberValues<Sensor>( obj );
|
||||||
|
|
||||||
if ( sensors.Count > 0 )
|
// if ( sensors.Count > 0 )
|
||||||
{
|
// {
|
||||||
if ( obj is Node n )
|
// if ( obj is Node n )
|
||||||
{
|
// {
|
||||||
n.LogInfo( sensors );
|
// n.LogInfo( sensors );
|
||||||
}
|
// }
|
||||||
else if ( obj is Resource r )
|
// else if ( obj is Resource r )
|
||||||
{
|
// {
|
||||||
r.LogInfo( sensors );
|
// r.LogInfo( sensors );
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
sensors.ForEach(
|
sensors.ForEach(
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
uid://dw76e4gfqy4no
|
uid://dl72xehl25fh5
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
uid://b7dgudl32s41y
|
uid://cwatnje5p2ktl
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
uid://86qwdjl5kbld
|
uid://ydp0av62q8oi
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
uid://bka252qrc5wr
|
uid://ccwlu251e3lnl
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
uid://b82uqqj3who4c
|
uid://cbj1d4lsdqdvw
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
uid://b5j3rl0bdcdsi
|
uid://blhqqoa8xfmj4
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
uid://clw0a3x4nmr6u
|
uid://cjlrsnt82lrvf
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
uid://djcv5dh2u73v5
|
uid://rr3bemugjdp4
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
uid://badk0je4kx6xb
|
uid://ctbplkysmyk1g
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
[gd_resource type="Resource" script_class="Timeline" load_steps=2 format=3 uid="uid://b4iykcwesp1y6"]
|
[gd_resource type="Resource" script_class="Timeline" load_steps=2 format=3 uid="uid://b4iykcwesp1y6"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://86qwdjl5kbld" path="res://addons/rokojori_action_library/Runtime/Time/Timeline.cs" id="1_kk6wf"]
|
[ext_resource type="Script" uid="uid://ydp0av62q8oi" path="res://addons/rokojori_action_library/Runtime/Time/Timeline.cs" id="1_kk6wf"]
|
||||||
|
|
||||||
[resource]
|
[resource]
|
||||||
script = ExtResource("1_kk6wf")
|
script = ExtResource("1_kk6wf")
|
||||||
clockSource = 2
|
|
||||||
executesInPause = true
|
executesInPause = true
|
||||||
|
|
|
||||||
|
|
@ -449,7 +449,7 @@ namespace Rokojori
|
||||||
|
|
||||||
// this.LogInfo( "InputEvent", inputEvent, ui.settings.uiConfirm.IsDown( inputEvent ) );
|
// this.LogInfo( "InputEvent", inputEvent, ui.settings.uiConfirm.IsDown( inputEvent ) );
|
||||||
|
|
||||||
if ( ui.settings.uiConfirm.IsDown( inputEvent ) )
|
if ( ui?.settings?.uiConfirm?.IsDown( inputEvent ) ?? false )
|
||||||
{
|
{
|
||||||
onUIConfirm?.Trigger();
|
onUIConfirm?.Trigger();
|
||||||
// GD.Print("ui_accept pressed while focused");
|
// GD.Print("ui_accept pressed while focused");
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ public partial class UIRegion : Control, UIStylePropertyContainerNode, UIHolderC
|
||||||
|
|
||||||
// this.LogInfo( "InputEvent", inputEvent, ui.settings.uiConfirm.IsDown( inputEvent ) );
|
// this.LogInfo( "InputEvent", inputEvent, ui.settings.uiConfirm.IsDown( inputEvent ) );
|
||||||
|
|
||||||
if ( ui.settings.uiConfirm.IsDown( inputEvent ) )
|
if ( ui?.settings?.uiConfirm?.IsDown( inputEvent ) ?? false )
|
||||||
{
|
{
|
||||||
onUIConfirm?.Trigger();
|
onUIConfirm?.Trigger();
|
||||||
// GD.Print("ui_accept pressed while focused");
|
// GD.Print("ui_accept pressed while focused");
|
||||||
|
|
|
||||||
|
|
@ -445,7 +445,7 @@ namespace Rokojori
|
||||||
|
|
||||||
// this.LogInfo( "InputEvent", inputEvent, ui.settings.uiConfirm.IsDown( inputEvent ) );
|
// this.LogInfo( "InputEvent", inputEvent, ui.settings.uiConfirm.IsDown( inputEvent ) );
|
||||||
|
|
||||||
if ( ui.settings.uiConfirm.IsDown( inputEvent ) )
|
if ( ui?.settings?.uiConfirm?.IsDown( inputEvent ) ?? false )
|
||||||
{
|
{
|
||||||
onUIConfirm?.Trigger();
|
onUIConfirm?.Trigger();
|
||||||
// GD.Print("ui_accept pressed while focused");
|
// GD.Print("ui_accept pressed while focused");
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,19 @@
|
||||||
[gd_resource type="Resource" script_class="UISettings" load_steps=9 format=3 uid="uid://dp57o0ykhkqfj"]
|
[gd_resource type="Resource" script_class="UISettings" load_steps=17 format=3 uid="uid://dp57o0ykhkqfj"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://cgdxalxhdbmjn" path="res://addons/rokojori_action_library/Runtime/UI/UISettings.cs" id="1_5a283"]
|
[ext_resource type="Script" uid="uid://cgdxalxhdbmjn" path="res://addons/rokojori_action_library/Runtime/UI/UISettings.cs" id="1_5a283"]
|
||||||
[ext_resource type="Resource" uid="uid://b4iykcwesp1y6" path="res://addons/rokojori_action_library/Runtime/Time/Timelines/UI Time.tres" id="1_6vky0"]
|
[ext_resource type="Resource" uid="uid://b4iykcwesp1y6" path="res://addons/rokojori_action_library/Runtime/Time/Timelines/UI Time.tres" id="1_lq2kq"]
|
||||||
[ext_resource type="Resource" uid="uid://bhy8b3gopkq4m" path="res://addons/rokojori_action_library/Runtime/UI/ShaderProperties/Vector2/Size.tres" id="2_cdd3u"]
|
[ext_resource type="Resource" uid="uid://bhy8b3gopkq4m" path="res://addons/rokojori_action_library/Runtime/UI/ShaderProperties/Vector2/Size.tres" id="2_cdd3u"]
|
||||||
[ext_resource type="Script" uid="uid://cebfjne1ewhnm" path="res://addons/rokojori_action_library/Runtime/Shading/Properties/Vector2PropertyName.cs" id="3_e2b6y"]
|
[ext_resource type="Script" uid="uid://cebfjne1ewhnm" path="res://addons/rokojori_action_library/Runtime/Shading/Properties/Vector2PropertyName.cs" id="3_e2b6y"]
|
||||||
[ext_resource type="Script" uid="uid://cnkyynboxg1qg" path="res://addons/rokojori_action_library/Runtime/UI/Styling/UINumber.cs" id="3_xon8j"]
|
[ext_resource type="Script" uid="uid://cnkyynboxg1qg" path="res://addons/rokojori_action_library/Runtime/UI/Styling/UINumber.cs" id="3_xon8j"]
|
||||||
[ext_resource type="Resource" uid="uid://dq52vhnqr5m6" path="res://addons/rokojori_action_library/Runtime/Sensors/Default-Sensors/Default-Input-Icons-Library.tres" id="4_v6r6i"]
|
[ext_resource type="Resource" uid="uid://dq52vhnqr5m6" path="res://addons/rokojori_action_library/Runtime/Sensors/Default-Sensors/Default-Input-Icons-Library.tres" id="4_v6r6i"]
|
||||||
|
[ext_resource type="Resource" uid="uid://dfvs7wbygwmhk" path="res://addons/rokojori_action_library/Runtime/Sensors/Default-Sensors/UI/Sensors/UI Cancel.tres" id="7_7wsju"]
|
||||||
|
[ext_resource type="Resource" uid="uid://ciia3k58fa5w" path="res://addons/rokojori_action_library/Runtime/Sensors/Default-Sensors/UI/Sensors/UI Confirm.tres" id="8_3x83o"]
|
||||||
|
[ext_resource type="Resource" uid="uid://ckyf78p517ga1" path="res://addons/rokojori_action_library/Runtime/Sensors/Default-Sensors/UI/Sensors/UI Down.tres" id="9_xyicm"]
|
||||||
|
[ext_resource type="Resource" uid="uid://cqatyb80rpor0" path="res://addons/rokojori_action_library/Runtime/Sensors/Default-Sensors/UI/Sensors/UI Left.tres" id="10_npq7o"]
|
||||||
|
[ext_resource type="Resource" uid="uid://ccff1bj35qcl0" path="res://addons/rokojori_action_library/Runtime/Sensors/Default-Sensors/UI/Sensors/UI Next Menu.tres" id="11_62mo6"]
|
||||||
|
[ext_resource type="Resource" uid="uid://dtykoghdisv37" path="res://addons/rokojori_action_library/Runtime/Sensors/Default-Sensors/UI/Sensors/UI Previous Menu.tres" id="12_boqnk"]
|
||||||
|
[ext_resource type="Resource" uid="uid://dafu3alp6wr25" path="res://addons/rokojori_action_library/Runtime/Sensors/Default-Sensors/UI/Sensors/UI Right.tres" id="13_ibgv6"]
|
||||||
|
[ext_resource type="Resource" uid="uid://r8bfiv34ghev" path="res://addons/rokojori_action_library/Runtime/Sensors/Default-Sensors/UI/Sensors/UI Up.tres" id="14_b8y6s"]
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_wm644"]
|
[sub_resource type="Resource" id="Resource_wm644"]
|
||||||
script = ExtResource("3_xon8j")
|
script = ExtResource("3_xon8j")
|
||||||
|
|
@ -21,7 +29,15 @@ metadata/_custom_type_script = "uid://cebfjne1ewhnm"
|
||||||
[resource]
|
[resource]
|
||||||
script = ExtResource("1_5a283")
|
script = ExtResource("1_5a283")
|
||||||
inputIconsLibrary = ExtResource("4_v6r6i")
|
inputIconsLibrary = ExtResource("4_v6r6i")
|
||||||
|
defaultTimeline = ExtResource("1_lq2kq")
|
||||||
fontSize = SubResource("Resource_wm644")
|
fontSize = SubResource("Resource_wm644")
|
||||||
|
uiConfirm = ExtResource("8_3x83o")
|
||||||
|
uiCancel = ExtResource("7_7wsju")
|
||||||
|
uiLeft = ExtResource("10_npq7o")
|
||||||
|
uiRight = ExtResource("13_ibgv6")
|
||||||
|
uiUp = ExtResource("14_b8y6s")
|
||||||
|
uiDown = ExtResource("9_xyicm")
|
||||||
|
uiPreviousMenu = ExtResource("12_boqnk")
|
||||||
|
uiNextMenu = ExtResource("11_62mo6")
|
||||||
sizePropertyName = ExtResource("2_cdd3u")
|
sizePropertyName = ExtResource("2_cdd3u")
|
||||||
textureSizePropertyName = SubResource("Resource_6vky0")
|
textureSizePropertyName = SubResource("Resource_6vky0")
|
||||||
defaultTimeline = ExtResource("1_6vky0")
|
|
||||||
|
|
|
||||||
|
|
@ -86,12 +86,12 @@ textureUVScale = 4.0
|
||||||
maskUVScale = 4.0
|
maskUVScale = 4.0
|
||||||
metadata/_custom_type_script = "uid://btuv7v342v3k6"
|
metadata/_custom_type_script = "uid://btuv7v342v3k6"
|
||||||
|
|
||||||
[sub_resource type="Curve" id="Curve_a4g6s"]
|
[sub_resource type="Curve" id="Curve_8d170"]
|
||||||
_data = [Vector2(0, 1), 0.0, -1.0, 0, 1, Vector2(1, 0), 0.0, 0.0, 0, 0]
|
_data = [Vector2(0, 1), 0.0, -1.0, 0, 1, Vector2(1, 0), 0.0, 0.0, 0, 0]
|
||||||
point_count = 2
|
point_count = 2
|
||||||
|
|
||||||
[sub_resource type="CurveTexture" id="CurveTexture_xxny3"]
|
[sub_resource type="CurveTexture" id="CurveTexture_ch4em"]
|
||||||
curve = SubResource("Curve_a4g6s")
|
curve = SubResource("Curve_8d170")
|
||||||
|
|
||||||
[sub_resource type="Resource" id="Resource_nuxa8"]
|
[sub_resource type="Resource" id="Resource_nuxa8"]
|
||||||
script = ExtResource("4_1hsao")
|
script = ExtResource("4_1hsao")
|
||||||
|
|
@ -100,7 +100,7 @@ hide = true
|
||||||
flareType = SubResource("Resource_krf45")
|
flareType = SubResource("Resource_krf45")
|
||||||
overwriteColor = Color(2.343, 2.343, 2.343, 1)
|
overwriteColor = Color(2.343, 2.343, 2.343, 1)
|
||||||
overwriteAmount = 0.2568
|
overwriteAmount = 0.2568
|
||||||
opacityCurvePerLayer = SubResource("CurveTexture_xxny3")
|
opacityCurvePerLayer = SubResource("CurveTexture_ch4em")
|
||||||
tint = Color(4.8530827, 4.8530827, 4.8530827, 1)
|
tint = Color(4.8530827, 4.8530827, 4.8530827, 1)
|
||||||
lighntessShift = -10.3896
|
lighntessShift = -10.3896
|
||||||
size = 4.0
|
size = 4.0
|
||||||
|
|
@ -262,7 +262,7 @@ opacity = 0.1873
|
||||||
numLayers = 3
|
numLayers = 3
|
||||||
flareType = SubResource("Resource_k3n7u")
|
flareType = SubResource("Resource_k3n7u")
|
||||||
overwriteColor = Color(2.385, 0.24872369, 0, 1)
|
overwriteColor = Color(2.385, 0.24872369, 0, 1)
|
||||||
opacityCurvePerLayer = SubResource("CurveTexture_xxny3")
|
opacityCurvePerLayer = SubResource("CurveTexture_ch4em")
|
||||||
temparatureShift = 34.56
|
temparatureShift = 34.56
|
||||||
size = 100.0
|
size = 100.0
|
||||||
sizeScale = 0.0912
|
sizeScale = 0.0912
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue