diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 96295f7..51fa16b 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.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://scenes/levels/test_room.tscn") -dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/", "res://scenes/ui/", "res://scenes/props/", "res://scenes/levels/") +dock_filesystem_selected_paths=PackedStringArray("res://scenes/characters/player_character.tscn") +dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scenes/", "res://scenes/ui/", "res://scenes/props/", "res://scenes/levels/", "res://scenes/characters/") dock_node_current_tab=0 dock_history_include_scene=true dock_history_include_global=true @@ -28,7 +28,7 @@ dock_5="Inspector,Node,History" [EditorNode] -open_scenes=PackedStringArray("res://scenes/levels/test_room.tscn") +open_scenes=PackedStringArray("res://scenes/levels/test_room.tscn", "res://scenes/characters/player_character.tscn") current_scene="res://scenes/levels/test_room.tscn" center_split_offset=0 selected_default_debugger_tab_idx=0 @@ -37,15 +37,15 @@ selected_bottom_panel_item=0 [EditorWindow] -screen=1 +screen=0 mode="windowed" size=Vector2i(1896, 1030) -position=Vector2i(1932, 38) +position=Vector2i(12, 38) [ScriptEditor] -open_scripts=[] -selected_script="" +open_scripts=["res://scripts/player_controller.gd"] +selected_script="res://scripts/player_controller.gd" open_help=[] script_split_offset=200 list_split_offset=0 diff --git a/.godot/editor/editor_script_doc_cache.res b/.godot/editor/editor_script_doc_cache.res deleted file mode 100644 index 156d66c..0000000 Binary files a/.godot/editor/editor_script_doc_cache.res and /dev/null differ diff --git a/.godot/editor/filesystem_cache10 b/.godot/editor/filesystem_cache10 index 6b7f248..318ee0c 100644 --- a/.godot/editor/filesystem_cache10 +++ b/.godot/editor/filesystem_cache10 @@ -1,5 +1,5 @@ 63f7b34db8d8cdea90c76aacccf841ec -::res://::1765200094 +::res://::1765203357 export_presets.cfg::TextFile::-1::1765166346::0::1::::<><><>0<>0<><>:: icon.svg::CompressedTexture2D::2150381636576227936::1765166346::1765166346::1::::<><><>0<>0<>6ec458a377696260d566dce7fb17cc76<>res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex:: README.md::TextFile::-1::1765166346::0::1::::<><><>0<>0<><>:: @@ -10,27 +10,27 @@ icon.svg::CompressedTexture2D::5804760287575086511::1765166347::1765166347::1::: ::res://assets/music/::1765166547 ::res://assets/sounds/::1765166547 ::res://assets/textures/::1765166780 -carvedStone_albedo.png::CompressedTexture2D::7637517970803647145::1765166346::1765166779::1::::<><><>0<>0<>1808f1cae03c0f19b8d7117bbbfbe4cc<>res://.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.ctex:: +carvedStone_albedo.png::CompressedTexture2D::7637517970803647145::1765166346::1765203359::1::::<><><>0<>0<>6776533ead8555e254e5e776845c4653<>res://.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.s3tc.ctex:: carvedStone_heightmap.png::CompressedTexture2D::893112945293199209::1765166346::1765166779::1::::<><><>0<>0<>2df8fd9371374216e4d256d311b5471f<>res://.godot/imported/carvedStone_heightmap.png-e4c89f472bad64dcd42cdfd40b8352ea.ctex:: -carvedStone_normal.png::CompressedTexture2D::8932966262758925579::1765166346::1765166779::1::::<><><>0<>0<>aa4f005428275de5cbce4ee6e0e9c246<>res://.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.ctex:: -carvedStone_orm.png::CompressedTexture2D::7481142983689827420::1765166346::1765166779::1::::<><><>0<>0<>d19bf64f40b4ffd13b891b4c54cfaff1<>res://.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.ctex:: +carvedStone_normal.png::CompressedTexture2D::8932966262758925579::1765166346::1765203359::1::::<><><>0<>0<>a0d159da56b5cbbf6858fcb8bd00223c<>res://.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.s3tc.ctex:: +carvedStone_orm.png::CompressedTexture2D::7481142983689827420::1765166346::1765203359::1::::<><><>0<>0<>3b9eb1be7986cc66ac976e2fcaafc3aa<>res://.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.s3tc.ctex:: grass_albedo.png::CompressedTexture2D::8673371136067976150::1765166347::1765166780::1::::<><><>0<>0<>e1895f2cbd63544650a493117d390d0b<>res://.godot/imported/grass_albedo.png-04a7e4555aae8789132c0bcc887b21de.ctex:: grass_heightmap.png::CompressedTexture2D::9046659113877141175::1765166347::1765166780::1::::<><><>0<>0<>103c9aa56df2bb3e0d41cc577e4e2ecc<>res://.godot/imported/grass_heightmap.png-a2e4e281498828368a7518872c47a692.ctex:: grass_normal.png::CompressedTexture2D::513863430113080815::1765166347::1765166780::1::::<><><>0<>0<>306afe136a1e7e67dd4363ab94bf72f0<>res://.godot/imported/grass_normal.png-469e34492d95850956d3053612bbfb61.ctex:: grass_orm.png::CompressedTexture2D::1486224454054714974::1765166347::1765166780::1::::<><><>0<>0<>f4aeff3582e25cec703482c1d370b922<>res://.godot/imported/grass_orm.png-5c6df0996ce73d4c595e95d00fbe2dda.ctex:: -wood_albedo.png::CompressedTexture2D::4114720100312162928::1765166347::1765166780::1::::<><><>0<>0<>9414149b93b81d076a676dbf73b88997<>res://.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.ctex:: -wood_normal.png::CompressedTexture2D::1278280688993979076::1765166347::1765166780::1::::<><><>0<>0<>3fd48c652d37c7a36015e6004a82fd77<>res://.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.ctex:: -wood_orm.png::CompressedTexture2D::4637285408980086021::1765166347::1765166780::1::::<><><>0<>0<>75eed085788972090a9a7da34f76c0d1<>res://.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.ctex:: +wood_albedo.png::CompressedTexture2D::4114720100312162928::1765166347::1765203359::1::::<><><>0<>0<>cd9d2c0006dddc60ee829dd9001fddc3<>res://.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.s3tc.ctex:: +wood_normal.png::CompressedTexture2D::1278280688993979076::1765166347::1765203359::1::::<><><>0<>0<>2c8b5f01e31a5ba08e5eed51ad6c4287<>res://.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.s3tc.ctex:: +wood_orm.png::CompressedTexture2D::4637285408980086021::1765166347::1765203359::1::::<><><>0<>0<>19ec18d9280bc1b7b8471cc3360f2c55<>res://.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.s3tc.ctex:: ::res://materials/::1765166554 -carvedStone.tres::StandardMaterial3D::4676106340516080263::1765166346::0::1::::<><><>0<>0<><>::uid://cdtbxw4neys1c::::res://carvedStone_albedo.png<>uid://eirst6oc4w20::::res://carvedStone_orm.png<>uid://i0mejqhgelvk::::res://carvedStone_normal.png<>uid://dqdk2cmnpakew::::res://carvedStone_heightmap.png -grass.tres::ORMMaterial3D::7903138233491583967::1765166346::0::1::::<><><>0<>0<><>::uid://bx3p57v4kmh3f::::res://assets/grass_albedo.png<>uid://cds7jys5drukl::::res://assets/grass_normal.png<>uid://c5dmbr5oa83y7::::res://assets/grass_heightmap.png -wood.tres::StandardMaterial3D::6725057253200752806::1765166347::0::1::::<><><>0<>0<><>::uid://d3cbbka1w2eq4::::res://wood_albedo.png<>uid://dt7j2h77j6te0::::res://wood_orm.png<>uid://cv08ximjjlfrc::::res://wood_normal.png +carvedStone.tres::StandardMaterial3D::4676106340516080263::1765203328::0::1::::<><><>0<>0<><>::res://assets/textures/carvedStone_albedo.png<>res://assets/textures/carvedStone_orm.png<>res://assets/textures/carvedStone_normal.png<>res://assets/textures/carvedStone_heightmap.png +grass.tres::ORMMaterial3D::7903138233491583967::1765203321::0::1::::<><><>0<>0<><>::uid://bx3p57v4kmh3f::::res://assets/grass_albedo.png<>uid://cds7jys5drukl::::res://assets/grass_normal.png<>uid://c5dmbr5oa83y7::::res://assets/grass_heightmap.png +wood.tres::StandardMaterial3D::6725057253200752806::1765203302::0::1::::<><><>0<>0<><>::res://assets/textures/wood_albedo.png<>res://assets/textures/wood_orm.png<>res://assets/textures/wood_normal.png ::res://scenes/::1765166547 ::res://scenes/characters/::1765166554 player_character.tscn::PackedScene::8217126413220459329::1765166671::0::1::::<><><>0<>0<><>::res://scripts/player_controller.gd -::res://scenes/levels/::1765166554 +::res://scenes/levels/::1765200101 sky_princess.tscn::PackedScene::5755036002026428019::1765166346::0::1::::<><><>0<>0<><>::uid://b7ve12hakqpdf::::res://assets/carvedStone.tres -test_room.tscn::PackedScene::7634184114940605230::1765166346::0::1::::<><><>0<>0<><>::uid://dpco4vo8rwkq0::::res://player_character.tscn<>uid://d01yomyxft4qt::::res://ui.tscn<>uid://dkulsdbn03prr::::res://assets/grass.tres<>uid://dsgxat46qwqbn::::res://table.tscn<>uid://b5ah32wouh61i::::res://chest.tscn<>uid://cn81uqcg16q4b::::res://sky_princess.tscn +test_room.tscn::PackedScene::7634184114940605230::1765200101::0::1::::<><><>0<>0<><>::uid://dpco4vo8rwkq0::::res://scenes/characters/player_character.tscn<>uid://d01yomyxft4qt::::res://scenes/ui/ui.tscn<>uid://dkulsdbn03prr::::res://materials/grass.tres<>uid://dsgxat46qwqbn::::res://scenes/props/table.tscn<>uid://b5ah32wouh61i::::res://scenes/props/chest.tscn<>uid://cn81uqcg16q4b::::res://scenes/levels/sky_princess.tscn ::res://scenes/props/::1765166554 chest.tscn::PackedScene::4492562466792060464::1765166346::0::1::::<><><>0<>0<><>::uid://c22wyfih5ebfy::::res://assets/wood.tres table.tscn::PackedScene::8436445038095616959::1765166346::0::1::::<><><>0<>0<><>::uid://c22wyfih5ebfy::::res://assets/wood.tres diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index 4439c26..44ca000 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -1 +1,2 @@ -res://scenes/levels/test_room.tscn +res://scenes/characters/player_character.tscn +res://scripts/player_controller.gd diff --git a/.godot/editor/player_character.tscn-editstate-37a0d74a25a03180f56fa9a7cf23e165.cfg b/.godot/editor/player_character.tscn-editstate-37a0d74a25a03180f56fa9a7cf23e165.cfg new file mode 100644 index 0000000..6e76ddf --- /dev/null +++ b/.godot/editor/player_character.tscn-editstate-37a0d74a25a03180f56fa9a7cf23e165.cfg @@ -0,0 +1,190 @@ +[editor_states] + +Anim={ +"visible": false +} +2D={ +"grid_offset": Vector2(0, 0), +"grid_snap_active": false, +"grid_step": Vector2(8, 8), +"grid_visibility": 1, +"ofs": Vector2(-166, -111), +"primary_grid_step": Vector2i(8, 8), +"show_group_gizmos": true, +"show_guides": true, +"show_helpers": false, +"show_lock_gizmos": true, +"show_origin": true, +"show_position_gizmos": true, +"show_rulers": true, +"show_transformation_gizmos": true, +"show_viewport": true, +"show_zoom_control": true, +"smart_snap_active": false, +"snap_guides": true, +"snap_node_anchors": true, +"snap_node_center": true, +"snap_node_parent": true, +"snap_node_sides": true, +"snap_other_nodes": true, +"snap_pixel": true, +"snap_relative": false, +"snap_rotation": false, +"snap_rotation_offset": 0.0, +"snap_rotation_step": 0.2617994, +"snap_scale": false, +"snap_scale_step": 0.1, +"zoom": 1.0 +} +3D={ +"fov": 70.01, +"gizmos_status": { +"AudioListener3D": 0, +"AudioStreamPlayer3D": 0, +"CPUParticles3D": 0, +"CSGShape3D": 0, +"Camera3D": 0, +"CollisionObject3D": 0, +"CollisionPolygon3D": 0, +"CollisionShape3D": 0, +"Decal": 0, +"FogVolume": 0, +"GPUParticles3D": 0, +"GPUParticlesCollision3D": 0, +"Joint3D": 0, +"Light3D": 0, +"LightmapGI": 0, +"LightmapProbe": 0, +"Marker3D": 0, +"MeshInstance3DCustomAABB": 0, +"NavigationLink3D": 0, +"NavigationObstacle3D": 0, +"NavigationRegion3D": 0, +"OccluderInstance3D": 0, +"Particles3DEmissionShape": 0, +"Path3D": 0, +"PhysicalBone3D": 0, +"RayCast3D": 0, +"ReflectionProbe": 0, +"ShapeCast3D": 0, +"Skeleton3D": 0, +"SoftBody3D": 0, +"SpringArm3D": 0, +"SpringBoneCollision3D": 0, +"SpringBoneSimulator3D": 0, +"VehicleWheel3D": 0, +"VisibleOnScreenNotifier3D": 0, +"VoxelGI": 0 +}, +"local_coords": false, +"preview_sun_env": { +"environ_ao_enabled": false, +"environ_enabled": true, +"environ_energy": 1.0, +"environ_gi_enabled": false, +"environ_glow_enabled": true, +"environ_ground_color": Color(0.2, 0.169, 0.133, 1), +"environ_sky_color": Color(0.385, 0.454, 0.55, 1), +"environ_tonemap_enabled": true, +"sun_color": Color(1, 1, 1, 1), +"sun_enabled": true, +"sun_energy": 1.0, +"sun_rotation": Vector2(-1.0471976, 2.6179938), +"sun_shadow_max_distance": 100.0 +}, +"rotate_snap": 15.0, +"scale_snap": 10.0, +"show_grid": true, +"show_origin": true, +"snap_enabled": false, +"translate_snap": 1.0, +"viewport_mode": 1, +"viewports": [{ +"auto_orthogonal": false, +"auto_orthogonal_enabled": true, +"cinematic_preview": false, +"display_mode": 22, +"distance": 4.0, +"doppler": false, +"frame_time": false, +"gizmos": true, +"grid": true, +"half_res": false, +"information": false, +"listener": true, +"lock_rotation": false, +"orthogonal": false, +"position": Vector3(-0.3587997, 0.5727471, -0.044849873), +"transform_gizmo": true, +"use_environment": false, +"view_type": 0, +"x_rotation": 0.34292027, +"y_rotation": -1.9966192 +}, { +"auto_orthogonal": false, +"auto_orthogonal_enabled": true, +"cinematic_preview": false, +"display_mode": 22, +"distance": 4.0, +"doppler": false, +"frame_time": false, +"gizmos": true, +"grid": true, +"half_res": false, +"information": false, +"listener": false, +"lock_rotation": false, +"orthogonal": false, +"position": Vector3(0, 0, 0), +"transform_gizmo": true, +"use_environment": false, +"view_type": 0, +"x_rotation": 0.5, +"y_rotation": -0.5 +}, { +"auto_orthogonal": false, +"auto_orthogonal_enabled": true, +"cinematic_preview": false, +"display_mode": 22, +"distance": 4.0, +"doppler": false, +"frame_time": false, +"gizmos": true, +"grid": true, +"half_res": false, +"information": false, +"listener": false, +"lock_rotation": false, +"orthogonal": false, +"position": Vector3(0, 0, 0), +"transform_gizmo": true, +"use_environment": false, +"view_type": 0, +"x_rotation": 0.5, +"y_rotation": -0.5 +}, { +"auto_orthogonal": false, +"auto_orthogonal_enabled": true, +"cinematic_preview": false, +"display_mode": 22, +"distance": 4.0, +"doppler": false, +"frame_time": false, +"gizmos": true, +"grid": true, +"half_res": false, +"information": false, +"listener": false, +"lock_rotation": false, +"orthogonal": false, +"position": Vector3(0, 0, 0), +"transform_gizmo": true, +"use_environment": false, +"view_type": 0, +"x_rotation": 0.5, +"y_rotation": -0.5 +}], +"zfar": 4000.01, +"znear": 0.05 +} +selected_nodes=Array[NodePath]([]) diff --git a/.godot/editor/player_character.tscn-folding-37a0d74a25a03180f56fa9a7cf23e165.cfg b/.godot/editor/player_character.tscn-folding-37a0d74a25a03180f56fa9a7cf23e165.cfg new file mode 100644 index 0000000..de41ac4 --- /dev/null +++ b/.godot/editor/player_character.tscn-folding-37a0d74a25a03180f56fa9a7cf23e165.cfg @@ -0,0 +1,5 @@ +[folding] + +node_unfolds=[NodePath("CharacterBody3D"), PackedStringArray("Collision"), NodePath("CharacterBody3D/MeshInstance3D"), PackedStringArray("Skeleton"), NodePath("CharacterBody3D/Camera3D"), PackedStringArray("Transform")] +resource_unfolds=["res://scenes/characters/player_character.tscn::CapsuleMesh_tfo3t", PackedStringArray("Resource"), "res://scenes/characters/player_character.tscn::CapsuleShape3D_tfo3t", PackedStringArray("Resource")] +nodes_folded=[] diff --git a/.godot/editor/player_controller.gd-folding-4ea7794e155d1afc11e06c8be2ed3849.cfg b/.godot/editor/player_controller.gd-folding-4ea7794e155d1afc11e06c8be2ed3849.cfg new file mode 100644 index 0000000..e860dd4 --- /dev/null +++ b/.godot/editor/player_controller.gd-folding-4ea7794e155d1afc11e06c8be2ed3849.cfg @@ -0,0 +1,3 @@ +[folding] + +sections_unfolded=PackedStringArray() diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index 1301b22..88004fb 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -14,7 +14,8 @@ project_settings=Rect2(360, 190, 1200, 700) [recent_files] -scenes=["res://scenes/levels/test_room.tscn", "res://sky_princess.tscn", "res://table.tscn", "res://ui.tscn", "res://chest.tscn", "res://player_character.tscn", "res://test_room.tscn"] +scenes=["res://scenes/characters/player_character.tscn", "res://scenes/levels/test_room.tscn", "res://sky_princess.tscn", "res://table.tscn", "res://ui.tscn", "res://chest.tscn", "res://player_character.tscn", "res://test_room.tscn"] +scripts=["res://scripts/player_controller.gd"] [color_picker] @@ -38,3 +39,7 @@ StandardMaterial3D:uv1_scale=true [quick_open_dialog] last_mode=0 + +[project_settings] + +show_builtin_actions=false diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index e69de29..a703303 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -0,0 +1,13 @@ +[res://scripts/player_controller.gd] + +state={ +"bookmarks": PackedInt32Array(), +"breakpoints": PackedInt32Array(), +"column": 27, +"folded_lines": Array[int]([]), +"h_scroll_position": 0, +"row": 32, +"scroll_position": 18.0, +"selection": false, +"syntax_highlighter": "GDScript" +} diff --git a/.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.md5 b/.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.md5 index c21f69e..081cdae 100644 --- a/.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.md5 +++ b/.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.md5 @@ -1,3 +1,3 @@ source_md5="a1f6d2e482242f55274513dc5a7d5fd4" -dest_md5="a3f435f61dfddff6633bacfb2f82df52" +dest_md5="af6e557d5d27e12bfc15d754c2e6db2c" diff --git a/.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.s3tc.ctex b/.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.s3tc.ctex new file mode 100644 index 0000000..277c9b8 Binary files /dev/null and b/.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.s3tc.ctex differ diff --git a/.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.md5 b/.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.md5 index 7131060..77b4572 100644 --- a/.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.md5 +++ b/.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.md5 @@ -1,3 +1,3 @@ source_md5="0cfe2405b0a7f221b69a3b000333b558" -dest_md5="d769832489512fd0ed9e02d31f3aac41" +dest_md5="4882627888bf52f5cafd4341b85b9538" diff --git a/.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.s3tc.ctex b/.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.s3tc.ctex new file mode 100644 index 0000000..b883db5 Binary files /dev/null and b/.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.s3tc.ctex differ diff --git a/.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.md5 b/.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.md5 index f3588b8..cb5cc56 100644 --- a/.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.md5 +++ b/.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.md5 @@ -1,3 +1,3 @@ source_md5="8a2a773248fe16077b5a04b1a48f4368" -dest_md5="6db1174f0041d9449952e1c455db62bb" +dest_md5="f35777642e344aedcd68a76128205a2e" diff --git a/.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.s3tc.ctex b/.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.s3tc.ctex new file mode 100644 index 0000000..a2d6ef0 Binary files /dev/null and b/.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.s3tc.ctex differ diff --git a/.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.md5 b/.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.md5 index 5dbe728..8633cad 100644 --- a/.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.md5 +++ b/.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.md5 @@ -1,3 +1,3 @@ source_md5="459cccc37605881ea22e938279ebcb95" -dest_md5="6392b8be2f1239eeab5a3f35232ed9bd" +dest_md5="d581f3b1bf6e3e58f36350161ceddb8e" diff --git a/.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.s3tc.ctex b/.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.s3tc.ctex new file mode 100644 index 0000000..596e42d Binary files /dev/null and b/.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.s3tc.ctex differ diff --git a/.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.md5 b/.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.md5 index dcac282..8550470 100644 --- a/.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.md5 +++ b/.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.md5 @@ -1,3 +1,3 @@ source_md5="aa348a7fca423b9fd3576ebf8b3724ea" -dest_md5="8caf6661097d965dbf952020106fbe8b" +dest_md5="0d532da75fb4d61b07a5e85af0e2b4b7" diff --git a/.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.s3tc.ctex b/.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.s3tc.ctex new file mode 100644 index 0000000..e88e7e4 Binary files /dev/null and b/.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.s3tc.ctex differ diff --git a/.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.md5 b/.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.md5 index cb70f91..37ecf83 100644 --- a/.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.md5 +++ b/.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.md5 @@ -1,3 +1,3 @@ source_md5="785ac989a52d5513eed45d39d1e46d5d" -dest_md5="255260c0b88e8e755516ca3254e60c9e" +dest_md5="4d0ba167c712d4d66a1109fb566bf90e" diff --git a/.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.s3tc.ctex b/.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.s3tc.ctex new file mode 100644 index 0000000..d788c93 Binary files /dev/null and b/.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.s3tc.ctex differ diff --git a/.godot/shader_cache/SceneForwardClusteredShaderRD/079d9a581c4254895ea1850f02af1e4ddee62d59868da37d9fce1554f45cd664/023a89c5f02502e4789f3285995bd2440c64b959.vulkan.cache b/.godot/shader_cache/SceneForwardClusteredShaderRD/079d9a581c4254895ea1850f02af1e4ddee62d59868da37d9fce1554f45cd664/023a89c5f02502e4789f3285995bd2440c64b959.vulkan.cache new file mode 100644 index 0000000..22a1613 Binary files /dev/null and b/.godot/shader_cache/SceneForwardClusteredShaderRD/079d9a581c4254895ea1850f02af1e4ddee62d59868da37d9fce1554f45cd664/023a89c5f02502e4789f3285995bd2440c64b959.vulkan.cache differ diff --git a/.godot/shader_cache/SceneForwardClusteredShaderRD/079d9a581c4254895ea1850f02af1e4ddee62d59868da37d9fce1554f45cd664/193f8110d2e0bd15c8cdd290ba29667194e512b0.vulkan.cache b/.godot/shader_cache/SceneForwardClusteredShaderRD/079d9a581c4254895ea1850f02af1e4ddee62d59868da37d9fce1554f45cd664/193f8110d2e0bd15c8cdd290ba29667194e512b0.vulkan.cache new file mode 100644 index 0000000..755a264 Binary files /dev/null and b/.godot/shader_cache/SceneForwardClusteredShaderRD/079d9a581c4254895ea1850f02af1e4ddee62d59868da37d9fce1554f45cd664/193f8110d2e0bd15c8cdd290ba29667194e512b0.vulkan.cache differ diff --git a/.godot/shader_cache/SceneForwardClusteredShaderRD/4c5d823bcbd5b17afd644d7811253d1b04c120aad508fa0d2dfcced9cf00daa7/023a89c5f02502e4789f3285995bd2440c64b959.vulkan.cache b/.godot/shader_cache/SceneForwardClusteredShaderRD/4c5d823bcbd5b17afd644d7811253d1b04c120aad508fa0d2dfcced9cf00daa7/023a89c5f02502e4789f3285995bd2440c64b959.vulkan.cache new file mode 100644 index 0000000..a5fb66d Binary files /dev/null and b/.godot/shader_cache/SceneForwardClusteredShaderRD/4c5d823bcbd5b17afd644d7811253d1b04c120aad508fa0d2dfcced9cf00daa7/023a89c5f02502e4789f3285995bd2440c64b959.vulkan.cache differ diff --git a/.godot/shader_cache/SceneForwardClusteredShaderRD/4c5d823bcbd5b17afd644d7811253d1b04c120aad508fa0d2dfcced9cf00daa7/193f8110d2e0bd15c8cdd290ba29667194e512b0.vulkan.cache b/.godot/shader_cache/SceneForwardClusteredShaderRD/4c5d823bcbd5b17afd644d7811253d1b04c120aad508fa0d2dfcced9cf00daa7/193f8110d2e0bd15c8cdd290ba29667194e512b0.vulkan.cache new file mode 100644 index 0000000..d5625f1 Binary files /dev/null and b/.godot/shader_cache/SceneForwardClusteredShaderRD/4c5d823bcbd5b17afd644d7811253d1b04c120aad508fa0d2dfcced9cf00daa7/193f8110d2e0bd15c8cdd290ba29667194e512b0.vulkan.cache differ diff --git a/assets/textures/carvedStone_albedo.png.import b/assets/textures/carvedStone_albedo.png.import index 5895c65..484c202 100644 --- a/assets/textures/carvedStone_albedo.png.import +++ b/assets/textures/carvedStone_albedo.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://dg2w2myt6a4sb" -path="res://.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.ctex" +path.s3tc="res://.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/carvedStone_albedo.png" -dest_files=["res://.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.ctex"] +dest_files=["res://.godot/imported/carvedStone_albedo.png-8afe1b0720ccb537d18abd156861f1ba.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +24,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,4 +38,4 @@ 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 +detect_3d/compress_to=0 diff --git a/assets/textures/carvedStone_normal.png.import b/assets/textures/carvedStone_normal.png.import index c153a1e..e8fe3e1 100644 --- a/assets/textures/carvedStone_normal.png.import +++ b/assets/textures/carvedStone_normal.png.import @@ -3,30 +3,31 @@ importer="texture" type="CompressedTexture2D" uid="uid://d0jgwcrewgn5l" -path="res://.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.ctex" +path.s3tc="res://.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/carvedStone_normal.png" -dest_files=["res://.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.ctex"] +dest_files=["res://.godot/imported/carvedStone_normal.png-e9e918e0469a41ffbe40b8a533641d27.s3tc.ctex"] [params] -compress/mode=0 +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/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://assets/textures/carvedStone_normal.png" process/channel_remap/red=0 process/channel_remap/green=1 process/channel_remap/blue=2 @@ -37,4 +38,4 @@ 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 +detect_3d/compress_to=0 diff --git a/assets/textures/carvedStone_orm.png.import b/assets/textures/carvedStone_orm.png.import index a4afba4..cc829d1 100644 --- a/assets/textures/carvedStone_orm.png.import +++ b/assets/textures/carvedStone_orm.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://det6ljyjvcxlk" -path="res://.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.ctex" +path.s3tc="res://.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/carvedStone_orm.png" -dest_files=["res://.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.ctex"] +dest_files=["res://.godot/imported/carvedStone_orm.png-1b5861e28074015abd8bb2b8126ab367.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,10 +24,10 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=8 +roughness/src_normal="res://assets/textures/carvedStone_normal.png" process/channel_remap/red=0 process/channel_remap/green=1 process/channel_remap/blue=2 @@ -37,4 +38,4 @@ 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 +detect_3d/compress_to=0 diff --git a/assets/textures/wood_albedo.png.import b/assets/textures/wood_albedo.png.import index 341ec37..0cd471d 100644 --- a/assets/textures/wood_albedo.png.import +++ b/assets/textures/wood_albedo.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://byvg3r0q5y1mq" -path="res://.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.ctex" +path.s3tc="res://.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/wood_albedo.png" -dest_files=["res://.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.ctex"] +dest_files=["res://.godot/imported/wood_albedo.png-df7cfe04033296b8dbf6ba00ea5a5c64.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +24,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,4 +38,4 @@ 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 +detect_3d/compress_to=0 diff --git a/assets/textures/wood_normal.png.import b/assets/textures/wood_normal.png.import index 1149598..9895f6e 100644 --- a/assets/textures/wood_normal.png.import +++ b/assets/textures/wood_normal.png.import @@ -3,30 +3,31 @@ importer="texture" type="CompressedTexture2D" uid="uid://shhdjgujexuq" -path="res://.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.ctex" +path.s3tc="res://.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/wood_normal.png" -dest_files=["res://.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.ctex"] +dest_files=["res://.godot/imported/wood_normal.png-cca7dd6cadacd62d99f5c37c8ab5eab5.s3tc.ctex"] [params] -compress/mode=0 +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/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://assets/textures/wood_normal.png" process/channel_remap/red=0 process/channel_remap/green=1 process/channel_remap/blue=2 @@ -37,4 +38,4 @@ 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 +detect_3d/compress_to=0 diff --git a/assets/textures/wood_orm.png.import b/assets/textures/wood_orm.png.import index 05c94d5..d3ac88f 100644 --- a/assets/textures/wood_orm.png.import +++ b/assets/textures/wood_orm.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://b7clobvh8ivyr" -path="res://.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.ctex" +path.s3tc="res://.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/wood_orm.png" -dest_files=["res://.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.ctex"] +dest_files=["res://.godot/imported/wood_orm.png-7b8be108f70f106da118b863b32758c9.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +24,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,4 +38,4 @@ 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 +detect_3d/compress_to=0 diff --git a/materials/carvedStone.tres b/materials/carvedStone.tres index 35bfc31..4457c53 100644 --- a/materials/carvedStone.tres +++ b/materials/carvedStone.tres @@ -1,9 +1,9 @@ [gd_resource type="StandardMaterial3D" load_steps=5 format=3 uid="uid://b7ve12hakqpdf"] -[ext_resource type="Texture2D" uid="uid://cdtbxw4neys1c" path="res://carvedStone_albedo.png" id="1"] -[ext_resource type="Texture2D" uid="uid://eirst6oc4w20" path="res://carvedStone_orm.png" id="2"] -[ext_resource type="Texture2D" uid="uid://i0mejqhgelvk" path="res://carvedStone_normal.png" id="3"] -[ext_resource type="Texture2D" uid="uid://dqdk2cmnpakew" path="res://carvedStone_heightmap.png" id="4"] +[ext_resource type="Texture2D" path="res://assets/textures/carvedStone_albedo.png" id="1"] +[ext_resource type="Texture2D" path="res://assets/textures/carvedStone_orm.png" id="2"] +[ext_resource type="Texture2D" path="res://assets/textures/carvedStone_normal.png" id="3"] +[ext_resource type="Texture2D" path="res://assets/textures/carvedStone_heightmap.png" id="4"] [resource] albedo_color = Color(1, 0.9350586, 0.40625, 1) @@ -18,11 +18,6 @@ normal_enabled = true normal_texture = ExtResource("3") ao_enabled = true ao_texture = ExtResource("2") -heightmap_enabled = true -heightmap_scale = 12.5 -heightmap_deep_parallax = true -heightmap_min_layers = 8 -heightmap_max_layers = 32 -heightmap_texture = ExtResource("4") +heightmap_enabled = false uv1_scale = Vector3(16.38, 16.38, 16.38) uv1_triplanar = true diff --git a/materials/grass.tres b/materials/grass.tres index b07dde7..8ef6a68 100644 --- a/materials/grass.tres +++ b/materials/grass.tres @@ -8,11 +8,6 @@ albedo_texture = ExtResource("1") normal_enabled = true normal_texture = ExtResource("3") -heightmap_enabled = true -heightmap_scale = 1.25 -heightmap_deep_parallax = true -heightmap_min_layers = 8 -heightmap_max_layers = 32 -heightmap_texture = ExtResource("4") +heightmap_enabled = false uv1_scale = Vector3(0.25, 0.25, 0.25) uv1_triplanar = true diff --git a/materials/wood.tres b/materials/wood.tres index 1ccf5ab..12a0c19 100644 --- a/materials/wood.tres +++ b/materials/wood.tres @@ -1,8 +1,8 @@ [gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://c22wyfih5ebfy"] -[ext_resource type="Texture2D" uid="uid://d3cbbka1w2eq4" path="res://wood_albedo.png" id="1"] -[ext_resource type="Texture2D" uid="uid://dt7j2h77j6te0" path="res://wood_orm.png" id="2"] -[ext_resource type="Texture2D" uid="uid://cv08ximjjlfrc" path="res://wood_normal.png" id="3"] +[ext_resource type="Texture2D" path="res://assets/textures/wood_albedo.png" id="1"] +[ext_resource type="Texture2D" path="res://assets/textures/wood_orm.png" id="2"] +[ext_resource type="Texture2D" path="res://assets/textures/wood_normal.png" id="3"] [resource] albedo_texture = ExtResource("1") diff --git a/project.godot b/project.godot index 76efb17..c4f8e6a 100644 --- a/project.godot +++ b/project.godot @@ -16,3 +16,42 @@ config/version="25.2" run/main_scene="uid://dg1b5q643boy5" config/features=PackedStringArray("4.5", "Forward Plus") run/max_fps=60 + +[input] + +forward={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null) +] +} +backward={ +"deadzone": 0.2, +"events": [null, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null) +] +} +slideLeft={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null) +] +} +slideRight={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null) +] +} +jump={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) +] +} +crouch={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":67,"key_label":0,"unicode":99,"location":0,"echo":false,"script":null) +] +} +sprint={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +] +} diff --git a/scenes/characters/player_character.tscn b/scenes/characters/player_character.tscn index 604fc36..2489a39 100644 --- a/scenes/characters/player_character.tscn +++ b/scenes/characters/player_character.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://dpco4vo8rwkq0"] -[ext_resource type="Script" path="res://scripts/player_controller.gd" id="1"] +[ext_resource type="Script" uid="uid://cyqtabd2e7m8d" path="res://scripts/player_controller.gd" id="1"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tfo3t"] albedo_color = Color(0.11764706, 0.4, 0.9607843, 1) diff --git a/scripts/player_controller.gd b/scripts/player_controller.gd index 91c4890..fa1ff03 100644 --- a/scripts/player_controller.gd +++ b/scripts/player_controller.gd @@ -2,8 +2,10 @@ extends CharacterBody3D @export var speed = 5.0 @export var sprint_speed = 10.0 +@export var crouch_speed = 2.0 @export var jump_velocity = 4.5 @export var mouse_sensitivity = 0.002 +@export var turn_speed = 10.0 @onready var camera = $Camera3D @@ -22,23 +24,28 @@ func _physics_process(delta): if not is_on_floor(): velocity.y -= gravity * delta - if Input.is_action_just_pressed("ui_accept") and is_on_floor(): + if Input.is_action_just_pressed("jump") and is_on_floor(): velocity.y = jump_velocity - var input_dir = Input.get_vector("ui_left", "ui_right", "ui_up", "ui_down") - var direction = (transform.basis * Vector3(input_dir.x, 0, input_dir.y)).normalized() + var input_dir = Input.get_vector("slideLeft", "slideRight", "backward", "forward") + input_dir = -input_dir + var direction = (camera.transform.basis * Vector3(input_dir.x, 0, input_dir.y)).normalized() if direction: - var current_speed = sprint_speed if Input.is_key_pressed(KEY_SHIFT) else speed + var current_speed = speed + if Input.is_action_pressed("sprint"): + current_speed = sprint_speed + elif Input.is_action_pressed("crouch"): + current_speed = crouch_speed velocity.x = direction.x * current_speed velocity.z = direction.z * current_speed - # Rotate player to face movement direction - var look_dir = Vector3(direction.x, 0, direction.z) - if look_dir.length() > 0: - look_at(global_position + look_dir, Vector3.UP) + # Smoothly rotate player to face movement direction only if moving forward/backward + if input_dir.y != 0: + var target_angle = atan2(direction.x, direction.z) + rotation.y = lerp_angle(rotation.y, target_angle, delta * turn_speed) else: velocity.x = move_toward(velocity.x, 0, speed) velocity.z = move_toward(velocity.z, 0, speed) - move_and_slide() \ No newline at end of file + move_and_slide()