Grunkmap scaling adjustments

This commit is contained in:
Rob Kelly 2025-03-09 16:40:19 -06:00
parent 04bd219946
commit df1930a4a0
7 changed files with 11 additions and 12 deletions

View File

@ -317,6 +317,7 @@ shape = SubResource("WorldBoundaryShape3D_c8g65")
[node name="Icosahedron" parent="Geometry" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")] [node name="Icosahedron" parent="Geometry" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.35498, 1.13294, -2.81423) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.35498, 1.13294, -2.81423)
mask_dim = 128
mesh_instance = NodePath("MeshInstance3D") mesh_instance = NodePath("MeshInstance3D")
initial_mask = ExtResource("2_2roq2") initial_mask = ExtResource("2_2roq2")
@ -328,6 +329,7 @@ shape = SubResource("ConcavePolygonShape3D_nxc47")
[node name="Monkey" parent="Geometry" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")] [node name="Monkey" parent="Geometry" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")]
transform = Transform3D(-0.616239, 0, 0.787559, 0, 1, 0, -0.787559, 0, -0.616239, -2.22512, 1.41158, 2.88581) transform = Transform3D(-0.616239, 0, 0.787559, 0, 1, 0, -0.787559, 0, -0.616239, -2.22512, 1.41158, 2.88581)
mask_dim = 128
mesh_instance = NodePath("MeshInstance3D") mesh_instance = NodePath("MeshInstance3D")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry/Monkey"] [node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry/Monkey"]
@ -338,7 +340,7 @@ shape = SubResource("ConcavePolygonShape3D_hvf6a")
[node name="Cube" parent="Geometry" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")] [node name="Cube" parent="Geometry" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 4, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 4, 0)
mask_dim = 1024 mask_dim = 512
mesh_instance = NodePath("MeshInstance3D") mesh_instance = NodePath("MeshInstance3D")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry/Cube"] [node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry/Cube"]
@ -349,7 +351,7 @@ shape = SubResource("ConcavePolygonShape3D_0qjrr")
[node name="Cylinder" parent="Geometry" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")] [node name="Cylinder" parent="Geometry" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("1_a67lu")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.33738, 6, -7.18125) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.33738, 6, -7.18125)
mask_dim = 1024 mask_dim = 512
mesh_instance = NodePath("MeshInstance3D") mesh_instance = NodePath("MeshInstance3D")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry/Cylinder"] [node name="MeshInstance3D" type="MeshInstance3D" parent="Geometry/Cylinder"]
@ -369,7 +371,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 25)
[node name="Hallway1" parent="LevelTiles" instance=ExtResource("1_a67lu")] [node name="Hallway1" parent="LevelTiles" instance=ExtResource("1_a67lu")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 6) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 6)
mask_dim = 512
[node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway1"] [node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway1"]
mesh = ExtResource("7_fk1xc") mesh = ExtResource("7_fk1xc")
@ -385,7 +386,6 @@ omni_range = 20.0
[node name="Hallway2" parent="LevelTiles" instance=ExtResource("1_a67lu")] [node name="Hallway2" parent="LevelTiles" instance=ExtResource("1_a67lu")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 18) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 18)
mask_dim = 512
[node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway2"] [node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway2"]
mesh = ExtResource("8_hrvvi") mesh = ExtResource("8_hrvvi")
@ -401,7 +401,6 @@ omni_range = 20.0
[node name="Hallway3" parent="LevelTiles" instance=ExtResource("1_a67lu")] [node name="Hallway3" parent="LevelTiles" instance=ExtResource("1_a67lu")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 30) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 30)
mask_dim = 512
[node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway3"] [node name="MeshInstance3D" type="MeshInstance3D" parent="LevelTiles/Hallway3"]
mesh = ExtResource("9_2roq2") mesh = ExtResource("9_2roq2")

View File

@ -1,7 +1,7 @@
class_name PointSpray extends Spray class_name PointSpray extends Spray
## Simple single-point spraygun ## Simple single-point spraygun
@export var spray_scale := 3.0 @export var spray_scale := 1.5
@onready var laser: LaserCast = %LaserCast @onready var laser: LaserCast = %LaserCast
@onready var spray_effect: MeshInstance3D = %SprayEffect @onready var spray_effect: MeshInstance3D = %SprayEffect

View File

@ -3,7 +3,7 @@ class_name WideSpray extends Spray
const SPRAYCAST_GROUP := "SprayCast" const SPRAYCAST_GROUP := "SprayCast"
@export var spray_scale := 2.0 @export var spray_scale := 1.0
@onready var spray_casts: Node3D = %SprayCasts @onready var spray_casts: Node3D = %SprayCasts
@onready var spray_effect: Node3D = %SprayEffect @onready var spray_effect: Node3D = %SprayEffect

View File

@ -1,6 +1,6 @@
class_name Player extends CharacterBody3D class_name Player extends CharacterBody3D
const FOCUS_SPEED := 40.0 const FOCUS_SPEED := 30.0
const RUN_SPEED := 80.0 const RUN_SPEED := 80.0
const SPRINT_SPEED := 160.0 const SPRINT_SPEED := 160.0
const AIR_SPEED := 10.0 const AIR_SPEED := 10.0
@ -28,7 +28,7 @@ func get_speed() -> float:
if is_on_floor(): if is_on_floor():
if firing: if firing:
return FOCUS_SPEED return FOCUS_SPEED
elif Input.is_action_pressed("sprint"): if Input.is_action_pressed("sprint"):
return SPRINT_SPEED return SPRINT_SPEED
return RUN_SPEED return RUN_SPEED
return AIR_SPEED return AIR_SPEED

View File

@ -3,7 +3,7 @@ extends Node3D
signal cleared signal cleared
signal activated signal activated
const CLEAR_THRESHOLD := 2650 const CLEAR_THRESHOLD := 1500
@export var enabled := false @export var enabled := false

View File

@ -205,7 +205,7 @@ unique_name_in_owner = true
[node name="GunkBody" parent="." index="2" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("7_3ib1l")] [node name="GunkBody" parent="." index="2" node_paths=PackedStringArray("mesh_instance") instance=ExtResource("7_3ib1l")]
unique_name_in_owner = true unique_name_in_owner = true
mask_dim = 64 mask_dim = 48
mesh_instance = NodePath("../Armature/Skeleton3D/WallSwitch_2") mesh_instance = NodePath("../Armature/Skeleton3D/WallSwitch_2")
[node name="CollisionShape3D" type="CollisionShape3D" parent="GunkBody" index="1"] [node name="CollisionShape3D" type="CollisionShape3D" parent="GunkBody" index="1"]

View File

@ -4,7 +4,7 @@ class_name GunkBody extends StaticBody3D
## Emitted from the main thread after the clear total is asynchronously updated. ## Emitted from the main thread after the clear total is asynchronously updated.
signal clear_total_updated(clear_total: float) signal clear_total_updated(clear_total: float)
const CONTINUITY_LIMIT := 16 const CONTINUITY_LIMIT := 32
const BUFFER_LIMIT := 3 const BUFFER_LIMIT := 3
const FACE_EPSILON := 0.01 const FACE_EPSILON := 0.01
const CLEAR_COLOR := Color.BLACK const CLEAR_COLOR := Color.BLACK