mirror of
https://github.com/Steffo99/pineapple-surf.git
synced 2024-11-25 01:04:18 +00:00
🙅🏻♀️ Remove torch
This commit is contained in:
parent
fb54a67393
commit
6cd3a85825
3 changed files with 12 additions and 20 deletions
|
@ -14,7 +14,6 @@ const AIR_ACCELERATE = 100 # Hu/39.97
|
|||
@onready var camera: Camera3D = head.get_node("Viewport/CameraViewportContainer/GameViewport/Camera")
|
||||
@onready var vport: SubViewport = head.get_node("Viewport/CameraViewportContainer/GameViewport")
|
||||
@onready var aim_raycast: RayCast3D = head.get_node("RayCast3D")
|
||||
@onready var torch: SpotLight3D = head.get_node("Torch")
|
||||
|
||||
@onready var OnHand = head.get_node("OnHand")
|
||||
@onready var active_weapon: BaseWeapon:
|
||||
|
@ -43,6 +42,7 @@ func _get_2d_velocity() -> Vector2:
|
|||
func _ready():
|
||||
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
||||
OnHand.player = self
|
||||
Singletons.player = self
|
||||
vport.size = viewport_resolution
|
||||
|
||||
func _physics_process(delta):
|
||||
|
@ -145,9 +145,6 @@ func _input(event):
|
|||
if event is InputEventKey and event.keycode == KEY_ESCAPE:
|
||||
get_tree().quit()
|
||||
|
||||
if Input.is_action_just_pressed("toggle_torch"):
|
||||
torch.visible = !torch.visible
|
||||
|
||||
if event is InputEventMouseMotion:
|
||||
var vec = event.relative
|
||||
self.mouse_movement = Vector2(vec.y / 10, vec.x / 10)
|
||||
|
|
|
@ -103,6 +103,7 @@ shader_parameter/spacing = 0.006
|
|||
shader_parameter/spread = 0.902
|
||||
|
||||
[node name="Player" type="CharacterBody3D"]
|
||||
collision_layer = 5
|
||||
slide_on_ceiling = false
|
||||
floor_constant_speed = true
|
||||
script = ExtResource("1_rujcr")
|
||||
|
@ -111,16 +112,6 @@ script = ExtResource("1_rujcr")
|
|||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.54, 0)
|
||||
script = ExtResource("2_ohlgu")
|
||||
|
||||
[node name="Torch" type="SpotLight3D" parent="Head"]
|
||||
visible = false
|
||||
light_energy = 5.5
|
||||
light_indirect_energy = 2.0
|
||||
light_cull_mask = 4294967293
|
||||
shadow_enabled = true
|
||||
spot_range = 28.8
|
||||
spot_angle = 23.1165
|
||||
spot_angle_attenuation = 0.466516
|
||||
|
||||
[node name="RayCast3D" type="RayCast3D" parent="Head"]
|
||||
target_position = Vector3(0, 0, -1.4)
|
||||
|
||||
|
@ -138,6 +129,7 @@ grow_horizontal = 2
|
|||
grow_vertical = 2
|
||||
|
||||
[node name="CameraViewportContainer" type="SubViewportContainer" parent="Head/Viewport"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
|
@ -177,6 +169,7 @@ theme = SubResource("Theme_smyke")
|
|||
|
||||
[node name="FPS_Label" type="Label" parent="HUD"]
|
||||
visible = false
|
||||
layout_mode = 1
|
||||
anchors_preset = 1
|
||||
anchor_left = 1.0
|
||||
anchor_right = 1.0
|
||||
|
@ -189,7 +182,7 @@ horizontal_alignment = 2
|
|||
script = SubResource("GDScript_iiadi")
|
||||
|
||||
[node name="PointsSpawner" type="Control" parent="HUD"]
|
||||
layout_mode = 3
|
||||
layout_mode = 1
|
||||
anchors_preset = 8
|
||||
anchor_left = 0.5
|
||||
anchor_top = 0.5
|
||||
|
@ -200,6 +193,7 @@ grow_vertical = 2
|
|||
script = SubResource("GDScript_5d122")
|
||||
|
||||
[node name="AmmoLabel" type="Label" parent="HUD"]
|
||||
layout_mode = 1
|
||||
anchors_preset = 3
|
||||
anchor_left = 1.0
|
||||
anchor_top = 1.0
|
||||
|
@ -224,6 +218,7 @@ metadata/_edit_lock_ = true
|
|||
[node name="SubViewportContainer" type="SubViewportContainer" parent="HUD"]
|
||||
visible = false
|
||||
show_behind_parent = true
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
|
@ -246,6 +241,7 @@ MainCamera = NodePath("../../../../Head/Viewport/CameraViewportContainer/GameVie
|
|||
|
||||
[node name="Crosshair" type="ColorRect" parent="HUD"]
|
||||
material = SubResource("ShaderMaterial_2p6rt")
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
|
|
|
@ -50,6 +50,10 @@ config/features=PackedStringArray("4.0", "GL Compatibility")
|
|||
boot_splash/bg_color=Color(0.231373, 0.490196, 0.309804, 1)
|
||||
config/icon="res://assets/icon.svg"
|
||||
|
||||
[autoload]
|
||||
|
||||
Singletons="*res://Singletons.gd"
|
||||
|
||||
[display]
|
||||
|
||||
window/size/viewport_width=284
|
||||
|
@ -103,11 +107,6 @@ slot3={
|
|||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"unicode":0,"echo":false,"script":null)
|
||||
]
|
||||
}
|
||||
toggle_torch={
|
||||
"deadzone": 0.5,
|
||||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":70,"unicode":0,"echo":false,"script":null)
|
||||
]
|
||||
}
|
||||
fire={
|
||||
"deadzone": 0.5,
|
||||
"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,"pressed":false,"double_click":false,"script":null)
|
||||
|
|
Loading…
Reference in a new issue