diff --git a/AGame/.godot/editor/DevTest.tscn-editstate-2043bd6cb13382f45264f4f5f5eb4370.cfg b/AGame/.godot/editor/DevTest.tscn-editstate-2043bd6cb13382f45264f4f5f5eb4370.cfg index be53e479..acfdbec7 100644 --- a/AGame/.godot/editor/DevTest.tscn-editstate-2043bd6cb13382f45264f4f5f5eb4370.cfg +++ b/AGame/.godot/editor/DevTest.tscn-editstate-2043bd6cb13382f45264f4f5f5eb4370.cfg @@ -114,12 +114,12 @@ Anim={ "listener": true, "lock_rotation": false, "orthogonal": false, -"position": Vector3(0.6880294, 6.747902, -5.954219), +"position": Vector3(-6.14097, 9.3316765, 3.5580091), "transform_gizmo": true, "use_environment": false, "view_type": 0, -"x_rotation": 0.6483527, -"y_rotation": -2.5158548 +"x_rotation": 0.059303682, +"y_rotation": -3.5892324 }, { "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/World/Player")]) +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/Player/CanvasLayer")]) diff --git a/AGame/.godot/editor/DevTest.tscn-folding-2043bd6cb13382f45264f4f5f5eb4370.cfg b/AGame/.godot/editor/DevTest.tscn-folding-2043bd6cb13382f45264f4f5f5eb4370.cfg index ba0bbfe3..3ddae4d7 100644 --- a/AGame/.godot/editor/DevTest.tscn-folding-2043bd6cb13382f45264f4f5f5eb4370.cfg +++ b/AGame/.godot/editor/DevTest.tscn-folding-2043bd6cb13382f45264f4f5f5eb4370.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("Player"), PackedStringArray("Collision")] +node_unfolds=[NodePath("."), PackedStringArray("environment"), NodePath("Player"), PackedStringArray("Collision")] resource_unfolds=["res://DevTest.tscn::Environment_l2ce6", PackedStringArray("Background", "Ambient Light", "Tonemap", "Sky", "sky", "SSR")] nodes_folded=[] diff --git a/AGame/.godot/editor/Floor.tscn-editstate-5006effbafa276c09596397f1dedfe17.cfg b/AGame/.godot/editor/Floor.tscn-editstate-5006effbafa276c09596397f1dedfe17.cfg index 3498dc2e..7ebbc133 100644 --- a/AGame/.godot/editor/Floor.tscn-editstate-5006effbafa276c09596397f1dedfe17.cfg +++ b/AGame/.godot/editor/Floor.tscn-editstate-5006effbafa276c09596397f1dedfe17.cfg @@ -104,7 +104,7 @@ Anim={ "auto_orthogonal_enabled": true, "cinematic_preview": false, "display_mode": 22, -"distance": 1.1447513, +"distance": 0.33703896, "doppler": false, "frame_time": false, "gizmos": true, @@ -114,12 +114,12 @@ Anim={ "listener": true, "lock_rotation": false, "orthogonal": false, -"position": Vector3(-10.162007, 11.304508, -11.346103), +"position": Vector3(-7.566904, 12.02426, 17.792248), "transform_gizmo": true, "use_environment": false, "view_type": 0, -"x_rotation": 0.5759586, -"y_rotation": -9.202266 +"x_rotation": 0.35342854, +"y_rotation": -11.741729 }, { "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/Box2")]) +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/brass_goblets_1k")]) diff --git a/AGame/.godot/editor/Floor.tscn-folding-5006effbafa276c09596397f1dedfe17.cfg b/AGame/.godot/editor/Floor.tscn-folding-5006effbafa276c09596397f1dedfe17.cfg index 3227731c..7bea8a60 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"), NodePath("Box"), PackedStringArray("Transform"), NodePath("Box/CSGMesh3D"), PackedStringArray("Transform", "material"), NodePath("Box/CollisionShape3D"), PackedStringArray("Transform")] +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"), NodePath("brass_goblets_1k"), 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/Player.tscn-editstate-90e1ff3baa03524a506ff0f7a9d78dcf.cfg b/AGame/.godot/editor/Player.tscn-editstate-90e1ff3baa03524a506ff0f7a9d78dcf.cfg index ac11ef4c..88c25ed4 100644 --- a/AGame/.godot/editor/Player.tscn-editstate-90e1ff3baa03524a506ff0f7a9d78dcf.cfg +++ b/AGame/.godot/editor/Player.tscn-editstate-90e1ff3baa03524a506ff0f7a9d78dcf.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-166, -111), +"ofs": Vector2(-142.25992, -186.82898), "primary_grid_step": Vector2i(8, 8), "show_group_gizmos": true, "show_guides": true, @@ -34,7 +34,7 @@ Anim={ "snap_rotation_step": 0.2617994, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 1.0 +"zoom": 0.75131476 } 3D={ "fov": 70.01, @@ -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/Player/LedgeForwardRay")]) +selected_nodes=Array[NodePath]([]) diff --git a/AGame/.godot/editor/Player.tscn-folding-90e1ff3baa03524a506ff0f7a9d78dcf.cfg b/AGame/.godot/editor/Player.tscn-folding-90e1ff3baa03524a506ff0f7a9d78dcf.cfg index 11aa09d2..77c96518 100644 --- a/AGame/.godot/editor/Player.tscn-folding-90e1ff3baa03524a506ff0f7a9d78dcf.cfg +++ b/AGame/.godot/editor/Player.tscn-folding-90e1ff3baa03524a506ff0f7a9d78dcf.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("CameraPivot/Camera3D"), PackedStringArray("Transform"), NodePath("ClimbCollider"), PackedStringArray("shape"), NodePath("LedgeForwardRay"), PackedStringArray("Transform")] +node_unfolds=[NodePath("CameraPivot/Camera3D"), PackedStringArray("Transform"), NodePath("ClimbCollider"), PackedStringArray("shape"), NodePath("LedgeForwardRay"), PackedStringArray("Transform"), NodePath("CanvasLayer/TextureRect"), PackedStringArray("Layout"), NodePath("CanvasLayer/Panel2/VBoxContainer/ProgressBar"), PackedStringArray("Layout"), NodePath("CanvasLayer/Panel2/VBoxContainer/ProgressBar/Label"), PackedStringArray("Theme Overrides", "Theme Overrides/font_sizes")] resource_unfolds=["res://Player.tscn::CapsuleMesh_kpjcp", PackedStringArray(), "res://Player.tscn::CapsuleShape3D_kne1u", PackedStringArray(), "res://Player.tscn::CapsuleShape3D_xhfnw", PackedStringArray()] nodes_folded=[NodePath("CameraPivot")] diff --git a/AGame/.godot/editor/create_recent.Node b/AGame/.godot/editor/create_recent.Node index c65e3b72..cbe08a1b 100644 --- a/AGame/.godot/editor/create_recent.Node +++ b/AGame/.godot/editor/create_recent.Node @@ -1,5 +1,10 @@ -RayCast3D +Label +ProgressBar +VBoxContainer Panel +Container +TextureRect +RayCast3D CanvasLayer CollisionShape3D CSGMesh3D @@ -8,5 +13,3 @@ Node3D WorldEnvironment DirectionalLight3D CharacterBody3D -Camera3D -MeshInstance3D diff --git a/AGame/.godot/editor/editor_layout.cfg b/AGame/.godot/editor/editor_layout.cfg index 08f85e21..f58a120f 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://DevTest.tscn") -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_filesystem_selected_paths=PackedStringArray("res://assets/textures/Crosshair.png") +dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://assets/", "res://assets/textures/", "res://assets/Models/brass_goblets.gltf/", "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://DevTest.tscn", "res://Player.tscn", "res://Floor.tscn") -current_scene="res://Floor.tscn" +current_scene="res://Player.tscn" center_split_offset=-257 selected_default_debugger_tab_idx=0 -selected_main_editor_idx=2 +selected_main_editor_idx=0 selected_bottom_panel_item=0 [EditorWindow] screen=1 -mode="windowed" +mode="fullscreen" size=Vector2i(1908, 1163) -position=Vector2i(1446, 31) +position=Vector2i(1440, 0) [ScriptEditor] diff --git a/AGame/.godot/editor/filesystem_cache10 b/AGame/.godot/editor/filesystem_cache10 index 154ea015..8439945d 100644 --- a/AGame/.godot/editor/filesystem_cache10 +++ b/AGame/.godot/editor/filesystem_cache10 @@ -1,9 +1,9 @@ 63f7b34db8d8cdea90c76aacccf841ec -::res://::1767524602 -DevTest.tscn::PackedScene::9123247578013174228::1767488108::0::1::::<><><>0<>0<><>::uid://grcsjnqdsbmj::::res://Floor.tscn<>uid://dsj41jw17qh40::::res://Player.tscn -Floor.tscn::PackedScene::456381555447325093::1767487883::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<>uid://c6c1fcbsll0mm::::res://assets/Materials/wood_planks/textures/wood_planks_diff_1k.png<>uid://dwxtktkem6kgb::::res://assets/Materials/wood_planks/textures/wood_planks_nor_gl_1k.png<>uid://54xt1ehp2lqm::::res://assets/Materials/wood_planks/textures/wood_planks_rough_1k.png -Player.tscn::PackedScene::8443048367702749007::1767489077::0::1::::<><><>0<>0<><>::uid://b8ddkhlwoiuvm::::res://Scripts/player.gd -::res://assets/::1767416168 +::res://::1767529210 +DevTest.tscn::PackedScene::9123247578013174228::1767528849::0::1::::<><><>0<>0<><>::uid://grcsjnqdsbmj::::res://Floor.tscn<>uid://dsj41jw17qh40::::res://Player.tscn +Floor.tscn::PackedScene::456381555447325093::1767528769::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<>uid://c6c1fcbsll0mm::::res://assets/Materials/wood_planks/textures/wood_planks_diff_1k.png<>uid://dwxtktkem6kgb::::res://assets/Materials/wood_planks/textures/wood_planks_nor_gl_1k.png<>uid://54xt1ehp2lqm::::res://assets/Materials/wood_planks/textures/wood_planks_rough_1k.png<>uid://defyk314stqmy::::res://assets/Models/brass_goblets.gltf/brass_goblets_1k.gltf +Player.tscn::PackedScene::8443048367702749007::1767529210::0::1::::<><><>0<>0<><>::uid://b8ddkhlwoiuvm::::res://Scripts/player.gd +::res://assets/::1767529400 icon.svg::CompressedTexture2D::347234531240620840::1767410708::1767410719::1::::<><><>0<>0<>cd8caee1c8a7b4b3cbd67faa4c96c3c0<>res://.godot/imported/icon.svg-56083ea2a1f1a4f1e49773bdc6d7826c.ctex:: ::res://assets/Materials/::1767481029 ::res://assets/Materials/stone_pathway/::1767416379 @@ -18,5 +18,20 @@ wood_planks_diff_1k.png::CompressedTexture2D::6954411953879281808::1767480996::1 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/::1767488944 -player.gd::GDScript::4709046051602623302::1767488944::0::1::::<>CharacterBody3D<><>0<>0<><>:: +::res://assets/Models/::1767528639 +::res://assets/Models/brass_goblets.gltf/::1767528642 +brass_goblets_1k.gltf::PackedScene::7451815892328341576::1767528584::1767528642::1::::<><><>0<>0<>1b9f6c1eb2eea62e7e2e05e81b636d33<>res://.godot/imported/brass_goblets_1k.gltf-f6a75e13d2b7f4a435dd2c3962ec7430.scn::uid://bni0dafthlm3d::::res://assets/Models/brass_goblets.gltf/textures/brass_goblet_01_diff_1k.jpg<>uid://e215br752mpa::::res://assets/Models/brass_goblets.gltf/textures/brass_goblet_01_arm_1k.jpg<>uid://bbhsu5opuuin6::::res://assets/Models/brass_goblets.gltf/textures/brass_goblet_01_nor_gl_1k.jpg<>uid://cosf4cetdnrp5::::res://assets/Models/brass_goblets.gltf/textures/brass_goblet_02_diff_1k.jpg<>uid://stsxspgml4mo::::res://assets/Models/brass_goblets.gltf/textures/brass_goblet_02_arm_1k.jpg<>uid://cvkp052ghk4ow::::res://assets/Models/brass_goblets.gltf/textures/brass_goblet_02_nor_gl_1k.jpg<>uid://lgqeayw0qj50::::res://assets/Models/brass_goblets.gltf/textures/brass_goblet_03_diff_1k.jpg<>uid://dvgxaojrwm34j::::res://assets/Models/brass_goblets.gltf/textures/brass_goblet_03_arm_1k.jpg<>uid://s2vj7ou5g7q1::::res://assets/Models/brass_goblets.gltf/textures/brass_goblet_03_nor_gl_1k.jpg +::res://assets/Models/brass_goblets.gltf/textures/::1767528642 +brass_goblet_01_arm_1k.jpg::CompressedTexture2D::338125869820942886::1767528586::1767528642::1::::<><><>0<>0<>0f6bbc8ec07687838f4442e935556aac<>res://.godot/imported/brass_goblet_01_arm_1k.jpg-a8ddcf8e1e360862b2b78798e4df9f10.s3tc.ctex:: +brass_goblet_01_diff_1k.jpg::CompressedTexture2D::3316913963817973203::1767528592::1767528642::1::::<><><>0<>0<>93714bf9ebe4a2e2ebc5ce1be273adf3<>res://.godot/imported/brass_goblet_01_diff_1k.jpg-e26830ec2bcb4f904a393ba4f3fd921b.s3tc.ctex:: +brass_goblet_01_nor_gl_1k.jpg::CompressedTexture2D::2472190391394266169::1767528588::1767528642::1::::<><><>0<>0<>3fee0c029fddc0e5ef245970a5265c81<>res://.godot/imported/brass_goblet_01_nor_gl_1k.jpg-d02aabb2dec248d71ef537cbc6e03445.s3tc.ctex:: +brass_goblet_02_arm_1k.jpg::CompressedTexture2D::1303757310822811314::1767528596::1767528642::1::::<><><>0<>0<>f8781d5cd721dbd5de63e1155091c73b<>res://.godot/imported/brass_goblet_02_arm_1k.jpg-7d7b80d5b56ff9704d7b333336fc15a1.s3tc.ctex:: +brass_goblet_02_diff_1k.jpg::CompressedTexture2D::5792999462972536920::1767528590::1767528642::1::::<><><>0<>0<>d98822164ada34112639715d64a5d2ef<>res://.godot/imported/brass_goblet_02_diff_1k.jpg-15667f6342060df04887b514c82d71b7.s3tc.ctex:: +brass_goblet_02_nor_gl_1k.jpg::CompressedTexture2D::6268407878757216806::1767528598::1767528642::1::::<><><>0<>0<>05767b4fe0003f181c2ff1d7dc9b925b<>res://.godot/imported/brass_goblet_02_nor_gl_1k.jpg-a2c72b1f7403ca3b6fe9461d2528e2f9.s3tc.ctex:: +brass_goblet_03_arm_1k.jpg::CompressedTexture2D::8647011274868418931::1767528594::1767528642::1::::<><><>0<>0<>9b20212ef162973b7bba22ccb8368bf4<>res://.godot/imported/brass_goblet_03_arm_1k.jpg-4be2a39a5cb4db76426d4fd867f72862.s3tc.ctex:: +brass_goblet_03_diff_1k.jpg::CompressedTexture2D::785442199711531913::1767528600::1767528642::1::::<><><>0<>0<>fc45328876c2528405b8a18df87896cd<>res://.godot/imported/brass_goblet_03_diff_1k.jpg-204e858a6db4a665514928e0afcbd990.s3tc.ctex:: +brass_goblet_03_nor_gl_1k.jpg::CompressedTexture2D::1320430217160975050::1767528584::1767528642::1::::<><><>0<>0<>eb24f73a585cb4e0faf3940e69747622<>res://.godot/imported/brass_goblet_03_nor_gl_1k.jpg-e794bbcf06d0c1591aa82cf5f84df156.s3tc.ctex:: +::res://assets/textures/::1767529411 +Crosshair.png::CompressedTexture2D::6562219969639507403::1767529411::1767529450::1::::<><><>0<>0<>3fdb70790d43618aa9a00a84b6dde3ab<>res://.godot/imported/Crosshair.png-924381f8bac511b37ea5c3e05e9d4219.ctex:: +::res://Scripts/::1767528044 +player.gd::GDScript::4709046051602623302::1767528044::0::1::::<>CharacterBody3D<><>0<>0<><>:: diff --git a/AGame/.godot/editor/filesystem_update4 b/AGame/.godot/editor/filesystem_update4 index f78d968d..79327497 100644 --- a/AGame/.godot/editor/filesystem_update4 +++ b/AGame/.godot/editor/filesystem_update4 @@ -1,3 +1,4 @@ res://Floor.tscn res://Player.tscn res://Scripts/player.gd +res://DevTest.tscn diff --git a/AGame/.godot/editor/project_metadata.cfg b/AGame/.godot/editor/project_metadata.cfg index 4514a4a0..add3d1b5 100644 --- a/AGame/.godot/editor/project_metadata.cfg +++ b/AGame/.godot/editor/project_metadata.cfg @@ -26,7 +26,7 @@ create_built_in_script=false [color_picker] picker_shape=3 -recent_presets=PackedColorArray(0.39210242, 0.58253837, 1, 1, 0, 0, 1, 1, 0.02948817, 0.2666716, 1, 1, 0.0006434119, 0.21836194, 1, 1, 1, 0.28627452, 1, 1, 0.5030338, 0.65093625, 0.96411306, 1, 0.7203012, 0.8066189, 0.98081595, 1, 0.25331905, 0.47389442, 1, 1, 0.6516739, 0.7670327, 1, 1) +recent_presets=PackedColorArray(1, 0.28627452, 1, 1, 0.5030338, 0.65093625, 0.96411306, 1, 0.7203012, 0.8066189, 0.98081595, 1, 0.25331905, 0.47389442, 1, 1, 0.6516739, 0.7670327, 1, 1, 0.87342215, 0.8013599, 0.59730405, 1, 0.8445671, 0.7986815, 0.7306062, 1, 0.76225907, 0.78073734, 0.67103314, 1, 0.7810361, 0.7749989, 0.65810764, 1) [project_settings] diff --git a/AGame/.godot/imported/Crosshair.png-924381f8bac511b37ea5c3e05e9d4219.ctex b/AGame/.godot/imported/Crosshair.png-924381f8bac511b37ea5c3e05e9d4219.ctex new file mode 100644 index 00000000..13115a79 Binary files /dev/null and b/AGame/.godot/imported/Crosshair.png-924381f8bac511b37ea5c3e05e9d4219.ctex differ diff --git a/AGame/.godot/imported/Crosshair.png-924381f8bac511b37ea5c3e05e9d4219.md5 b/AGame/.godot/imported/Crosshair.png-924381f8bac511b37ea5c3e05e9d4219.md5 new file mode 100644 index 00000000..1c2cb84f --- /dev/null +++ b/AGame/.godot/imported/Crosshair.png-924381f8bac511b37ea5c3e05e9d4219.md5 @@ -0,0 +1,3 @@ +source_md5="ae36b1f020973217d08f31404476fcf3" +dest_md5="adc5aced590b091e8dc3e8e19e97656e" + diff --git a/AGame/.godot/imported/brass_goblet_01_arm_1k.jpg-a8ddcf8e1e360862b2b78798e4df9f10.ctex b/AGame/.godot/imported/brass_goblet_01_arm_1k.jpg-a8ddcf8e1e360862b2b78798e4df9f10.ctex new file mode 100644 index 00000000..09119db5 Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_01_arm_1k.jpg-a8ddcf8e1e360862b2b78798e4df9f10.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_01_arm_1k.jpg-a8ddcf8e1e360862b2b78798e4df9f10.md5 b/AGame/.godot/imported/brass_goblet_01_arm_1k.jpg-a8ddcf8e1e360862b2b78798e4df9f10.md5 new file mode 100644 index 00000000..514851ba --- /dev/null +++ b/AGame/.godot/imported/brass_goblet_01_arm_1k.jpg-a8ddcf8e1e360862b2b78798e4df9f10.md5 @@ -0,0 +1,3 @@ +source_md5="c9bdf5da73aef25e691da7a35e788873" +dest_md5="7314ab85fda6965b44dbfd99f8889af0" + diff --git a/AGame/.godot/imported/brass_goblet_01_arm_1k.jpg-a8ddcf8e1e360862b2b78798e4df9f10.s3tc.ctex b/AGame/.godot/imported/brass_goblet_01_arm_1k.jpg-a8ddcf8e1e360862b2b78798e4df9f10.s3tc.ctex new file mode 100644 index 00000000..c9437bb4 Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_01_arm_1k.jpg-a8ddcf8e1e360862b2b78798e4df9f10.s3tc.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_01_diff_1k.jpg-e26830ec2bcb4f904a393ba4f3fd921b.ctex b/AGame/.godot/imported/brass_goblet_01_diff_1k.jpg-e26830ec2bcb4f904a393ba4f3fd921b.ctex new file mode 100644 index 00000000..688893b4 Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_01_diff_1k.jpg-e26830ec2bcb4f904a393ba4f3fd921b.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_01_diff_1k.jpg-e26830ec2bcb4f904a393ba4f3fd921b.md5 b/AGame/.godot/imported/brass_goblet_01_diff_1k.jpg-e26830ec2bcb4f904a393ba4f3fd921b.md5 new file mode 100644 index 00000000..e5ed16c1 --- /dev/null +++ b/AGame/.godot/imported/brass_goblet_01_diff_1k.jpg-e26830ec2bcb4f904a393ba4f3fd921b.md5 @@ -0,0 +1,3 @@ +source_md5="0d4d1e7376965e48539a1fc27b17e1cd" +dest_md5="5e76ed44d35882e550d9dd546b2c6f90" + diff --git a/AGame/.godot/imported/brass_goblet_01_diff_1k.jpg-e26830ec2bcb4f904a393ba4f3fd921b.s3tc.ctex b/AGame/.godot/imported/brass_goblet_01_diff_1k.jpg-e26830ec2bcb4f904a393ba4f3fd921b.s3tc.ctex new file mode 100644 index 00000000..bc6c963e Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_01_diff_1k.jpg-e26830ec2bcb4f904a393ba4f3fd921b.s3tc.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_01_nor_gl_1k.jpg-d02aabb2dec248d71ef537cbc6e03445.ctex b/AGame/.godot/imported/brass_goblet_01_nor_gl_1k.jpg-d02aabb2dec248d71ef537cbc6e03445.ctex new file mode 100644 index 00000000..32f8ba59 Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_01_nor_gl_1k.jpg-d02aabb2dec248d71ef537cbc6e03445.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_01_nor_gl_1k.jpg-d02aabb2dec248d71ef537cbc6e03445.md5 b/AGame/.godot/imported/brass_goblet_01_nor_gl_1k.jpg-d02aabb2dec248d71ef537cbc6e03445.md5 new file mode 100644 index 00000000..d8a01258 --- /dev/null +++ b/AGame/.godot/imported/brass_goblet_01_nor_gl_1k.jpg-d02aabb2dec248d71ef537cbc6e03445.md5 @@ -0,0 +1,3 @@ +source_md5="3089d0223399a4c52e8dabc046c09d57" +dest_md5="2b6f263bbe63f6c6e4cc494313080d37" + diff --git a/AGame/.godot/imported/brass_goblet_01_nor_gl_1k.jpg-d02aabb2dec248d71ef537cbc6e03445.s3tc.ctex b/AGame/.godot/imported/brass_goblet_01_nor_gl_1k.jpg-d02aabb2dec248d71ef537cbc6e03445.s3tc.ctex new file mode 100644 index 00000000..13440a74 Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_01_nor_gl_1k.jpg-d02aabb2dec248d71ef537cbc6e03445.s3tc.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_02_arm_1k.jpg-7d7b80d5b56ff9704d7b333336fc15a1.ctex b/AGame/.godot/imported/brass_goblet_02_arm_1k.jpg-7d7b80d5b56ff9704d7b333336fc15a1.ctex new file mode 100644 index 00000000..dc19dd7f Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_02_arm_1k.jpg-7d7b80d5b56ff9704d7b333336fc15a1.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_02_arm_1k.jpg-7d7b80d5b56ff9704d7b333336fc15a1.md5 b/AGame/.godot/imported/brass_goblet_02_arm_1k.jpg-7d7b80d5b56ff9704d7b333336fc15a1.md5 new file mode 100644 index 00000000..37c96a32 --- /dev/null +++ b/AGame/.godot/imported/brass_goblet_02_arm_1k.jpg-7d7b80d5b56ff9704d7b333336fc15a1.md5 @@ -0,0 +1,3 @@ +source_md5="253f069532a05cb23540fa3cf1b84866" +dest_md5="257f26e830602193f3857b44a41ab895" + diff --git a/AGame/.godot/imported/brass_goblet_02_arm_1k.jpg-7d7b80d5b56ff9704d7b333336fc15a1.s3tc.ctex b/AGame/.godot/imported/brass_goblet_02_arm_1k.jpg-7d7b80d5b56ff9704d7b333336fc15a1.s3tc.ctex new file mode 100644 index 00000000..03954ffd Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_02_arm_1k.jpg-7d7b80d5b56ff9704d7b333336fc15a1.s3tc.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_02_diff_1k.jpg-15667f6342060df04887b514c82d71b7.ctex b/AGame/.godot/imported/brass_goblet_02_diff_1k.jpg-15667f6342060df04887b514c82d71b7.ctex new file mode 100644 index 00000000..c70d4387 Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_02_diff_1k.jpg-15667f6342060df04887b514c82d71b7.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_02_diff_1k.jpg-15667f6342060df04887b514c82d71b7.md5 b/AGame/.godot/imported/brass_goblet_02_diff_1k.jpg-15667f6342060df04887b514c82d71b7.md5 new file mode 100644 index 00000000..35806537 --- /dev/null +++ b/AGame/.godot/imported/brass_goblet_02_diff_1k.jpg-15667f6342060df04887b514c82d71b7.md5 @@ -0,0 +1,3 @@ +source_md5="5eadfe540b3eab26739ba84f61b95fc7" +dest_md5="758ea4162ba87813f6a7018e1ba320d2" + diff --git a/AGame/.godot/imported/brass_goblet_02_diff_1k.jpg-15667f6342060df04887b514c82d71b7.s3tc.ctex b/AGame/.godot/imported/brass_goblet_02_diff_1k.jpg-15667f6342060df04887b514c82d71b7.s3tc.ctex new file mode 100644 index 00000000..a283ce18 Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_02_diff_1k.jpg-15667f6342060df04887b514c82d71b7.s3tc.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_02_nor_gl_1k.jpg-a2c72b1f7403ca3b6fe9461d2528e2f9.ctex b/AGame/.godot/imported/brass_goblet_02_nor_gl_1k.jpg-a2c72b1f7403ca3b6fe9461d2528e2f9.ctex new file mode 100644 index 00000000..fb4669ba Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_02_nor_gl_1k.jpg-a2c72b1f7403ca3b6fe9461d2528e2f9.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_02_nor_gl_1k.jpg-a2c72b1f7403ca3b6fe9461d2528e2f9.md5 b/AGame/.godot/imported/brass_goblet_02_nor_gl_1k.jpg-a2c72b1f7403ca3b6fe9461d2528e2f9.md5 new file mode 100644 index 00000000..08422677 --- /dev/null +++ b/AGame/.godot/imported/brass_goblet_02_nor_gl_1k.jpg-a2c72b1f7403ca3b6fe9461d2528e2f9.md5 @@ -0,0 +1,3 @@ +source_md5="96d50a779c628ac10a1ac50eb5a52a3c" +dest_md5="2705ceec1f1a95d934944828843d2dc8" + diff --git a/AGame/.godot/imported/brass_goblet_02_nor_gl_1k.jpg-a2c72b1f7403ca3b6fe9461d2528e2f9.s3tc.ctex b/AGame/.godot/imported/brass_goblet_02_nor_gl_1k.jpg-a2c72b1f7403ca3b6fe9461d2528e2f9.s3tc.ctex new file mode 100644 index 00000000..699175ca Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_02_nor_gl_1k.jpg-a2c72b1f7403ca3b6fe9461d2528e2f9.s3tc.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_03_arm_1k.jpg-4be2a39a5cb4db76426d4fd867f72862.ctex b/AGame/.godot/imported/brass_goblet_03_arm_1k.jpg-4be2a39a5cb4db76426d4fd867f72862.ctex new file mode 100644 index 00000000..4e3fb268 Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_03_arm_1k.jpg-4be2a39a5cb4db76426d4fd867f72862.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_03_arm_1k.jpg-4be2a39a5cb4db76426d4fd867f72862.md5 b/AGame/.godot/imported/brass_goblet_03_arm_1k.jpg-4be2a39a5cb4db76426d4fd867f72862.md5 new file mode 100644 index 00000000..96e3c7b5 --- /dev/null +++ b/AGame/.godot/imported/brass_goblet_03_arm_1k.jpg-4be2a39a5cb4db76426d4fd867f72862.md5 @@ -0,0 +1,3 @@ +source_md5="28de0acc731a5acf1c07b505a753c3f6" +dest_md5="b0a675ea74bfd102467f19c3ab7acffa" + diff --git a/AGame/.godot/imported/brass_goblet_03_arm_1k.jpg-4be2a39a5cb4db76426d4fd867f72862.s3tc.ctex b/AGame/.godot/imported/brass_goblet_03_arm_1k.jpg-4be2a39a5cb4db76426d4fd867f72862.s3tc.ctex new file mode 100644 index 00000000..e9c1980e Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_03_arm_1k.jpg-4be2a39a5cb4db76426d4fd867f72862.s3tc.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_03_diff_1k.jpg-204e858a6db4a665514928e0afcbd990.ctex b/AGame/.godot/imported/brass_goblet_03_diff_1k.jpg-204e858a6db4a665514928e0afcbd990.ctex new file mode 100644 index 00000000..810ca0e1 Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_03_diff_1k.jpg-204e858a6db4a665514928e0afcbd990.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_03_diff_1k.jpg-204e858a6db4a665514928e0afcbd990.md5 b/AGame/.godot/imported/brass_goblet_03_diff_1k.jpg-204e858a6db4a665514928e0afcbd990.md5 new file mode 100644 index 00000000..011dea3f --- /dev/null +++ b/AGame/.godot/imported/brass_goblet_03_diff_1k.jpg-204e858a6db4a665514928e0afcbd990.md5 @@ -0,0 +1,3 @@ +source_md5="ea621239d3e707d4fdbfd0f0c1266d71" +dest_md5="cd10c414ae89bf4d72b3e2ce1394b8fa" + diff --git a/AGame/.godot/imported/brass_goblet_03_diff_1k.jpg-204e858a6db4a665514928e0afcbd990.s3tc.ctex b/AGame/.godot/imported/brass_goblet_03_diff_1k.jpg-204e858a6db4a665514928e0afcbd990.s3tc.ctex new file mode 100644 index 00000000..1faf8a2a Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_03_diff_1k.jpg-204e858a6db4a665514928e0afcbd990.s3tc.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_03_nor_gl_1k.jpg-e794bbcf06d0c1591aa82cf5f84df156.ctex b/AGame/.godot/imported/brass_goblet_03_nor_gl_1k.jpg-e794bbcf06d0c1591aa82cf5f84df156.ctex new file mode 100644 index 00000000..a22c319a Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_03_nor_gl_1k.jpg-e794bbcf06d0c1591aa82cf5f84df156.ctex differ diff --git a/AGame/.godot/imported/brass_goblet_03_nor_gl_1k.jpg-e794bbcf06d0c1591aa82cf5f84df156.md5 b/AGame/.godot/imported/brass_goblet_03_nor_gl_1k.jpg-e794bbcf06d0c1591aa82cf5f84df156.md5 new file mode 100644 index 00000000..d5758a54 --- /dev/null +++ b/AGame/.godot/imported/brass_goblet_03_nor_gl_1k.jpg-e794bbcf06d0c1591aa82cf5f84df156.md5 @@ -0,0 +1,3 @@ +source_md5="6f2a231d3514d414d60abcba0d9250f6" +dest_md5="7a449ee59a9d6b63d9b749d38728e470" + diff --git a/AGame/.godot/imported/brass_goblet_03_nor_gl_1k.jpg-e794bbcf06d0c1591aa82cf5f84df156.s3tc.ctex b/AGame/.godot/imported/brass_goblet_03_nor_gl_1k.jpg-e794bbcf06d0c1591aa82cf5f84df156.s3tc.ctex new file mode 100644 index 00000000..82e9aae1 Binary files /dev/null and b/AGame/.godot/imported/brass_goblet_03_nor_gl_1k.jpg-e794bbcf06d0c1591aa82cf5f84df156.s3tc.ctex differ diff --git a/AGame/.godot/imported/brass_goblets_1k.gltf-f6a75e13d2b7f4a435dd2c3962ec7430.md5 b/AGame/.godot/imported/brass_goblets_1k.gltf-f6a75e13d2b7f4a435dd2c3962ec7430.md5 new file mode 100644 index 00000000..9b52a27a --- /dev/null +++ b/AGame/.godot/imported/brass_goblets_1k.gltf-f6a75e13d2b7f4a435dd2c3962ec7430.md5 @@ -0,0 +1,3 @@ +source_md5="9e76131d099b3dcdadb82c1d2d8bd536" +dest_md5="224fba0c5af50e40585713208cb4744b" + diff --git a/AGame/.godot/imported/brass_goblets_1k.gltf-f6a75e13d2b7f4a435dd2c3962ec7430.scn b/AGame/.godot/imported/brass_goblets_1k.gltf-f6a75e13d2b7f4a435dd2c3962ec7430.scn new file mode 100644 index 00000000..77727f25 Binary files /dev/null and b/AGame/.godot/imported/brass_goblets_1k.gltf-f6a75e13d2b7f4a435dd2c3962ec7430.scn differ diff --git a/AGame/.godot/uid_cache.bin b/AGame/.godot/uid_cache.bin index 11249357..99ad1d42 100644 Binary files a/AGame/.godot/uid_cache.bin and b/AGame/.godot/uid_cache.bin differ diff --git a/AGame/DevTest.tscn b/AGame/DevTest.tscn index c15ab7ed..4ee5dc7c 100644 --- a/AGame/DevTest.tscn +++ b/AGame/DevTest.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://dsj41jw17qh40" path="res://Player.tscn" id="2_nkng6"] [sub_resource type="Gradient" id="Gradient_l2ce6"] -colors = PackedColorArray(0.6516739, 0.7670327, 1, 1, 0.7203012, 0.8066189, 0.98081595, 1) +colors = PackedColorArray(0.7810361, 0.7749989, 0.65810764, 1, 0.8445671, 0.7986815, 0.7306062, 1) [sub_resource type="GradientTexture1D" id="GradientTexture1D_nkng6"] gradient = SubResource("Gradient_l2ce6") @@ -34,9 +34,3 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 7.021526, 0) - -[node name="CanvasLayer" type="CanvasLayer" parent="."] - -[node name="Panel" type="Panel" parent="CanvasLayer"] -offset_right = 203.0 -offset_bottom = 113.0 diff --git a/AGame/Floor.tscn b/AGame/Floor.tscn index 3a0cd278..e1e243b6 100644 --- a/AGame/Floor.tscn +++ b/AGame/Floor.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=3 uid="uid://grcsjnqdsbmj"] +[gd_scene load_steps=14 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"] @@ -6,6 +6,7 @@ [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"] +[ext_resource type="PackedScene" uid="uid://defyk314stqmy" path="res://assets/Models/brass_goblets.gltf/brass_goblets_1k.gltf" id="7_0gdli"] [sub_resource type="BoxMesh" id="BoxMesh_spmh5"] @@ -67,7 +68,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1.0000001, -0.0024477243, -0.001 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) +transform = Transform3D(5, 0, 0, 0, 5, 0, 0, 0, 5, -16.142433, 2.8491917, 15.89838) [node name="CSGMesh3D" type="CSGMesh3D" parent="Box3"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.029260352, 0) @@ -77,3 +78,18 @@ 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") + +[node name="Box4" type="StaticBody3D" parent="."] +transform = Transform3D(5, 0, 0, 0, 1.336447, 0, 0, 0, 5, -1.239542, 6.856723, 15.89838) + +[node name="CSGMesh3D" type="CSGMesh3D" parent="Box4"] +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="Box4"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1.0000001, -0.0024477243, -0.0018959045, -0.00027276576) +shape = SubResource("BoxShape3D_mb0cl") + +[node name="brass_goblets_1k" parent="." instance=ExtResource("7_0gdli")] +transform = Transform3D(-3.9801757, 0, -4.3009076, 0, 5.86, 0, 4.3009076, 0, -3.9801757, -0.21352774, 7.480236, 17.036135) diff --git a/AGame/Player.tscn b/AGame/Player.tscn index c1d42614..5e51a805 100644 --- a/AGame/Player.tscn +++ b/AGame/Player.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=5 format=3 uid="uid://dsj41jw17qh40"] +[gd_scene load_steps=6 format=3 uid="uid://dsj41jw17qh40"] [ext_resource type="Script" uid="uid://b8ddkhlwoiuvm" path="res://Scripts/player.gd" id="1_xhfnw"] +[ext_resource type="Texture2D" uid="uid://c0q12luhomjlr" path="res://assets/textures/Crosshair.png" id="2_kpjcp"] [sub_resource type="CapsuleMesh" id="CapsuleMesh_kpjcp"] @@ -41,3 +42,54 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) target_position = Vector3(0, 0, -1.4) [node name="LedgeDownRay" type="RayCast3D" parent="."] + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="TextureRect" type="TextureRect" parent="CanvasLayer"] +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -20.0 +offset_top = -20.0 +offset_right = 20.0 +offset_bottom = 20.0 +grow_horizontal = 2 +grow_vertical = 2 +texture = ExtResource("2_kpjcp") +expand_mode = 1 + +[node name="Panel2" type="Panel" parent="CanvasLayer"] +anchors_preset = 2 +anchor_top = 1.0 +anchor_bottom = 1.0 +offset_left = 19.0 +offset_top = -61.0 +offset_right = 319.0 +offset_bottom = -20.0 +grow_vertical = 0 + +[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/Panel2"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="ProgressBar" type="ProgressBar" parent="CanvasLayer/Panel2/VBoxContainer"] +custom_minimum_size = Vector2(0, 44.305) +layout_mode = 2 +value = 93.0 +show_percentage = false + +[node name="Label" type="Label" parent="CanvasLayer/Panel2/VBoxContainer/ProgressBar"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_font_sizes/font_size = 36 +text = " 93" diff --git a/AGame/assets/Models/brass_goblets.gltf/brass_goblets.bin b/AGame/assets/Models/brass_goblets.gltf/brass_goblets.bin new file mode 100644 index 00000000..aab7b2db Binary files /dev/null and b/AGame/assets/Models/brass_goblets.gltf/brass_goblets.bin differ diff --git a/AGame/assets/Models/brass_goblets.gltf/brass_goblets_1k.gltf b/AGame/assets/Models/brass_goblets.gltf/brass_goblets_1k.gltf new file mode 100644 index 00000000..88b9032a --- /dev/null +++ b/AGame/assets/Models/brass_goblets.gltf/brass_goblets_1k.gltf @@ -0,0 +1,412 @@ +{ + "asset": { + "generator": "Khronos glTF Blender I/O v4.0.44", + "version": "2.0" + }, + "scene": 0, + "scenes": [ + { + "name": "Scene", + "nodes": [ + 0, + 1, + 2 + ] + } + ], + "nodes": [ + { + "mesh": 0, + "name": "brass_goblet_01", + "translation": [ + -0.00032767606899142265, + 0.004920530132949352, + 0.12025979906320572 + ] + }, + { + "mesh": 1, + "name": "brass_goblet_02", + "translation": [ + -0.14954441785812378, + 0.005822327919304371, + -0.030845999717712402 + ] + }, + { + "mesh": 2, + "name": "brass_goblet_03", + "translation": [ + 0.15866722166538239, + 0.006193193141371012, + -0.027895381674170494 + ] + } + ], + "materials": [ + { + "doubleSided": true, + "name": "brass_goblets_01", + "normalTexture": { + "index": 0 + }, + "pbrMetallicRoughness": { + "baseColorTexture": { + "index": 1 + }, + "metallicRoughnessTexture": { + "index": 2 + } + } + }, + { + "doubleSided": true, + "name": "brass_goblets_02", + "normalTexture": { + "index": 3 + }, + "pbrMetallicRoughness": { + "baseColorTexture": { + "index": 4 + }, + "metallicRoughnessTexture": { + "index": 5 + } + } + }, + { + "doubleSided": true, + "name": "brass_goblets_03", + "normalTexture": { + "index": 6 + }, + "pbrMetallicRoughness": { + "baseColorTexture": { + "index": 7 + }, + "metallicRoughnessTexture": { + "index": 8 + } + } + } + ], + "meshes": [ + { + "name": "brass_goblet_01", + "primitives": [ + { + "attributes": { + "POSITION": 0, + "NORMAL": 1, + "TEXCOORD_0": 2 + }, + "indices": 3, + "material": 0 + } + ] + }, + { + "name": "brass_goblet_02", + "primitives": [ + { + "attributes": { + "POSITION": 4, + "NORMAL": 5, + "TEXCOORD_0": 6 + }, + "indices": 7, + "material": 1 + } + ] + }, + { + "name": "brass_goblet_03", + "primitives": [ + { + "attributes": { + "POSITION": 8, + "NORMAL": 9, + "TEXCOORD_0": 10 + }, + "indices": 11, + "material": 2 + } + ] + } + ], + "textures": [ + { + "sampler": 0, + "source": 0 + }, + { + "sampler": 0, + "source": 1 + }, + { + "sampler": 0, + "source": 2 + }, + { + "sampler": 0, + "source": 3 + }, + { + "sampler": 0, + "source": 4 + }, + { + "sampler": 0, + "source": 5 + }, + { + "sampler": 0, + "source": 6 + }, + { + "sampler": 0, + "source": 7 + }, + { + "sampler": 0, + "source": 8 + } + ], + "images": [ + { + "mimeType": "image/jpeg", + "name": "brass_goblet_01_nor_gl", + "uri": "textures/brass_goblet_01_nor_gl_1k.jpg" + }, + { + "mimeType": "image/jpeg", + "name": "brass_goblet_01_diff", + "uri": "textures/brass_goblet_01_diff_1k.jpg" + }, + { + "mimeType": "image/jpeg", + "name": "brass_goblet_01_metal-brass_goblet_01_rough", + "uri": "textures/brass_goblet_01_arm_1k.jpg" + }, + { + "mimeType": "image/jpeg", + "name": "brass_goblet_02_nor_gl", + "uri": "textures/brass_goblet_02_nor_gl_1k.jpg" + }, + { + "mimeType": "image/jpeg", + "name": "brass_goblet_02_diff", + "uri": "textures/brass_goblet_02_diff_1k.jpg" + }, + { + "mimeType": "image/jpeg", + "name": "brass_goblet_02_metal-brass_goblet_02_rough", + "uri": "textures/brass_goblet_02_arm_1k.jpg" + }, + { + "mimeType": "image/jpeg", + "name": "brass_goblet_03_nor_gl", + "uri": "textures/brass_goblet_03_nor_gl_1k.jpg" + }, + { + "mimeType": "image/jpeg", + "name": "brass_goblet_03_diff", + "uri": "textures/brass_goblet_03_diff_1k.jpg" + }, + { + "mimeType": "image/jpeg", + "name": "brass_goblet_03_metal-brass_goblet_03_rough", + "uri": "textures/brass_goblet_03_arm_1k.jpg" + } + ], + "accessors": [ + { + "bufferView": 0, + "componentType": 5126, + "count": 1946, + "max": [ + 0.07483092695474625, + 0.2719894349575043, + 0.07483091205358505 + ], + "min": [ + -0.07483093440532684, + -2.7939677238464355e-9, + -0.07483094185590744 + ], + "type": "VEC3" + }, + { + "bufferView": 1, + "componentType": 5126, + "count": 1946, + "type": "VEC3" + }, + { + "bufferView": 2, + "componentType": 5126, + "count": 1946, + "type": "VEC2" + }, + { + "bufferView": 3, + "componentType": 5123, + "count": 9216, + "type": "SCALAR" + }, + { + "bufferView": 4, + "componentType": 5126, + "count": 2224, + "max": [ + 0.07055510580539703, + 0.26576897501945496, + 0.07055514305830002 + ], + "min": [ + -0.070555180311203, + -0.000004996545612812042, + -0.07055515050888062 + ], + "type": "VEC3" + }, + { + "bufferView": 5, + "componentType": 5126, + "count": 2224, + "type": "VEC3" + }, + { + "bufferView": 6, + "componentType": 5126, + "count": 2224, + "type": "VEC2" + }, + { + "bufferView": 7, + "componentType": 5123, + "count": 9792, + "type": "SCALAR" + }, + { + "bufferView": 8, + "componentType": 5126, + "count": 2209, + "max": [ + 0.0746278464794159, + 0.2721051871776581, + 0.07462787628173828 + ], + "min": [ + -0.07462790608406067, + 3.259629011154175e-9, + -0.07462787628173828 + ], + "type": "VEC3" + }, + { + "bufferView": 9, + "componentType": 5126, + "count": 2209, + "type": "VEC3" + }, + { + "bufferView": 10, + "componentType": 5126, + "count": 2209, + "type": "VEC2" + }, + { + "bufferView": 11, + "componentType": 5123, + "count": 9792, + "type": "SCALAR" + } + ], + "bufferViews": [ + { + "buffer": 0, + "byteLength": 23352, + "byteOffset": 0, + "target": 34962 + }, + { + "buffer": 0, + "byteLength": 23352, + "byteOffset": 23352, + "target": 34962 + }, + { + "buffer": 0, + "byteLength": 15568, + "byteOffset": 46704, + "target": 34962 + }, + { + "buffer": 0, + "byteLength": 18432, + "byteOffset": 62272, + "target": 34963 + }, + { + "buffer": 0, + "byteLength": 26688, + "byteOffset": 80704, + "target": 34962 + }, + { + "buffer": 0, + "byteLength": 26688, + "byteOffset": 107392, + "target": 34962 + }, + { + "buffer": 0, + "byteLength": 17792, + "byteOffset": 134080, + "target": 34962 + }, + { + "buffer": 0, + "byteLength": 19584, + "byteOffset": 151872, + "target": 34963 + }, + { + "buffer": 0, + "byteLength": 26508, + "byteOffset": 171456, + "target": 34962 + }, + { + "buffer": 0, + "byteLength": 26508, + "byteOffset": 197964, + "target": 34962 + }, + { + "buffer": 0, + "byteLength": 17672, + "byteOffset": 224472, + "target": 34962 + }, + { + "buffer": 0, + "byteLength": 19584, + "byteOffset": 242144, + "target": 34963 + } + ], + "samplers": [ + { + "magFilter": 9729, + "minFilter": 9987 + } + ], + "buffers": [ + { + "byteLength": 261728, + "uri": "brass_goblets.bin" + } + ] +} \ No newline at end of file diff --git a/AGame/assets/Models/brass_goblets.gltf/brass_goblets_1k.gltf.import b/AGame/assets/Models/brass_goblets.gltf/brass_goblets_1k.gltf.import new file mode 100644 index 00000000..45330a73 --- /dev/null +++ b/AGame/assets/Models/brass_goblets.gltf/brass_goblets_1k.gltf.import @@ -0,0 +1,42 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://defyk314stqmy" +path="res://.godot/imported/brass_goblets_1k.gltf-f6a75e13d2b7f4a435dd2c3962ec7430.scn" + +[deps] + +source_file="res://assets/Models/brass_goblets.gltf/brass_goblets_1k.gltf" +dest_files=["res://.godot/imported/brass_goblets_1k.gltf-f6a75e13d2b7f4a435dd2c3962ec7430.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 diff --git a/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_arm_1k.jpg b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_arm_1k.jpg new file mode 100644 index 00000000..5652c98f Binary files /dev/null and b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_arm_1k.jpg differ diff --git a/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_arm_1k.jpg.import b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_arm_1k.jpg.import new file mode 100644 index 00000000..649080ec --- /dev/null +++ b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_arm_1k.jpg.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://e215br752mpa" +path.s3tc="res://.godot/imported/brass_goblet_01_arm_1k.jpg-a8ddcf8e1e360862b2b78798e4df9f10.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Models/brass_goblets.gltf/textures/brass_goblet_01_arm_1k.jpg" +dest_files=["res://.godot/imported/brass_goblet_01_arm_1k.jpg-a8ddcf8e1e360862b2b78798e4df9f10.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/Models/brass_goblets.gltf/textures/brass_goblet_01_diff_1k.jpg b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_diff_1k.jpg new file mode 100644 index 00000000..3435ba8a Binary files /dev/null and b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_diff_1k.jpg differ diff --git a/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_diff_1k.jpg.import b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_diff_1k.jpg.import new file mode 100644 index 00000000..3a1b4620 --- /dev/null +++ b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_diff_1k.jpg.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bni0dafthlm3d" +path.s3tc="res://.godot/imported/brass_goblet_01_diff_1k.jpg-e26830ec2bcb4f904a393ba4f3fd921b.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Models/brass_goblets.gltf/textures/brass_goblet_01_diff_1k.jpg" +dest_files=["res://.godot/imported/brass_goblet_01_diff_1k.jpg-e26830ec2bcb4f904a393ba4f3fd921b.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/Models/brass_goblets.gltf/textures/brass_goblet_01_nor_gl_1k.jpg b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_nor_gl_1k.jpg new file mode 100644 index 00000000..d232cb21 Binary files /dev/null and b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_nor_gl_1k.jpg differ diff --git a/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_nor_gl_1k.jpg.import b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_nor_gl_1k.jpg.import new file mode 100644 index 00000000..6bda002f --- /dev/null +++ b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_01_nor_gl_1k.jpg.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bbhsu5opuuin6" +path.s3tc="res://.godot/imported/brass_goblet_01_nor_gl_1k.jpg-d02aabb2dec248d71ef537cbc6e03445.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Models/brass_goblets.gltf/textures/brass_goblet_01_nor_gl_1k.jpg" +dest_files=["res://.godot/imported/brass_goblet_01_nor_gl_1k.jpg-d02aabb2dec248d71ef537cbc6e03445.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/Models/brass_goblets.gltf/textures/brass_goblet_01_nor_gl_1k.jpg" +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/Models/brass_goblets.gltf/textures/brass_goblet_02_arm_1k.jpg b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_arm_1k.jpg new file mode 100644 index 00000000..648795db Binary files /dev/null and b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_arm_1k.jpg differ diff --git a/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_arm_1k.jpg.import b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_arm_1k.jpg.import new file mode 100644 index 00000000..b8d59372 --- /dev/null +++ b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_arm_1k.jpg.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://stsxspgml4mo" +path.s3tc="res://.godot/imported/brass_goblet_02_arm_1k.jpg-7d7b80d5b56ff9704d7b333336fc15a1.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Models/brass_goblets.gltf/textures/brass_goblet_02_arm_1k.jpg" +dest_files=["res://.godot/imported/brass_goblet_02_arm_1k.jpg-7d7b80d5b56ff9704d7b333336fc15a1.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/Models/brass_goblets.gltf/textures/brass_goblet_02_diff_1k.jpg b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_diff_1k.jpg new file mode 100644 index 00000000..166ecd4d Binary files /dev/null and b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_diff_1k.jpg differ diff --git a/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_diff_1k.jpg.import b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_diff_1k.jpg.import new file mode 100644 index 00000000..e6fd6818 --- /dev/null +++ b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_diff_1k.jpg.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cosf4cetdnrp5" +path.s3tc="res://.godot/imported/brass_goblet_02_diff_1k.jpg-15667f6342060df04887b514c82d71b7.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Models/brass_goblets.gltf/textures/brass_goblet_02_diff_1k.jpg" +dest_files=["res://.godot/imported/brass_goblet_02_diff_1k.jpg-15667f6342060df04887b514c82d71b7.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/Models/brass_goblets.gltf/textures/brass_goblet_02_nor_gl_1k.jpg b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_nor_gl_1k.jpg new file mode 100644 index 00000000..da0c95be Binary files /dev/null and b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_nor_gl_1k.jpg differ diff --git a/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_nor_gl_1k.jpg.import b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_nor_gl_1k.jpg.import new file mode 100644 index 00000000..56581227 --- /dev/null +++ b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_02_nor_gl_1k.jpg.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cvkp052ghk4ow" +path.s3tc="res://.godot/imported/brass_goblet_02_nor_gl_1k.jpg-a2c72b1f7403ca3b6fe9461d2528e2f9.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Models/brass_goblets.gltf/textures/brass_goblet_02_nor_gl_1k.jpg" +dest_files=["res://.godot/imported/brass_goblet_02_nor_gl_1k.jpg-a2c72b1f7403ca3b6fe9461d2528e2f9.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/Models/brass_goblets.gltf/textures/brass_goblet_02_nor_gl_1k.jpg" +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/Models/brass_goblets.gltf/textures/brass_goblet_03_arm_1k.jpg b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_arm_1k.jpg new file mode 100644 index 00000000..bb943354 Binary files /dev/null and b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_arm_1k.jpg differ diff --git a/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_arm_1k.jpg.import b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_arm_1k.jpg.import new file mode 100644 index 00000000..0108aae8 --- /dev/null +++ b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_arm_1k.jpg.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dvgxaojrwm34j" +path.s3tc="res://.godot/imported/brass_goblet_03_arm_1k.jpg-4be2a39a5cb4db76426d4fd867f72862.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Models/brass_goblets.gltf/textures/brass_goblet_03_arm_1k.jpg" +dest_files=["res://.godot/imported/brass_goblet_03_arm_1k.jpg-4be2a39a5cb4db76426d4fd867f72862.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/Models/brass_goblets.gltf/textures/brass_goblet_03_diff_1k.jpg b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_diff_1k.jpg new file mode 100644 index 00000000..0b489bef Binary files /dev/null and b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_diff_1k.jpg differ diff --git a/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_diff_1k.jpg.import b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_diff_1k.jpg.import new file mode 100644 index 00000000..ebcc1198 --- /dev/null +++ b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_diff_1k.jpg.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://lgqeayw0qj50" +path.s3tc="res://.godot/imported/brass_goblet_03_diff_1k.jpg-204e858a6db4a665514928e0afcbd990.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Models/brass_goblets.gltf/textures/brass_goblet_03_diff_1k.jpg" +dest_files=["res://.godot/imported/brass_goblet_03_diff_1k.jpg-204e858a6db4a665514928e0afcbd990.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/Models/brass_goblets.gltf/textures/brass_goblet_03_nor_gl_1k.jpg b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_nor_gl_1k.jpg new file mode 100644 index 00000000..cbe21d26 Binary files /dev/null and b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_nor_gl_1k.jpg differ diff --git a/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_nor_gl_1k.jpg.import b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_nor_gl_1k.jpg.import new file mode 100644 index 00000000..49468343 --- /dev/null +++ b/AGame/assets/Models/brass_goblets.gltf/textures/brass_goblet_03_nor_gl_1k.jpg.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://s2vj7ou5g7q1" +path.s3tc="res://.godot/imported/brass_goblet_03_nor_gl_1k.jpg-e794bbcf06d0c1591aa82cf5f84df156.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Models/brass_goblets.gltf/textures/brass_goblet_03_nor_gl_1k.jpg" +dest_files=["res://.godot/imported/brass_goblet_03_nor_gl_1k.jpg-e794bbcf06d0c1591aa82cf5f84df156.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/Models/brass_goblets.gltf/textures/brass_goblet_03_nor_gl_1k.jpg" +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/textures/Crosshair.png b/AGame/assets/textures/Crosshair.png new file mode 100644 index 00000000..80f327a1 Binary files /dev/null and b/AGame/assets/textures/Crosshair.png differ diff --git a/AGame/assets/textures/Crosshair.png.import b/AGame/assets/textures/Crosshair.png.import new file mode 100644 index 00000000..16ed6158 --- /dev/null +++ b/AGame/assets/textures/Crosshair.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c0q12luhomjlr" +path="res://.godot/imported/Crosshair.png-924381f8bac511b37ea5c3e05e9d4219.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/Crosshair.png" +dest_files=["res://.godot/imported/Crosshair.png-924381f8bac511b37ea5c3e05e9d4219.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