Merge branch 'main' of https://codeberg.org/code-your-friends/gmtk2022

16 files changed, 222 insertions, 17 deletions

diff --git a/godot/.gitattributes b/godot/.gitattributes
new file mode 100644
index 0000000..0f8f149
--- /dev/null
+++ b/godot/.gitattributes
@@ -0,0 +1,17 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.cpp text
+*.c text
+*.h text
+*.gd text
+*.cs text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
diff --git a/godot/.gitignore b/godot/.gitignore
new file mode 100644
index 0000000..6d330c4
--- /dev/null
+++ b/godot/.gitignore
@@ -0,0 +1,7 @@
+# Import cache
+.import/
+
+# Binaries
+bin/
+build/
+lib/
diff --git a/godot/assets/sounds/Uuhhh.mp3 b/godot/assets/sounds/Uuhhh.mp3
new file mode 100644
index 0000000..ea917a2
--- /dev/null
+++ b/godot/assets/sounds/Uuhhh.mp3
diff --git a/godot/assets/sounds/Uuhhh.mp3.import b/godot/assets/sounds/Uuhhh.mp3.import
new file mode 100644
index 0000000..4044597
--- /dev/null
+++ b/godot/assets/sounds/Uuhhh.mp3.import
@@ -0,0 +1,15 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+path="res://.import/Uuhhh.mp3-1452b4c6d720c509ff34f445446a352e.mp3str"
+
+[deps]
+
+source_file="res://assets/sounds/Uuhhh.mp3"
+dest_files=[ "res://.import/Uuhhh.mp3-1452b4c6d720c509ff34f445446a352e.mp3str" ]
+
+[params]
+
+loop=true
+loop_offset=0
diff --git a/godot/assets/textures/grass-texture-26.jpg b/godot/assets/textures/grass-texture-26.jpg
new file mode 100644
index 0000000..bdd70b7
--- /dev/null
+++ b/godot/assets/textures/grass-texture-26.jpg
diff --git a/godot/assets/textures/grass-texture-26.jpg.import b/godot/assets/textures/grass-texture-26.jpg.import
new file mode 100644
index 0000000..26272f5
--- /dev/null
+++ b/godot/assets/textures/grass-texture-26.jpg.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/grass-texture-26.jpg-f4d636ca8594cebf001f20c088d6db38.s3tc.stex"
+path.etc2="res://.import/grass-texture-26.jpg-f4d636ca8594cebf001f20c088d6db38.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/textures/grass-texture-26.jpg"
+dest_files=[ "res://.import/grass-texture-26.jpg-f4d636ca8594cebf001f20c088d6db38.s3tc.stex", "res://.import/grass-texture-26.jpg-f4d636ca8594cebf001f20c088d6db38.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0
diff --git a/godot/assets/textures/sandstone-brick-wall-texture.jpg b/godot/assets/textures/sandstone-brick-wall-texture.jpg
new file mode 100644
index 0000000..a0bc162
--- /dev/null
+++ b/godot/assets/textures/sandstone-brick-wall-texture.jpg
diff --git a/godot/assets/textures/sandstone-brick-wall-texture.jpg.import b/godot/assets/textures/sandstone-brick-wall-texture.jpg.import
new file mode 100644
index 0000000..0d3ef4c
--- /dev/null
+++ b/godot/assets/textures/sandstone-brick-wall-texture.jpg.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/sandstone-brick-wall-texture.jpg-c5b2a47ccb2119e07ae706d0127496d2.s3tc.stex"
+path.etc2="res://.import/sandstone-brick-wall-texture.jpg-c5b2a47ccb2119e07ae706d0127496d2.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/textures/sandstone-brick-wall-texture.jpg"
+dest_files=[ "res://.import/sandstone-brick-wall-texture.jpg-c5b2a47ccb2119e07ae706d0127496d2.s3tc.stex", "res://.import/sandstone-brick-wall-texture.jpg-c5b2a47ccb2119e07ae706d0127496d2.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0
diff --git a/godot/project.godot b/godot/project.godot
index 914091e..a8f6586 100644
--- a/godot/project.godot
+++ b/godot/project.godot
@@ -8,15 +8,16 @@
 
 config_version=4
 
-_global_script_classes=[  ]
-_global_script_class_icons={
-}
-
 [application]
 
 config/name="code-with-your-friends2022"
+run/main_scene="res://scenes/Game.tscn"
 config/icon="res://assets/godot-ferris-32x32.png"
 
+[gdnative]
+
+singletons=[  ]
+
 [rendering]
 
 environment/default_environment="res://default_env.tres"
diff --git a/godot/scenes/Game.tscn b/godot/scenes/Game.tscn
index ba84e42..f8b17cb 100644
--- a/godot/scenes/Game.tscn
+++ b/godot/scenes/Game.tscn
@@ -1,13 +1,14 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://native/Game.gdns" type="Script" id=1]
-[ext_resource path="res://scenes/levels/test_scene/TestScene.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn" type="PackedScene" id=2]
 
 [node name="Game" type="Spatial"]
 script = ExtResource( 1 )
 
 [node name="Camera" type="Camera" parent="."]
-transform = Transform( 0.572229, -0.327396, 0.751909, 0, 0.916856, 0.399217, -0.820094, -0.228443, 0.524651, 4.71648, 2.5, 3.45846 )
+transform = Transform( -0.538224, 0.336461, -0.772728, 0, 0.916856, 0.399217, 0.842802, 0.214868, -0.493474, -6.58972, 3.31005, -7.31211 )
 current = true
+fov = 64.6875
 
-[node name="TestScene" parent="." instance=ExtResource( 2 )]
+[node name="TestSceneUuuhhh" parent="." instance=ExtResource( 2 )]
diff --git a/godot/scenes/levels/test_scene/TestScene.tscn b/godot/scenes/levels/test_scene/TestScene.tscn
index 5775e39..ed981f8 100644
--- a/godot/scenes/levels/test_scene/TestScene.tscn
+++ b/godot/scenes/levels/test_scene/TestScene.tscn
@@ -1,7 +1,11 @@
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://scenes/levels/test_scene/Floor.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scenes/W8.tscn" type="PackedScene" id=2]
 
 [node name="TestScene" type="Spatial"]
 
 [node name="Floor" parent="." instance=ExtResource( 1 )]
+
+[node name="RigidBody" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0339947, 2.91518, -1.40456 )
diff --git a/godot/scenes/levels/test_scene/Floor.tscn b/godot/scenes/levels/test_scene_uuuhhh/Floor.tscn
index 5b58b9f..f8970a7 100644
--- a/godot/scenes/levels/test_scene/Floor.tscn
+++ b/godot/scenes/levels/test_scene_uuuhhh/Floor.tscn
@@ -1,7 +1,12 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://assets/textures/grass-texture-26.jpg" type="Texture" id=1]
 
 [sub_resource type="CubeMesh" id=1]
 
+[sub_resource type="SpatialMaterial" id=3]
+albedo_texture = ExtResource( 1 )
+
 [sub_resource type="BoxShape" id=2]
 
 [node name="StaticBody" type="StaticBody"]
@@ -10,7 +15,7 @@
 transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0 )
 mesh = SubResource( 1 )
 skeleton = NodePath("../CollisionShape")
-material/0 = null
+material/0 = SubResource( 3 )
 
 [node name="CollisionShape" type="CollisionShape" parent="."]
 transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0 )
