Merge branch 'master' of https://git.sjkillen.ca/sjkillen/hurrmmm

godot/Objects/child/child.gd

@@ -0,0 +1,19 @@
+extends Node3D
+
+var delta := 1.0 / float(Engine.physics_ticks_per_second)
+
+func _ready():
+	Engine.get_physics_frames()
+	TAS_System.FrameIncremented.connect(frame_inc)
+	TAS_System.FramesAdvanced.connect(frames_change)
+	TAS_System.FramesRegressed.connect(frames_change)
+
+func frame_inc(frame: int):
+	%AnimationTree.advance(delta)
+
+func frames_change(start: int, end: int):
+	%AnimationTree.advance((end - start)*delta)
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(delta):
+	pass

godot/Objects/child/child.tscn

@@ -1,5 +1,57 @@
-[gd_scene load_steps=2 format=3 uid="uid://cfpiau12q3fut"]
+[gd_scene load_steps=9 format=3 uid="uid://cfpiau12q3fut"]
 
 [ext_resource type="PackedScene" uid="uid://c2kmady6gqslx" path="res://child.glb" id="1_rqu88"]
+[ext_resource type="Script" path="res://animation_tree.gd" id="2_tcc3g"]
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_uc42e"]
+animation = &"JumpingJacksNLA"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ijpln"]
+animation = &"JumpingJacksNLA"
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_57k3o"]
+switch_mode = 2
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_3idly"]
+switch_mode = 2
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_h2mkw"]
+switch_mode = 2
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_u0o4a"]
+states/JumpingJacksNLA/node = SubResource("AnimationNodeAnimation_ijpln")
+states/JumpingJacksNLA/position = Vector2(559, 54)
+"states/JumpingJacksNLA 2/node" = SubResource("AnimationNodeAnimation_uc42e")
+"states/JumpingJacksNLA 2/position" = Vector2(633, 131)
+transitions = ["JumpingJacksNLA", "JumpingJacksNLA 2", SubResource("AnimationNodeStateMachineTransition_57k3o"), "JumpingJacksNLA 2", "JumpingJacksNLA", SubResource("AnimationNodeStateMachineTransition_3idly"), "Start", "JumpingJacksNLA", SubResource("AnimationNodeStateMachineTransition_h2mkw")]
 
 [node name="child" instance=ExtResource("1_rqu88")]
