diff --git a/models/barista.glb.import b/models/barista.glb.import index be97c9c..4651f95 100644 --- a/models/barista.glb.import +++ b/models/barista.glb.import @@ -34,17 +34,37 @@ animation/import_rest_as_RESET=false import_script/path="" _subresources={ "materials": { +"Black": { +"use_external/enabled": true, +"use_external/path": "uid://0sk1tleeh5ls" +}, +"Brown": { +"use_external/enabled": true, +"use_external/path": "" +}, +"Brown2": { +"use_external/enabled": true, +"use_external/path": "uid://cxyhpm6edelgh" +}, +"Brown_02": { +"use_external/enabled": true, +"use_external/path": "uid://bmgw5tdbaedtw" +}, "Face": { "use_external/enabled": true, -"use_external/path": "res://models/materials/barista_face.tres" +"use_external/path": "uid://cadb0m2p5a5yr" }, "Hair_Brown": { "use_external/enabled": true, "use_external/path": "res://models/materials/barista_hair.tres" }, +"LimeGreen": { +"use_external/enabled": true, +"use_external/path": "uid://b1u12e67h4pvw" +}, "Skin": { "use_external/enabled": true, -"use_external/path": "res://models/materials/barista_skin.tres" +"use_external/path": "uid://mi6qsbhnys4p" } }, "meshes": { @@ -53,7 +73,6 @@ _subresources={ "generate/lods": 0, "generate/shadow_meshes": 0, "lods/normal_merge_angle": 60.0, -"lods/normal_split_angle": 25.0, "save_to_file/enabled": true, "save_to_file/path": "res://models/barista_body.res" }, @@ -62,7 +81,6 @@ _subresources={ "generate/lods": 0, "generate/shadow_meshes": 0, "lods/normal_merge_angle": 60.0, -"lods/normal_split_angle": 25.0, "save_to_file/enabled": true, "save_to_file/path": "res://models/barista_head.res" }, @@ -71,7 +89,6 @@ _subresources={ "generate/lods": 0, "generate/shadow_meshes": 0, "lods/normal_merge_angle": 60.0, -"lods/normal_split_angle": 25.0, "save_to_file/enabled": true, "save_to_file/path": "res://models/barista_feet.res" }, @@ -80,7 +97,6 @@ _subresources={ "generate/lods": 0, "generate/shadow_meshes": 0, "lods/normal_merge_angle": 60.0, -"lods/normal_split_angle": 25.0, "save_to_file/enabled": true, "save_to_file/path": "res://models/barista_legs.res" } diff --git a/models/barista_body.res b/models/barista_body.res index e63ac69..4b3eb83 100644 Binary files a/models/barista_body.res and b/models/barista_body.res differ diff --git a/models/barista_feet.res b/models/barista_feet.res index 0873137..e2605fa 100644 Binary files a/models/barista_feet.res and b/models/barista_feet.res differ diff --git a/models/barista_legs.res b/models/barista_legs.res index 70ddba8..01bc938 100644 Binary files a/models/barista_legs.res and b/models/barista_legs.res differ diff --git a/models/materials/barista_pants1.tres b/models/materials/barista_pants1.tres new file mode 100644 index 0000000..0d1f809 --- /dev/null +++ b/models/materials/barista_pants1.tres @@ -0,0 +1,8 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://bmgw5tdbaedtw"] + +[resource] +resource_name = "Brown_02" +cull_mode = 2 +albedo_color = Color(0.459991, 0.391184, 0.251099, 1) +metallic_specular = 0.0 +roughness = 0.5 diff --git a/models/materials/barista_pants2.tres b/models/materials/barista_pants2.tres new file mode 100644 index 0000000..6cd2e04 --- /dev/null +++ b/models/materials/barista_pants2.tres @@ -0,0 +1,8 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://cxyhpm6edelgh"] + +[resource] +resource_name = "Brown2" +cull_mode = 2 +albedo_color = Color(0.359989, 0.30614, 0.196504, 1) +metallic_specular = 0.0 +roughness = 0.5 diff --git a/models/materials/barista_skirt.tres b/models/materials/barista_skirt.tres new file mode 100644 index 0000000..0f0d448 --- /dev/null +++ b/models/materials/barista_skirt.tres @@ -0,0 +1,8 @@ +[gd_resource type="StandardMaterial3D" format=3 uid="uid://b1u12e67h4pvw"] + +[resource] +resource_name = "LimeGreen" +cull_mode = 2 +albedo_color = Color(0.276335, 0.406654, 0.263508, 1) +metallic_specular = 0.0 +roughness = 0.5 diff --git a/models/nightstand.res b/models/nightstand.res index 07b7a76..f786e15 100644 Binary files a/models/nightstand.res and b/models/nightstand.res differ diff --git a/scripts/player.gd b/scripts/player.gd index e54b6f6..b7ce543 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -44,7 +44,10 @@ func _physics_process(delta): velocity.y -= gravity * delta if Input.is_action_just_pressed("ui_cancel"): - get_tree().quit() + if Input.mouse_mode == Input.MOUSE_MODE_CAPTURED: + Input.mouse_mode = Input.MOUSE_MODE_VISIBLE + else: + get_tree().quit() if !locked: if Input.is_action_just_pressed("crouch"): @@ -75,7 +78,10 @@ func _physics_process(delta): handle_aim() aiming = true elif Input.is_action_just_pressed("use"): - handle_use() + if Input.mouse_mode == Input.MOUSE_MODE_VISIBLE: + Input.mouse_mode = Input.MOUSE_MODE_CAPTURED + else: + handle_use() if Input.is_action_just_pressed("use_alt"): handle_use_alt()