diff --git a/AGame/.godot/editor/Floor.tscn-editstate-5006effbafa276c09596397f1dedfe17.cfg b/AGame/.godot/editor/Floor.tscn-editstate-5006effbafa276c09596397f1dedfe17.cfg index 7064b29a..f6b9b4b9 100644 --- a/AGame/.godot/editor/Floor.tscn-editstate-5006effbafa276c09596397f1dedfe17.cfg +++ b/AGame/.godot/editor/Floor.tscn-editstate-5006effbafa276c09596397f1dedfe17.cfg @@ -100,11 +100,11 @@ Anim={ "translate_snap": 1.0, "viewport_mode": 1, "viewports": [{ -"auto_orthogonal": true, +"auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, "display_mode": 22, -"distance": 1.8527803, +"distance": 1.1447513, "doppler": false, "frame_time": false, "gizmos": true, @@ -113,13 +113,13 @@ Anim={ "information": false, "listener": true, "lock_rotation": false, -"orthogonal": true, -"position": Vector3(-4.8259034, 0.74621856, -1.2634671), +"orthogonal": false, +"position": Vector3(-0.7700564, 8.38965, 0.80201924), "transform_gizmo": true, "use_environment": false, -"view_type": 4, -"x_rotation": 0.0, -"y_rotation": -1.5707964 +"view_type": 0, +"x_rotation": 0.45814914, +"y_rotation": -8.102711 }, { "auto_orthogonal": false, "auto_orthogonal_enabled": true, @@ -187,4 +187,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@20438/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@62/@VBoxContainer@63/@EditorMainScreen@103/MainScreen/@CanvasItemEditor@10871/@VSplitContainer@10516/@HSplitContainer@10518/@HSplitContainer@10520/@Control@10521/@SubViewportContainer@10522/@SubViewport@10523/Node3D/CollisionShape3D")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@20438/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@62/@VBoxContainer@63/@EditorMainScreen@103/MainScreen/@CanvasItemEditor@10871/@VSplitContainer@10516/@HSplitContainer@10518/@HSplitContainer@10520/@Control@10521/@SubViewportContainer@10522/@SubViewport@10523/Node3D/Box3")]) diff --git a/AGame/.godot/editor/Floor.tscn-folding-5006effbafa276c09596397f1dedfe17.cfg b/AGame/.godot/editor/Floor.tscn-folding-5006effbafa276c09596397f1dedfe17.cfg index fbf7a9fb..3227731c 100644 --- a/AGame/.godot/editor/Floor.tscn-folding-5006effbafa276c09596397f1dedfe17.cfg +++ b/AGame/.godot/editor/Floor.tscn-folding-5006effbafa276c09596397f1dedfe17.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("CSGMesh3D"), PackedStringArray("material"), NodePath("CollisionShape3D"), PackedStringArray("Transform")] -resource_unfolds=["res://Floor.tscn::BoxMesh_spmh5", PackedStringArray(), "res://Floor.tscn::StandardMaterial3D_yrkb7", PackedStringArray(), "res://Floor.tscn::BoxShape3D_spmh5", PackedStringArray()] +node_unfolds=[NodePath("CSGMesh3D"), PackedStringArray("material"), NodePath("CollisionShape3D"), PackedStringArray("Transform"), NodePath("Box"), PackedStringArray("Transform"), NodePath("Box/CSGMesh3D"), PackedStringArray("Transform", "material"), NodePath("Box/CollisionShape3D"), PackedStringArray("Transform")] +resource_unfolds=["res://Floor.tscn::BoxMesh_spmh5", PackedStringArray(), "res://Floor.tscn::StandardMaterial3D_yrkb7", PackedStringArray(), "res://Floor.tscn::BoxShape3D_spmh5", PackedStringArray(), "res://Floor.tscn::BoxMesh_f2mh0", PackedStringArray(), "res://Floor.tscn::StandardMaterial3D_bdff4", PackedStringArray("UV1", "Albedo", "Roughness"), "res://Floor.tscn::BoxShape3D_mb0cl", PackedStringArray()] nodes_folded=[] diff --git a/AGame/.godot/editor/create_recent.Node b/AGame/.godot/editor/create_recent.Node index 639c2b01..7f4f2dfb 100644 --- a/AGame/.godot/editor/create_recent.Node +++ b/AGame/.godot/editor/create_recent.Node @@ -1,9 +1,9 @@ +CollisionShape3D +CSGMesh3D +StaticBody3D Node3D WorldEnvironment DirectionalLight3D -StaticBody3D -CollisionShape3D CharacterBody3D Camera3D MeshInstance3D -CSGMesh3D diff --git a/AGame/.godot/editor/editor_layout.cfg b/AGame/.godot/editor/editor_layout.cfg index 8599db28..d4379efa 100644 --- a/AGame/.godot/editor/editor_layout.cfg +++ b/AGame/.godot/editor/editor_layout.cfg @@ -9,8 +9,8 @@ dock_filesystem_v_split_offset=0 dock_filesystem_display_mode=0 dock_filesystem_file_sort=0 dock_filesystem_file_list_display_mode=1 -dock_filesystem_selected_paths=PackedStringArray("res://Player.tscn") -dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://assets/", "res://assets/Materials/", "res://assets/Materials/stone_pathway/", "res://assets/Materials/stone_pathway/textures/") +dock_filesystem_selected_paths=PackedStringArray("res://assets/Materials/wood_planks/textures/wood_planks_rough_1k.png") +dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://assets/", "res://assets/Materials/", "res://assets/Materials/wood_planks/", "res://assets/Materials/wood_planks/textures/", "res://assets/Materials/stone_pathway/textures/") dock_node_current_tab=0 dock_history_include_scene=true dock_history_include_global=true @@ -29,18 +29,18 @@ dock_5="Inspector,Node,History" [EditorNode] open_scenes=PackedStringArray("res://Floor.tscn", "res://Player.tscn") -current_scene="res://Player.tscn" +current_scene="res://Floor.tscn" center_split_offset=0 selected_default_debugger_tab_idx=0 -selected_main_editor_idx=2 +selected_main_editor_idx=1 selected_bottom_panel_item=0 [EditorWindow] screen=1 -mode="fullscreen" +mode="windowed" size=Vector2i(1908, 1163) -position=Vector2i(1440, 0) +position=Vector2i(1446, 31) [ScriptEditor] diff --git a/AGame/.godot/editor/filesystem_cache10 b/AGame/.godot/editor/filesystem_cache10 index 1ad36f64..db19d184 100644 --- a/AGame/.godot/editor/filesystem_cache10 +++ b/AGame/.godot/editor/filesystem_cache10 @@ -1,16 +1,22 @@ 63f7b34db8d8cdea90c76aacccf841ec -::res://::1767479118 +::res://::1767481049 DevTest.tscn::PackedScene::9123247578013174228::1767411651::0::1::::<><><>0<>0<><>::uid://grcsjnqdsbmj::::res://Floor.tscn<>uid://dsj41jw17qh40::::res://Player.tscn -Floor.tscn::PackedScene::456381555447325093::1767418994::0::1::::<><><>0<>0<><>::uid://dwdp3f073q201::::res://assets/Materials/stone_pathway/textures/stone_pathway_02_diff_1k.png<>uid://dth2ctcqe0nri::::res://assets/Materials/stone_pathway/textures/stone_pathway_02_nor_gl_1k.png<>uid://c8vnh4apwdyy6::::res://assets/Materials/stone_pathway/textures/stone_pathway_02_rough_1k.png -Player.tscn::PackedScene::8443048367702749007::1767415906::0::1::::<><><>0<>0<><>::uid://b8ddkhlwoiuvm::::res://Scripts/player.gd +Floor.tscn::PackedScene::456381555447325093::1767479615::0::1::::<><><>0<>0<><>::uid://dwdp3f073q201::::res://assets/Materials/stone_pathway/textures/stone_pathway_02_diff_1k.png<>uid://dth2ctcqe0nri::::res://assets/Materials/stone_pathway/textures/stone_pathway_02_nor_gl_1k.png<>uid://c8vnh4apwdyy6::::res://assets/Materials/stone_pathway/textures/stone_pathway_02_rough_1k.png +Player.tscn::PackedScene::8443048367702749007::1767480833::0::1::::<><><>0<>0<><>::uid://b8ddkhlwoiuvm::::res://Scripts/player.gd ::res://assets/::1767416168 icon.svg::CompressedTexture2D::347234531240620840::1767410708::1767410719::1::::<><><>0<>0<>cd8caee1c8a7b4b3cbd67faa4c96c3c0<>res://.godot/imported/icon.svg-56083ea2a1f1a4f1e49773bdc6d7826c.ctex:: -::res://assets/Materials/::1767416391 +::res://assets/Materials/::1767481029 ::res://assets/Materials/stone_pathway/::1767416379 ::res://assets/Materials/stone_pathway/textures/::1767416631 stone_pathway_02_diff_1k.png::CompressedTexture2D::8710570804227902040::1767416372::1767416409::1::::<><><>0<>0<>024744925d268103fd25f3e5fec2366c<>res://.godot/imported/stone_pathway_02_diff_1k.png-120f486f1110be0c1fbd52209fdcc8de.s3tc.ctex:: stone_pathway_02_disp_1k.png::CompressedTexture2D::6812096667217185925::1767416372::1767416391::1::::<><><>0<>0<>add6b013cee511daf3f495c87865d6f9<>res://.godot/imported/stone_pathway_02_disp_1k.png-09ca21ec1b99b1589b5d080c3969064c.ctex:: stone_pathway_02_nor_gl_1k.png::CompressedTexture2D::8508944656639413126::1767416372::1767416516::1::::<><><>0<>0<>82cd783198cdc6e8bee4a3c3fa744c24<>res://.godot/imported/stone_pathway_02_nor_gl_1k.png-90a48320dd4c9c60b9e68fa350107138.s3tc.ctex:: stone_pathway_02_rough_1k.png::CompressedTexture2D::7133228485628055815::1767416372::1767416631::1::::<><><>0<>0<>ca9d6e30979c45204097877beba0ef3e<>res://.godot/imported/stone_pathway_02_rough_1k.png-7bc2e60cf9d95ba7753177c3883fca73.s3tc.ctex:: -::res://Scripts/::1767418816 -player.gd::GDScript::4709046051602623302::1767418816::0::1::::<>CharacterBody3D<><>0<>0<><>:: +::res://assets/Materials/wood_planks/::1767481021 +::res://assets/Materials/wood_planks/textures/::1767481021 +wood_planks_diff_1k.png::CompressedTexture2D::6954411953879281808::1767480996::1767481459::1::::<><><>0<>0<>aa75400313605363557468bc1955bd77<>res://.godot/imported/wood_planks_diff_1k.png-28832cc8b8be02a08eca68bbca5833d6.s3tc.ctex:: +wood_planks_disp_1k.png::CompressedTexture2D::189196940330241145::1767480998::1767481050::1::::<><><>0<>0<>322da655e040dd3a43fbb683f8f6268a<>res://.godot/imported/wood_planks_disp_1k.png-210b824a140b4c19e9a2cb4661fb0a7e.ctex:: +wood_planks_nor_gl_1k.png::CompressedTexture2D::8752069793851707053::1767481002::1767481442::1::::<><><>0<>0<>6f26dd0a61f6c720bb5117cbe149e0db<>res://.godot/imported/wood_planks_nor_gl_1k.png-d024cbb03b846bef5796ea2d214c03f5.s3tc.ctex:: +wood_planks_rough_1k.png::CompressedTexture2D::2166964057052015616::1767481004::1767481487::1::::<><><>0<>0<>0cffb3c51099170e58ad0c6876de9261<>res://.godot/imported/wood_planks_rough_1k.png-1147de2f8d0257affd8f6fc6e09389b5.s3tc.ctex:: +::res://Scripts/::1767480748 +player.gd::GDScript::4709046051602623302::1767480748::0::1::::<>CharacterBody3D<><>0<>0<><>:: diff --git a/AGame/.godot/editor/filesystem_update4 b/AGame/.godot/editor/filesystem_update4 index fc702cb8..f78d968d 100644 --- a/AGame/.godot/editor/filesystem_update4 +++ b/AGame/.godot/editor/filesystem_update4 @@ -1,3 +1,3 @@ res://Floor.tscn -res://Scripts/player.gd res://Player.tscn +res://Scripts/player.gd diff --git a/AGame/.godot/editor/project_metadata.cfg b/AGame/.godot/editor/project_metadata.cfg index 8753ba62..7c9c599e 100644 --- a/AGame/.godot/editor/project_metadata.cfg +++ b/AGame/.godot/editor/project_metadata.cfg @@ -11,6 +11,7 @@ executable_path="/media/kevin/Drive2/GodotProjects/.editor_config/AGame/Godot_v4 create_new_node=Rect2(1950, 250, 900, 700) project_settings=Rect2(1800, 250, 1200, 700) +search_help=Rect2(1920, 300, 960, 600) [recent_files] @@ -35,3 +36,8 @@ show_builtin_actions=false material_preview_rotation=Vector2(-15, 30) material_preview_mesh="sphere" + +[linked_properties] + +CSGMesh3D:scale=false +StaticBody3D:scale=true diff --git a/AGame/.godot/editor/script_editor_cache.cfg b/AGame/.godot/editor/script_editor_cache.cfg index ff03043a..27c93769 100644 --- a/AGame/.godot/editor/script_editor_cache.cfg +++ b/AGame/.godot/editor/script_editor_cache.cfg @@ -3,11 +3,11 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 30, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 178, -"scroll_position": 122.0, +"row": 10, +"scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" } diff --git a/AGame/.godot/imported/wood_planks_diff_1k.png-28832cc8b8be02a08eca68bbca5833d6.ctex b/AGame/.godot/imported/wood_planks_diff_1k.png-28832cc8b8be02a08eca68bbca5833d6.ctex new file mode 100644 index 00000000..56e3fe22 Binary files /dev/null and b/AGame/.godot/imported/wood_planks_diff_1k.png-28832cc8b8be02a08eca68bbca5833d6.ctex differ diff --git a/AGame/.godot/imported/wood_planks_diff_1k.png-28832cc8b8be02a08eca68bbca5833d6.md5 b/AGame/.godot/imported/wood_planks_diff_1k.png-28832cc8b8be02a08eca68bbca5833d6.md5 new file mode 100644 index 00000000..1811cf3e --- /dev/null +++ b/AGame/.godot/imported/wood_planks_diff_1k.png-28832cc8b8be02a08eca68bbca5833d6.md5 @@ -0,0 +1,3 @@ +source_md5="8308a169ed23e5912ef27eb5a54b1543" +dest_md5="a79a0a840f072b549f31ee1caac13b0a" + diff --git a/AGame/.godot/imported/wood_planks_diff_1k.png-28832cc8b8be02a08eca68bbca5833d6.s3tc.ctex b/AGame/.godot/imported/wood_planks_diff_1k.png-28832cc8b8be02a08eca68bbca5833d6.s3tc.ctex new file mode 100644 index 00000000..edb90553 Binary files /dev/null and b/AGame/.godot/imported/wood_planks_diff_1k.png-28832cc8b8be02a08eca68bbca5833d6.s3tc.ctex differ diff --git a/AGame/.godot/imported/wood_planks_disp_1k.png-210b824a140b4c19e9a2cb4661fb0a7e.ctex b/AGame/.godot/imported/wood_planks_disp_1k.png-210b824a140b4c19e9a2cb4661fb0a7e.ctex new file mode 100644 index 00000000..4277df66 Binary files /dev/null and b/AGame/.godot/imported/wood_planks_disp_1k.png-210b824a140b4c19e9a2cb4661fb0a7e.ctex differ diff --git a/AGame/.godot/imported/wood_planks_disp_1k.png-210b824a140b4c19e9a2cb4661fb0a7e.md5 b/AGame/.godot/imported/wood_planks_disp_1k.png-210b824a140b4c19e9a2cb4661fb0a7e.md5 new file mode 100644 index 00000000..d81054fc --- /dev/null +++ b/AGame/.godot/imported/wood_planks_disp_1k.png-210b824a140b4c19e9a2cb4661fb0a7e.md5 @@ -0,0 +1,3 @@ +source_md5="dac8132268b3fae4a7764337df0ec222" +dest_md5="859f3452a01ad08411b4907633bd567d" + diff --git a/AGame/.godot/imported/wood_planks_nor_gl_1k.png-d024cbb03b846bef5796ea2d214c03f5.ctex b/AGame/.godot/imported/wood_planks_nor_gl_1k.png-d024cbb03b846bef5796ea2d214c03f5.ctex new file mode 100644 index 00000000..709c0988 Binary files /dev/null and b/AGame/.godot/imported/wood_planks_nor_gl_1k.png-d024cbb03b846bef5796ea2d214c03f5.ctex differ diff --git a/AGame/.godot/imported/wood_planks_nor_gl_1k.png-d024cbb03b846bef5796ea2d214c03f5.md5 b/AGame/.godot/imported/wood_planks_nor_gl_1k.png-d024cbb03b846bef5796ea2d214c03f5.md5 new file mode 100644 index 00000000..0108ec36 --- /dev/null +++ b/AGame/.godot/imported/wood_planks_nor_gl_1k.png-d024cbb03b846bef5796ea2d214c03f5.md5 @@ -0,0 +1,3 @@ +source_md5="5e1006892b116203e732984d0c0a09a4" +dest_md5="c575037bd6348454f8442ea532ac0610" + diff --git a/AGame/.godot/imported/wood_planks_nor_gl_1k.png-d024cbb03b846bef5796ea2d214c03f5.s3tc.ctex b/AGame/.godot/imported/wood_planks_nor_gl_1k.png-d024cbb03b846bef5796ea2d214c03f5.s3tc.ctex new file mode 100644 index 00000000..e6d336fe Binary files /dev/null and b/AGame/.godot/imported/wood_planks_nor_gl_1k.png-d024cbb03b846bef5796ea2d214c03f5.s3tc.ctex differ diff --git a/AGame/.godot/imported/wood_planks_rough_1k.png-1147de2f8d0257affd8f6fc6e09389b5.ctex b/AGame/.godot/imported/wood_planks_rough_1k.png-1147de2f8d0257affd8f6fc6e09389b5.ctex new file mode 100644 index 00000000..fd69684f Binary files /dev/null and b/AGame/.godot/imported/wood_planks_rough_1k.png-1147de2f8d0257affd8f6fc6e09389b5.ctex differ diff --git a/AGame/.godot/imported/wood_planks_rough_1k.png-1147de2f8d0257affd8f6fc6e09389b5.md5 b/AGame/.godot/imported/wood_planks_rough_1k.png-1147de2f8d0257affd8f6fc6e09389b5.md5 new file mode 100644 index 00000000..26fc4950 --- /dev/null +++ b/AGame/.godot/imported/wood_planks_rough_1k.png-1147de2f8d0257affd8f6fc6e09389b5.md5 @@ -0,0 +1,3 @@ +source_md5="1d46baf0758ea215e32d332bf4786ab5" +dest_md5="e74466a71b0b7b5dde4ecd43551139fc" + diff --git a/AGame/.godot/imported/wood_planks_rough_1k.png-1147de2f8d0257affd8f6fc6e09389b5.s3tc.ctex b/AGame/.godot/imported/wood_planks_rough_1k.png-1147de2f8d0257affd8f6fc6e09389b5.s3tc.ctex new file mode 100644 index 00000000..fb381b12 Binary files /dev/null and b/AGame/.godot/imported/wood_planks_rough_1k.png-1147de2f8d0257affd8f6fc6e09389b5.s3tc.ctex differ diff --git a/AGame/.godot/uid_cache.bin b/AGame/.godot/uid_cache.bin index bcfee2f9..9057a8cc 100644 Binary files a/AGame/.godot/uid_cache.bin and b/AGame/.godot/uid_cache.bin differ diff --git a/AGame/Floor.tscn b/AGame/Floor.tscn index 7e3486eb..40f82fb0 100644 --- a/AGame/Floor.tscn +++ b/AGame/Floor.tscn @@ -1,8 +1,11 @@ -[gd_scene load_steps=7 format=3 uid="uid://grcsjnqdsbmj"] +[gd_scene load_steps=13 format=3 uid="uid://grcsjnqdsbmj"] [ext_resource type="Texture2D" uid="uid://dwdp3f073q201" path="res://assets/Materials/stone_pathway/textures/stone_pathway_02_diff_1k.png" id="1_ragr8"] [ext_resource type="Texture2D" uid="uid://dth2ctcqe0nri" path="res://assets/Materials/stone_pathway/textures/stone_pathway_02_nor_gl_1k.png" id="2_sr8py"] [ext_resource type="Texture2D" uid="uid://c8vnh4apwdyy6" path="res://assets/Materials/stone_pathway/textures/stone_pathway_02_rough_1k.png" id="3_3tt66"] +[ext_resource type="Texture2D" uid="uid://c6c1fcbsll0mm" path="res://assets/Materials/wood_planks/textures/wood_planks_diff_1k.png" id="4_yrkb7"] +[ext_resource type="Texture2D" uid="uid://dwxtktkem6kgb" path="res://assets/Materials/wood_planks/textures/wood_planks_nor_gl_1k.png" id="5_0gdli"] +[ext_resource type="Texture2D" uid="uid://54xt1ehp2lqm" path="res://assets/Materials/wood_planks/textures/wood_planks_rough_1k.png" id="6_gq7au"] [sub_resource type="BoxMesh" id="BoxMesh_spmh5"] @@ -16,6 +19,18 @@ uv1_scale = Vector3(25, 25, 25) [sub_resource type="BoxShape3D" id="BoxShape3D_spmh5"] size = Vector3(76.918335, 0.44656372, 87.31734) +[sub_resource type="BoxMesh" id="BoxMesh_f2mh0"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bdff4"] +albedo_texture = ExtResource("4_yrkb7") +roughness_texture = ExtResource("6_gq7au") +normal_enabled = true +normal_texture = ExtResource("5_0gdli") +uv1_scale = Vector3(2, 2, 2) + +[sub_resource type="BoxShape3D" id="BoxShape3D_mb0cl"] +size = Vector3(1.0030236, 0.99328613, 1.0022774) + [node name="Node3D" type="StaticBody3D"] [node name="CSGMesh3D" type="CSGMesh3D" parent="."] @@ -26,3 +41,39 @@ material = SubResource("StandardMaterial3D_yrkb7") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.018493652, 0.0028533936, -1) shape = SubResource("BoxShape3D_spmh5") + +[node name="Box" type="StaticBody3D" parent="."] +transform = Transform3D(5, 0, 0, 0, 5, 0, 0, 0, 5, 0, -0.35228002, 0) + +[node name="CSGMesh3D" type="CSGMesh3D" parent="Box"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.029260352, 0) +mesh = SubResource("BoxMesh_f2mh0") +material = SubResource("StandardMaterial3D_bdff4") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Box"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1.0000001, -0.0024477243, -0.0018959045, -0.00027276576) +shape = SubResource("BoxShape3D_mb0cl") + +[node name="Box2" type="StaticBody3D" parent="."] +transform = Transform3D(5, 0, 0, 0, 5, 0, 0, 0, 5, -16.142433, 1.5642476, 0) + +[node name="CSGMesh3D" type="CSGMesh3D" parent="Box2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.029260352, 0) +mesh = SubResource("BoxMesh_f2mh0") +material = SubResource("StandardMaterial3D_bdff4") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Box2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1.0000001, -0.0024477243, -0.0018959045, -0.00027276576) +shape = SubResource("BoxShape3D_mb0cl") + +[node name="Box3" type="StaticBody3D" parent="."] +transform = Transform3D(5, 0, 0, 0, 5, 0, 0, 0, 5, -16.142433, 3.735155, 15.89838) + +[node name="CSGMesh3D" type="CSGMesh3D" parent="Box3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.029260352, 0) +mesh = SubResource("BoxMesh_f2mh0") +material = SubResource("StandardMaterial3D_bdff4") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Box3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1.0000001, -0.0024477243, -0.0018959045, -0.00027276576) +shape = SubResource("BoxShape3D_mb0cl") diff --git a/AGame/Scripts/player.gd b/AGame/Scripts/player.gd index 835cc2c0..5f5da2a3 100644 --- a/AGame/Scripts/player.gd +++ b/AGame/Scripts/player.gd @@ -8,7 +8,7 @@ extends CharacterBody3D @export var walk_speed := 10.0 @export var crouch_speed := 5.0 @export var slide_speed := 18.0 -@export var jump_velocity := 4.5 +@export var jump_velocity := 6.5 @export var ground_friction := 25.0 @export var slide_friction := 15.0 diff --git a/AGame/assets/Materials/wood_planks/textures/wood_planks_diff_1k.png b/AGame/assets/Materials/wood_planks/textures/wood_planks_diff_1k.png new file mode 100644 index 00000000..6e8b72f2 Binary files /dev/null and b/AGame/assets/Materials/wood_planks/textures/wood_planks_diff_1k.png differ diff --git a/AGame/assets/Materials/wood_planks/textures/wood_planks_diff_1k.png.import b/AGame/assets/Materials/wood_planks/textures/wood_planks_diff_1k.png.import new file mode 100644 index 00000000..4d6576f0 --- /dev/null +++ b/AGame/assets/Materials/wood_planks/textures/wood_planks_diff_1k.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c6c1fcbsll0mm" +path.s3tc="res://.godot/imported/wood_planks_diff_1k.png-28832cc8b8be02a08eca68bbca5833d6.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Materials/wood_planks/textures/wood_planks_diff_1k.png" +dest_files=["res://.godot/imported/wood_planks_diff_1k.png-28832cc8b8be02a08eca68bbca5833d6.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/AGame/assets/Materials/wood_planks/textures/wood_planks_disp_1k.png b/AGame/assets/Materials/wood_planks/textures/wood_planks_disp_1k.png new file mode 100644 index 00000000..89863796 Binary files /dev/null and b/AGame/assets/Materials/wood_planks/textures/wood_planks_disp_1k.png differ diff --git a/AGame/assets/Materials/wood_planks/textures/wood_planks_disp_1k.png.import b/AGame/assets/Materials/wood_planks/textures/wood_planks_disp_1k.png.import new file mode 100644 index 00000000..179150a0 --- /dev/null +++ b/AGame/assets/Materials/wood_planks/textures/wood_planks_disp_1k.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cxwbteu8jcmb" +path="res://.godot/imported/wood_planks_disp_1k.png-210b824a140b4c19e9a2cb4661fb0a7e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/Materials/wood_planks/textures/wood_planks_disp_1k.png" +dest_files=["res://.godot/imported/wood_planks_disp_1k.png-210b824a140b4c19e9a2cb4661fb0a7e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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=1 diff --git a/AGame/assets/Materials/wood_planks/textures/wood_planks_nor_gl_1k.png b/AGame/assets/Materials/wood_planks/textures/wood_planks_nor_gl_1k.png new file mode 100644 index 00000000..73e280e6 Binary files /dev/null and b/AGame/assets/Materials/wood_planks/textures/wood_planks_nor_gl_1k.png differ diff --git a/AGame/assets/Materials/wood_planks/textures/wood_planks_nor_gl_1k.png.import b/AGame/assets/Materials/wood_planks/textures/wood_planks_nor_gl_1k.png.import new file mode 100644 index 00000000..0b43e5e8 --- /dev/null +++ b/AGame/assets/Materials/wood_planks/textures/wood_planks_nor_gl_1k.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dwxtktkem6kgb" +path.s3tc="res://.godot/imported/wood_planks_nor_gl_1k.png-d024cbb03b846bef5796ea2d214c03f5.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Materials/wood_planks/textures/wood_planks_nor_gl_1k.png" +dest_files=["res://.godot/imported/wood_planks_nor_gl_1k.png-d024cbb03b846bef5796ea2d214c03f5.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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://assets/Materials/wood_planks/textures/wood_planks_nor_gl_1k.png" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/AGame/assets/Materials/wood_planks/textures/wood_planks_rough_1k.png b/AGame/assets/Materials/wood_planks/textures/wood_planks_rough_1k.png new file mode 100644 index 00000000..1afaf465 Binary files /dev/null and b/AGame/assets/Materials/wood_planks/textures/wood_planks_rough_1k.png differ diff --git a/AGame/assets/Materials/wood_planks/textures/wood_planks_rough_1k.png.import b/AGame/assets/Materials/wood_planks/textures/wood_planks_rough_1k.png.import new file mode 100644 index 00000000..5469fc2a --- /dev/null +++ b/AGame/assets/Materials/wood_planks/textures/wood_planks_rough_1k.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://54xt1ehp2lqm" +path.s3tc="res://.godot/imported/wood_planks_rough_1k.png-1147de2f8d0257affd8f6fc6e09389b5.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Materials/wood_planks/textures/wood_planks_rough_1k.png" +dest_files=["res://.godot/imported/wood_planks_rough_1k.png-1147de2f8d0257affd8f6fc6e09389b5.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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