diff --git a/project.godot b/project.godot index 50c0aed..eaf6a71 100644 --- a/project.godot +++ b/project.godot @@ -96,27 +96,27 @@ move_right={ ] } aim_up={ -"deadzone": 0.5, +"deadzone": 0.0, "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":-1.0,"script":null) ] } aim_down={ -"deadzone": 0.5, +"deadzone": 0.0, "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":1.0,"script":null) ] } aim_left={ -"deadzone": 0.5, +"deadzone": 0.0, "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":2,"axis_value":-1.0,"script":null) ] } aim_right={ -"deadzone": 0.5, +"deadzone": 0.0, "events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":2,"axis_value":1.0,"script":null) ] } attack={ -"deadzone": 0.5, +"deadzone": 0.0, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":1,"position":Vector2(118, 11),"global_position":Vector2(127, 57),"factor":1.0,"button_index":1,"canceled":false,"pressed":true,"double_click":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null) ] @@ -127,6 +127,7 @@ attack={ 3d_render/layer_6="characters" 3d_render/layer_7="projectiles" 3d_render/layer_8="props" +3d_render/layer_9="effects" 3d_physics/layer_5="player" 3d_physics/layer_6="projectiles" diff --git a/scenes/player.tscn b/scenes/player.tscn index a0485b7..986d37c 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -74,6 +74,8 @@ radius = 2.0 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m1xj5"] resource_local_to_scene = true transparency = 1 +blend_mode = 1 +shading_mode = 0 [sub_resource type="SphereMesh" id="SphereMesh_kqbjh"] radius = 2.0 @@ -286,6 +288,7 @@ size = Vector3(1.5, 6, 1.5) [node name="SwoopMesh" type="MeshInstance3D" parent="Effects"] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -0.0985078, 0, 1, -4.30591e-09, 0, 1, 0) +layers = 256 material_override = SubResource("StandardMaterial3D_m1xj5") cast_shadow = 0 mesh = SubResource("SphereMesh_kqbjh") diff --git a/scripts/player/player.gd b/scripts/player/player.gd index 654b92b..3a6bb48 100644 --- a/scripts/player/player.gd +++ b/scripts/player/player.gd @@ -2,7 +2,7 @@ class_name Player extends CharacterBody3D @export var _input_mode: Inputer.Mode = Inputer.Mode.KB_MOUSE -@export var _device_index: int = -1 +@export var _device_index: int = 0 @export var _respawn_height: float = -5 @export var _collision_debug_material: Material @@ -50,6 +50,7 @@ func _unhandled_input(event: InputEvent) -> void: ): return + aiming.handle_input(event, mode) movement.handle_input(event, mode) if event.is_action_pressed("attack"):