v1.4.? : use mipmaps

TinyTakinTeller · Feb 9, 2025 · 170108d · 170108d
1 parent c355117
commit 170108d
Show file tree

Hide file tree

Showing 38 changed files with 70 additions and 44 deletions.
diff --git a/assets/image/art/angel.png.import b/assets/image/art/angel.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/bird.png.import b/assets/image/art/bird.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/bone.png.import b/assets/image/art/bone.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/cat.png.import b/assets/image/art/cat.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/death.png.import b/assets/image/art/death.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/dino.png.import b/assets/image/art/dino.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/dragon.png.import b/assets/image/art/dragon.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/eye.png.import b/assets/image/art/eye.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/flesh.png.import b/assets/image/art/flesh.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/heart.png.import b/assets/image/art/heart.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/judgement.png.import b/assets/image/art/judgement.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/rabbit.png.import b/assets/image/art/rabbit.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/skeleton.png.import b/assets/image/art/skeleton.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/slime.png.import b/assets/image/art/slime.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/spider.png.import b/assets/image/art/spider.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/strength.png.import b/assets/image/art/strength.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/temperance.png.import b/assets/image/art/temperance.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/the_chariot.png.import b/assets/image/art/the_chariot.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/the_emperor.png.import b/assets/image/art/the_emperor.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/the_empress.png.import b/assets/image/art/the_empress.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/the_hanged_man.png.import b/assets/image/art/the_hanged_man.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/the_hermit.png.import b/assets/image/art/the_hermit.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/the_hierophant.png.import b/assets/image/art/the_hierophant.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/the_high_priestess.png.import b/assets/image/art/the_high_priestess.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/the_magician.png.import b/assets/image/art/the_magician.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/the_tower.png.import b/assets/image/art/the_tower.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/the_world.png.import b/assets/image/art/the_world.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/void.png.import b/assets/image/art/void.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/wheel_of_fortune.png.import b/assets/image/art/wheel_of_fortune.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/assets/image/art/wolf.png.import b/assets/image/art/wolf.png.import
@@ -21,7 +21,7 @@ compress/lossy_quality=0.7
 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=""

diff --git a/project.godot b/project.godot
@@ -113,10 +113,6 @@ locale/translations=PackedStringArray("res://assets/i18n/localization.en.transla
 
 textures/canvas_textures/default_texture_filter=2
 textures/vram_compression/import_etc2_astc=true
-textures/default_filters/use_nearest_mipmap_filter=true
-textures/default_filters/anisotropic_filtering_level=4
-textures/decals/filter=5
-textures/light_projectors/filter=5
 environment/defaults/default_clear_color=Color(0, 0, 0, 1)
 anti_aliasing/quality/msaa_2d=1
 anti_aliasing/quality/screen_space_aa=1

diff --git a/resources/theme/dark/dark.tres b/resources/theme/dark/dark.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=84 format=4 uid="uid://d276arnrjws3i"]
+[gd_resource type="Theme" load_steps=85 format=4 uid="uid://d276arnrjws3i"]
 
 [ext_resource type="FontFile" uid="uid://q32pdsh1f0q8" path="res://assets/font/noto_sans/woff/noto_sans.woff" id="2_mxpaq"]
 [ext_resource type="Texture2D" uid="uid://bvpjbal72ck7r" path="res://resources/theme/dark/icons.svg" id="2_plspm"]
@@ -1406,6 +1406,14 @@ border_width_right = 1
 border_width_bottom = 1
 border_color = Color(0.282353, 0.282353, 0.282353, 1)
 
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_sawul"]
+bg_color = Color(0, 0, 0, 1)
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+border_color = Color(0, 0, 0, 1)
+
 [sub_resource type="StyleBoxFlat" id="45"]
 content_margin_left = 5.0
 content_margin_top = 5.0
@@ -1670,6 +1678,8 @@ TextEdit/styles/completion = null
 TextEdit/styles/focus = SubResource("27")
 TextEdit/styles/normal = SubResource("34")
 TextEdit/styles/read_only = SubResource("29")
