Feat/6 knife and melee fundamentals #10

Merged
Dotts merged 2 commits from feat/6-knife-and-melee-fundamentals into main 2026-06-05 23:26:43 -07:00
2 changed files with 17 additions and 3 deletions
Showing only changes of commit 4eaf4671ef - Show all commits
+14
View File
@@ -4,6 +4,7 @@ class_name ImpactSpawner
static var bullet_hole_mat: StandardMaterial3D = null static var bullet_hole_mat: StandardMaterial3D = null
static var crater_mat: StandardMaterial3D = null static var crater_mat: StandardMaterial3D = null
static var plasma_mat: StandardMaterial3D = null static var plasma_mat: StandardMaterial3D = null
static var slash_mat: StandardMaterial3D = null
static func _ensure_mats(): static func _ensure_mats():
if bullet_hole_mat != null: if bullet_hole_mat != null:
@@ -52,11 +53,22 @@ static func _ensure_mats():
plasma_mat.emission_texture = tex_p plasma_mat.emission_texture = tex_p
plasma_mat.emission_energy_multiplier = 2.0 plasma_mat.emission_energy_multiplier = 2.0
var tex_s = make_tex.call(
[Color(0.9, 0.9, 0.9, 1.0), Color(0.8, 0.8, 0.8, 0.8), Color(0.8, 0.8, 0.8, 0.0)],
[0.0, 0.5, 1.0], 64)
slash_mat = StandardMaterial3D.new()
slash_mat.albedo_texture = tex_s
slash_mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA
static func spawn(scene_tree: SceneTree, type: String, pos: Vector3, normal: Vector3, size: float = 0.2): static func spawn(scene_tree: SceneTree, type: String, pos: Vector3, normal: Vector3, size: float = 0.2):
_ensure_mats() _ensure_mats()
var mi = MeshInstance3D.new() var mi = MeshInstance3D.new()
var qm = QuadMesh.new() var qm = QuadMesh.new()
if type == "slash":
qm.size = Vector2(size * 4.0, size * 0.4)
else:
qm.size = Vector2(size, size) qm.size = Vector2(size, size)
var mat: StandardMaterial3D var mat: StandardMaterial3D
@@ -66,6 +78,8 @@ static func spawn(scene_tree: SceneTree, type: String, pos: Vector3, normal: Vec
mat = crater_mat.duplicate() mat = crater_mat.duplicate()
elif type == "plasma": elif type == "plasma":
mat = plasma_mat.duplicate() mat = plasma_mat.duplicate()
elif type == "slash":
mat = slash_mat.duplicate()
qm.material = mat qm.material = mat
mi.mesh = qm mi.mesh = qm
+2 -2
View File
@@ -162,8 +162,8 @@ func _do_damage() -> void:
if ray_result: if ray_result:
var col = ray_result.collider var col = ray_result.collider
if col is StaticBody3D or col is CSGShape3D: if not col.has_method("take_damage") and (col is StaticBody3D or col is CSGShape3D):
ImpactSpawner.spawn(get_tree(), "bullet", ray_result.position, ray_result.normal, 0.1) ImpactSpawner.spawn(get_tree(), "slash", ray_result.position, ray_result.normal, 0.5)
func _finish_swing() -> void: func _finish_swing() -> void:
is_swinging = false is_swinging = false