Skip to content

Commit 961a21d

Browse files
fix(example): More responsive firing (#366)
Give the decal the appropriate parent (not top level) and don't use CSGs for the map. Fix mouse button `weapon_fire` input not activating due to some keyboard ghosting issue with Godot. Added an additional `mouse_weapon_fire` to avoid collision. --------- Co-authored-by: Tamás Gálffy <ezittgtx@gmail.com>
1 parent 90d9098 commit 961a21d

File tree

4 files changed

+29
-88
lines changed

4 files changed

+29
-88
lines changed

examples/multiplayer-fps/multiplayer-fps.tscn

Lines changed: 22 additions & 85 deletions
Large diffs are not rendered by default.

examples/multiplayer-fps/scripts/bullethole.gd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ var pool := NodePool.new()
1717

1818
func _ready():
1919
pool.pool_limit = instance_limit
20-
pool.spawn_root = self
20+
pool.spawn_root = get_tree().root.get_node("multiplayer-fps/Map/StaticBody3D")
2121

2222
var decal_node: Decal = Decal.new()
2323
decal_node.cull_mask = decal_mask
2424
decal_node.layers = decal_layer
25-
decal_node.top_level = true
2625

2726
pool.target_node = decal_node
2827

examples/multiplayer-fps/scripts/player-input.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func _gather():
4545
movement = Vector3(mx, 0, mz)
4646

4747
jump = Input.is_action_pressed("move_jump")
48-
fire = Input.is_action_pressed("weapon_fire")
48+
fire = Input.is_action_pressed("mouse_weapon_fire")
4949

5050
if override_mouse:
5151
look_angle = Vector2.ZERO

project.godot

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ move_jump={
8080
, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null)
8181
]
8282
}
83+
mouse_weapon_fire={
84+
"deadzone": 0.5,
85+
"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":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null)
86+
]
87+
}
8388
weapon_fire={
8489
"deadzone": 0.5,
8590
"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":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null)

0 commit comments

Comments
 (0)