Merge branch 'main' of https://github.com/MarcEricMartel/FirstPersonSlapper
This commit is contained in:
		
							
								
								
									
										15
									
								
								Player.gd
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								Player.gd
									
									
									
									
									
								
							| @@ -2,11 +2,15 @@ extends KinematicBody | |||||||
|  |  | ||||||
| export var speed = 20 | export var speed = 20 | ||||||
| export var h_acceleration = 6 | export var h_acceleration = 6 | ||||||
|  | export var air_acceleration = 1 | ||||||
|  | export var normal_acceleration = 6 | ||||||
| export var gravity = 40 | export var gravity = 40 | ||||||
| export var jump = 30 | export var jump = 30 | ||||||
|  |  | ||||||
| export var mouse_sensitivity = 0.03 | export var mouse_sensitivity = 0.03 | ||||||
|  |  | ||||||
|  | var bottom_boudaries = -20 | ||||||
|  |  | ||||||
| var full_contact = false | var full_contact = false | ||||||
| var direction = Vector3() | var direction = Vector3() | ||||||
| var h_velocity = Vector3() | var h_velocity = Vector3() | ||||||
| @@ -28,10 +32,10 @@ func _input(event): | |||||||
|  |  | ||||||
| func _physics_process(delta): | func _physics_process(delta): | ||||||
| 	 | 	 | ||||||
| 	if Input.is_action_just_pressed("uncapture_mouse"): | 	if global_transform.origin.y < bottom_boudaries: | ||||||
| 		Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) | 		global_transform.origin.x = 0 | ||||||
| 	elif Input.is_action_just_released("uncapture_mouse"): | 		global_transform.origin.y = 10 | ||||||
| 		Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) | 		global_transform.origin.z = 0 | ||||||
| 	 | 	 | ||||||
| 	direction = Vector3() | 	direction = Vector3() | ||||||
| 	 | 	 | ||||||
| @@ -39,10 +43,13 @@ func _physics_process(delta): | |||||||
| 	 | 	 | ||||||
| 	if not is_on_floor(): | 	if not is_on_floor(): | ||||||
| 		gravity_vec += Vector3.DOWN * gravity * delta | 		gravity_vec += Vector3.DOWN * gravity * delta | ||||||
|  | 		h_acceleration = air_acceleration | ||||||
| 	elif is_on_floor() and full_contact: | 	elif is_on_floor() and full_contact: | ||||||
| 		gravity_vec = -get_floor_normal()  * gravity | 		gravity_vec = -get_floor_normal()  * gravity | ||||||
|  | 		h_acceleration = normal_acceleration | ||||||
| 	else: | 	else: | ||||||
| 		gravity_vec = -get_floor_normal() | 		gravity_vec = -get_floor_normal() | ||||||
|  | 		h_acceleration = normal_acceleration | ||||||
| 	 | 	 | ||||||
| 	 | 	 | ||||||
| 	if Input.is_action_just_pressed("jump") and (is_on_floor() or ground_check.is_colliding()): | 	if Input.is_action_just_pressed("jump") and (is_on_floor() or ground_check.is_colliding()): | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user