diff --git a/Assets/Procedural/Grass/grass-albedo.jpg.import b/Assets/Procedural/Grass/grass-albedo.jpg.import index 0e54675..a359077 100644 --- a/Assets/Procedural/Grass/grass-albedo.jpg.import +++ b/Assets/Procedural/Grass/grass-albedo.jpg.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://d26yo7jsrxtws" path.s3tc="res://.godot/imported/grass-albedo.jpg-c84cfed4e689cec916b830b5e61c6fc2.s3tc.ctex" +path.etc2="res://.godot/imported/grass-albedo.jpg-c84cfed4e689cec916b830b5e61c6fc2.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://addons/rokojori_action_library/Assets/Procedural/Grass/grass-albedo.jpg" -dest_files=["res://.godot/imported/grass-albedo.jpg-c84cfed4e689cec916b830b5e61c6fc2.s3tc.ctex"] +dest_files=["res://.godot/imported/grass-albedo.jpg-c84cfed4e689cec916b830b5e61c6fc2.s3tc.ctex", "res://.godot/imported/grass-albedo.jpg-c84cfed4e689cec916b830b5e61c6fc2.etc2.ctex"] [params] diff --git a/Assets/Procedural/Grass/grass-normal.jpg.import b/Assets/Procedural/Grass/grass-normal.jpg.import index 714ec14..c49544c 100644 --- a/Assets/Procedural/Grass/grass-normal.jpg.import +++ b/Assets/Procedural/Grass/grass-normal.jpg.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://bq7d1ml585fxg" path.s3tc="res://.godot/imported/grass-normal.jpg-161cf607f42dce5cf9be332a6b828c4c.s3tc.ctex" +path.etc2="res://.godot/imported/grass-normal.jpg-161cf607f42dce5cf9be332a6b828c4c.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://addons/rokojori_action_library/Assets/Procedural/Grass/grass-normal.jpg" -dest_files=["res://.godot/imported/grass-normal.jpg-161cf607f42dce5cf9be332a6b828c4c.s3tc.ctex"] +dest_files=["res://.godot/imported/grass-normal.jpg-161cf607f42dce5cf9be332a6b828c4c.s3tc.ctex", "res://.godot/imported/grass-normal.jpg-161cf607f42dce5cf9be332a6b828c4c.etc2.ctex"] [params] diff --git a/Assets/Procedural/Grass/grass-orm.jpg.import b/Assets/Procedural/Grass/grass-orm.jpg.import index 662ea3f..6c1f052 100644 --- a/Assets/Procedural/Grass/grass-orm.jpg.import +++ b/Assets/Procedural/Grass/grass-orm.jpg.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://b4qprmwr2fmno" path.s3tc="res://.godot/imported/grass-orm.jpg-c21643a740d42c09c2f89b7bf2e82eda.s3tc.ctex" +path.etc2="res://.godot/imported/grass-orm.jpg-c21643a740d42c09c2f89b7bf2e82eda.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://addons/rokojori_action_library/Assets/Procedural/Grass/grass-orm.jpg" -dest_files=["res://.godot/imported/grass-orm.jpg-c21643a740d42c09c2f89b7bf2e82eda.s3tc.ctex"] +dest_files=["res://.godot/imported/grass-orm.jpg-c21643a740d42c09c2f89b7bf2e82eda.s3tc.ctex", "res://.godot/imported/grass-orm.jpg-c21643a740d42c09c2f89b7bf2e82eda.etc2.ctex"] [params] diff --git a/Icons/FlareVFX.svg.import b/Icons/FlareVFX.svg.import index 0db720c..fb640a1 100644 --- a/Icons/FlareVFX.svg.import +++ b/Icons/FlareVFX.svg.import @@ -4,15 +4,16 @@ importer="texture" type="CompressedTexture2D" uid="uid://b7u8spfui08e7" path.s3tc="res://.godot/imported/FlareVFX.svg-7c0691138c416c828300e95f7f8b3111.s3tc.ctex" +path.etc2="res://.godot/imported/FlareVFX.svg-7c0691138c416c828300e95f7f8b3111.etc2.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], +"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true } [deps] source_file="res://addons/rokojori_action_library/Icons/FlareVFX.svg" -dest_files=["res://.godot/imported/FlareVFX.svg-7c0691138c416c828300e95f7f8b3111.s3tc.ctex"] +dest_files=["res://.godot/imported/FlareVFX.svg-7c0691138c416c828300e95f7f8b3111.s3tc.ctex", "res://.godot/imported/FlareVFX.svg-7c0691138c416c828300e95f7f8b3111.etc2.ctex"] [params] diff --git a/Runtime/Animation/MoveOnSpline.cs b/Runtime/Animation/MoveOnSpline.cs new file mode 100644 index 0000000..9bef3a9 --- /dev/null +++ b/Runtime/Animation/MoveOnSpline.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using System.Text.RegularExpressions; +using System.Text; +using Godot; + +using Rokojori.Extensions; +namespace Rokojori; + +[Tool] +[GlobalClass] +public partial class MoveOnSpline:Action +{ + [Export] + public Node3D target; + + [Export] + public Spline spline; + + [Export] + public float duration; + + [Export] + public Timeline timeline; + + + protected override void _OnTrigger() + { + var curve = spline.GetCurve(); + + var position = ( timeline.position % duration ) / duration; + + // RJLog.Log( timeline.position, position ); + + target.GlobalPosition = curve.PositionAt( position ); + + + + } +} + diff --git a/Runtime/Animation/MoveOnSpline.cs.uid b/Runtime/Animation/MoveOnSpline.cs.uid new file mode 100644 index 0000000..ba9cbd6 --- /dev/null +++ b/Runtime/Animation/MoveOnSpline.cs.uid @@ -0,0 +1 @@ +uid://4eggei5kwxm4 diff --git a/Runtime/Presets/App/MainModule.cs b/Runtime/Presets/App/MainModule.cs index 7adc798..fcf14b0 100644 --- a/Runtime/Presets/App/MainModule.cs +++ b/Runtime/Presets/App/MainModule.cs @@ -75,8 +75,8 @@ namespace Rokojori var tm = root.CreateChild( "Timeline Manager" ); var timelinePath = "res://addons/rokojori_action_library/Runtime/Time/TimeLines/"; - var gameTime = ResourceLoader.Load( timelinePath + "GameTime.tres" ); - var realTime = ResourceLoader.Load( timelinePath + "RealTime.tres" ); + var gameTime = ResourceLoader.Load( timelinePath + "Game Time.tres" ); + var realTime = ResourceLoader.Load( timelinePath + "Real Time.tres" ); tm.timeScaleTimeline = gameTime; tm.realtimeTimeline = realTime; diff --git a/Runtime/Rendering/RenderingManager.cs b/Runtime/Rendering/RenderingManager.cs index 98a656a..bb98026 100644 --- a/Runtime/Rendering/RenderingManager.cs +++ b/Runtime/Rendering/RenderingManager.cs @@ -46,7 +46,7 @@ namespace Rokojori } [Export] - public Shader[] shaders; + public Shader[] shaders = []; [ExportToolButton( "Get Material Code")] public Callable getMaterialCodeButton => Callable.From( diff --git a/Runtime/Sensors/DeviceFilters/DefaultSensorDeviceSelector.cs b/Runtime/Sensors/DeviceFilters/DefaultSensorDeviceSelector.cs index 9803e85..ce9b654 100644 --- a/Runtime/Sensors/DeviceFilters/DefaultSensorDeviceSelector.cs +++ b/Runtime/Sensors/DeviceFilters/DefaultSensorDeviceSelector.cs @@ -14,7 +14,8 @@ namespace Rokojori GamePad, Keyboard_and_Mouse, Keyboard, - Mouse + Mouse, + Touch } [Export] diff --git a/Runtime/Time/TimelineCallback.cs.uid b/Runtime/Time/TimelineCallback.cs.uid new file mode 100644 index 0000000..8103a64 --- /dev/null +++ b/Runtime/Time/TimelineCallback.cs.uid @@ -0,0 +1 @@ +uid://dk3j08t5evitr diff --git a/Runtime/Time/TimelineEvent.cs.uid b/Runtime/Time/TimelineEvent.cs.uid new file mode 100644 index 0000000..b3a5670 --- /dev/null +++ b/Runtime/Time/TimelineEvent.cs.uid @@ -0,0 +1 @@ +uid://265t3iw34spd diff --git a/Runtime/Time/TimelineManager_Scheduling.cs.uid b/Runtime/Time/TimelineManager_Scheduling.cs.uid new file mode 100644 index 0000000..2aa12e0 --- /dev/null +++ b/Runtime/Time/TimelineManager_Scheduling.cs.uid @@ -0,0 +1 @@ +uid://i61y8ksecjih diff --git a/Runtime/Time/TimelineRunner.cs.uid b/Runtime/Time/TimelineRunner.cs.uid new file mode 100644 index 0000000..f1af734 --- /dev/null +++ b/Runtime/Time/TimelineRunner.cs.uid @@ -0,0 +1 @@ +uid://cm32xy4cjb4ah diff --git a/Runtime/Time/TimelineSpan.cs.uid b/Runtime/Time/TimelineSpan.cs.uid new file mode 100644 index 0000000..97f0f4d --- /dev/null +++ b/Runtime/Time/TimelineSpan.cs.uid @@ -0,0 +1 @@ +uid://coe7ieoo2kma3 diff --git a/Runtime/Time/Timelines/Game Time.tres b/Runtime/Time/Timelines/Game Time.tres index 9764ac3..e104675 100644 --- a/Runtime/Time/Timelines/Game Time.tres +++ b/Runtime/Time/Timelines/Game Time.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="Timeline" format=3 uid="uid://ch5nsa6yafs5l"] -[ext_resource type="Script" uid="uid://ydp0av62q8oi" path="res://addons/rokojori_action_library/Runtime/Time/Timeline.cs" id="1_afdkj"] +[ext_resource type="Script" uid="uid://lhkx6c78a61x" path="res://addons/rokojori_action_library/Runtime/Time/Timeline.cs" id="1_afdkj"] [resource] script = ExtResource("1_afdkj")