From b6f6c3d27edc279b7944b11cfc49748fa8a98b6b Mon Sep 17 00:00:00 2001
From: ChaoticByte <contact@chaoticbyte.net>
Date: Thu, 13 Mar 2025 21:39:05 +0100
Subject: [PATCH] Change background and fix image viewport outline

---
 project.godot                   |   2 +-
 src/Camera.gd                   |  14 +++++++------
 src/ImageCompositor.gd          |   1 -
 src/assets/bg.png               | Bin 0 -> 532 bytes
 src/assets/bg.png.import        |  34 ++++++++++++++++++++++++++++++++
 src/scenes/main.tscn            |  25 +++++++++++++++++++++--
 src/shader/ivd_outline.gdshader |   2 +-
 7 files changed, 67 insertions(+), 11 deletions(-)
 create mode 100644 src/assets/bg.png
 create mode 100644 src/assets/bg.png.import

diff --git a/project.godot b/project.godot
index 65c3810..82de90a 100644
--- a/project.godot
+++ b/project.godot
@@ -72,4 +72,4 @@ renderer/rendering_method="mobile"
 textures/vram_compression/import_etc2_astc=true
 textures/lossless_compression/force_png=true
 shader_compiler/shader_cache/enabled=false
-environment/defaults/default_clear_color=Color(0, 0, 0, 1)
+environment/defaults/default_clear_color=Color(0.501961, 0.501961, 0.501961, 1)
diff --git a/src/Camera.gd b/src/Camera.gd
index 9ca1b84..b1fe7f1 100644
--- a/src/Camera.gd
+++ b/src/Camera.gd
@@ -16,6 +16,14 @@ func _input(event):
 	if self.drag && event is InputEventMouseMotion:
 		self.global_position -= event.relative / self.zoom
 
+var old_zoom = self.zoom
+
+func _process(delta: float) -> void:
+	if self.zoom != old_zoom:
+		image_viewport_display.update_zoom_texture_filter(self.zoom)
+		image_viewport_display.material.set_shader_parameter("zoom_level", self.zoom)
+		old_zoom = self.zoom
+
 func fit_image():
 	if Filesystem.original_image != null:
 		var image_size = Filesystem.original_image.get_size()
@@ -28,21 +36,15 @@ func fit_image():
 		self.zoom = Vector2(zoomf, zoomf)
 		self.global_position = Vector2(0, 0)
 
-func update_vd_zoomlevel():
-	image_viewport_display.update_zoom_texture_filter(self.zoom)
-	image_viewport_display.material.set_shader_parameter("zoom_level", self.zoom)
-
 func zoom_in():
 	var old_mouse_pos = get_global_mouse_position()
 	self.zoom *= 1.2
 	self.global_position += old_mouse_pos - get_global_mouse_position()
-	update_vd_zoomlevel()
 
 func zoom_out():
 	var old_mouse_pos = get_global_mouse_position()
 	self.zoom *= 1/1.2
 	self.global_position += old_mouse_pos - get_global_mouse_position()
-	update_vd_zoomlevel()
 
 func _on_fit_image_button_pressed():
 	fit_image()
diff --git a/src/ImageCompositor.gd b/src/ImageCompositor.gd
index ad1ffb5..f913a8a 100644
--- a/src/ImageCompositor.gd
+++ b/src/ImageCompositor.gd
@@ -106,7 +106,6 @@ func update(overwrite_image_path: String = "") -> Array: # returns error message
 	image_sprite.material = null
 	if fit_image:
 		camera.fit_image()
-	camera.update_vd_zoomlevel()
 	image_viewport_display.show()
 	# done
 	return errors
