fix barista model material import settings, uncapture mouse on escape

This commit is contained in:
2025-08-13 15:04:45 -04:00
parent ab72548577
commit 059d2f4ea1
9 changed files with 54 additions and 8 deletions

View File

@@ -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"
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -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

View File

@@ -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

View File

@@ -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

Binary file not shown.

View File

@@ -44,6 +44,9 @@ func _physics_process(delta):
velocity.y -= gravity * delta
if Input.is_action_just_pressed("ui_cancel"):
if Input.mouse_mode == Input.MOUSE_MODE_CAPTURED:
Input.mouse_mode = Input.MOUSE_MODE_VISIBLE
else:
get_tree().quit()
if !locked:
@@ -75,6 +78,9 @@ func _physics_process(delta):
handle_aim()
aiming = true
elif Input.is_action_just_pressed("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"):