diff --git a/assets/models/characters/Textures/colormap.png.import b/assets/models/characters/Textures/colormap.png.import index 7c1a734..7b8ac1b 100644 --- a/assets/models/characters/Textures/colormap.png.import +++ b/assets/models/characters/Textures/colormap.png.import @@ -3,19 +3,20 @@ importer="texture" type="CompressedTexture2D" uid="uid://dcina0y6noagf" -path="res://.godot/imported/colormap.png-b5aed20b09058b318ffab234d99d2130.ctex" +path.s3tc="res://.godot/imported/colormap.png-b5aed20b09058b318ffab234d99d2130.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/models/characters/Textures/colormap.png" -dest_files=["res://.godot/imported/colormap.png-b5aed20b09058b318ffab234d99d2130.ctex"] +dest_files=["res://.godot/imported/colormap.png-b5aed20b09058b318ffab234d99d2130.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/uastc_level=0 @@ -23,7 +24,7 @@ compress/rdo_quality_loss=0.0 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -37,4 +38,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/scenes/prologue/act1_room.tscn b/scenes/prologue/act1_room.tscn index e9f6f9f..032e87e 100644 --- a/scenes/prologue/act1_room.tscn +++ b/scenes/prologue/act1_room.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://scripts/prologue/act1.gd" id="1_act1"] [ext_resource type="Script" path="res://scripts/interactables/interactable.gd" id="2_int"] [ext_resource type="PackedScene" path="res://scenes/components/player_fpv.tscn" id="3_player"] -[ext_resource type="PackedScene" path="res://assets/models/characters/character-male-c.glb" id="100_father"] +[ext_resource type="PackedScene" path="res://assets/models/characters/character-male-a.glb" id="100_father"] [ext_resource type="PackedScene" path="res://assets/models/furniture/bedSingle.glb" id="101_bed"] [ext_resource type="PackedScene" path="res://assets/models/furniture/desk.glb" id="102_desk"] [ext_resource type="PackedScene" path="res://assets/models/furniture/chairDesk.glb" id="103_chair"] @@ -650,7 +650,7 @@ material_override = SubResource("mat_note") shape = SubResource("shape_note") [node name="FatherNPC" parent="." instance=ExtResource("100_father")] -transform = Transform3D(0, 0, -1, 0, 1, 0, 1, 0, 0, 1.7, 0, 0) +transform = Transform3D(0, 0, -2, 0, 2, 0, 2, 0, 0, 1.4, 0, 0) [node name="PlayerFPV" parent="." instance=ExtResource("3_player")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.5)