diff --git a/assets/mesh_libraries/w1/w1_walls.meshlib b/assets/mesh_libraries/w1/w1_walls.meshlib index 1231501..5aefc5a 100644 Binary files a/assets/mesh_libraries/w1/w1_walls.meshlib and b/assets/mesh_libraries/w1/w1_walls.meshlib differ diff --git a/assets/mesh_libraries/w1/w1_walls.tscn b/assets/mesh_libraries/w1/w1_walls.tscn index aea9e40..7b1215b 100644 --- a/assets/mesh_libraries/w1/w1_walls.tscn +++ b/assets/mesh_libraries/w1/w1_walls.tscn @@ -1,9 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://d3kpyse5k7scu"] +[gd_scene load_steps=4 format=3 uid="uid://d3kpyse5k7scu"] [ext_resource type="PackedScene" uid="uid://ckqliu2kcydpu" path="res://assets/models/tiles/w1_walls.glb" id="1_1elhp"] [sub_resource type="BoxShape3D" id="BoxShape3D_kqhok"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_bvwbx"] +points = PackedVector3Array(0.5, 1, 0.5, 0.5, 1, -0.5, -0.5, 1, -0.5, 0.5, 0, 0.5, 0.5, 0, -0.5, -0.5, 0, -0.5) + [node name="W1Walls" instance=ExtResource("1_1elhp")] [node name="StaticBody3D" type="StaticBody3D" parent="GreyBlock" index="0"] @@ -11,3 +14,8 @@ [node name="CollisionShape3D" type="CollisionShape3D" parent="GreyBlock/StaticBody3D" index="0"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) shape = SubResource("BoxShape3D_kqhok") + +[node name="StaticBody3D" type="StaticBody3D" parent="GreyBlockCorner" index="0"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="GreyBlockCorner/StaticBody3D" index="0"] +shape = SubResource("ConvexPolygonShape3D_bvwbx") diff --git a/assets/models/tiles/w1_walls.blend b/assets/models/tiles/w1_walls.blend index 6a4b963..08e0824 100644 Binary files a/assets/models/tiles/w1_walls.blend and b/assets/models/tiles/w1_walls.blend differ diff --git a/assets/models/tiles/w1_walls.blend1 b/assets/models/tiles/w1_walls.blend1 index ea9f15c..7e573b1 100644 Binary files a/assets/models/tiles/w1_walls.blend1 and b/assets/models/tiles/w1_walls.blend1 differ diff --git a/assets/models/tiles/w1_walls.glb b/assets/models/tiles/w1_walls.glb index 2223b0f..c096543 100644 Binary files a/assets/models/tiles/w1_walls.glb and b/assets/models/tiles/w1_walls.glb differ diff --git a/assets/models/tiles/w1_walls.glb.import b/assets/models/tiles/w1_walls.glb.import index 71f4c2d..a56a2b7 100644 --- a/assets/models/tiles/w1_walls.glb.import +++ b/assets/models/tiles/w1_walls.glb.import @@ -35,7 +35,7 @@ _subresources={ "materials": { "GreyBlock": { "use_external/enabled": true, -"use_external/path": "res://assets/models/tiles/w1_walls/grey_block.tres" +"use_external/path": "res://assets/models/tiles/w1_walls/grey_block.material" } } } diff --git a/assets/models/tiles/w1_walls/grey_block.material b/assets/models/tiles/w1_walls/grey_block.material new file mode 100644 index 0000000..68549b3 Binary files /dev/null and b/assets/models/tiles/w1_walls/grey_block.material differ diff --git a/assets/models/tiles/w1_walls/grey_block.material.depren b/assets/models/tiles/w1_walls/grey_block.material.depren new file mode 100644 index 0000000..081a0ee Binary files /dev/null and b/assets/models/tiles/w1_walls/grey_block.material.depren differ diff --git a/assets/models/tiles/w1_walls/grey_block.tres b/assets/models/tiles/w1_walls/grey_block.tres index cb6e2ae..1502b56 100644 --- a/assets/models/tiles/w1_walls/grey_block.tres +++ b/assets/models/tiles/w1_walls/grey_block.tres @@ -8,4 +8,6 @@ shading_mode = 2 specular_mode = 2 albedo_texture = ExtResource("1_y03ms") metallic_specular = 0.0 +uv1_offset = Vector3(0.5, 0, 0.5) +uv1_triplanar = true texture_filter = 0 diff --git a/project.godot b/project.godot index bef0700..c55e805 100644 --- a/project.godot +++ b/project.godot @@ -19,7 +19,7 @@ config/icon="res://icon.svg" window/size/viewport_width=320 window/size/viewport_height=240 -window/stretch/mode="canvas_items" +window/stretch/mode="viewport" [editor_plugins] diff --git a/test_scene.tscn b/test_scene.tscn index e12aff2..18c7d23 100644 --- a/test_scene.tscn +++ b/test_scene.tscn @@ -1,25 +1,41 @@ -[gd_scene load_steps=9 format=3 uid="uid://dllug6vijj18o"] +[gd_scene load_steps=11 format=3 uid="uid://dllug6vijj18o"] [ext_resource type="PackedScene" uid="uid://cybm74xwbsivx" path="res://objects/canny_cat.tscn" id="1_8qiqb"] [ext_resource type="MeshLibrary" uid="uid://cbs170roel08g" path="res://assets/mesh_libraries/w1/w1_floors.meshlib" id="2_ohutf"] [ext_resource type="MeshLibrary" uid="uid://bqxgr3arh0i7f" path="res://assets/mesh_libraries/w1/w1_walls.meshlib" id="3_k3r2h"] [ext_resource type="PackedScene" uid="uid://cdpgby3r6xe4n" path="res://objects/goal_post.tscn" id="4_71ems"] [ext_resource type="PackedScene" uid="uid://bfic5n608nc5j" path="res://objects/sand_pit.tscn" id="5_7n16u"] +[ext_resource type="PackedScene" uid="uid://b4a8aif3iigdw" path="res://objects/boney.tscn" id="6_gpbt0"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_akirf"] +sky_top_color = Color(0.270389, 0.858166, 0.929253, 1) +sky_horizon_color = Color(0.270588, 0.858824, 0.929412, 1) +ground_bottom_color = Color(0.089621, 0.176788, 0.342266, 1) +ground_horizon_color = Color(0.270588, 0.858824, 0.929412, 1) +ground_curve = 0.452548 +sun_angle_max = 0.0 +use_debanding = false [sub_resource type="Sky" id="Sky_f657k"] sky_material = SubResource("ProceduralSkyMaterial_akirf") +radiance_size = 0 [sub_resource type="Environment" id="Environment_0oogp"] background_mode = 2 sky = SubResource("Sky_f657k") +ambient_light_source = 2 +ambient_light_color = Color(1, 1, 1, 1) +ambient_light_energy = 0.25 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_77yoh"] +resource_local_to_scene = true +shading_mode = 0 +albedo_color = Color(0.916968, 0.113727, 0, 1) [node name="TestScene" type="Node3D"] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(0.893065, 0.251134, -0.373318, 0, 0.82973, 0.558165, 0.449927, -0.498478, 0.741003, 0, 3.18312, 0) -light_energy = 1.5 sky_mode = 1 [node name="Floor" type="GridMap" parent="."] @@ -27,7 +43,7 @@ mesh_library = ExtResource("2_ohutf") cell_size = Vector3(1, 1, 1) cell_center_y = false data = { -"cells": PackedInt32Array(0, 65535, 0, 65535, 65535, 0, 65535, 0, 1441792, 65534, 0, 0, 65534, 65535, 0, 65534, 65534, 0, 65535, 65534, 0, 0, 65534, 0, 1, 65534, 0, 1, 65535, 0, 1, 0, 1441792, 65535, 1, 0, 65534, 1, 0, 1, 2, 0, 0, 2, 0, 65535, 2, 0, 65534, 2, 0, 65533, 2, 0, 65533, 1, 0, 65533, 0, 0, 65533, 65535, 0, 65533, 65534, 0, 65533, 65533, 0, 65534, 65533, 0, 0, 65533, 0, 65535, 65533, 0, 2, 1, 1441792, 3, 2, 0, 3, 1, 0, 0, 65532, 0, 65535, 65532, 0, 65534, 65532, 0, 65533, 65532, 0, 65532, 65532, 0, 65532, 65533, 0, 65532, 65534, 0, 65532, 65535, 0, 65532, 1, 0, 65532, 0, 0, 65532, 2, 0, 65532, 3, 0, 65533, 3, 0, 65534, 3, 0, 65535, 3, 0, 1, 3, 0, 2, 3, 0, 3, 3, 0, 0, 3, 0, 4, 3, 0, 4, 2, 0, 4, 1, 0, 2, 2, 0, 5, 4, 0, 4, 4, 0, 3, 4, 0, 2, 4, 0, 1, 4, 0, 0, 4, 0, 0, 5, 0, 65535, 5, 0, 65534, 5, 0, 65533, 5, 0, 65533, 4, 0, 65532, 4, 0, 65534, 4, 0, 65535, 4, 0, 3, 5, 0, 4, 5, 0, 5, 5, 0, 2, 5, 0, 1, 5, 0, 65532, 5, 0, 65531, 5, 0, 65531, 4, 0, 65531, 3, 0, 65531, 2, 0, 65531, 1, 0, 65530, 1, 0, 65530, 0, 0, 65530, 65535, 0, 65530, 65534, 0, 65530, 65533, 0, 65531, 65534, 0, 65531, 65535, 0, 65531, 0, 0, 65531, 65533, 0, 65531, 65532, 0, 65531, 65531, 0, 65532, 65531, 0, 65533, 65531, 0, 65534, 65531, 0, 65535, 65531, 0, 0, 65531, 0, 6, 65531, 0, 5, 1, 0, 5, 2, 0, 5, 3, 0, 6, 0, 0, 6, 65535, 0, 6, 65534, 0, 5, 0, 0, 7, 65535, 0, 7, 65534, 0, 8, 65533, 0, 8, 65534, 0, 7, 0, 0, 6, 1, 0, 6, 2, 0, 6, 4, 0, 6, 3, 0, 7, 2, 0, 7, 1, 0, 8, 1, 0, 8, 0, 0, 1, 1, 1441792, 0, 1, 1441792, 3, 0, 1441792, 4, 0, 1441792, 4, 65535, 1441792, 3, 65535, 1441792, 2, 65534, 1441792, 2, 65533, 1441792, 1, 65533, 1441792, 1, 65532, 1441792, 1, 65531, 1441792, 2, 65531, 1441792, 2, 65530, 1441792, 3, 65530, 1441792, 3, 65531, 1441792, 2, 65532, 1441792, 4, 65532, 1441792, 4, 65531, 1441792, 5, 65531, 1441792, 5, 65532, 1441792, 5, 65533, 1441792, 5, 65534, 1441792, 5, 65535, 1441792, 4, 65534, 1441792, 4, 65533, 1441792, 6, 65533, 1441792, 6, 65532, 1441792, 3, 65532, 1441792, 3, 65533, 1441792, 3, 65534, 1441792, 2, 65535, 1441792, 2, 0, 1441792, 0, 0, 1441792) +"cells": PackedInt32Array(0, 65535, 0, 65535, 65535, 0, 65535, 0, 0, 65534, 0, 0, 65534, 65535, 0, 65534, 65534, 0, 65535, 65534, 0, 0, 65534, 0, 1, 65534, 0, 1, 65535, 0, 1, 0, 0, 65535, 1, 0, 65534, 1, 0, 1, 2, 0, 0, 2, 0, 65535, 2, 0, 65534, 2, 0, 65533, 2, 655360, 65533, 1, 0, 65533, 0, 0, 65533, 65535, 0, 65533, 65534, 0, 65533, 65533, 0, 65534, 65533, 0, 0, 65533, 0, 65535, 65533, 0, 2, 1, 0, 3, 2, 0, 3, 1, 0, 0, 65532, 0, 65535, 65532, 0, 65534, 65532, 0, 65533, 65532, 0, 65532, 65532, 0, 65532, 65533, 0, 65532, 65534, 0, 65532, 65535, 0, 65532, 1, 0, 65532, 0, 0, 65532, 2, 655360, 65532, 3, 0, 65533, 3, 0, 65534, 3, 0, 65535, 3, 0, 1, 3, 0, 2, 3, 0, 3, 3, 0, 0, 3, 0, 4, 3, 0, 4, 2, 0, 4, 1, 0, 2, 2, 0, 5, 4, 0, 4, 4, 0, 3, 4, 0, 2, 4, 0, 1, 4, 0, 0, 4, 0, 0, 5, 0, 65535, 5, 0, 65534, 5, 0, 65533, 5, 0, 65533, 4, 0, 65532, 4, 0, 65534, 4, 0, 65535, 4, 0, 3, 5, 0, 4, 5, 0, 5, 5, 0, 2, 5, 0, 1, 5, 0, 65532, 5, 0, 65531, 5, 0, 65531, 4, 0, 65531, 3, 0, 65531, 2, 0, 65531, 1, 0, 65530, 1, 0, 65530, 0, 0, 65530, 65535, 0, 65530, 65534, 0, 65530, 65533, 0, 65531, 65534, 0, 65531, 65535, 0, 65531, 0, 0, 65531, 65533, 0, 65531, 65532, 0, 65531, 65531, 0, 65532, 65531, 0, 65533, 65531, 0, 65534, 65531, 0, 65535, 65531, 0, 0, 65531, 0, 6, 65531, 0, 5, 1, 0, 5, 2, 0, 5, 3, 0, 6, 0, 0, 6, 65535, 0, 6, 65534, 0, 5, 0, 0, 7, 65535, 0, 7, 65534, 0, 8, 65533, 0, 8, 65534, 0, 7, 0, 0, 6, 1, 0, 6, 2, 0, 6, 4, 0, 6, 3, 0, 7, 2, 655360, 7, 1, 0, 8, 1, 0, 8, 0, 0, 1, 1, 0, 0, 1, 0, 3, 0, 0, 4, 0, 0, 4, 65535, 1441792, 3, 65535, 0, 2, 65534, 0, 2, 65533, 0, 1, 65533, 0, 1, 65532, 0, 1, 65531, 0, 2, 65531, 0, 2, 65530, 0, 3, 65530, 0, 3, 65531, 0, 2, 65532, 0, 4, 65532, 0, 4, 65531, 0, 5, 65531, 0, 5, 65532, 0, 5, 65533, 0, 5, 65534, 0, 5, 65535, 0, 4, 65534, 0, 4, 65533, 0, 6, 65533, 0, 6, 65532, 0, 3, 65532, 0, 3, 65533, 0, 3, 65534, 0, 2, 65535, 0, 2, 0, 0, 0, 0, 0, 65530, 2, 0, 6, 5, 655360, 65529, 0, 0) } metadata/_editor_floor_ = Vector3(0, 0, 0) @@ -36,7 +52,7 @@ mesh_library = ExtResource("3_k3r2h") cell_size = Vector3(1, 1, 1) cell_center_y = false data = { -"cells": PackedInt32Array(65531, 65530, 0, 65532, 65530, 0, 65533, 65530, 0, 65534, 65530, 0, 65535, 65530, 0, 0, 65530, 0, 1, 65530, 0, 65530, 65530, 0, 65530, 65531, 0, 65530, 65532, 0, 65529, 65531, 0, 65529, 65532, 0, 65529, 65533, 0, 65529, 65534, 0, 65529, 65535, 0, 65529, 0, 0, 65529, 1, 0, 65529, 2, 0, 65530, 2, 0, 2, 65529, 1441792, 3, 65529, 1441792, 4, 65529, 1441792, 4, 65530, 1441792, 5, 65530, 1441792, 6, 65530, 1441792, 7, 65530, 1441792, 7, 65532, 1441792, 7, 65533, 1441792, 8, 65532, 1441792, 9, 65532, 1441792, 9, 65533, 1441792, 9, 65534, 1441792, 9, 65535, 1441792, 9, 0, 1441792, 8, 65535, 1441792, 9, 1, 1441792, 9, 2, 1441792, 8, 2, 1441792, 8, 3, 1441792, 7, 3, 1441792, 7, 4, 1441792, 7, 5, 1441792, 6, 5, 1441792, 6, 6, 1441792, 5, 6, 1441792, 4, 6, 1441792, 3, 6, 1441792, 2, 6, 1441792, 1, 6, 1441792, 0, 6, 1441792, 65535, 6, 1441792, 65534, 6, 1441792, 65533, 6, 1441792, 65532, 6, 1441792, 65531, 6, 1441792, 65530, 6, 1441792, 65530, 5, 1441792, 65530, 4, 1441792, 65530, 3, 1441792, 1, 65529, 1441792, 6, 65534, 0, 5, 0, 0, 7, 65531, 1441792, 6, 65531, 1441792) +"cells": PackedInt32Array(65531, 65530, 0, 65532, 65530, 0, 65533, 65530, 0, 65534, 65530, 0, 65535, 65530, 0, 0, 65530, 0, 1, 65530, 0, 65530, 65530, 0, 65530, 65531, 0, 65530, 65532, 0, 65529, 65531, 0, 65529, 65532, 0, 65529, 65533, 0, 65529, 65534, 0, 65529, 65535, 0, 65529, 0, 0, 65529, 1, 0, 65529, 2, 0, 65530, 2, 655361, 2, 65529, 1441792, 3, 65529, 1441792, 4, 65529, 1441792, 4, 65530, 1441792, 5, 65530, 1441792, 6, 65530, 1441792, 7, 65530, 1441792, 7, 65532, 1441792, 7, 65533, 1441792, 8, 65532, 1441792, 9, 65532, 1441792, 9, 65533, 1441792, 9, 65534, 1441792, 9, 65535, 1441792, 9, 0, 1441792, 8, 65535, 1441792, 9, 1, 1441792, 9, 2, 1441792, 8, 2, 1441792, 8, 3, 1441792, 7, 3, 1441792, 7, 4, 1441792, 7, 5, 1441792, 6, 5, 1441792, 6, 6, 1441792, 5, 6, 1441792, 4, 6, 1441792, 3, 6, 1441792, 2, 6, 1441792, 1, 6, 1441792, 0, 6, 1441792, 65535, 6, 1441792, 65534, 6, 1441792, 65533, 6, 1441792, 65532, 6, 1441792, 65531, 6, 1441792, 65530, 6, 1441792, 65530, 5, 1441792, 65530, 4, 1441792, 65530, 3, 1441792, 1, 65529, 1441792, 6, 65534, 0, 5, 0, 0, 7, 65531, 1441792, 6, 65531, 1441792, 65531, 4, 0, 65531, 5, 0, 65532, 5, 0, 65533, 5, 655361, 65532, 4, 655361, 65531, 3, 655361) } metadata/_editor_floor_ = Vector3(0, 0, 0) @@ -45,10 +61,16 @@ environment = SubResource("Environment_0oogp") [node name="CannyCat" parent="." instance=ExtResource("1_8qiqb")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.926551, 3.63641) +power_line_material = SubResource("StandardMaterial3D_77yoh") [node name="GoalPost" parent="." instance=ExtResource("4_71ems")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, -2.38419e-07, -4) -[node name="CSGPolygon3D" parent="." instance=ExtResource("5_7n16u")] +[node name="SandPit" parent="." instance=ExtResource("5_7n16u")] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 2, 0, -4) polygon = PackedVector2Array(0, -1, 1, -1, 3, 0, 3, 2, 2, 3, -1, 2, -2, 0) + +[node name="Boney" parent="." instance=ExtResource("6_gpbt0")] +transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 1.98854, 0, 1.02292) +speed = 1.0 +rotation_speed = 3.14159