Core Export Update
This commit is contained in:
parent
107614bcb7
commit
96d39db4b1
|
|
@ -3,15 +3,15 @@
|
|||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bujyx7ltsi40k"
|
||||
path="res://.godot/imported/TimeLineManager.svg-dd6b4ada11f698cccbfe51b895d69a3b.ctex"
|
||||
path="res://.godot/imported/TimelineManager.svg-deb996f134b015aad25457e6b0de530f.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://addons/rokojori_action_library/Icons/TimeLineManager.svg"
|
||||
dest_files=["res://.godot/imported/TimeLineManager.svg-dd6b4ada11f698cccbfe51b895d69a3b.ctex"]
|
||||
source_file="res://addons/rokojori_action_library/Icons/TimelineManager.svg"
|
||||
dest_files=["res://.godot/imported/TimelineManager.svg-deb996f134b015aad25457e6b0de530f.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,254 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
height="16"
|
||||
viewBox="0 0 16 16"
|
||||
width="16"
|
||||
version="1.1"
|
||||
id="svg4"
|
||||
sodipodi:docname="Timeline.svg"
|
||||
inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
|
||||
xml:space="preserve"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"><defs
|
||||
id="defs8"><linearGradient
|
||||
inkscape:collect="never"
|
||||
id="linearGradient33765"><stop
|
||||
style="stop-color:#cccfd5;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop33761" /><stop
|
||||
style="stop-color:#a9aeb6;stop-opacity:1;"
|
||||
offset="0.41559249"
|
||||
id="stop16949" /><stop
|
||||
style="stop-color:#b2b3b9;stop-opacity:1;"
|
||||
offset="0.80959076"
|
||||
id="stop16951" /><stop
|
||||
style="stop-color:#8a8a8a;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop33763" /></linearGradient><linearGradient
|
||||
id="linearGradient3074"><stop
|
||||
style="stop-color:#e26708;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3070" /><stop
|
||||
style="stop-color:#bb3c00;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop3072" /></linearGradient><radialGradient
|
||||
xlink:href="#linearGradient45008"
|
||||
id="radialGradient3076"
|
||||
cx="30.688875"
|
||||
cy="30.069115"
|
||||
fx="30.688875"
|
||||
fy="30.069115"
|
||||
r="14.05412"
|
||||
gradientUnits="userSpaceOnUse" /><linearGradient
|
||||
xlink:href="#linearGradient45008"
|
||||
id="linearGradient45010"
|
||||
x1="-31.87768"
|
||||
y1="22.065159"
|
||||
x2="-31.87768"
|
||||
y2="48.78738"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(101.16951,-6.5921995)" /><linearGradient
|
||||
id="linearGradient45008"><stop
|
||||
style="stop-color:#e14500;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop45004" /><stop
|
||||
style="stop-color:#e17900;stop-opacity:1;"
|
||||
offset="0.59811592"
|
||||
id="stop45012" /><stop
|
||||
style="stop-color:#e19c00;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop45006" /></linearGradient><linearGradient
|
||||
xlink:href="#linearGradient45008"
|
||||
id="linearGradient46715"
|
||||
x1="31.917692"
|
||||
y1="47.524929"
|
||||
x2="31.917692"
|
||||
y2="22.632998"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(1.7923447e-6)" /><radialGradient
|
||||
inkscape:collect="never"
|
||||
xlink:href="#linearGradient33765"
|
||||
id="radialGradient33767"
|
||||
cx="28.252495"
|
||||
cy="28.914215"
|
||||
fx="28.252495"
|
||||
fy="28.914215"
|
||||
r="14.43763"
|
||||
gradientTransform="matrix(2.0592515,0,0,2.0182304,-29.633594,-30.690448)"
|
||||
gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
|
||||
id="namedview6"
|
||||
pagecolor="#505050"
|
||||
bordercolor="#eeeeee"
|
||||
borderopacity="1"
|
||||
inkscape:showpageshadow="0"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#505050"
|
||||
showgrid="false"
|
||||
inkscape:zoom="11.313709"
|
||||
inkscape:cx="5.3033009"
|
||||
inkscape:cy="2.4748737"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1017"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="g33736" /><g
|
||||
id="g2210"
|
||||
transform="matrix(0.54328517,0,0,0.54328517,-9.4489315,-11.300948)"><g
|
||||
id="g33736"><rect
|
||||
style="fill:url(#radialGradient33767);fill-opacity:1;stroke:none;stroke-width:1.91428;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect18059"
|
||||
width="28.875259"
|
||||
height="28.300053"
|
||||
x="17.679815"
|
||||
y="21.376339"
|
||||
ry="14.006492" /><g
|
||||
id="g17763"
|
||||
style="opacity:0.2769556;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||
inkscape:transform-center-x="-1.2719054"
|
||||
inkscape:transform-center-y="-1.2220245"
|
||||
transform="matrix(1.1286242,0,0,1.1286242,-4.0892676,-4.3982168)"><g
|
||||
id="g17761"
|
||||
transform="matrix(0.69923898,0,0,0.69923898,9.3325793,10.29016)"
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"><rect
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.91428;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect17757"
|
||||
width="3.2538471"
|
||||
height="14.88635"
|
||||
x="30.488947"
|
||||
y="23.89229"
|
||||
ry="1.6269236" /><rect
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.91428;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect17759"
|
||||
width="3.2766507"
|
||||
height="10.920136"
|
||||
x="3.4293973"
|
||||
y="-58.743446"
|
||||
ry="1.6269236"
|
||||
inkscape:transform-center-y="1.5929503"
|
||||
transform="rotate(133.35838)"
|
||||
inkscape:transform-center-x="-1.6869533" /></g></g><g
|
||||
id="g32999"
|
||||
style="fill:#353a3d;fill-opacity:1"
|
||||
inkscape:transform-center-x="-1.2719054"
|
||||
inkscape:transform-center-y="-1.2220245"
|
||||
transform="matrix(1.1286242,0,0,1.1286242,-4.0892676,-4.3982168)"><g
|
||||
id="g33729"
|
||||
transform="matrix(0.69923898,0,0,0.69923898,9.3325793,10.29016)"
|
||||
style="fill:#353a3d;fill-opacity:1"><rect
|
||||
style="fill:#353a3d;fill-opacity:1;stroke:none;stroke-width:1.91428;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect32993"
|
||||
width="3.2538471"
|
||||
height="14.88635"
|
||||
x="30.488947"
|
||||
y="23.89229"
|
||||
ry="1.6269236" /><rect
|
||||
style="fill:#353a3d;fill-opacity:1;stroke:none;stroke-width:1.91428;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect32995"
|
||||
width="3.2766507"
|
||||
height="10.920136"
|
||||
x="3.4293973"
|
||||
y="-58.743446"
|
||||
ry="1.6269236"
|
||||
inkscape:transform-center-y="1.5929503"
|
||||
transform="rotate(133.35838)"
|
||||
inkscape:transform-center-x="-1.6869533" /></g></g><g
|
||||
id="g44470"><rect
|
||||
style="opacity:0.437632;fill:#000000;fill-opacity:1;stroke:none;stroke-width:184.065;stroke-linecap:square;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect40748"
|
||||
width="2.1857765"
|
||||
height="1.8981743"
|
||||
x="18.830223"
|
||||
y="34.318436"
|
||||
ry="0.80296504" /><rect
|
||||
style="opacity:0.437632;fill:#000000;fill-opacity:1;stroke:none;stroke-width:184.065;stroke-linecap:square;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect40750"
|
||||
width="2.1857765"
|
||||
height="1.8981743"
|
||||
x="42.873764"
|
||||
y="34.318436"
|
||||
ry="0.80296504" /><rect
|
||||
style="opacity:0.437632;fill:#000000;fill-opacity:1;stroke:none;stroke-width:184.065;stroke-linecap:square;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect40756"
|
||||
width="2.1857765"
|
||||
height="1.8981743"
|
||||
x="22.447657"
|
||||
y="-32.89397"
|
||||
ry="0.80296504"
|
||||
transform="rotate(90)" /><rect
|
||||
style="opacity:0.437632;fill:#000000;fill-opacity:1;stroke:none;stroke-width:184.065;stroke-linecap:square;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect40758"
|
||||
width="2.1857765"
|
||||
height="1.8981743"
|
||||
x="46.491196"
|
||||
y="-32.89397"
|
||||
ry="0.80296504"
|
||||
transform="rotate(90)" /></g><g
|
||||
id="g44490"
|
||||
transform="rotate(31.072797,31.949858,35.560981)"><rect
|
||||
style="opacity:0.437632;fill:#000000;fill-opacity:1;stroke:none;stroke-width:184.065;stroke-linecap:square;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect44482"
|
||||
width="2.1857765"
|
||||
height="1.8981743"
|
||||
x="18.830223"
|
||||
y="34.318436"
|
||||
ry="0.80296504" /><rect
|
||||
style="opacity:0.437632;fill:#000000;fill-opacity:1;stroke:none;stroke-width:184.065;stroke-linecap:square;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect44484"
|
||||
width="2.1857765"
|
||||
height="1.8981743"
|
||||
x="42.873764"
|
||||
y="34.318436"
|
||||
ry="0.80296504" /><rect
|
||||
style="opacity:0.437632;fill:#000000;fill-opacity:1;stroke:none;stroke-width:184.065;stroke-linecap:square;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect44486"
|
||||
width="2.1857765"
|
||||
height="1.8981743"
|
||||
x="22.447657"
|
||||
y="-32.89397"
|
||||
ry="0.80296504"
|
||||
transform="rotate(90)" /><rect
|
||||
style="opacity:0.437632;fill:#000000;fill-opacity:1;stroke:none;stroke-width:184.065;stroke-linecap:square;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect44488"
|
||||
width="2.1857765"
|
||||
height="1.8981743"
|
||||
x="46.491196"
|
||||
y="-32.89397"
|
||||
ry="0.80296504"
|
||||
transform="rotate(90)" /></g><g
|
||||
id="g44500"
|
||||
transform="rotate(59.678732,31.945314,35.562358)"><rect
|
||||
style="opacity:0.437632;fill:#000000;fill-opacity:1;stroke:none;stroke-width:184.065;stroke-linecap:square;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect44492"
|
||||
width="2.1857765"
|
||||
height="1.8981743"
|
||||
x="18.830223"
|
||||
y="34.318436"
|
||||
ry="0.80296504" /><rect
|
||||
style="opacity:0.437632;fill:#000000;fill-opacity:1;stroke:none;stroke-width:184.065;stroke-linecap:square;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect44494"
|
||||
width="2.1857765"
|
||||
height="1.8981743"
|
||||
x="42.873764"
|
||||
y="34.318436"
|
||||
ry="0.80296504" /><rect
|
||||
style="opacity:0.437632;fill:#000000;fill-opacity:1;stroke:none;stroke-width:184.065;stroke-linecap:square;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect44496"
|
||||
width="2.1857765"
|
||||
height="1.8981743"
|
||||
x="22.447657"
|
||||
y="-32.89397"
|
||||
ry="0.80296504"
|
||||
transform="rotate(90)" /><rect
|
||||
style="opacity:0.437632;fill:#000000;fill-opacity:1;stroke:none;stroke-width:184.065;stroke-linecap:square;stroke-opacity:1;paint-order:markers stroke fill"
|
||||
id="rect44498"
|
||||
width="2.1857765"
|
||||
height="1.8981743"
|
||||
x="46.491196"
|
||||
y="-32.89397"
|
||||
ry="0.80296504"
|
||||
transform="rotate(90)" /></g></g></g></svg>
|
||||
|
After Width: | Height: | Size: 11 KiB |
|
|
@ -0,0 +1,43 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dghmmuwu5hr8e"
|
||||
path="res://.godot/imported/Timeline.svg-f58e429fe74f50d9853fd6498e486130.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://addons/rokojori_action_library/Icons/Timeline.svg"
|
||||
dest_files=["res://.godot/imported/Timeline.svg-f58e429fe74f50d9853fd6498e486130.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
compress/mode=0
|
||||
compress/high_quality=false
|
||||
compress/lossy_quality=0.7
|
||||
compress/uastc_level=0
|
||||
compress/rdo_quality_loss=0.0
|
||||
compress/hdr_compression=1
|
||||
compress/normal_map=0
|
||||
compress/channel_pack=0
|
||||
mipmaps/generate=false
|
||||
mipmaps/limit=-1
|
||||
roughness/mode=0
|
||||
roughness/src_normal=""
|
||||
process/channel_remap/red=0
|
||||
process/channel_remap/green=1
|
||||
process/channel_remap/blue=2
|
||||
process/channel_remap/alpha=3
|
||||
process/fix_alpha_border=true
|
||||
process/premult_alpha=false
|
||||
process/normal_map_invert_y=false
|
||||
process/hdr_as_srgb=false
|
||||
process/hdr_clamp_exposure=false
|
||||
process/size_limit=0
|
||||
detect_3d/compress_to=1
|
||||
svg/scale=1.0
|
||||
editor/scale_with_editor_scale=false
|
||||
editor/convert_colors_with_editor_theme=false
|
||||
|
|
@ -5,17 +5,58 @@ using System.Collections.Generic;
|
|||
using System.Globalization;
|
||||
using System;
|
||||
using System.Data;
|
||||
|
||||
#if ! ROKOJORI_ACTION_CORE
|
||||
using Rokojori.Tools;
|
||||
#endif
|
||||
|
||||
namespace Rokojori
|
||||
{
|
||||
#if ! TOOLS
|
||||
[Tool]
|
||||
public partial class RokojoriPlugin:Node
|
||||
|
||||
#if ROKOJORI_ACTION_CORE
|
||||
[Tool][RokojoriActionCoreExport]
|
||||
public partial class RokojoriPlugin:EditorPlugin
|
||||
{
|
||||
#if ROKOJORI_ACTION_CORE_GD
|
||||
public static readonly string _path = "res://addons/rokojori_action_code_gd";
|
||||
#else
|
||||
public static readonly string _path = "res://addons/rokojori_action_code_cs";
|
||||
#endif
|
||||
|
||||
public static string Path( string path )
|
||||
{
|
||||
return RokojoriPlugin._path + "/" + path;
|
||||
}
|
||||
|
||||
public static string GlobalizedPath( string path )
|
||||
{
|
||||
return ProjectSettings.GlobalizePath( Path( path ) );
|
||||
}
|
||||
|
||||
static readonly string RokojoriRootAutoLoad = "RokojoriRootAutoLoad";
|
||||
|
||||
#if ROKOJORI_ACTION_CORE_GD
|
||||
public static readonly string RokojoriRootAutoLoadPath = Path( "Runtime/Godot/RJ_Root.cs" );
|
||||
#else
|
||||
public static readonly string RokojoriRootAutoLoadPath = Path( "Runtime/Godot/Root.cs" );
|
||||
#endif
|
||||
|
||||
|
||||
public override void _EnablePlugin()
|
||||
{
|
||||
AddAutoloadSingleton( RokojoriRootAutoLoad, RokojoriRootAutoLoadPath );
|
||||
}
|
||||
|
||||
public override void _DisablePlugin()
|
||||
{
|
||||
RemoveAutoloadSingleton( RokojoriRootAutoLoad );
|
||||
}
|
||||
|
||||
}
|
||||
#else
|
||||
#endif
|
||||
|
||||
#elif ! ROKOJORI_ACTION_CORE
|
||||
[Tool]
|
||||
public partial class RokojoriPlugin: EditorPlugin
|
||||
{
|
||||
|
|
@ -109,12 +150,9 @@ namespace Rokojori
|
|||
}
|
||||
|
||||
|
||||
static readonly string ProblemsExplorerPath = "res://addons/rokojori_action_library/Tools/Messages/Messages.tscn";
|
||||
static Control messages;
|
||||
|
||||
public override void _EnterTree()
|
||||
{
|
||||
// _instance = this;
|
||||
|
||||
EnsureHiddenProjectPath( RokojoriProjectInternalPath );
|
||||
EnsureHiddenProjectPath( RokojoriSettingsPath );
|
||||
|
|
@ -126,39 +164,12 @@ namespace Rokojori
|
|||
|
||||
inspectorTools.rokojoriPlugin = this;
|
||||
inspectorTools.AddPlugins();
|
||||
// var pePackedScene = GD.Load<PackedScene>( ProblemsExplorerPath );
|
||||
|
||||
// if ( pePackedScene != null )
|
||||
// {
|
||||
// // this.LogInfo( "Problems Explorer found: ", pePackedScene );
|
||||
|
||||
// messages = ((PackedScene)pePackedScene).Instantiate<Control>();
|
||||
|
||||
// var ui = messages.Get<UI>();
|
||||
// ui.BindOwnChildren();
|
||||
|
||||
|
||||
|
||||
// var shortCut = new Shortcut();
|
||||
// shortCut.Events = [ new InputEventKey{ CtrlPressed = true, Keycode = Key.U } ];
|
||||
|
||||
// AddControlToDock( DockSlot.RightBr, messages, shortCut );
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// this.LogInfo( "Problems Explorer not found: ", ProblemsExplorerPath );
|
||||
// }
|
||||
}
|
||||
|
||||
public override void _ExitTree()
|
||||
{
|
||||
this.LogInfo();
|
||||
|
||||
if ( messages != null )
|
||||
{
|
||||
RemoveControlFromDocks( messages );
|
||||
}
|
||||
|
||||
RemoveNode3DGizmoPlugin( gizmoDrawerPlugin );
|
||||
|
||||
inspectorTools.rokojoriPlugin = this;
|
||||
|
|
@ -234,10 +245,6 @@ namespace Rokojori
|
|||
|
||||
editingScene.ForEach<IAssemblyReload>( ar => ar.OnAssemblyReloaded() );
|
||||
|
||||
if ( messages != null )
|
||||
{
|
||||
messages.ForEach<IAssemblyReload>( ar => ar.OnAssemblyReloaded() );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,19 @@ using Godot;
|
|||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
[Tool]
|
||||
[GlobalClass, Icon("res://addons/rokojori_action_library/Icons/Action.svg")]
|
||||
[RokojoriActionCoreExport]
|
||||
public partial class Action : NetworkNode
|
||||
public abstract partial class Action : NetworkNode
|
||||
{
|
||||
#if ROKOJORI_ACTION_CORE
|
||||
protected int networkSeed => 0;
|
||||
|
||||
#endif
|
||||
|
||||
public enum ActionTriggerMode
|
||||
{
|
||||
Only_When_Processing_In_Hierarchy,
|
||||
|
|
@ -33,7 +39,7 @@ public partial class Action : NetworkNode
|
|||
#endif
|
||||
|
||||
[ExportToolButton( "Trigger Action in Editor")]
|
||||
public Callable TriggerActionButton => Callable.From( ()=> Trigger() );
|
||||
public Callable triggerActionButton => Callable.From( ()=> Trigger() );
|
||||
|
||||
#if !ROKOJORI_ACTION_CORE
|
||||
|
||||
|
|
@ -194,7 +200,7 @@ public partial class Action : NetworkNode
|
|||
return _sendingNetworkSeed;
|
||||
}
|
||||
|
||||
_sendingNetworkSeed = GodotRandom.Get().IntegerExclusive( 0, maxNetworkSeed );
|
||||
_sendingNetworkSeed = GodotRandom.Get().IntegerExclusiveInRange( 0, maxNetworkSeed );
|
||||
_sendsSeed = true;
|
||||
|
||||
return _sendingNetworkSeed;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
/** <summary>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,10 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
namespace Rokojori
|
||||
{
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
[RokojoriActionCoreExport]
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/ActionReference.svg")]
|
||||
public partial class ActionReference : Action
|
||||
{
|
||||
|
|
@ -31,4 +33,3 @@ namespace Rokojori
|
|||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
using Godot;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
using Godot;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
[Tool]
|
||||
|
|
@ -19,11 +20,11 @@ public partial class MusicChannelPlayer:Node
|
|||
|
||||
public void TweenVolume( AudioStreamPlayer target, float duration, float toVolume, bool clear, System.Action onReady = null )
|
||||
{
|
||||
var tl = TimeLineManager.Ensure( null );
|
||||
var tl = TimelineManager.Ensure( null );
|
||||
var start = tl.position;
|
||||
var fromVolume = target.VolumeLinear;
|
||||
|
||||
TimeLineManager.ScheduleSpanIn( tl, 0, duration,
|
||||
TimelineManager.ScheduleSpanIn( tl, 0, duration,
|
||||
( span, type )=>
|
||||
{
|
||||
if ( ! GodotObject.IsInstanceValid( target ) )
|
||||
|
|
@ -34,7 +35,7 @@ public partial class MusicChannelPlayer:Node
|
|||
var lerpedVolume = Mathf.Lerp( fromVolume, toVolume, span.phase );
|
||||
target.VolumeLinear = lerpedVolume;
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End && clear )
|
||||
if ( type == TimelineSpanUpdateType.End && clear )
|
||||
{
|
||||
if ( clear )
|
||||
{
|
||||
|
|
@ -71,7 +72,7 @@ public partial class MusicChannelPlayer:Node
|
|||
|
||||
this.LogInfo( "Playing:", nextMusic );
|
||||
|
||||
var name = FilePath.Absolute( nextMusic.audio.ResourcePath ).fileName;
|
||||
var name = nextMusic.audio.ResourcePath.ExtractFileName();
|
||||
var nextPlayer = this.CreateChild<AudioStreamPlayer>( "Player " + name );
|
||||
nextPlayer.VolumeLinear = 0f;
|
||||
nextPlayer.Stream = nextMusic.audio;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
using Godot;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
[Tool]
|
||||
|
|
@ -19,7 +20,8 @@ public partial class MusicData: Resource
|
|||
public override string ToString()
|
||||
{
|
||||
var prefix = pitchSemitonesOffset == 0 ? "+/-" : pitchSemitonesOffset > 0 ? "+" : "";
|
||||
return "MusicData: " + (100 * volume)._FF() + "% (" + prefix + pitchSemitonesOffset + " st) " + audio.ResourcePath;
|
||||
var volumeString = ( int) ( 100 * volume);
|
||||
return "MusicData: " + volumeString+ "% (" + prefix + pitchSemitonesOffset + " st) " + audio.ResourcePath;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -31,7 +32,7 @@ namespace Rokojori
|
|||
public bool cacheEndPositionOnStart = true;
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
|
||||
protected override void _OnTrigger()
|
||||
|
|
@ -41,7 +42,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
var tl = TimeLineManager.Ensure( timeLine );
|
||||
var tl = TimelineManager.Ensure( timeLine );
|
||||
|
||||
var start = tl.position;
|
||||
|
||||
|
|
@ -57,7 +58,7 @@ namespace Rokojori
|
|||
tweenType = TweenTimeCurve.defaultCurve;
|
||||
}
|
||||
|
||||
TimeLineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
TimelineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
( span, type )=>
|
||||
{
|
||||
if ( ! GodotObject.IsInstanceValid( target ) )
|
||||
|
|
@ -80,7 +81,7 @@ namespace Rokojori
|
|||
|
||||
target.VolumeDb = lerpedVolume;
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
DispatchEnd( sequenceID );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using Godot;
|
|||
using System.Collections.Generic;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using Godot;
|
|||
using System.Collections.Generic;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -35,7 +36,7 @@ namespace Rokojori
|
|||
{
|
||||
_isCoolingDown = coolDownDuration != null;
|
||||
|
||||
var te = TimeLineManager.ScheduleEventIn(
|
||||
var te = TimelineManager.ScheduleEventIn(
|
||||
coolDownDuration.timeLine,
|
||||
coolDownDuration.GetDurationInSeconds(),
|
||||
ev =>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using Godot;
|
|||
using System.Collections.Generic;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using Godot;
|
|||
using System.Collections.Generic;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using Godot;
|
|||
using System.Collections.Generic;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using Godot;
|
|||
using System.Collections.Generic;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using Godot;
|
|||
using System.Collections.Generic;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using Godot;
|
|||
using System.Collections.Generic;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass ]
|
||||
|
|
@ -21,7 +22,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
iterationIndex = MathX.Repeat( iterationIndex, num );
|
||||
iterationIndex = MathX.RepeatInt( iterationIndex, num );
|
||||
|
||||
Action.TriggerSafe( this.GetNthDirectChild<Action>( iterationIndex ) );
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/SetNodeState.svg")]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/SetNodeState.svg")]
|
||||
|
|
@ -20,7 +21,7 @@ namespace Rokojori
|
|||
|
||||
void SetNodeState()
|
||||
{
|
||||
NodeState.Configure( target, configuration );
|
||||
NodeState.ConfigureWith( target, configuration );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/SetNodeState.svg")]
|
||||
|
|
@ -60,7 +61,7 @@ namespace Rokojori
|
|||
var enbled = state == PhysicsState.Physics_Enabled;
|
||||
var trillian = enbled ? Trillean.True : Trillean.False;
|
||||
|
||||
NodeState.Configure( physicsBody,
|
||||
NodeState.PartialConfigure( physicsBody,
|
||||
trillian, trillian, trillian,
|
||||
trillian, Trillean.Any, false, ProcessModeEnum.Inherit );
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[GlobalClass, Tool ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[GlobalClass, Tool ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[GlobalClass, Tool ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[GlobalClass, Tool ]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass ]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[GlobalClass, Tool ]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass ]
|
||||
|
|
@ -36,8 +37,8 @@ namespace Rokojori
|
|||
|
||||
var startPosition = target.GlobalPosition;
|
||||
|
||||
_currentSpanAnimationID = TimeLineManager.ScheduleSpanIn( duration.timeLine, 0, duration.GetDurationInSeconds(),
|
||||
( TimeLineSpan span, TimeLineSpanUpdateType type )=>
|
||||
_currentSpanAnimationID = TimelineManager.ScheduleSpanIn( duration.timeLine, 0, duration.GetDurationInSeconds(),
|
||||
( TimelineSpan span, TimelineSpanUpdateType type )=>
|
||||
{
|
||||
if ( span.id != _currentSpanAnimationID )
|
||||
{
|
||||
|
|
@ -52,7 +53,7 @@ namespace Rokojori
|
|||
target.GlobalPosition = startPosition.Lerp( goal.GlobalPosition, span.phase );;
|
||||
|
||||
|
||||
if ( TimeLineSpanUpdateType.End == type )
|
||||
if ( TimelineSpanUpdateType.End == type )
|
||||
{
|
||||
AnimationManager.EndAnimation( this, target, AnimationMember.Position );
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass ]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||
using Godot;
|
||||
using Rokojori;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -93,7 +94,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
var tm = Unique<TimeLineManager>.Get();
|
||||
var tm = Unique<TimelineManager>.Get();
|
||||
|
||||
if ( tm == null )
|
||||
{
|
||||
|
|
@ -129,7 +130,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
var tm = Unique<TimeLineManager>.Get();
|
||||
var tm = Unique<TimelineManager>.Get();
|
||||
|
||||
if ( tm == null )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/PlayParticles.svg")]
|
||||
|
|
@ -17,7 +18,7 @@ namespace Rokojori
|
|||
public float godotFinishedReporingBugOffset = 0.2f;
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
List<GpuParticles3D> _pool = new List<GpuParticles3D>();
|
||||
List<bool> _emitting = new List<bool>();
|
||||
|
|
@ -60,7 +61,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
TimeLineManager.ScheduleEventIn(
|
||||
TimelineManager.ScheduleEventIn(
|
||||
timeLine,
|
||||
godotFinishedReporingBugOffset,
|
||||
t => _emitting[ index ] = false
|
||||
|
|
|
|||
|
|
@ -2,8 +2,10 @@
|
|||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[RokojoriActionCoreExport]
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/PlaySound.svg")]
|
||||
public partial class PlaySound:Action
|
||||
{
|
||||
|
|
@ -48,7 +50,7 @@ namespace Rokojori
|
|||
public bool generatePools = true;
|
||||
|
||||
|
||||
List<AudioStreamPlayer3D> players = new List<AudioStreamPlayer3D>();
|
||||
List<AudioStreamPlayer3D> players = [];
|
||||
|
||||
AudioStreamPlayer3D _cached = null;
|
||||
|
||||
|
|
@ -126,7 +128,7 @@ namespace Rokojori
|
|||
|
||||
var length = player.Stream.GetLength();
|
||||
var numOffsets = Mathf.FloorToInt( length / durationPerSound.GetDurationInSeconds() );
|
||||
var randomIndex = random.IntegerExclusive( numOffsets );
|
||||
var randomIndex = random.IntegerExclusivePositive( numOffsets );
|
||||
offset = randomIndex * durationPerSound.GetDurationInSeconds();
|
||||
|
||||
// this.LogInfo( "Offset", numOffsets, randomIndex, offset );
|
||||
|
|
@ -143,12 +145,12 @@ namespace Rokojori
|
|||
|
||||
if ( audioManager != null && randomizePlaybackPosition )
|
||||
{
|
||||
var tl = TimeLineManager.Ensure( durationPerSound.timeLine );
|
||||
var tl = TimelineManager.Ensure( durationPerSound.timeLine );
|
||||
|
||||
var start = tl.position;
|
||||
|
||||
var stopDuration = ( durationPerSound.GetDurationInSeconds() - audioManager.data.bufferCutDuration * cutBufferLengths ) / player.PitchScale;
|
||||
TimeLineManager.ScheduleSpanIn( durationPerSound.timeLine, 0, stopDuration,
|
||||
TimelineManager.ScheduleSpanIn( durationPerSound.timeLine, 0, stopDuration,
|
||||
( span, type )=>
|
||||
{
|
||||
var timeNow = tl.position;
|
||||
|
|
@ -156,7 +158,7 @@ namespace Rokojori
|
|||
|
||||
var phase = span.phase;
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
player.Stop();
|
||||
player.Playing = false;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[GlobalClass, Tool ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[GlobalClass, Tool ]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -33,7 +34,7 @@ namespace Rokojori
|
|||
public bool cacheEndVolumeOnStart = true;
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
|
||||
public void OnAnimatorStart(){}
|
||||
|
|
@ -69,7 +70,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
var tl = TimeLineManager.Ensure( timeLine );
|
||||
var tl = TimelineManager.Ensure( timeLine );
|
||||
|
||||
var start = tl.position;
|
||||
|
||||
|
|
@ -95,7 +96,7 @@ namespace Rokojori
|
|||
|
||||
AnimationManager.StartAnimation( this, target, AnimationMember.VolumeDB );
|
||||
|
||||
TimeLineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
TimelineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
( span, type )=>
|
||||
{
|
||||
if ( ! AnimationManager.IsAnimating( this, target, AnimationMember.VolumeDB ) )
|
||||
|
|
@ -119,7 +120,7 @@ namespace Rokojori
|
|||
|
||||
// this.LogInfo( "Volume", lerpedVolume );
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
DispatchEnd( sequenceID );
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,10 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
namespace Rokojori
|
||||
{
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
[RokojoriActionCoreExport]
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/OnEvent.svg") ]
|
||||
public partial class OnPhysicsProcess : Node
|
||||
{
|
||||
|
|
@ -20,4 +22,3 @@ namespace Rokojori
|
|||
Action.TriggerAllActions( actions, this, triggerDirectChildren );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,8 +2,10 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
namespace Rokojori
|
||||
{
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
[RokojoriActionCoreExport]
|
||||
[GlobalClass, Tool, Icon("res://addons/rokojori_action_library/Icons/OnEvent.svg") ]
|
||||
public partial class OnProcess : Node
|
||||
{
|
||||
|
|
@ -28,4 +30,3 @@ namespace Rokojori
|
|||
Action.TriggerAllActions( actions, this, triggerDirectChildren );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,8 +2,10 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
namespace Rokojori
|
||||
{
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
[RokojoriActionCoreExport]
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/OnEvent.svg") ]
|
||||
public partial class OnReady : Node
|
||||
{
|
||||
|
|
@ -18,8 +20,15 @@ namespace Rokojori
|
|||
[Export]
|
||||
public bool triggerInsideEditor = false;
|
||||
|
||||
public Action.ActionTriggerMode additionalMode = Action.ActionTriggerMode.Always;
|
||||
public Trillean someTrillean = Trillean.False;
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
additionalMode = Action.ActionTriggerMode.Only_When_Processing_In_Hierarchy;
|
||||
|
||||
var nas = Trillean.Any;
|
||||
|
||||
if ( Engine.IsEditorHint() && ! triggerInsideEditor )
|
||||
{
|
||||
return;
|
||||
|
|
@ -28,4 +37,3 @@ namespace Rokojori
|
|||
Action.TriggerAllActions( actions, this, triggerDirectChildren );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -66,10 +67,10 @@ namespace Rokojori
|
|||
|
||||
if ( _eventID != -1 )
|
||||
{
|
||||
TimeLineManager.RemoveEvent( timeLine, _eventID );
|
||||
TimelineManager.RemoveEvent( timeLine, _eventID );
|
||||
}
|
||||
|
||||
var tle = TimeLineManager.ScheduleLoopEvent( timeLine, duration, offset, tle => Action.TriggerSafe( action ) );
|
||||
var tle = TimelineManager.ScheduleLoopEvent( timeLine, duration, offset, tle => Action.TriggerSafe( action ) );
|
||||
|
||||
_eventID = tle.id;
|
||||
}
|
||||
|
|
@ -83,7 +84,7 @@ namespace Rokojori
|
|||
}
|
||||
|
||||
|
||||
TimeLineManager.RemoveEvent( timeLine, _eventID );
|
||||
TimelineManager.RemoveEvent( timeLine, _eventID );
|
||||
_eventID = -1;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using Godot.Collections;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[GlobalClass,Tool]
|
||||
|
|
|
|||
|
|
@ -2,8 +2,10 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
namespace Rokojori
|
||||
{
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
[RokojoriActionCoreExport]
|
||||
[Tool][GlobalClass]
|
||||
public partial class QuitApp : Action
|
||||
{
|
||||
|
|
@ -13,4 +15,3 @@ namespace Rokojori
|
|||
GetTree().Quit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/RemoveNode.svg")]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/Parallel.svg") ]
|
||||
|
|
@ -30,31 +31,36 @@ namespace Rokojori
|
|||
public bool errorsCountAsFinished = false;
|
||||
|
||||
|
||||
Dictionary<int,int> numFinished = new Dictionary<int, int>();
|
||||
Dictionary<int,bool> running = new Dictionary<int, bool>();
|
||||
|
||||
protected override void _OnTrigger()
|
||||
{
|
||||
|
||||
var actions = new List<Action>( this.actions );
|
||||
var allActions = new List<Action>( this.actions );
|
||||
|
||||
|
||||
if ( triggerDirectChildren )
|
||||
{
|
||||
Nodes.ForEachDirectChild<Action>( this, a => actions.Add( a ) );
|
||||
Nodes.ForEachDirectChild<Action>( this, a => allActions.Add( a ) );
|
||||
}
|
||||
|
||||
var sequenceActions = Lists.FilterAndMap( actions, ( a, i ) => a is SequenceAction, a => (SequenceAction) a );
|
||||
var sequenceActions = ListExtensions.FilterType<Action,SequenceAction>( allActions);
|
||||
|
||||
var sequenceID = DispatchStart();
|
||||
|
||||
if ( ! ignoreNonSequenceActions && sequenceActions.Count != actions.Count && Mode.First_Finishes_Sequence == mode )
|
||||
if ( ! ignoreNonSequenceActions && sequenceActions.Count != allActions.Count && Mode.First_Finishes_Sequence == mode )
|
||||
{
|
||||
actions.ForEach( a => Action.TriggerSafe( a ) );
|
||||
allActions.ForEach( a => Action.TriggerSafe( a ) );
|
||||
DispatchEnd( sequenceID );
|
||||
return;
|
||||
}
|
||||
|
||||
numFinished[ sequenceID ] = 0;
|
||||
running[ sequenceID ] = true;
|
||||
|
||||
var numFinished = 0;
|
||||
var running = true;
|
||||
// var numFinished = 0;
|
||||
// var running = true;
|
||||
|
||||
sequenceActions.ForEach(
|
||||
sa =>
|
||||
|
|
@ -64,27 +70,27 @@ namespace Rokojori
|
|||
{
|
||||
// this.LogInfo( "Sequence Action finished:", HierarchyName.Of( sa ) );
|
||||
|
||||
if ( ! running )
|
||||
if ( ! running.ContainsKey( sequenceID ) )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if ( fe.success || errorsCountAsFinished )
|
||||
{
|
||||
numFinished ++;
|
||||
numFinished[ sequenceID ] = numFinished[ sequenceID ] + 1;
|
||||
|
||||
if ( Mode.First_Finishes_Sequence == mode )
|
||||
{
|
||||
running = false;
|
||||
running.Remove( sequenceID );
|
||||
// this.LogInfo( "DispatchEnd for First_Finishes_Sequence" );
|
||||
DispatchEnd( sequenceID );
|
||||
|
||||
}
|
||||
else if ( Mode.Wait_For_All_To_Finish == mode )
|
||||
{
|
||||
if ( numFinished == sequenceActions.Count )
|
||||
if ( numFinished[ sequenceID ] == sequenceActions.Count )
|
||||
{
|
||||
running = false;
|
||||
running.Remove( sequenceID );
|
||||
// this.LogInfo( "DispatchEnd for Wait_For_All_To_Finish" );
|
||||
DispatchEnd( sequenceID );
|
||||
}
|
||||
|
|
@ -92,7 +98,7 @@ namespace Rokojori
|
|||
}
|
||||
else
|
||||
{
|
||||
running = false;
|
||||
running.Remove( sequenceID );
|
||||
// this.LogInfo( "DispatchCancelled for Wait_For_All_To_Finish" );
|
||||
DispatchCancelled( sequenceID );
|
||||
}
|
||||
|
|
@ -101,7 +107,7 @@ namespace Rokojori
|
|||
}
|
||||
);
|
||||
|
||||
actions.ForEach( a => Action.TriggerSafe( a ) );
|
||||
allActions.ForEach( a => Action.TriggerSafe( a ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
|
||||
|
|
@ -19,7 +20,7 @@ namespace Rokojori
|
|||
public float maxRepeatDuration = 60;
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
|
||||
bool stopSignal = false;
|
||||
|
|
@ -43,7 +44,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
var tl = TimeLineManager.Ensure( timeLine );
|
||||
var tl = TimelineManager.Ensure( timeLine );
|
||||
|
||||
if ( maxNumRepeats <= 0 && ( tl == null || maxRepeatDuration <= 0 ) )
|
||||
{
|
||||
|
|
@ -63,7 +64,7 @@ namespace Rokojori
|
|||
public class RepeatSequenceRunner
|
||||
{
|
||||
public RepeatSequence repeatSequence;
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
public int sequenceID;
|
||||
public int maxRepeats = 0;
|
||||
public int started = 0;
|
||||
|
|
@ -74,7 +75,7 @@ namespace Rokojori
|
|||
{
|
||||
this.repeatSequence = repeatSequence;
|
||||
this.sequenceID = id;
|
||||
timeLine = TimeLineManager.Ensure( repeatSequence.timeLine );
|
||||
timeLine = TimelineManager.Ensure( repeatSequence.timeLine );
|
||||
startTime = timeLine.position;
|
||||
endTime = startTime + repeatSequence.maxRepeatDuration;
|
||||
maxRepeats = repeatSequence.maxNumRepeats;
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
|
||||
|
|
@ -227,7 +228,7 @@ namespace Rokojori
|
|||
Nodes.ForEachDirectChild<Action>( this, a => run.actions.Add( a ) );
|
||||
}
|
||||
|
||||
run.sequencables = Lists.FilterType<Action,SequenceAction>( run.actions );
|
||||
run.sequencables = ListExtensions.FilterType<Action,SequenceAction>( run.actions );
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using Godot;
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
|
||||
|
|
@ -11,12 +12,6 @@ namespace Rokojori
|
|||
[RokojoriActionCoreExport]
|
||||
public abstract partial class SequenceAction : Action
|
||||
{
|
||||
public class FinishedEvent
|
||||
{
|
||||
public int id;
|
||||
public bool success;
|
||||
}
|
||||
|
||||
[ExportGroup("Debugging")]
|
||||
[ExportToolButton("Clear Listeners")]
|
||||
public Callable clearListeners => Callable.From(
|
||||
|
|
@ -41,10 +36,13 @@ namespace Rokojori
|
|||
return _dispatchCounter;
|
||||
}
|
||||
|
||||
public readonly EventSlot<SequenceAction.FinishedEvent> onSequenceDone = new EventSlot<SequenceAction.FinishedEvent>();
|
||||
public readonly EventSlot<SequenceActionFinishedEvent> onSequenceDone = new EventSlot<SequenceActionFinishedEvent>();
|
||||
|
||||
|
||||
|
||||
public int DispatchStart()
|
||||
{
|
||||
|
||||
_dispatchCounter ++;
|
||||
|
||||
if ( showRunningSequences )
|
||||
|
|
@ -61,7 +59,7 @@ namespace Rokojori
|
|||
{
|
||||
_running.Remove( id );
|
||||
|
||||
var ev = new SequenceAction.FinishedEvent{ id = id, success = true };
|
||||
var ev = new SequenceActionFinishedEvent{ id = id, success = true };
|
||||
onSequenceDone.DispatchEvent( ev );
|
||||
|
||||
if ( showRunningSequences )
|
||||
|
|
@ -76,7 +74,7 @@ namespace Rokojori
|
|||
{
|
||||
_running.Remove( id );
|
||||
|
||||
var ev = new SequenceAction.FinishedEvent{ id = id, success = true };
|
||||
var ev = new SequenceActionFinishedEvent{ id = id, success = true };
|
||||
onSequenceDone.DispatchEvent( ev );
|
||||
|
||||
if ( showRunningSequences )
|
||||
|
|
@ -89,14 +87,10 @@ namespace Rokojori
|
|||
|
||||
public virtual void CancelAllRunning()
|
||||
{
|
||||
var runningList = _running.ToArray();
|
||||
|
||||
runningList.ForEach(
|
||||
( id )=>
|
||||
foreach ( var r in _running )
|
||||
{
|
||||
CancelAction( id );
|
||||
CancelAction( r );
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
public virtual void CancelAction( int id )
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
|
||||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
public class SequenceActionFinishedEvent
|
||||
{
|
||||
public int id;
|
||||
public bool success;
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
uid://k3685pvc4n6h
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/SequenceActionReference.svg")]
|
||||
|
|
@ -35,7 +36,7 @@ namespace Rokojori
|
|||
var ownID = DispatchStart();
|
||||
var referenceID = -1;
|
||||
|
||||
System.Action<SequenceAction.FinishedEvent> callback = ( se )=>
|
||||
System.Action<SequenceActionFinishedEvent> callback = ( se )=>
|
||||
{
|
||||
if ( se.id != referenceID )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,8 +6,9 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
namespace Rokojori
|
||||
{
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori;
|
||||
|
||||
public class SequenceRunner
|
||||
{
|
||||
public Sequence sequence;
|
||||
|
|
@ -88,15 +89,15 @@ namespace Rokojori
|
|||
StartAction( sequenceAction );
|
||||
}
|
||||
|
||||
Dictionary<SequenceAction,System.Action<SequenceAction.FinishedEvent>> callbacks =
|
||||
new Dictionary<SequenceAction, System.Action<SequenceAction.FinishedEvent>>();
|
||||
Dictionary<SequenceAction,System.Action<SequenceActionFinishedEvent>> callbacks =
|
||||
new Dictionary<SequenceAction, System.Action<SequenceActionFinishedEvent>>();
|
||||
|
||||
void StartAction( SequenceAction action )
|
||||
{
|
||||
var capturedAction = action;
|
||||
|
||||
System.Action<SequenceAction.FinishedEvent> callback =
|
||||
( SequenceAction.FinishedEvent ev ) =>
|
||||
System.Action<SequenceActionFinishedEvent> callback =
|
||||
( SequenceActionFinishedEvent ev ) =>
|
||||
{
|
||||
|
||||
|
||||
|
|
@ -139,7 +140,7 @@ namespace Rokojori
|
|||
*/
|
||||
}
|
||||
|
||||
void RunNext( SequenceAction action, System.Action<SequenceAction.FinishedEvent> callback )
|
||||
void RunNext( SequenceAction action, System.Action<SequenceActionFinishedEvent> callback )
|
||||
{
|
||||
_runningAction = action;
|
||||
callbacks[ _runningAction ] = callback;
|
||||
|
|
@ -157,7 +158,7 @@ namespace Rokojori
|
|||
|
||||
for ( int i = actionIndex - 1; i >= 0; i -- )
|
||||
{
|
||||
if ( typeof( SequenceAction ).IsAssignableFrom( actions[ i ].GetType() ) )
|
||||
if ( TypeTools.IsOfType<SequenceAction>( actions[ i ] ) )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -175,7 +176,7 @@ namespace Rokojori
|
|||
|
||||
for ( int i = actionIndex + 1; i < actions.Count; i ++ )
|
||||
{
|
||||
if ( typeof( SequenceAction ).IsAssignableFrom( actions[ i ].GetType() ) )
|
||||
if ( TypeTools.IsOfType<SequenceAction>( actions[ i ] ) )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -189,4 +190,3 @@ namespace Rokojori
|
|||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/Parallel.svg") ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass ]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System.Linq;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass ]
|
||||
|
|
@ -38,7 +39,7 @@ namespace Rokojori
|
|||
}
|
||||
|
||||
var configuration = soloNode == n ? soloConfig : muteConfig;
|
||||
NodeState.Configure( n, configuration );
|
||||
NodeState.ConfigureWith( n, configuration );
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,10 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[RokojoriActionCoreExport]
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/Delay.svg")]
|
||||
public partial class Delay : SequenceAction
|
||||
{
|
||||
|
|
@ -11,7 +13,7 @@ namespace Rokojori
|
|||
public float duration;
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
|
||||
protected override void _OnTrigger()
|
||||
|
|
@ -22,13 +24,13 @@ namespace Rokojori
|
|||
|
||||
if ( Engine.IsEditorHint() )
|
||||
{
|
||||
TimeLineManager.ScheduleSpanIn( timeLine, 0, duration ,
|
||||
TimelineManager.ScheduleSpanIn(timeLine, 0, duration,
|
||||
( span, type )=>
|
||||
{
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
DispatchEnd( sequenceID );
|
||||
this.LogInfo( "time:", Time.GetTicksMsec() / 1000f );
|
||||
this.LogInfo( "time:", Godot.Time.GetTicksMsec() / 1000f );
|
||||
}
|
||||
},
|
||||
this
|
||||
|
|
@ -36,7 +38,7 @@ namespace Rokojori
|
|||
}
|
||||
else
|
||||
{
|
||||
var eventID = TimeLineManager.ScheduleEventIn( timeLine, duration,
|
||||
var eventID = TimelineManager.ScheduleEventIn( timeLine, duration,
|
||||
( tle ) =>
|
||||
{
|
||||
DispatchEnd( sequenceID );
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool][GlobalClass, Icon("res://addons/rokojori_action_library/Icons/Delay.svg")]
|
||||
|
|
@ -18,15 +19,15 @@ namespace Rokojori
|
|||
|
||||
if ( Engine.IsEditorHint() )
|
||||
{
|
||||
var timeLine = TimeLineManager.Ensure( null );
|
||||
var timeLine = TimelineManager.Ensure( null );
|
||||
|
||||
TimeLineManager.ScheduleSpanIn( timeLine, 0, numFrames * 1f/60f ,
|
||||
TimelineManager.ScheduleSpanIn( timeLine, 0, numFrames * 1f/60f ,
|
||||
( span, type )=>
|
||||
{
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
DispatchEnd( sequenceID );
|
||||
this.LogInfo( "time:", Time.GetTicksMsec() / 1000f );
|
||||
this.LogInfo( "time:", Godot.Time.GetTicksMsec() / 1000f );
|
||||
}
|
||||
},
|
||||
this
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using Godot;
|
|||
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -16,7 +17,7 @@ namespace Rokojori
|
|||
public float growDuration = 0.0f;
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
[Export]
|
||||
public Action[] actions = new Action[ 0 ];
|
||||
|
|
@ -41,7 +42,7 @@ namespace Rokojori
|
|||
|
||||
for ( int i = 0; i < list.Count; i++ )
|
||||
{
|
||||
TimeLineManager.ScheduleEventIn( timeLine, offset,
|
||||
TimelineManager.ScheduleEventIn( timeLine, offset,
|
||||
id =>
|
||||
{
|
||||
Action.TriggerSafe( list[ i ] );
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -16,7 +17,7 @@ namespace Rokojori
|
|||
public int numRepeats;
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
[Export]
|
||||
public Action action;
|
||||
|
|
@ -32,7 +33,7 @@ namespace Rokojori
|
|||
{
|
||||
for ( int i = 0; i < numRepeats; i++ )
|
||||
{
|
||||
TimeLineManager.ScheduleEventIn( timeLine, i * duration,
|
||||
TimelineManager.ScheduleEventIn( timeLine, i * duration,
|
||||
id =>
|
||||
{
|
||||
if ( i == 0 )
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -10,7 +11,7 @@ namespace Rokojori
|
|||
public partial class TweenTimeLineSpeed:SequenceAction
|
||||
{
|
||||
[Export]
|
||||
public TimeLine targetTimeLine;
|
||||
public Timeline targetTimeLine;
|
||||
|
||||
[Export]
|
||||
public float timeLineSpeed;
|
||||
|
|
@ -22,7 +23,7 @@ namespace Rokojori
|
|||
public bool cacheSpeedOnStart = true;
|
||||
|
||||
[Export]
|
||||
public TimeLine tweenTimeLine;
|
||||
public Timeline tweenTimeLine;
|
||||
|
||||
protected override void _OnTrigger()
|
||||
{
|
||||
|
|
@ -31,7 +32,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
var tl = tweenTimeLine == null ? TimeLineManager.Get().realtimeTimeline : tweenTimeLine;
|
||||
var tl = tweenTimeLine == null ? TimelineManager.Get().realtimeTimeline : tweenTimeLine;
|
||||
|
||||
var start = targetTimeLine.position;
|
||||
|
||||
|
|
@ -48,7 +49,7 @@ namespace Rokojori
|
|||
tweenType = TweenTimeCurve.defaultCurve;
|
||||
}
|
||||
|
||||
TimeLineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
TimelineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
( span, type )=>
|
||||
{
|
||||
var timeNow = tl.position;
|
||||
|
|
@ -65,7 +66,7 @@ namespace Rokojori
|
|||
|
||||
targetTimeLine.runner.speed = lerpedSpeed;
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
DispatchEnd( sequenceID );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -40,7 +41,7 @@ namespace Rokojori
|
|||
|
||||
_actionID = _id;
|
||||
|
||||
_animationID = TimeLineManager.ScheduleSpanWith( duration,
|
||||
_animationID = TimelineManager.ScheduleSpanWith( duration,
|
||||
( s, t ) =>
|
||||
{
|
||||
if ( _animationID != s.id )
|
||||
|
|
@ -53,7 +54,7 @@ namespace Rokojori
|
|||
|
||||
target.Set( intNumber + "" );
|
||||
|
||||
if ( TimeLineSpanUpdateType.End == t )
|
||||
if ( TimelineSpanUpdateType.End == t )
|
||||
{
|
||||
target.Set( endValue + "" );
|
||||
DispatchEnd( _id );
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -83,7 +84,7 @@ namespace Rokojori
|
|||
|
||||
this.LogInfo( "Start Value Float Tween", HierarchyName.OfAny( target ), target.GetType().Name, targetMemberPath, ">>", startValue );
|
||||
|
||||
_timeID = TimeLineManager.ScheduleSpanWith( duration,
|
||||
_timeID = TimelineManager.ScheduleSpanWith( duration,
|
||||
( span, type )=>
|
||||
{
|
||||
|
||||
|
|
@ -113,7 +114,7 @@ namespace Rokojori
|
|||
// target._Set( targetMember, value );
|
||||
SetTargetValue( target, targetMemberPath, value );
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
// this.LogInfo( "End Float Tween", endValue );
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -67,7 +68,7 @@ namespace Rokojori
|
|||
|
||||
AnimationManager.StartAnimation( this, compositorVFX, "driverValue" );
|
||||
|
||||
_timeID = TimeLineManager.ScheduleSpanWith( duration,
|
||||
_timeID = TimelineManager.ScheduleSpanWith( duration,
|
||||
( span, type )=>
|
||||
{
|
||||
|
||||
|
|
@ -93,7 +94,7 @@ namespace Rokojori
|
|||
|
||||
compositorVFX.driverValue = value;
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
compositorVFX.driverValue = value;
|
||||
AnimationManager.EndAnimation( this, compositorVFX, "driverValue" );
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -120,7 +121,7 @@ namespace Rokojori
|
|||
|
||||
this.LogInfo( "Start Value Float Tween", HierarchyName.OfAny( target ), target.GetType().Name, targetMemberPath, ">>", startValue );
|
||||
|
||||
_timeID = TimeLineManager.ScheduleSpanWith( duration,
|
||||
_timeID = TimelineManager.ScheduleSpanWith( duration,
|
||||
( span, type )=>
|
||||
{
|
||||
|
||||
|
|
@ -150,7 +151,7 @@ namespace Rokojori
|
|||
// target._Set( targetMember, value );
|
||||
SetTargetValue( target, targetMemberPath, value );
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
// this.LogInfo( "End Float Tween", endValue );
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -109,7 +110,7 @@ namespace Rokojori
|
|||
|
||||
// this.LogInfo( "Get Float Tween", startValue );
|
||||
|
||||
_timeID = TimeLineManager.ScheduleSpanWith( duration,
|
||||
_timeID = TimelineManager.ScheduleSpanWith( duration,
|
||||
( span, type )=>
|
||||
{
|
||||
|
||||
|
|
@ -138,7 +139,7 @@ namespace Rokojori
|
|||
propertyName.Set( material, value );
|
||||
// ReflectionHelper.SetValue( material, propertyName , value );
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
// this.LogInfo( "End Float Tween", endValue );
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -19,7 +20,7 @@ namespace Rokojori
|
|||
public TweenType tweenType = new TweenTimeCurve();
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
|
||||
protected override void _OnTrigger()
|
||||
|
|
@ -34,7 +35,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
var tl = TimeLineManager.Ensure( timeLine );
|
||||
var tl = TimelineManager.Ensure( timeLine );
|
||||
|
||||
var start = tl.position;
|
||||
|
||||
|
|
@ -51,7 +52,7 @@ namespace Rokojori
|
|||
tweenType = TweenTimeCurve.defaultCurve;
|
||||
}
|
||||
|
||||
TimeLineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
TimelineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
( span, type )=>
|
||||
{
|
||||
if ( ! GodotObject.IsInstanceValid( light3D ) )
|
||||
|
|
@ -69,7 +70,7 @@ namespace Rokojori
|
|||
|
||||
lerpData.CopyTo( light3D );
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
DispatchEnd( sequenceID );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -23,7 +24,7 @@ namespace Rokojori
|
|||
public TweenType tweenType = new TweenTimeCurve();
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
ColorProperty[] colors = [];
|
||||
|
||||
|
|
@ -90,7 +91,7 @@ namespace Rokojori
|
|||
|
||||
SetAssignedMaterial( fromMaterial );
|
||||
|
||||
var tl = TimeLineManager.Ensure( timeLine );
|
||||
var tl = TimelineManager.Ensure( timeLine );
|
||||
|
||||
var start = tl.position;
|
||||
|
||||
|
|
@ -136,7 +137,7 @@ namespace Rokojori
|
|||
tweenType = TweenTimeCurve.defaultCurve;
|
||||
}
|
||||
|
||||
TimeLineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
TimelineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
( span, type )=>
|
||||
{
|
||||
var timeNow = tl.position;
|
||||
|
|
@ -167,7 +168,7 @@ namespace Rokojori
|
|||
elementIndex ++;
|
||||
}
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
foreach ( var c in colors )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -19,7 +20,7 @@ namespace Rokojori
|
|||
public TweenType tweenType = new TweenTimeCurve();
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
|
||||
protected override void _OnTrigger()
|
||||
|
|
@ -34,7 +35,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
var tl = TimeLineManager.Ensure( timeLine );
|
||||
var tl = TimelineManager.Ensure( timeLine );
|
||||
|
||||
var start = tl.position;
|
||||
|
||||
|
|
@ -51,7 +52,7 @@ namespace Rokojori
|
|||
tweenType = TweenTimeCurve.defaultCurve;
|
||||
}
|
||||
|
||||
TimeLineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
TimelineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
( span, type )=>
|
||||
{
|
||||
if ( ! GodotObject.IsInstanceValid( particles3D ) )
|
||||
|
|
@ -69,7 +70,7 @@ namespace Rokojori
|
|||
|
||||
lerpData.CopyTo( particles3D );
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
DispatchEnd( sequenceID );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -39,7 +40,7 @@ namespace Rokojori
|
|||
public bool cacheEndPositionOnStart = true;
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
|
||||
Vector3 GetToPosition()
|
||||
|
|
@ -63,7 +64,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
var tl = TimeLineManager.Ensure( timeLine );
|
||||
var tl = TimelineManager.Ensure( timeLine );
|
||||
|
||||
var start = tl.position;
|
||||
|
||||
|
|
@ -79,7 +80,7 @@ namespace Rokojori
|
|||
tweenType = TweenTimeCurve.defaultCurve;
|
||||
}
|
||||
|
||||
TimeLineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
TimelineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
( span, type )=>
|
||||
{
|
||||
if ( ! GodotObject.IsInstanceValid( target ) )
|
||||
|
|
@ -109,7 +110,7 @@ namespace Rokojori
|
|||
target.Position = lerpedPosition;
|
||||
}
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
DispatchEnd( sequenceID );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -22,7 +23,7 @@ namespace Rokojori
|
|||
public bool cacheEndPositionOnStart = true;
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
|
||||
protected override void _OnTrigger()
|
||||
|
|
@ -32,7 +33,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
var tl = TimeLineManager.Ensure( timeLine );
|
||||
var tl = TimelineManager.Ensure( timeLine );
|
||||
|
||||
var start = tl.position;
|
||||
|
||||
|
|
@ -48,7 +49,7 @@ namespace Rokojori
|
|||
tweenType = TweenTimeCurve.defaultCurve;
|
||||
}
|
||||
|
||||
TimeLineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
TimelineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
( span, type )=>
|
||||
{
|
||||
if ( ! GodotObject.IsInstanceValid( activeVolume ) )
|
||||
|
|
@ -71,7 +72,7 @@ namespace Rokojori
|
|||
|
||||
activeVolume.weight = lerpedWeight;
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
DispatchEnd( sequenceID );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System;
|
|||
using Godot;
|
||||
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -25,7 +26,7 @@ namespace Rokojori
|
|||
public bool cacheEndPositionOnStart = true;
|
||||
|
||||
[Export]
|
||||
public TimeLine timeLine;
|
||||
public Timeline timeLine;
|
||||
|
||||
|
||||
protected override void _OnTrigger()
|
||||
|
|
@ -35,7 +36,7 @@ namespace Rokojori
|
|||
return;
|
||||
}
|
||||
|
||||
var tl = TimeLineManager.Ensure( timeLine );
|
||||
var tl = TimelineManager.Ensure( timeLine );
|
||||
|
||||
var start = tl.position;
|
||||
|
||||
|
|
@ -51,7 +52,7 @@ namespace Rokojori
|
|||
tweenType = TweenTimeCurve.defaultCurve;
|
||||
}
|
||||
|
||||
TimeLineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
TimelineManager.ScheduleSpanIn( tl, 0, tweenType.GetTweenDuration(),
|
||||
( span, type )=>
|
||||
{
|
||||
if ( ! GodotObject.IsInstanceValid( target ) )
|
||||
|
|
@ -74,7 +75,7 @@ namespace Rokojori
|
|||
|
||||
target.Scale = lerpedScale;
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
DispatchEnd( sequenceID );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
|
|||
using System.Text;
|
||||
using Godot;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -57,9 +58,9 @@ namespace Rokojori
|
|||
random = random == null ? GodotRandom.Get() : random;
|
||||
|
||||
return new Vector3(
|
||||
random.Polar() * durationRandomRange,
|
||||
random.Polar() * delayRandomRange,
|
||||
random.Polar() * scaleRandomRange
|
||||
random.Polar1() * durationRandomRange,
|
||||
random.Polar1() * delayRandomRange,
|
||||
random.Polar1() * scaleRandomRange
|
||||
);
|
||||
|
||||
}
|
||||
|
|
@ -72,7 +73,7 @@ namespace Rokojori
|
|||
return curve.Sample( phase ) * ( scaleY + scaleOffset );
|
||||
}
|
||||
|
||||
public float Sample( float time, Vector3 randomization )
|
||||
public float SampleRandomized( float time, Vector3 randomization )
|
||||
{
|
||||
return Sample( time, randomization.X, randomization.Y, randomization.Z );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
|
|||
using System.Text;
|
||||
using Godot;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -64,9 +65,9 @@ namespace Rokojori
|
|||
random = random == null ? GodotRandom.Get() : random;
|
||||
|
||||
return new Vector3(
|
||||
random.Polar() * durationRandomRange,
|
||||
random.Polar() * delayRandomRange,
|
||||
random.Polar() * scaleAllRandomRange
|
||||
random.Polar1() * durationRandomRange,
|
||||
random.Polar1() * delayRandomRange,
|
||||
random.Polar1() * scaleAllRandomRange
|
||||
);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
|
|||
using System.Text;
|
||||
using Godot;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
public interface Animator
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
|
|||
using System.Text;
|
||||
using Godot;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
|
|||
using System.Text;
|
||||
using Godot;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
public interface IFloatDriver
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
|
|||
using System.Text;
|
||||
using Godot;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
|
|||
using System.Text;
|
||||
using Godot;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
|
|||
using System.Text;
|
||||
using Godot;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
|
|||
using System.Text;
|
||||
using Godot;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ using System.Text;
|
|||
using Godot;
|
||||
using System.Linq;
|
||||
|
||||
using Rokojori.Extensions;
|
||||
namespace Rokojori
|
||||
{
|
||||
[Tool]
|
||||
|
|
@ -127,7 +128,7 @@ namespace Rokojori
|
|||
allTargets.AddRange( targets );
|
||||
}
|
||||
|
||||
allTargets = Lists.Filter( Lists.From( allTargets ), t => t as GeometryInstance3D != null );
|
||||
allTargets = ListExtensions.Filter( ListExtensions.From( allTargets ), t => t as GeometryInstance3D != null );
|
||||
|
||||
return allTargets;
|
||||
}
|
||||
|
|
@ -164,7 +165,7 @@ namespace Rokojori
|
|||
|
||||
var flashCurve = flashEffect.flashCurve;
|
||||
var color = flashEffect.color.GetHDRColor();
|
||||
var timeline = TimeLineManager.Ensure( flashEffect.timeline );
|
||||
var timeline = TimelineManager.Ensure( flashEffect.timeline );
|
||||
|
||||
runner.randomization = flashCurve.Randomize( random );
|
||||
var duration = flashCurve.GetRandomizedDuration( runner.randomization );
|
||||
|
|
@ -257,8 +258,8 @@ namespace Rokojori
|
|||
|
||||
|
||||
|
||||
runner.animationID = TimeLineManager.ScheduleSpanIn( timeline, 0, duration,
|
||||
( TimeLineSpan span, TimeLineSpanUpdateType type )=>
|
||||
runner.animationID = TimelineManager.ScheduleSpanIn( timeline, 0, duration,
|
||||
( TimelineSpan span, TimelineSpanUpdateType type )=>
|
||||
{
|
||||
|
||||
// debugProcessIndicator.Position = debugProcessIndicatorFull * span.phase;
|
||||
|
|
@ -325,7 +326,7 @@ namespace Rokojori
|
|||
);
|
||||
|
||||
|
||||
if ( type == TimeLineSpanUpdateType.End )
|
||||
if ( type == TimelineSpanUpdateType.End )
|
||||
{
|
||||
if ( runner.light != null )
|
||||
{
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue