diff --git a/Assets/Splash/rokojori-action-library-splash.png.import b/Assets/Splash/rokojori-action-library-splash.png.import
index 8beb0c0..94848a1 100644
--- a/Assets/Splash/rokojori-action-library-splash.png.import
+++ b/Assets/Splash/rokojori-action-library-splash.png.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cj3w71yd4boe"
-path="res://.godot/imported/rokojori-action-library-splash.png-d751c80b8a8a96ee0087afb0bd27552e.ctex"
+path="res://.godot/imported/rokojori-action-library-splash.png-4ebf88d03e1c80c3046c56e7c8aca3a2.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Assets/Splash/rokojori-action-library-splash.png"
-dest_files=["res://.godot/imported/rokojori-action-library-splash.png-d751c80b8a8a96ee0087afb0bd27552e.ctex"]
+source_file="res://addons/rokojori_action_library/Assets/Splash/rokojori-action-library-splash.png"
+dest_files=["res://.godot/imported/rokojori-action-library-splash.png-4ebf88d03e1c80c3046c56e7c8aca3a2.ctex"]
[params]
diff --git a/Icons/RJAction.svg.import b/Icons/RJAction.svg.import
index f2c18f8..961ff50 100644
--- a/Icons/RJAction.svg.import
+++ b/Icons/RJAction.svg.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://3o4jrbvgynae"
-path="res://.godot/imported/RJAction.svg-beb0a31def94ebf28119d2bd3d7976a9.ctex"
+path="res://.godot/imported/RJAction.svg-988fbeddf1f77ded6809176cb9fee094.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJAction.svg"
-dest_files=["res://.godot/imported/RJAction.svg-beb0a31def94ebf28119d2bd3d7976a9.ctex"]
+source_file="res://addons/rokojori_action_library/Icons/RJAction.svg"
+dest_files=["res://.godot/imported/RJAction.svg-988fbeddf1f77ded6809176cb9fee094.ctex"]
[params]
diff --git a/Icons/RJActionList.svg.import b/Icons/RJActionList.svg.import
index a5e6e23..ed1b890 100644
--- a/Icons/RJActionList.svg.import
+++ b/Icons/RJActionList.svg.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bsgb2qdpdftr4"
-path="res://.godot/imported/RJActionList.svg-beaf5561f3ed1bddbcfc6914d2361da3.ctex"
+path="res://.godot/imported/RJActionList.svg-7215a507296376afc809e1085f3d87c9.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJActionList.svg"
-dest_files=["res://.godot/imported/RJActionList.svg-beaf5561f3ed1bddbcfc6914d2361da3.ctex"]
+source_file="res://addons/rokojori_action_library/Icons/RJActionList.svg"
+dest_files=["res://.godot/imported/RJActionList.svg-7215a507296376afc809e1085f3d87c9.ctex"]
[params]
diff --git a/Icons/RJActionSequence.svg.import b/Icons/RJActionSequence.svg.import
index e0b6a9f..6cfe9ce 100644
--- a/Icons/RJActionSequence.svg.import
+++ b/Icons/RJActionSequence.svg.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://c6lekbldg584j"
-path="res://.godot/imported/RJActionSequence.svg-861cbfffa33440d8d759203c534bd591.ctex"
+path="res://.godot/imported/RJActionSequence.svg-1ce6e79167ccb7f7d3246c49f748a320.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJActionSequence.svg"
-dest_files=["res://.godot/imported/RJActionSequence.svg-861cbfffa33440d8d759203c534bd591.ctex"]
+source_file="res://addons/rokojori_action_library/Icons/RJActionSequence.svg"
+dest_files=["res://.godot/imported/RJActionSequence.svg-1ce6e79167ccb7f7d3246c49f748a320.ctex"]
[params]
diff --git a/Icons/RJIcon.svg.import b/Icons/RJIcon.svg.import
index 3d30088..7e8ece4 100644
--- a/Icons/RJIcon.svg.import
+++ b/Icons/RJIcon.svg.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cg5fnpnwnnlxp"
-path="res://.godot/imported/RJIcon.svg-0c4b76f83ee560c49146d5d0e2e2cd82.ctex"
+path="res://.godot/imported/RJIcon.svg-8e2fc142259b1ef6a7b9d44d49ea7566.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJIcon.svg"
-dest_files=["res://.godot/imported/RJIcon.svg-0c4b76f83ee560c49146d5d0e2e2cd82.ctex"]
+source_file="res://addons/rokojori_action_library/Icons/RJIcon.svg"
+dest_files=["res://.godot/imported/RJIcon.svg-8e2fc142259b1ef6a7b9d44d49ea7566.ctex"]
[params]
diff --git a/Icons/RJOnEvent.svg.import b/Icons/RJOnEvent.svg.import
index f851e7c..ddf1099 100644
--- a/Icons/RJOnEvent.svg.import
+++ b/Icons/RJOnEvent.svg.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://c7ie66dc2001j"
-path="res://.godot/imported/RJOnEvent.svg-5454a5a8fda6964ac7468efc75d89600.ctex"
+path="res://.godot/imported/RJOnEvent.svg-678c3e44ce4ea495de01231d4169e9d8.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJOnEvent.svg"
-dest_files=["res://.godot/imported/RJOnEvent.svg-5454a5a8fda6964ac7468efc75d89600.ctex"]
+source_file="res://addons/rokojori_action_library/Icons/RJOnEvent.svg"
+dest_files=["res://.godot/imported/RJOnEvent.svg-678c3e44ce4ea495de01231d4169e9d8.ctex"]
[params]
diff --git a/Icons/RJSelector.svg.import b/Icons/RJSelector.svg.import
index c800add..7cbca4f 100644
--- a/Icons/RJSelector.svg.import
+++ b/Icons/RJSelector.svg.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://di5twkhxs6ldl"
-path="res://.godot/imported/RJSelector.svg-82cc12c5034e0b56287fb852d3c62b39.ctex"
+path="res://.godot/imported/RJSelector.svg-6a7c010efebc230663b06363c5e9229f.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJSelector.svg"
-dest_files=["res://.godot/imported/RJSelector.svg-82cc12c5034e0b56287fb852d3c62b39.ctex"]
+source_file="res://addons/rokojori_action_library/Icons/RJSelector.svg"
+dest_files=["res://.godot/imported/RJSelector.svg-6a7c010efebc230663b06363c5e9229f.ctex"]
[params]
diff --git a/Icons/RJSensor.svg.import b/Icons/RJSensor.svg.import
index e62f8e5..6d34ed9 100644
--- a/Icons/RJSensor.svg.import
+++ b/Icons/RJSensor.svg.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://cexdhupggsnhd"
-path="res://.godot/imported/RJSensor.svg-1fbd8106fb1975a47409ab98bb231c4f.ctex"
+path="res://.godot/imported/RJSensor.svg-7f213641b40eaf775c1d6f373c7584c7.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJSensor.svg"
-dest_files=["res://.godot/imported/RJSensor.svg-1fbd8106fb1975a47409ab98bb231c4f.ctex"]
+source_file="res://addons/rokojori_action_library/Icons/RJSensor.svg"
+dest_files=["res://.godot/imported/RJSensor.svg-7f213641b40eaf775c1d6f373c7584c7.ctex"]
[params]
diff --git a/Icons/Rokojori-Action-Library-Logo.svg.import b/Icons/Rokojori-Action-Library-Logo.svg.import
index 87f30d0..877d6bc 100644
--- a/Icons/Rokojori-Action-Library-Logo.svg.import
+++ b/Icons/Rokojori-Action-Library-Logo.svg.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bc3554irquknv"
-path="res://.godot/imported/Rokojori-Action-Library-Logo.svg-084dc0777a3bf5e12ed64558d69c8366.ctex"
+path="res://.godot/imported/Rokojori-Action-Library-Logo.svg-3dd4acc27920727c330711656aab94e1.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Icons/Rokojori-Action-Library-Logo.svg"
-dest_files=["res://.godot/imported/Rokojori-Action-Library-Logo.svg-084dc0777a3bf5e12ed64558d69c8366.ctex"]
+source_file="res://addons/rokojori_action_library/Icons/Rokojori-Action-Library-Logo.svg"
+dest_files=["res://.godot/imported/Rokojori-Action-Library-Logo.svg-3dd4acc27920727c330711656aab94e1.ctex"]
[params]
diff --git a/Icons/Scatterer.svg.import b/Icons/Scatterer.svg.import
index 0e215e1..359609a 100644
--- a/Icons/Scatterer.svg.import
+++ b/Icons/Scatterer.svg.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://clm1p530y0sh0"
-path="res://.godot/imported/Scatterer.svg-faa0f406c786220743edbcf86085b917.ctex"
+path="res://.godot/imported/Scatterer.svg-47ada0ad4359cdaef937276acc71b3c5.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Icons/Scatterer.svg"
-dest_files=["res://.godot/imported/Scatterer.svg-faa0f406c786220743edbcf86085b917.ctex"]
+source_file="res://addons/rokojori_action_library/Icons/Scatterer.svg"
+dest_files=["res://.godot/imported/Scatterer.svg-47ada0ad4359cdaef937276acc71b3c5.ctex"]
[params]
diff --git a/Icons/Spline.svg.import b/Icons/Spline.svg.import
index 6456a8b..dbfecc4 100644
--- a/Icons/Spline.svg.import
+++ b/Icons/Spline.svg.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://c4t5wy2e8guge"
-path="res://.godot/imported/Spline.svg-24ecac2761c76806ec867265b5304b23.ctex"
+path="res://.godot/imported/Spline.svg-1e2b9f874c3ee57ea8b3834092dfaef8.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Icons/Spline.svg"
-dest_files=["res://.godot/imported/Spline.svg-24ecac2761c76806ec867265b5304b23.ctex"]
+source_file="res://addons/rokojori_action_library/Icons/Spline.svg"
+dest_files=["res://.godot/imported/Spline.svg-1e2b9f874c3ee57ea8b3834092dfaef8.ctex"]
[params]
diff --git a/Icons/VirtualCamera3DSlot.svg.import b/Icons/VirtualCamera3DSlot.svg.import
index 76014f3..25ac473 100644
--- a/Icons/VirtualCamera3DSlot.svg.import
+++ b/Icons/VirtualCamera3DSlot.svg.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://bw4lwbtmuf06s"
-path="res://.godot/imported/VirtualCamera3DSlot.svg-c72b6fb2631e86a90ef74119fcd12075.ctex"
+path="res://.godot/imported/VirtualCamera3DSlot.svg-86ba6841a565711cf6f67b15a1f31fbb.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Icons/VirtualCamera3DSlot.svg"
-dest_files=["res://.godot/imported/VirtualCamera3DSlot.svg-c72b6fb2631e86a90ef74119fcd12075.ctex"]
+source_file="res://addons/rokojori_action_library/Icons/VirtualCamera3DSlot.svg"
+dest_files=["res://.godot/imported/VirtualCamera3DSlot.svg-86ba6841a565711cf6f67b15a1f31fbb.ctex"]
[params]
diff --git a/Runtime/Actions/ActionList.cs b/Runtime/Actions/ActionList.cs
index fee900a..065b1b7 100644
--- a/Runtime/Actions/ActionList.cs
+++ b/Runtime/Actions/ActionList.cs
@@ -19,7 +19,7 @@ namespace Rokojori
*/
- [GlobalClass, Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJActionList.svg") ]
+ [GlobalClass, Icon("res://addons/rokojori_action_library/Icons/RJActionList.svg") ]
public partial class ActionList : RJAction
{
diff --git a/Runtime/Actions/ActionSequence.cs b/Runtime/Actions/ActionSequence.cs
index 79779bb..57ece00 100644
--- a/Runtime/Actions/ActionSequence.cs
+++ b/Runtime/Actions/ActionSequence.cs
@@ -187,7 +187,7 @@ namespace Rokojori
}
- [GlobalClass, Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJActionSequence.svg") ]
+ [GlobalClass, Icon("res://addons/rokojori_action_library/Icons/RJActionSequence.svg") ]
public partial class ActionSequence:RJSequenceAction
{
/** Actions to execute*/
diff --git a/Runtime/Actions/OnPhysicsProcess.cs b/Runtime/Actions/OnPhysicsProcess.cs
index dc170b7..989f011 100644
--- a/Runtime/Actions/OnPhysicsProcess.cs
+++ b/Runtime/Actions/OnPhysicsProcess.cs
@@ -4,7 +4,7 @@ using Godot;
namespace Rokojori
{
- [GlobalClass, Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJOnEvent.svg") ]
+ [GlobalClass, Icon("res://addons/rokojori_action_library/Icons/RJOnEvent.svg") ]
public partial class OnPhysicsProcess : Node
{
/** Actions to execute*/
diff --git a/Runtime/Actions/OnProcess.cs b/Runtime/Actions/OnProcess.cs
index da9df8d..2a376e8 100644
--- a/Runtime/Actions/OnProcess.cs
+++ b/Runtime/Actions/OnProcess.cs
@@ -4,7 +4,7 @@ using Godot;
namespace Rokojori
{
- [GlobalClass, Tool, Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJOnEvent.svg") ]
+ [GlobalClass, Tool, Icon("res://addons/rokojori_action_library/Icons/RJOnEvent.svg") ]
public partial class OnProcess : Node
{
/** Actions to execute*/
diff --git a/Runtime/Actions/OnReady.cs b/Runtime/Actions/OnReady.cs
index 8652019..8028ed5 100644
--- a/Runtime/Actions/OnReady.cs
+++ b/Runtime/Actions/OnReady.cs
@@ -4,7 +4,7 @@ using Godot;
namespace Rokojori
{
- [GlobalClass, Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJOnEvent.svg") ]
+ [GlobalClass, Icon("res://addons/rokojori_action_library/Icons/RJOnEvent.svg") ]
public partial class OnReady : Node
{
/** Actions to execute*/
diff --git a/Runtime/Math/Geometry/SplineCurve.cs b/Runtime/Math/Geometry/SplineCurve.cs
index 30e64df..2cce770 100644
--- a/Runtime/Math/Geometry/SplineCurve.cs
+++ b/Runtime/Math/Geometry/SplineCurve.cs
@@ -96,6 +96,11 @@ namespace Rokojori
public Vector3 MinPointPosition()
{
+ if ( _points.Count == 0 )
+ {
+ return Vector3.Zero;
+ }
+
var min = _points[ 0 ].position;
points.ForEach( p => min = min.Min( p.position ) );
@@ -105,6 +110,11 @@ namespace Rokojori
public Vector3 MaxPointPosition()
{
+ if ( _points.Count == 0 )
+ {
+ return Vector3.Zero;
+ }
+
var max = _points[ 0 ].position;
points.ForEach( p => max = max.Max( p.position ) );
diff --git a/Runtime/Procedural/Assets/Grass/GrassPatch.cs b/Runtime/Procedural/Assets/Grass/GrassPatch.cs
index b4022ce..12832bf 100644
--- a/Runtime/Procedural/Assets/Grass/GrassPatch.cs
+++ b/Runtime/Procedural/Assets/Grass/GrassPatch.cs
@@ -8,7 +8,7 @@ using System;
namespace Rokojori
{
[Tool]
- [GlobalClass, Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/Scatterer.svg") ]
+ [GlobalClass, Icon("res://addons/rokojori_action_library/Icons/Scatterer.svg") ]
public partial class GrassPatch:Node3D
{
[Export]
@@ -242,8 +242,7 @@ namespace Rokojori
var index = random.IntegerExclusive( uvSegments );
if ( uvSegmentWeightsClose != null )
- {
-
+ {
var weightsClose = MathX.GetCurveWeights( uvSegmentWeightsClose, uvSegments );
if ( uvSegmentWeightsFar != null )
@@ -261,15 +260,29 @@ namespace Rokojori
}
var x = index % uvSegmentColumns;
- var y = index / uvSegmentRows;
+ var y = Mathf.FloorToInt( index / uvSegmentColumns );
- var xSize = 1f / uvSegmentRows;
- var ySize = 1f / uvSegmentColumns;
+ var xSize = 1f / uvSegmentColumns;
+ var ySize = 1f / uvSegmentRows;
uvMin.X = x * xSize;
uvMin.Y = y * ySize;
uvMax = uvMin + new Vector2( xSize, ySize );
+
+ // if ( X_numBlades < 6 )
+ // {
+ // RJLog.Log(
+
+ // " c,r:",uvSegmentColumns,uvSegmentRows,
+ // " index:", index,
+ // " x,y:", x,y,
+ // " xS,yS:",xSize,ySize,
+ // " uvMin:", uvMin,
+ // " uvMax:", uvMax
+
+ // );
+ // }
}
for ( int i = 0; i <= bladeSegments; i++ )
diff --git a/Runtime/Procedural/Assets/Leaf/LeafMesh.cs b/Runtime/Procedural/Assets/Leaf/LeafMesh.cs
index 78f3ed8..6bae5f8 100644
--- a/Runtime/Procedural/Assets/Leaf/LeafMesh.cs
+++ b/Runtime/Procedural/Assets/Leaf/LeafMesh.cs
@@ -8,7 +8,7 @@ using System;
namespace Rokojori
{
[Tool]
- [GlobalClass, Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/Spline.svg") ]
+ [GlobalClass, Icon("res://addons/rokojori_action_library/Icons/Spline.svg") ]
public partial class LeafMesh:Node3D
{
[Export]
diff --git a/Runtime/Procedural/Parametric/Spline/Spline.cs b/Runtime/Procedural/Parametric/Spline/Spline.cs
index 8109535..c48860a 100644
--- a/Runtime/Procedural/Parametric/Spline/Spline.cs
+++ b/Runtime/Procedural/Parametric/Spline/Spline.cs
@@ -12,7 +12,7 @@ namespace Rokojori
}
[Tool]
- [GlobalClass, Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/Spline.svg") ]
+ [GlobalClass, Icon("res://addons/rokojori_action_library/Icons/Spline.svg") ]
public partial class Spline : Node3D
#if TOOLS
, GizmoDrawer
@@ -62,6 +62,8 @@ namespace Rokojori
{
var splinePoints = Nodes.GetDirectChildren( this );
+
+
splineCurve = new SplineCurveCreator().Create( splinePoints, closed );
min = splineCurve.MinPointPosition();
@@ -132,6 +134,14 @@ namespace Rokojori
gizmo.Clear();
+ if ( curve.points.Count <= 1 )
+ {
+ return;
+ }
+
+
+
+
var linePoints = new List();
int resolution = editorResolution <= 0 ? 20 : editorResolution;
diff --git a/Runtime/Procedural/Parametric/Tube/Tube.cs b/Runtime/Procedural/Parametric/Tube/Tube.cs
index 443dae8..3e0c174 100644
--- a/Runtime/Procedural/Parametric/Tube/Tube.cs
+++ b/Runtime/Procedural/Parametric/Tube/Tube.cs
@@ -21,7 +21,7 @@ namespace Rokojori
}
[Tool]
- [GlobalClass, Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/Spline.svg") ]
+ [GlobalClass, Icon("res://addons/rokojori_action_library/Icons/Spline.svg") ]
public partial class Tube : Node3D
{
[Export]
diff --git a/Runtime/Procedural/Parametric/Tube/TubeShape.cs b/Runtime/Procedural/Parametric/Tube/TubeShape.cs
index 8d8461d..09640cb 100644
--- a/Runtime/Procedural/Parametric/Tube/TubeShape.cs
+++ b/Runtime/Procedural/Parametric/Tube/TubeShape.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
namespace Rokojori
{
[Tool]
- [GlobalClass, Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/Spline.svg") ]
+ [GlobalClass, Icon("res://addons/rokojori_action_library/Icons/Spline.svg") ]
public partial class TubeShape:Node
{
[Export]
diff --git a/Runtime/Procedural/Scatter/Scatterer.cs b/Runtime/Procedural/Scatter/Scatterer.cs
index 521018b..244d61f 100644
--- a/Runtime/Procedural/Scatter/Scatterer.cs
+++ b/Runtime/Procedural/Scatter/Scatterer.cs
@@ -8,7 +8,7 @@ using System;
namespace Rokojori
{
[Tool]
- [GlobalClass, Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/Scatterer.svg") ]
+ [GlobalClass, Icon("res://addons/rokojori_action_library/Icons/Scatterer.svg") ]
public partial class Scatterer:Node3D
{
[Export]
diff --git a/Runtime/Sensors/CombineSensor.cs b/Runtime/Sensors/CombineSensor.cs
index baa1d77..ee029d0 100644
--- a/Runtime/Sensors/CombineSensor.cs
+++ b/Runtime/Sensors/CombineSensor.cs
@@ -4,7 +4,7 @@ using Godot;
namespace Rokojori
{
- [GlobalClass,Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJSensor.svg")]
+ [GlobalClass,Icon("res://addons/rokojori_action_library/Icons/RJSensor.svg")]
public partial class CombineSensor : RJSensor
{
[Export]
diff --git a/Runtime/Sensors/InputSensor.cs b/Runtime/Sensors/InputSensor.cs
index 5ff9d6f..a872826 100644
--- a/Runtime/Sensors/InputSensor.cs
+++ b/Runtime/Sensors/InputSensor.cs
@@ -4,7 +4,7 @@ using Godot;
namespace Rokojori
{
- [GlobalClass,Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJSensor.svg")]
+ [GlobalClass,Icon("res://addons/rokojori_action_library/Icons/RJSensor.svg")]
public partial class InputSensor : RJSensor
{
[Export]
diff --git a/Runtime/Sensors/OnSensor.cs b/Runtime/Sensors/OnSensor.cs
index cff8640..4838cdf 100644
--- a/Runtime/Sensors/OnSensor.cs
+++ b/Runtime/Sensors/OnSensor.cs
@@ -4,7 +4,7 @@ using Godot;
namespace Rokojori
{
- [GlobalClass, Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/RJOnEvent.svg") ]
+ [GlobalClass, Icon("res://addons/rokojori_action_library/Icons/RJOnEvent.svg") ]
public partial class OnSensor: Node
{
[Export]
diff --git a/Runtime/Shading/Library/Colors.gdshaderinc b/Runtime/Shading/Library/Colors.gdshaderinc
index b2757f0..08c5135 100644
--- a/Runtime/Shading/Library/Colors.gdshaderinc
+++ b/Runtime/Shading/Library/Colors.gdshaderinc
@@ -1,4 +1,4 @@
-#include "res://Scripts/Rokojori/Rokojori-Action-Library/Runtime/Shading/Library/Math.gdshaderinc"
+#include "res://addons/rokojori_action_library/Runtime/Shading/Library/Math.gdshaderinc"
const float HCV_EPSILON = 1e-10;
const float HSL_EPSILON = 1e-10;
diff --git a/Runtime/Shading/Shaders/PostProcessing/ColorCurves.gdshader b/Runtime/Shading/Shaders/PostProcessing/ColorCurves.gdshader
index 33dc249..4e6b5e1 100644
--- a/Runtime/Shading/Shaders/PostProcessing/ColorCurves.gdshader
+++ b/Runtime/Shading/Shaders/PostProcessing/ColorCurves.gdshader
@@ -1,7 +1,7 @@
shader_type canvas_item;
-#include "res://Scripts/Rokojori/Rokojori-Action-Library/Runtime/Shading/Library/Colors.gdshaderinc"
-#include "res://Scripts/Rokojori/Rokojori-Action-Library/Runtime/Shading/Library/Math.gdshaderinc"
+#include "res://addons/rokojori_action_library/Runtime/Shading/Library/Colors.gdshaderinc"
+#include "res://addons/rokojori_action_library/Runtime/Shading/Library/Math.gdshaderinc"
uniform sampler2D screenTexture:
hint_screen_texture,
diff --git a/Runtime/Shading/Shaders/PostProcessing/Overlays.gdshader b/Runtime/Shading/Shaders/PostProcessing/Overlays.gdshader
index 36e7970..d293c28 100644
--- a/Runtime/Shading/Shaders/PostProcessing/Overlays.gdshader
+++ b/Runtime/Shading/Shaders/PostProcessing/Overlays.gdshader
@@ -1,7 +1,7 @@
shader_type canvas_item;
-#include "res://Scripts/Rokojori/Rokojori-Action-Library/Runtime/Shading/Library/Colors.gdshaderinc"
-#include "res://Scripts/Rokojori/Rokojori-Action-Library/Runtime/Shading/Library/Math.gdshaderinc"
+#include "res://addons/rokojori_action_library/Runtime/Shading/Library/Colors.gdshaderinc"
+#include "res://addons/rokojori_action_library/Runtime/Shading/Library/Math.gdshaderinc"
uniform sampler2D screenTexture:
hint_screen_texture,
diff --git a/Runtime/UI/Layouts/UILayouting.cs b/Runtime/UI/Layouts/UILayouting.cs
index e5efb1f..572e38e 100644
--- a/Runtime/UI/Layouts/UILayouting.cs
+++ b/Runtime/UI/Layouts/UILayouting.cs
@@ -97,6 +97,18 @@ namespace Rokojori
return;
}
+ if ( ui.settings == null )
+ {
+ // RJLog.Log( "No UI.settings Found" );
+ return;
+ }
+
+ if ( ui.settings.sizePropertyName == null )
+ {
+ RJLog.Log( "No UI.settings.sizePropertyName Found" );
+ return;
+ }
+
//RJLog.Log( "Setting Size", ui.settings.sizePropertyName.propertyName, HierarchyName.Of( uiImage ) );
ui.settings.sizePropertyName.Set( uiImage.Material, uiImage.Size );
diff --git a/Runtime/UI/ShaderProperties/Float/borderRadius.tres b/Runtime/UI/ShaderProperties/Float/borderRadius.tres
index c9b78c6..bd43700 100644
--- a/Runtime/UI/ShaderProperties/Float/borderRadius.tres
+++ b/Runtime/UI/ShaderProperties/Float/borderRadius.tres
@@ -1,6 +1,6 @@
[gd_resource type="Resource" script_class="FloatPropertyName" load_steps=2 format=3 uid="uid://v423srfwpna8"]
-[ext_resource type="Script" path="res://Scripts/Rokojori/Rokojori-Action-Library/Runtime/Shading/Properties/FloatPropertyName.cs" id="1_4guhd"]
+[ext_resource type="Script" path="res://addons/rokojori_action_library/Runtime/Shading/Properties/FloatPropertyName.cs" id="1_4guhd"]
[resource]
script = ExtResource("1_4guhd")
diff --git a/Runtime/UI/ShaderProperties/Float/offset.tres b/Runtime/UI/ShaderProperties/Float/offset.tres
index 9975188..68ac398 100644
--- a/Runtime/UI/ShaderProperties/Float/offset.tres
+++ b/Runtime/UI/ShaderProperties/Float/offset.tres
@@ -1,6 +1,6 @@
[gd_resource type="Resource" script_class="FloatPropertyName" load_steps=2 format=3 uid="uid://dbg2rgj5s7uqn"]
-[ext_resource type="Script" path="res://Scripts/Rokojori/Rokojori-Action-Library/Runtime/Shading/Properties/FloatPropertyName.cs" id="1_2hnh6"]
+[ext_resource type="Script" path="res://addons/rokojori_action_library/Runtime/Shading/Properties/FloatPropertyName.cs" id="1_2hnh6"]
[resource]
script = ExtResource("1_2hnh6")
diff --git a/Runtime/UI/ShaderProperties/Float/strokeSize.tres b/Runtime/UI/ShaderProperties/Float/strokeSize.tres
index a20b9b1..f664171 100644
--- a/Runtime/UI/ShaderProperties/Float/strokeSize.tres
+++ b/Runtime/UI/ShaderProperties/Float/strokeSize.tres
@@ -1,6 +1,6 @@
[gd_resource type="Resource" script_class="FloatPropertyName" load_steps=2 format=3 uid="uid://dngbeoiix72sf"]
-[ext_resource type="Script" path="res://Scripts/Rokojori/Rokojori-Action-Library/Runtime/Shading/Properties/FloatPropertyName.cs" id="1_0sf2s"]
+[ext_resource type="Script" path="res://addons/rokojori_action_library/Runtime/Shading/Properties/FloatPropertyName.cs" id="1_0sf2s"]
[resource]
script = ExtResource("1_0sf2s")
diff --git a/Runtime/UI/ShaderProperties/Vector2/Size.tres b/Runtime/UI/ShaderProperties/Vector2/Size.tres
index 5760d96..4ce18d7 100644
--- a/Runtime/UI/ShaderProperties/Vector2/Size.tres
+++ b/Runtime/UI/ShaderProperties/Vector2/Size.tres
@@ -1,6 +1,6 @@
[gd_resource type="Resource" script_class="Vector2PropertyName" load_steps=2 format=3 uid="uid://bhy8b3gopkq4m"]
-[ext_resource type="Script" path="res://Scripts/Rokojori/Rokojori-Action-Library/Runtime/Shading/Properties/Vector2PropertyName.cs" id="1_t5csl"]
+[ext_resource type="Script" path="res://addons/rokojori_action_library/Runtime/Shading/Properties/Vector2PropertyName.cs" id="1_t5csl"]
[resource]
script = ExtResource("1_t5csl")
diff --git a/Runtime/UI/UI-Settings-Default.tres b/Runtime/UI/UI-Settings-Default.tres
index 8f58e7a..5f882cd 100644
--- a/Runtime/UI/UI-Settings-Default.tres
+++ b/Runtime/UI/UI-Settings-Default.tres
@@ -1,7 +1,7 @@
[gd_resource type="Resource" script_class="UISettings" load_steps=3 format=3 uid="uid://dp57o0ykhkqfj"]
-[ext_resource type="Script" path="res://Scripts/Rokojori/Rokojori-Action-Library/Runtime/UI/UISettings.cs" id="1_5a283"]
-[ext_resource type="Resource" uid="uid://bhy8b3gopkq4m" path="res://Scripts/Rokojori/Rokojori-Action-Library/Runtime/UI/ShaderProperties/Vector2/Size.tres" id="2_cdd3u"]
+[ext_resource type="Script" path="res://addons/rokojori_action_library/Runtime/UI/UISettings.cs" id="1_5a283"]
+[ext_resource type="Resource" uid="uid://bhy8b3gopkq4m" path="res://addons/rokojori_action_library/Runtime/UI/ShaderProperties/Vector2/Size.tres" id="2_cdd3u"]
[resource]
script = ExtResource("1_5a283")
diff --git a/Runtime/VirtualCameras/VirtualCamera3DSlot.cs b/Runtime/VirtualCameras/VirtualCamera3DSlot.cs
index 9e12d02..84b80ac 100644
--- a/Runtime/VirtualCameras/VirtualCamera3DSlot.cs
+++ b/Runtime/VirtualCameras/VirtualCamera3DSlot.cs
@@ -9,7 +9,7 @@ using Godot;
namespace Rokojori
{
[Tool]
- [Icon("res://Scripts/Rokojori/Rokojori-Action-Library/Icons/VirtualCamera3DSlot.svg") ]
+ [Icon("res://addons/rokojori_action_library/Icons/VirtualCamera3DSlot.svg") ]
[GlobalClass]
public partial class VirtualCamera3DSlot:RJAction
{
diff --git a/Runtime/XML/SVG/Arc-Test.svg.import b/Runtime/XML/SVG/Arc-Test.svg.import
index d67adc8..e566e91 100644
--- a/Runtime/XML/SVG/Arc-Test.svg.import
+++ b/Runtime/XML/SVG/Arc-Test.svg.import
@@ -3,15 +3,15 @@
importer="texture"
type="CompressedTexture2D"
uid="uid://dl0a70xdmboor"
-path="res://.godot/imported/Arc-Test.svg-26823712ea0acab6c0061bccaa916650.ctex"
+path="res://.godot/imported/Arc-Test.svg-e4176aa927bd6cb6b7e8759e912fa4a8.ctex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://Scripts/Rokojori/Rokojori-Action-Library/Runtime/XML/SVG/Arc-Test.svg"
-dest_files=["res://.godot/imported/Arc-Test.svg-26823712ea0acab6c0061bccaa916650.ctex"]
+source_file="res://addons/rokojori_action_library/Runtime/XML/SVG/Arc-Test.svg"
+dest_files=["res://.godot/imported/Arc-Test.svg-e4176aa927bd6cb6b7e8759e912fa4a8.ctex"]
[params]