diff --git a/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn b/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn
new file mode 100644
index 0000000..a8f9003
--- /dev/null
+++ b/godot/scenes/levels/test_scene_uuuhhh/TestSceneUuuhhh.tscn
@@ -0,0 +1,39 @@
+[gd_scene load_steps=6 format=2]
+
+[ext_resource path="res://scenes/levels/test_scene_uuuhhh/Wall.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scenes/levels/test_scene_uuuhhh/Floor.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scenes/scripts/roblox-cube.gd" type="Script" id=3]
+[ext_resource path="res://assets/sounds/Uuhhh.mp3" type="AudioStream" id=4]
+[ext_resource path="res://scenes/objects/W8.tscn" type="PackedScene" id=5]
+
+[node name="TestScene" type="Spatial"]
+
+[node name="W8" parent="." instance=ExtResource( 5 )]
+transform = Transform( 0.990268, 0.0360207, 0.134431, 0, 0.965926, -0.258819, -0.139173, 0.2563, 0.956525, -2.57174, 1.79727, 8.45058 )
+contacts_reported = 3
+contact_monitor = true
+script = ExtResource( 3 )
+
+[node name="Floor" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0290833, -0.981747, 0.00208664 )
+
+[node name="Floor2" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 20 )
+
+[node name="Floor3" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 20, -1, 0 )
+
+[node name="Floor4" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 20, -1, 20 )
+
+[node name="Floor5" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 40, -1, 0 )
+
+[node name="Floor6" parent="." instance=ExtResource( 2 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 40, -1, 20 )
+
+[node name="Wall" parent="." instance=ExtResource( 1 )]
+transform = Transform( 0.766044, 0, -0.642788, 0, 2, 0, 0.642788, 0, 0.766044, 19.47, 0, 14.7187 )
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 4 )
diff --git a/godot/scenes/levels/test_scene_uuuhhh/Wall.tscn b/godot/scenes/levels/test_scene_uuuhhh/Wall.tscn
new file mode 100644
index 0000000..e3afe23
--- /dev/null
+++ b/godot/scenes/levels/test_scene_uuuhhh/Wall.tscn
@@ -0,0 +1,23 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://assets/textures/sandstone-brick-wall-texture.jpg" type="Texture" id=1]
+
+[sub_resource type="CubeMesh" id=1]
+
+[sub_resource type="SpatialMaterial" id=2]
+albedo_texture = ExtResource( 1 )
+
+[sub_resource type="ConvexPolygonShape" id=3]
+points = PoolVector3Array( 1, 1, 1, 1, 1, -1, -1, 1, 1, 1, -1, 1, 1, -1, -1, -1, 1, -1, -1, -1, 1, -1, -1, -1 )
+
+[node name="StaticBody" type="StaticBody"]
+
+[node name="MeshInstance" type="MeshInstance" parent="."]
+transform = Transform( 0.3, 0, 0, 0, 1, 0, 0, 0, 5, 0, 1, 0 )
+mesh = SubResource( 1 )
+skeleton = NodePath("")
+material/0 = SubResource( 2 )
+
+[node name="CollisionShape" type="CollisionShape" parent="."]
+transform = Transform( 0.3, 0, 0, 0, 1, 0, 0, 0, 5, 0, 1, 0 )
+shape = SubResource( 3 )
diff --git a/godot/scenes/W8.tscn b/godot/scenes/objects/W8.tscn
index 1cf2dba..91f58eb 100644
--- a/godot/scenes/W8.tscn
+++ b/godot/scenes/objects/W8.tscn
@@ -1,6 +1,5 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://assets/game_objects/W8.gltf" type="PackedScene" id=1]
 [ext_resource path="res://assets/game_objects/W8baseColor_Mat.material" type="Material" id=2]
 
 [sub_resource type="ArrayMesh" id=1]