+TextPanel/base_type = &"Panel"
+TextPanel/styles/panel = SubResource("StyleBoxFlat_sawul")
 Tree/colors/custom_button_font_highlight = Color(0.94, 0.94, 0.94, 1)
 Tree/colors/drop_position_color = Color(1, 0.3, 0.2, 1)
 Tree/colors/font_color = Color(0.69, 0.69, 0.69, 1)

diff --git a/scenes/autostart/main/main.gd b/scenes/autostart/main/main.gd
@@ -1,5 +1,9 @@
 extends Node
 
+const CAT_X: int = 90
+const CAT_Y: int = 100
+const CAT_SIZE: Vector2 = Vector2(CAT_X, CAT_Y)
+
 const SHORTCUTS_1: Array = [KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9]
 const SHORTCUTS_2: Array = [
 	KEY_KP_0,
@@ -58,6 +62,9 @@ func _input(event: InputEvent) -> void:
 
 
 func _ready() -> void:
+	cat_sprite_2d.scale.x = CAT_X / cat_sprite_2d.texture.get_size().x
+	cat_sprite_2d.scale.y = CAT_Y / cat_sprite_2d.texture.get_size().y
+
 	_connect_signals()
 	_initialize()
 

diff --git a/scenes/autostart/main/main.tscn b/scenes/autostart/main/main.tscn
@@ -146,6 +146,7 @@ grow_vertical = 2
 unique_name_in_owner = true
 z_index = 4096
 position = Vector2(475, 617)
+scale = Vector2(0.176, 0.195)
 texture = ExtResource("24_msvnv")
 
 [node name="SoulSprite" parent="CanvasLayer/MainControl/SoulUI" instance=ExtResource("25_jo8o4")]

diff --git a/scenes/autostart/soul_screen/soul_screen.gd b/scenes/autostart/soul_screen/soul_screen.gd
@@ -1,5 +1,9 @@
 extends Node
 
+const CAT_X: int = 90
+const CAT_Y: int = 100
+const CAT_SIZE: Vector2 = Vector2(CAT_X, CAT_Y)
+
 @export var shake_shader_component_scene: PackedScene
 
 var hp: int = 9
@@ -8,6 +12,8 @@ var boss_cycle: int = 0
 var boss_pattern: int = 0
 var max_boss_pattern: int = 3
 
+var cat_size: float = 0
+
 @onready var canvas_layer: CanvasLayer = %CanvasLayer
 
 @onready var node_2d: Node2D = %Node2D
@@ -34,6 +40,9 @@ func _physics_process(_delta: float) -> void:
 
 
 func _ready() -> void:
+	cat_sprite_2d.scale.x = CAT_X / cat_sprite_2d.texture.get_size().x
+	cat_sprite_2d.scale.y = CAT_Y / cat_sprite_2d.texture.get_size().y
+
 	_connect_signals()
 	_initialize()
 	_intro_animation()
@@ -74,7 +83,7 @@ func _update_clicks(delta: int) -> void:
 
 
 func _intro_animation() -> void:
-	var cat_sprite_2d_size: Vector2 = cat_sprite_2d.get_rect().size
+	var cat_sprite_2d_size: Vector2 = CAT_SIZE
 	var viewport_size: Vector2 = get_viewport().get_visible_rect().size
 	var target_position: Vector2 = viewport_size / 2
 	target_position.y = cat_sprite_2d_size.y + 16

diff --git a/scenes/autostart/soul_screen/soul_screen.tscn b/scenes/autostart/soul_screen/soul_screen.tscn
@@ -32,6 +32,7 @@ z_index = 4095
 [node name="CatSprite2D" type="Sprite2D" parent="CanvasLayer/Node2D"]
 unique_name_in_owner = true
 position = Vector2(482, 252)
+scale = Vector2(0.176, 0.195)
 texture = ExtResource("5_ary8y")
 
 [node name="Control" type="Control" parent="CanvasLayer"]