diff --git a/AGame/.godot/editor/Player.tscn-folding-90e1ff3baa03524a506ff0f7a9d78dcf.cfg b/AGame/.godot/editor/Player.tscn-folding-90e1ff3baa03524a506ff0f7a9d78dcf.cfg index 963b1956..9ecdddf6 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=[] +node_unfolds=[NodePath("CameraPivot/Camera3D"), PackedStringArray("Transform")] resource_unfolds=["res://Player.tscn::CapsuleMesh_kpjcp", PackedStringArray(), "res://Player.tscn::CapsuleShape3D_kne1u", PackedStringArray()] nodes_folded=[] diff --git a/AGame/.godot/editor/create_recent.Node b/AGame/.godot/editor/create_recent.Node index a09d386f..639c2b01 100644 --- a/AGame/.godot/editor/create_recent.Node +++ b/AGame/.godot/editor/create_recent.Node @@ -1,3 +1,4 @@ +Node3D WorldEnvironment DirectionalLight3D StaticBody3D diff --git a/AGame/.godot/editor/editor_layout.cfg b/AGame/.godot/editor/editor_layout.cfg index 156ae786..dbecd404 100644 --- a/AGame/.godot/editor/editor_layout.cfg +++ b/AGame/.godot/editor/editor_layout.cfg @@ -29,10 +29,10 @@ dock_5="Inspector,Node,History" [EditorNode] open_scenes=PackedStringArray("res://Floor.tscn", "res://Player.tscn", "res://DevTest.tscn") -current_scene="res://DevTest.tscn" +current_scene="res://Player.tscn" center_split_offset=0 selected_default_debugger_tab_idx=0 -selected_main_editor_idx=1 +selected_main_editor_idx=2 selected_bottom_panel_item=0 [EditorWindow] diff --git a/AGame/.godot/editor/filesystem_update4 b/AGame/.godot/editor/filesystem_update4 index b2fae37a..9266168e 100644 --- a/AGame/.godot/editor/filesystem_update4 +++ b/AGame/.godot/editor/filesystem_update4 @@ -1,3 +1,5 @@ res://Floor.tscn res://node_3d.tscn res://DevTest.tscn +res://Player.tscn +res://Scripts/player.gd diff --git a/AGame/.godot/editor/script_editor_cache.cfg b/AGame/.godot/editor/script_editor_cache.cfg index 637a85e1..2cd10d4c 100644 --- a/AGame/.godot/editor/script_editor_cache.cfg +++ b/AGame/.godot/editor/script_editor_cache.cfg @@ -3,10 +3,10 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 22, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 0, +"row": 14, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" diff --git a/AGame/.godot/shader_cache/SceneForwardClusteredShaderRD/6a184745fdc168cf1854f82e467b075c7754389099dd4260c7cfd820f974abb7/c28b6b2d263b660d239cf794cfebbf2f62936db7.vulkan.cache b/AGame/.godot/shader_cache/SceneForwardClusteredShaderRD/6a184745fdc168cf1854f82e467b075c7754389099dd4260c7cfd820f974abb7/c28b6b2d263b660d239cf794cfebbf2f62936db7.vulkan.cache new file mode 100644 index 00000000..2aa206ff Binary files /dev/null and b/AGame/.godot/shader_cache/SceneForwardClusteredShaderRD/6a184745fdc168cf1854f82e467b075c7754389099dd4260c7cfd820f974abb7/c28b6b2d263b660d239cf794cfebbf2f62936db7.vulkan.cache differ diff --git a/AGame/Player.tscn b/AGame/Player.tscn index 442e352f..d00edabd 100644 --- a/AGame/Player.tscn +++ b/AGame/Player.tscn @@ -12,9 +12,11 @@ script = ExtResource("1_xhfnw") [node name="MeshInstance3D" type="MeshInstance3D" parent="."] mesh = SubResource("CapsuleMesh_kpjcp") -[node name="Camera3D" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.57051647, 0) -current = true - [node name="CollisionShape3D" type="CollisionShape3D" parent="."] shape = SubResource("CapsuleShape3D_kne1u") + +[node name="CameraPivot" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.54473054, 0) + +[node name="Camera3D" type="Camera3D" parent="CameraPivot"] +current = true diff --git a/AGame/Scripts/player.gd b/AGame/Scripts/player.gd index acb7fb25..66cababf 100644 --- a/AGame/Scripts/player.gd +++ b/AGame/Scripts/player.gd @@ -1,11 +1,35 @@ extends CharacterBody3D - +@export var mouse_sensitivity = 1 const SPEED = 5.0 const JUMP_VELOCITY = 4.5 +var max_look_up = deg_to_rad(80) +var max_look_down = deg_to_rad(-80) + +var pitch = 0 + +@onready var camera_pivot = $CameraPivot + + +func _ready() -> void: + mouse_sensitivity = mouse_sensitivity * 0.001 + Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) + + +func _unhandled_input(event: InputEvent) -> void: + if event is InputEventMouseMotion: + rotate_y(-event.relative.x * mouse_sensitivity) + + pitch -= event.relative.y * mouse_sensitivity + pitch = clamp(pitch, max_look_down, max_look_up) + camera_pivot.rotation.x = pitch func _physics_process(delta: float) -> void: + + + + # Add the gravity. if not is_on_floor(): velocity += get_gravity() * delta