@@ -21,14 +20,12 @@ surfaces/0 = {
 [sub_resource type="ConvexPolygonShape" id=2]
 points = PoolVector3Array( -0.0850063, -0.879389, -0.0282584, 0.0288993, 0.929375, 0.0289349, 0.0288993, 0.929375, -0.0289349, 0.929367, -0.0289314, 0.0289314, -0.0289784, -0.0289338, 0.929338, -0.929369, 0.028929, 0.028929, 0.0288993, -0.0289349, -0.929375, 0.0288993, -0.929375, 0.0289349, -0.0850063, 0.0282584, -0.879389, 0.0282247, 0.084959, 0.87945, 0.857489, 0.056933, -0.0855785, -0.879454, -0.0849424, 0.0282549, 0.0570775, -0.885814, -0.0571088, 0.0570775, -0.0571088, 0.885814, -0.0571532, 0.885743, -0.0571043, -0.0571532, 0.885743, 0.0571043, 0.0570775, 0.0571088, -0.885814, -0.885806, -0.057097, -0.057097, 0.879446, 0.0849494, 0.0282572, 0.857335, -0.0571018, -0.0855632, -0.0571532, 0.0571043, 0.885743, -0.0571532, -0.885743, 0.0571043, -0.885806, 0.057097, -0.057097, -0.0571532, -0.0571043, -0.885743, 0.0570775, 0.0571088, 0.885814, -0.0571532, -0.885743, -0.0571043, -0.0571532, 0.0571043, -0.885743, 0.0570775, -0.885814, 0.0571088, 0.0570775, 0.885814, 0.0571088, -0.0571532, -0.0571043, 0.885743, -0.885806, 0.057097, 0.057097, 0.0570775, 0.885814, -0.0571088, 0.0570775, -0.0571088, -0.885814, 0.857335, -0.0571018, 0.0855632, -0.885806, -0.057097, 0.057097, 0.857489, 0.056933, 0.0855785, 0.929425, 0.0287513, -0.0289333, 0.929367, -0.0289314, -0.0289314, -0.0289784, 0.929338, -0.0289338, 0.0288993, 0.0289349, -0.929375, -0.929369, -0.028929, -0.028929, -0.0283039, -0.87942, -0.0849561, 0.084933, 0.0282608, 0.879461, -0.0289784, 0.929338, 0.0289338, -0.0289784, -0.0289338, -0.929338, -0.0289784, 0.0289338, 0.929338, 0.0288993, -0.0289349, 0.929375, 0.0288993, -0.929375, -0.0289349, -0.0289784, -0.929338, 0.0289338, -0.929369, 0.028929, -0.028929, -0.0283039, 0.0849561, -0.87942, -0.879454, -0.0282549, 0.0849424, 0.879512, 0.0280816, 0.0849558, 0.879446, -0.0849494, -0.0282572, -0.0282988, -0.822574, 0.141805, 0.17021, 0.0280745, -0.794261, -0.879454, 0.0849424, -0.0282549, -0.0283039, 0.87942, 0.0849561, 0.0282247, 0.87945, -0.084959, 0.0282247, -0.084959, -0.87945, -0.879454, -0.0282549, -0.0849424, -0.0850063, 0.0282584, 0.879389, -0.0850063, 0.879389, 0.0282584, 0.084933, -0.0282608, 0.879461 )
 
-[node name="W8" instance=ExtResource( 1 )]
+[node name="RigidBody" type="RigidBody"]
 
-[node name="RigidBody" type="RigidBody" parent="." index="0"]
-
-[node name="Cone" type="MeshInstance" parent="RigidBody" index="0"]
+[node name="Cone" type="MeshInstance" parent="."]
 mesh = SubResource( 1 )
 skeleton = NodePath("../..")
 material/0 = null
 
-[node name="CollisionShape" type="CollisionShape" parent="RigidBody" index="1"]
+[node name="CollisionShape" type="CollisionShape" parent="."]
 shape = SubResource( 2 )
diff --git a/godot/scenes/scripts/roblox-cube.gd b/godot/scenes/scripts/roblox-cube.gd
new file mode 100644
index 0000000..453067b
--- /dev/null
+++ b/godot/scenes/scripts/roblox-cube.gd
@@ -0,0 +1,22 @@
+extends Spatial
+
+
+# Declare member variables here. Examples:
+# var a = 2
+# var b = "text"
+func on_collision(other):
+	var ap = get_parent().get_node("AudioStreamPlayer")
+	ap.play()
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	var rb = self
+	rb.apply_impulse(Vector3(), Vector3(40, 1, 10))
+	rb.connect("body_entered", self, "on_collision")
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass
+