+
+[node name="Skeleton3D" parent="Armature" index="0"]
+bones/0/position = Vector3(0, 2.32035, 0)
+bones/3/rotation = Quaternion(0.0514876, -5.4438e-17, -2.71031e-16, 0.998674)
+bones/5/rotation = Quaternion(0.0965706, 0.063607, -0.119505, 0.986077)
+bones/6/rotation = Quaternion(0.0206859, -0.0873376, 0.0694537, 0.993539)
+bones/7/rotation = Quaternion(0.00777981, 0.0423361, -0.0822345, 0.995683)
+bones/9/rotation = Quaternion(0.0965705, -0.063607, 0.119505, 0.986077)
+bones/10/rotation = Quaternion(0.0206859, 0.0873376, -0.0694538, 0.993539)
+bones/11/rotation = Quaternion(0.00777978, -0.0423361, 0.0822345, 0.995683)
+bones/12/rotation = Quaternion(0.626251, 0.334163, 0.616519, -0.340661)
+bones/13/rotation = Quaternion(-0.27126, -0.0288476, 0.0393126, 0.96127)
+bones/14/rotation = Quaternion(-0.0251956, -0.00324478, 0.00115795, 0.999677)
+bones/15/rotation = Quaternion(0.0339653, 0.0223564, -0.693306, 0.719495)
+bones/16/rotation = Quaternion(0.626251, -0.334163, -0.616519, -0.340661)
+bones/17/rotation = Quaternion(-0.27126, 0.0288476, -0.0393126, 0.96127)
+bones/18/rotation = Quaternion(-0.0251956, 0.00324479, -0.00115795, 0.999677)
+bones/19/rotation = Quaternion(0.0339653, -0.0223564, 0.693306, 0.719495)
+
+[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
+unique_name_in_owner = true
+tree_root = SubResource("AnimationNodeStateMachine_u0o4a")
+anim_player = NodePath("../AnimationPlayer")
+active = true
+process_callback = 2
+script = ExtResource("2_tcc3g")

godot/animation_tree.gd

@@ -0,0 +1,14 @@
+extends AnimationTree
+
+var delta := 1.0 / float(Engine.physics_ticks_per_second)
+
+func _ready():
+	TAS_System.FrameIncremented.connect(frame_inc)
+	TAS_System.FramesAdvanced.connect(frames_change)
+	TAS_System.FramesRegressed.connect(frames_change)
+
+func frame_inc(frame: int):
+	advance(delta)
+
+func frames_change(start: int, end: int):
+	advance((end - start)*delta)

godot/igloo_Igloo_Colour.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cubs5wn64bh8j"
+path.s3tc="res://.godot/imported/igloo_Igloo_Colour.png-53ffaa4f01ab126b02b022a48d701737.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+generator_parameters={}
+
+[deps]
+
+source_file="res://igloo_Igloo_Colour.png"
+dest_files=["res://.godot/imported/igloo_Igloo_Colour.png-53ffaa4f01ab126b02b022a48d701737.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+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=0

godot/igloo_Igloo_Normal.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://gsn7icv0cccu"
+path.s3tc="res://.godot/imported/igloo_Igloo_Normal.png-c26a5981ba757b6a9728ef855805e1dd.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+generator_parameters={}
+
+[deps]
+
+source_file="res://igloo_Igloo_Normal.png"
+dest_files=["res://.godot/imported/igloo_Igloo_Normal.png-c26a5981ba757b6a9728ef855805e1dd.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=1
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=1
+roughness/src_normal="res://igloo_Igloo_Normal.png"
+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=0

godot/tests/control_scheme/test_basic_controls.tscn

@@ -1,10 +1,12 @@
-[gd_scene load_steps=7 format=3 uid="uid://70bb2yncbl"]
+[gd_scene load_steps=9 format=3 uid="uid://70bb2yncbl"]
 
 [ext_resource type="PackedScene" uid="uid://bua7f25rpewkp" path="res://small_room.glb" id="1_2ticn"]
 [ext_resource type="PackedScene" uid="uid://drmb4sitb74fx" path="res://control_scheme/controller.tscn" id="2_dcvuq"]
 [ext_resource type="PackedScene" uid="uid://c43pr474qofhl" path="res://physics/grape.tscn" id="3_gijly"]
 [ext_resource type="PackedScene" uid="uid://b1uf31ed6h0ir" path="res://UI/TAS UI/TAS UI.tscn" id="4_8yatx"]
-[ext_resource type="PackedScene" path="res://cake.tscn" id="5_udc7s"]
+[ext_resource type="PackedScene" uid="uid://cx4ohbn84hmc3" path="res://cake.tscn" id="5_udc7s"]
+[ext_resource type="PackedScene" uid="uid://cfpiau12q3fut" path="res://Objects/child/child.tscn" id="6_52mue"]
+[ext_resource type="PackedScene" uid="uid://dfkyytk42ecwk" path="res://Objects/igloo/igloo.tscn" id="7_ifsxo"]
 
 [sub_resource type="Environment" id="Environment_f0m14"]
 ambient_light_source = 2
@@ -36,3 +38,8 @@ current = true
 
 [node name="cake" parent="." index="8" instance=ExtResource("5_udc7s")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.45077, 0)
+
+[node name="child" parent="." index="9" instance=ExtResource("6_52mue")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.93688)
+
+[node name="igloo" parent="." index="10" instance=ExtResource("7_ifsxo")]