diff --git a/src/assets/bg.png b/src/assets/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb67c1960502b929facc49946af2a7c5da578092
GIT binary patch
literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ$>*$1v7{^WT;MdQ4w*fRVYG*P%E_RU~=gfG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_U2sx#krMxx7Fxu3aNLh~_a1le0HI!Hy4@86bi=Vy
ziMW)>u1Y<x2qFv-1DI8qZO+MZ629Z>9s$1IMR}J0xj#o(%h?PFNW?K_S`P6B@${x+
za^5EvSy9o5&xyw^x*+i**VQJ!aV~f)@J!K4r{;-8VyV!<Y6r8Tr4vsPM>O4_d?C|h
zjq?^~y<BCjd-4~Ca>mLs*J+L*fkiAqh6EK=lu(9)D6Ix5Hd3@7_wf&Vewkb<xk_N<
zSU?3j6weR-2fw?u^OF<Jq);5_esSH8QJ`lRXw+Qy``C3GCqVESxH8)QN*$Q_B)!(w
zB1b^~HgIv>*3>=Vat9cCG8Ielq##Wpp9kL0=$o>@;4RR%*6gjdkJASrO<g5#fP+I|
ztU%f8KJV`B?Csw(t^R%hvc7V_ilg@W00006VoOIv0RI600RN!9r;`8x010qNS#tmY
zE+YT{E+YYWr9XB6001OOL_t(o!|m2F4FCWLz%cxq9wN9%S_!*00|0zhr2+tOU5W)e
W#030}xG{<V0000<MNUMnLSTYWp59jg

literal 0
HcmV?d00001

diff --git a/src/assets/bg.png.import b/src/assets/bg.png.import
new file mode 100644
index 0000000..e61ed86
--- /dev/null
+++ b/src/assets/bg.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d2nwchyd6huob"
+path="res://.godot/imported/bg.png-7c8713dd1fab321784216191fa747e53.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://src/assets/bg.png"
+dest_files=["res://.godot/imported/bg.png-7c8713dd1fab321784216191fa747e53.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+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
diff --git a/src/scenes/main.tscn b/src/scenes/main.tscn
index 169705e..14b19bd 100644
--- a/src/scenes/main.tscn
+++ b/src/scenes/main.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=12 format=3 uid="uid://bjah7k4bxo044"]
+[gd_scene load_steps=13 format=3 uid="uid://bjah7k4bxo044"]
 
 [ext_resource type="Script" uid="uid://5sbslwysin5a" path="res://src/Main.gd" id="1_64y3g"]
 [ext_resource type="Script" uid="uid://d106170kuigl3" path="res://src/ImageCompositor.gd" id="2_4ykh7"]
 [ext_resource type="Shader" uid="uid://ctk7jomfyx0fh" path="res://src/shader/ivd_outline.gdshader" id="3_0fllm"]
 [ext_resource type="Script" uid="uid://ctc4lhbdsoq7u" path="res://src/ImageViewportDisplay.gd" id="4_pbpx2"]
 [ext_resource type="Script" uid="uid://b6r8rigubdctk" path="res://src/Camera.gd" id="5_hkdq6"]
+[ext_resource type="Texture2D" uid="uid://d2nwchyd6huob" path="res://src/assets/bg.png" id="6_kokaf"]
 [ext_resource type="Theme" uid="uid://cwqlns34rj3vx" path="res://src/theme.tres" id="6_rjp5f"]
 [ext_resource type="Script" uid="uid://bxgmf2ny7yuc8" path="res://src/MainUI.gd" id="7_5puhk"]
 [ext_resource type="Script" uid="uid://bh0gpu3i2p47f" path="res://src/VersionLabel.gd" id="8_kod8x"]
@@ -18,7 +19,6 @@ viewport_path = NodePath("Compositor")
 
 [sub_resource type="LabelSettings" id="LabelSettings_6o860"]
 font_size = 12
-font_color = Color(1, 1, 1, 0.509804)
 shadow_color = Color(0, 0, 0, 1)
 
 [node name="Main" type="Node2D"]
@@ -39,6 +39,27 @@ unique_name_in_owner = true
 offset = Vector2(0, -64)
 script = ExtResource("5_hkdq6")
 
+[node name="CanvasLayerBg" type="CanvasLayer" parent="."]
+layer = -1
+
+[node name="Control" type="Control" parent="CanvasLayerBg"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="TextureRect" type="TextureRect" parent="CanvasLayerBg/Control"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = ExtResource("6_kokaf")
+stretch_mode = 1
+
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
 [node name="MainUI" type="Control" parent="CanvasLayer"]
diff --git a/src/shader/ivd_outline.gdshader b/src/shader/ivd_outline.gdshader
index 14ce6e0..78bfe77 100644
--- a/src/shader/ivd_outline.gdshader
+++ b/src/shader/ivd_outline.gdshader
@@ -11,6 +11,6 @@ void fragment() {
 		UV.x > 1.0-t.x ||
 		UV.y > 1.0-t.y
 	) {
-		COLOR = mix(COLOR, vec4(1.0), 0.5);
+		COLOR = mix(COLOR, vec4(0.5), 0.5);
 	}
 }