diff --git a/Game/Assets/Characters/Player.gd b/Game/Assets/Characters/Player.gd index ab09bea..c088a7b 100644 --- a/Game/Assets/Characters/Player.gd +++ b/Game/Assets/Characters/Player.gd @@ -5,6 +5,7 @@ extends KinematicBody3D @onready var hud = get_tree().root.find_node("HUD", true, false) @onready var crosshair = hud.get_node("Crosshair") +@onready var vignette = hud.get_node("Vignette") @onready var head = $Head @onready var camera = $Head/Camera @onready var tween = $Head/Camera/Tween @@ -20,7 +21,8 @@ var view_zoom := 1.0 : set(zoom): view_zoom = zoom camera.fov = base_fov / zoom - crosshair.modulate.a = 1 - (zoom - 1) + crosshair.modulate.a = clamp(1 - (zoom - 1), 0, 1) + vignette.modulate.a = (zoom - 1) / 3 var climb_height := 1 diff --git a/Game/Assets/Props/BeerCan.glb b/Game/Assets/Props/BeerCan.glb new file mode 100644 index 0000000..4dbe2a4 Binary files /dev/null and b/Game/Assets/Props/BeerCan.glb differ diff --git a/Game/Assets/Props/BeerCan.glb.import b/Game/Assets/Props/BeerCan.glb.import new file mode 100644 index 0000000..55f86c1 --- /dev/null +++ b/Game/Assets/Props/BeerCan.glb.import @@ -0,0 +1,28 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +path="res://.godot/imported/BeerCan.glb-4aed8c8c9e0cbbe3eefd2e211aca428b.scn" + +[deps] + +source_file="res://Assets/Props/BeerCan.glb" +dest_files=[ "res://.godot/imported/BeerCan.glb-4aed8c8c9e0cbbe3eefd2e211aca428b.scn" ] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=2 +meshes/lightmap_texel_size=0.1 +skins/use_named_skins=true +animation/import=true +animation/fps=15 +import_script/path="" +_subresources={ +} diff --git a/Game/Assets/Props/BeerCan.tscn b/Game/Assets/Props/BeerCan.tscn new file mode 100644 index 0000000..bccb3a3 --- /dev/null +++ b/Game/Assets/Props/BeerCan.tscn @@ -0,0 +1,5 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Assets/Props/BeerCan.glb" type="PackedScene" id=1] + +[node name="BeerCan" instance=ExtResource( 1 )]