Finished basic movement, collision, visuals

[baabarian.git] / test.tscn

diff --git a/test.tscn b/test.tscn
index c5570b85bb3425f73401e2a2eb164cb9d3f3175d..a1312ce49814976cba4dcc8d29932667ebaa66c0 100644 (file)
--- a/test.tscn
+++ b/test.tscn
@@ -1,11 +1,12 @@
-[gd_scene load_steps=13 format=3 uid="uid://c1bxy5s8fvheq"]
+[gd_scene load_steps=14 format=3 uid="uid://c1bxy5s8fvheq"]

 
 

-[ext_resource type="Script" uid="uid://dpsqolvx3mdic" path="res://Scene.gd" id="1_6uqi0"]
-[ext_resource type="PackedScene" uid="uid://ch6s2gvhi64uh" path="res://player.tscn" id="1_37kl0"]
+[ext_resource type="Script" uid="uid://dpsqolvx3mdic" path="res://class/Scene.gd" id="1_6uqi0"]
+[ext_resource type="PackedScene" uid="uid://ch6s2gvhi64uh" path="res://player/player.tscn" id="1_37kl0"]

 [ext_resource type="PackedScene" uid="uid://bx83k2u0snfjc" path="res://cube.tscn" id="2_8uh7m"]
 [ext_resource type="PackedScene" uid="uid://bx83k2u0snfjc" path="res://cube.tscn" id="2_8uh7m"]

-[ext_resource type="Script" uid="uid://dd3sep8kprktl" path="res://ux/debug_overlay.gd" id="2_g14j6"]
-[ext_resource type="Script" uid="uid://mgg7ii0w4vod" path="res://ux/debug_stats.gd" id="2_ppyta"]
-[ext_resource type="Script" uid="uid://bocc5xwqtbkbb" path="res://ux/debug_draw_3d.gd" id="4_vbegm"]
+[ext_resource type="Script" uid="uid://dd3sep8kprktl" path="res://class/ux/debug_overlay.gd" id="2_g14j6"]
+[ext_resource type="Script" uid="uid://mgg7ii0w4vod" path="res://class/ux/debug_stats.gd" id="2_ppyta"]
+[ext_resource type="Script" uid="uid://bocc5xwqtbkbb" path="res://class/ux/debug_draw_3d.gd" id="4_vbegm"]
+[ext_resource type="Texture2D" uid="uid://dpjg45owgorg2" path="res://texture/untextured.png" id="5_vbegm"]

 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_mf4mk"]
 sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_mf4mk"]
 sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)


@@ -25,6 +26,9 @@ size = Vector2(222, 222)
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_37kl0"]
 albedo_color = Color(0.133333, 0.278431, 0.133333, 1)
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_37kl0"]
 albedo_color = Color(0.133333, 0.278431, 0.133333, 1)

+albedo_texture = ExtResource("5_vbegm")
+uv1_scale = Vector3(10, 10, 10)
+uv1_world_triplanar = true

 
 [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_37kl0"]
 data = PackedVector3Array(111, 0, 111, -111, 0, 111, 111, 0, -111, -111, 0, 111, -111, 0, -111, 111, 0, -111)
 
 [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_37kl0"]
 data = PackedVector3Array(111, 0, 111, -111, 0, 111, 111, 0, -111, -111, 0, 111, -111, 0, -111, 111, 0, -111)


@@ -45,9 +49,6 @@ theme_override_constants/margin_right = 5
 theme_override_constants/margin_bottom = 5
 script = ExtResource("2_ppyta")
 
 theme_override_constants/margin_bottom = 5
 script = ExtResource("2_ppyta")
 

-[node name="VBoxContainer" type="VBoxContainer" parent="debug/DebugStats"]
-layout_mode = 2
-

 [node name="DebugDraw3D" type="Control" parent="debug"]
 layout_mode = 3
 anchors_preset = 0
 [node name="DebugDraw3D" type="Control" parent="debug"]
 layout_mode = 3
 anchors_preset = 0


@@ -55,26 +56,43 @@ offset_right = 40.0
 offset_bottom = 40.0
 script = ExtResource("4_vbegm")
 
 offset_bottom = 40.0
 script = ExtResource("4_vbegm")
 

-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+[node name="player" parent="." instance=ExtResource("1_37kl0")]
+collision_layer = 2
+collision_mask = 7
+
+[node name="map" type="Node3D" parent="."]
+
+[node name="WorldEnvironment" type="WorldEnvironment" parent="map"]

 environment = SubResource("Environment_8uh7m")
 
 environment = SubResource("Environment_8uh7m")
 

-[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="map"]

 transform = Transform3D(1, 0, 0, 0, 0.499998, 0.866027, 0, -0.866027, 0.499998, 0, 0, 0)
 shadow_enabled = true
 
 transform = Transform3D(1, 0, 0, 0, 0.499998, 0.866027, 0, -0.866027, 0.499998, 0, 0, 0)
 shadow_enabled = true
 

-[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+[node name="MeshInstance3D" type="MeshInstance3D" parent="map"]

 mesh = SubResource("PlaneMesh_mf4mk")
 mesh = SubResource("PlaneMesh_mf4mk")

+skeleton = NodePath("../..")

 surface_material_override/0 = SubResource("StandardMaterial3D_37kl0")
 
 surface_material_override/0 = SubResource("StandardMaterial3D_37kl0")
 

-[node name="StaticBody3D" type="StaticBody3D" parent="MeshInstance3D"]
+[node name="StaticBody3D" type="StaticBody3D" parent="map/MeshInstance3D"]
+collision_mask = 7

 
 

-[node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D/StaticBody3D"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="map/MeshInstance3D/StaticBody3D"]

 shape = SubResource("ConcavePolygonShape3D_37kl0")
 
 shape = SubResource("ConcavePolygonShape3D_37kl0")
 

-[node name="player" parent="." instance=ExtResource("1_37kl0")]
+[node name="boxes" type="Node3D" parent="."]

 
 [node name="Cube" parent="." instance=ExtResource("2_8uh7m")]
 
 [node name="Cube" parent="." instance=ExtResource("2_8uh7m")]

-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.297243, 0, 10.8886)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.566431, 1, 10.0699)

 
 [node name="Cube2" parent="." instance=ExtResource("2_8uh7m")]
 
 [node name="Cube2" parent="." instance=ExtResource("2_8uh7m")]

-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.27809, -9.53674e-07, 6.40379)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.10187, 1, 6.38805)
+
+[node name="Cube3" parent="." instance=ExtResource("2_8uh7m")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.92195, 1, 9.742)
+
+[node name="Cube4" parent="." instance=ExtResource("2_8uh7m")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.37007, 0.999999, 14.1222)
+
+[node name="Cube5" parent="." instance=ExtResource("2_8uh7m")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.3609, 1, 14.9511)