From 9b1efc15132630de97a5a5cee7831e1796d86f44 Mon Sep 17 00:00:00 2001 From: ChaoticByte Date: Thu, 13 Mar 2025 20:57:31 +0100 Subject: [PATCH] Update to Godot 4.4 --- build-template/Containerfile | 7 +++---- examples/blur.gdshader.uid | 1 + examples/channel_offset.gdshader.uid | 1 + examples/color_and_pixelate.gdshader.uid | 1 + examples/denoise.gdshader.uid | 1 + examples/greyscale.gdshader.uid | 1 + examples/kuwahara.gdshader.uid | 1 + examples/lowpass.gdshader.uid | 1 + examples/multistep_distort.gdshader.uid | 1 + examples/oklab.gdshader.uid | 1 + examples/place_texture.gdshader.uid | 1 + project.godot | 2 +- shaderlib/blur.gdshaderinc.uid | 1 + shaderlib/common.gdshaderinc.uid | 1 + shaderlib/denoise.gdshaderinc.uid | 1 + shaderlib/hsv.gdshaderinc.uid | 1 + shaderlib/kuwahara.gdshaderinc.uid | 1 + shaderlib/oklab.gdshaderinc.uid | 1 + shaderlib/pixelate.gdshaderinc.uid | 1 + shaderlib/place_texture.gdshaderinc.uid | 1 + src/Camera.gd.uid | 1 + src/Filesystem.gd.uid | 1 + src/ImageCompositor.gd.uid | 1 + src/ImageViewportDisplay.gd.uid | 1 + src/Main.gd.uid | 1 + src/MainUI.gd.uid | 1 + src/ShaderDirectiveParser.gd.uid | 1 + src/VersionLabel.gd.uid | 1 + src/scenes/main.tscn | 15 +++++++-------- src/shader/ivd_outline.gdshader.uid | 1 + tools/get_version.gd.uid | 1 + 31 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 examples/blur.gdshader.uid create mode 100644 examples/channel_offset.gdshader.uid create mode 100644 examples/color_and_pixelate.gdshader.uid create mode 100644 examples/denoise.gdshader.uid create mode 100644 examples/greyscale.gdshader.uid create mode 100644 examples/kuwahara.gdshader.uid create mode 100644 examples/lowpass.gdshader.uid create mode 100644 examples/multistep_distort.gdshader.uid create mode 100644 examples/oklab.gdshader.uid create mode 100644 examples/place_texture.gdshader.uid create mode 100644 shaderlib/blur.gdshaderinc.uid create mode 100644 shaderlib/common.gdshaderinc.uid create mode 100644 shaderlib/denoise.gdshaderinc.uid create mode 100644 shaderlib/hsv.gdshaderinc.uid create mode 100644 shaderlib/kuwahara.gdshaderinc.uid create mode 100644 shaderlib/oklab.gdshaderinc.uid create mode 100644 shaderlib/pixelate.gdshaderinc.uid create mode 100644 shaderlib/place_texture.gdshaderinc.uid create mode 100644 src/Camera.gd.uid create mode 100644 src/Filesystem.gd.uid create mode 100644 src/ImageCompositor.gd.uid create mode 100644 src/ImageViewportDisplay.gd.uid create mode 100644 src/Main.gd.uid create mode 100644 src/MainUI.gd.uid create mode 100644 src/ShaderDirectiveParser.gd.uid create mode 100644 src/VersionLabel.gd.uid create mode 100644 src/shader/ivd_outline.gdshader.uid create mode 100644 tools/get_version.gd.uid diff --git a/build-template/Containerfile b/build-template/Containerfile index e47f847..b1a0c48 100644 --- a/build-template/Containerfile +++ b/build-template/Containerfile @@ -7,13 +7,12 @@ FROM docker.io/ubuntu:focal AS os-base # https://docs.godotengine.org/en/stable/contributing/development/compiling/compiling_for_linuxbsd.html RUN apt-get update -RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq build-essential scons pkg-config libx11-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu1-mesa-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev libwayland-dev - -RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq git +RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq python3-pip git build-essential pkg-config libx11-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu1-mesa-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev libwayland-dev +RUN pip3 install --system scons FROM os-base AS clone-src -RUN git clone https://github.com/godotengine/godot.git -b 4.3-stable /godot-src +RUN git clone https://github.com/godotengine/godot.git -b 4.4-stable /godot-src FROM clone-src diff --git a/examples/blur.gdshader.uid b/examples/blur.gdshader.uid new file mode 100644 index 0000000..3739afe --- /dev/null +++ b/examples/blur.gdshader.uid @@ -0,0 +1 @@ +uid://cny8dtukv54wt diff --git a/examples/channel_offset.gdshader.uid b/examples/channel_offset.gdshader.uid new file mode 100644 index 0000000..66e7cef --- /dev/null +++ b/examples/channel_offset.gdshader.uid @@ -0,0 +1 @@ +uid://0efk4fornlg6 diff --git a/examples/color_and_pixelate.gdshader.uid b/examples/color_and_pixelate.gdshader.uid new file mode 100644 index 0000000..d943067 --- /dev/null +++ b/examples/color_and_pixelate.gdshader.uid @@ -0,0 +1 @@ +uid://gd23hu7ro148 diff --git a/examples/denoise.gdshader.uid b/examples/denoise.gdshader.uid new file mode 100644 index 0000000..9337646 --- /dev/null +++ b/examples/denoise.gdshader.uid @@ -0,0 +1 @@ +uid://cbwyneu03fki6 diff --git a/examples/greyscale.gdshader.uid b/examples/greyscale.gdshader.uid new file mode 100644 index 0000000..b6e1bbd --- /dev/null +++ b/examples/greyscale.gdshader.uid @@ -0,0 +1 @@ +uid://dvarqolt6es27 diff --git a/examples/kuwahara.gdshader.uid b/examples/kuwahara.gdshader.uid new file mode 100644 index 0000000..2e0241a --- /dev/null +++ b/examples/kuwahara.gdshader.uid @@ -0,0 +1 @@ +uid://cdhyuk7u8kxyk diff --git a/examples/lowpass.gdshader.uid b/examples/lowpass.gdshader.uid new file mode 100644 index 0000000..80b19c7 --- /dev/null +++ b/examples/lowpass.gdshader.uid @@ -0,0 +1 @@ +uid://dn02xsjm1kok8 diff --git a/examples/multistep_distort.gdshader.uid b/examples/multistep_distort.gdshader.uid new file mode 100644 index 0000000..22efbc6 --- /dev/null +++ b/examples/multistep_distort.gdshader.uid @@ -0,0 +1 @@ +uid://c17u5jx7a7o81 diff --git a/examples/oklab.gdshader.uid b/examples/oklab.gdshader.uid new file mode 100644 index 0000000..87cef6b --- /dev/null +++ b/examples/oklab.gdshader.uid @@ -0,0 +1 @@ +uid://cu37y8lc0x83 diff --git a/examples/place_texture.gdshader.uid b/examples/place_texture.gdshader.uid new file mode 100644 index 0000000..8ced27b --- /dev/null +++ b/examples/place_texture.gdshader.uid @@ -0,0 +1 @@ +uid://dybe4t5rbbkc6 diff --git a/project.godot b/project.godot index 4b605af..65c3810 100644 --- a/project.godot +++ b/project.godot @@ -13,7 +13,7 @@ config_version=5 config/name="Fragmented" config/version="v9.0" run/main_scene="res://src/scenes/main.tscn" -config/features=PackedStringArray("4.3", "Mobile") +config/features=PackedStringArray("4.4", "Mobile") run/low_processor_mode=true config/icon="res://src/assets/icon.png" diff --git a/shaderlib/blur.gdshaderinc.uid b/shaderlib/blur.gdshaderinc.uid new file mode 100644 index 0000000..d5c8dfd --- /dev/null +++ b/shaderlib/blur.gdshaderinc.uid @@ -0,0 +1 @@ +uid://bjtljvcjcu6dr diff --git a/shaderlib/common.gdshaderinc.uid b/shaderlib/common.gdshaderinc.uid new file mode 100644 index 0000000..f43430d --- /dev/null +++ b/shaderlib/common.gdshaderinc.uid @@ -0,0 +1 @@ +uid://764b6ekchgb8 diff --git a/shaderlib/denoise.gdshaderinc.uid b/shaderlib/denoise.gdshaderinc.uid new file mode 100644 index 0000000..132a166 --- /dev/null +++ b/shaderlib/denoise.gdshaderinc.uid @@ -0,0 +1 @@ +uid://b7ksfifyyfcip diff --git a/shaderlib/hsv.gdshaderinc.uid b/shaderlib/hsv.gdshaderinc.uid new file mode 100644 index 0000000..771cc38 --- /dev/null +++ b/shaderlib/hsv.gdshaderinc.uid @@ -0,0 +1 @@ +uid://bbr3tq6mp5qa2 diff --git a/shaderlib/kuwahara.gdshaderinc.uid b/shaderlib/kuwahara.gdshaderinc.uid new file mode 100644 index 0000000..1ff911b --- /dev/null +++ b/shaderlib/kuwahara.gdshaderinc.uid @@ -0,0 +1 @@ +uid://chqh2cni1qiuu diff --git a/shaderlib/oklab.gdshaderinc.uid b/shaderlib/oklab.gdshaderinc.uid new file mode 100644 index 0000000..7f0bf5f --- /dev/null +++ b/shaderlib/oklab.gdshaderinc.uid @@ -0,0 +1 @@ +uid://ckw4nfslk4m6l diff --git a/shaderlib/pixelate.gdshaderinc.uid b/shaderlib/pixelate.gdshaderinc.uid new file mode 100644 index 0000000..a0a0d4d --- /dev/null +++ b/shaderlib/pixelate.gdshaderinc.uid @@ -0,0 +1 @@ +uid://dpu5nneo5bgnq diff --git a/shaderlib/place_texture.gdshaderinc.uid b/shaderlib/place_texture.gdshaderinc.uid new file mode 100644 index 0000000..f0b6f69 --- /dev/null +++ b/shaderlib/place_texture.gdshaderinc.uid @@ -0,0 +1 @@ +uid://51u2hjq62e5i diff --git a/src/Camera.gd.uid b/src/Camera.gd.uid new file mode 100644 index 0000000..f25b715 --- /dev/null +++ b/src/Camera.gd.uid @@ -0,0 +1 @@ +uid://b6r8rigubdctk diff --git a/src/Filesystem.gd.uid b/src/Filesystem.gd.uid new file mode 100644 index 0000000..a89dcab --- /dev/null +++ b/src/Filesystem.gd.uid @@ -0,0 +1 @@ +uid://rlb041ygdwol diff --git a/src/ImageCompositor.gd.uid b/src/ImageCompositor.gd.uid new file mode 100644 index 0000000..2e55fae --- /dev/null +++ b/src/ImageCompositor.gd.uid @@ -0,0 +1 @@ +uid://d106170kuigl3 diff --git a/src/ImageViewportDisplay.gd.uid b/src/ImageViewportDisplay.gd.uid new file mode 100644 index 0000000..dbde761 --- /dev/null +++ b/src/ImageViewportDisplay.gd.uid @@ -0,0 +1 @@ +uid://ctc4lhbdsoq7u diff --git a/src/Main.gd.uid b/src/Main.gd.uid new file mode 100644 index 0000000..2f9a508 --- /dev/null +++ b/src/Main.gd.uid @@ -0,0 +1 @@ +uid://5sbslwysin5a diff --git a/src/MainUI.gd.uid b/src/MainUI.gd.uid new file mode 100644 index 0000000..0077ccd --- /dev/null +++ b/src/MainUI.gd.uid @@ -0,0 +1 @@ +uid://bxgmf2ny7yuc8 diff --git a/src/ShaderDirectiveParser.gd.uid b/src/ShaderDirectiveParser.gd.uid new file mode 100644 index 0000000..59f7f0e --- /dev/null +++ b/src/ShaderDirectiveParser.gd.uid @@ -0,0 +1 @@ +uid://dw8bep14j4j3w diff --git a/src/VersionLabel.gd.uid b/src/VersionLabel.gd.uid new file mode 100644 index 0000000..e731c41 --- /dev/null +++ b/src/VersionLabel.gd.uid @@ -0,0 +1 @@ +uid://bh0gpu3i2p47f diff --git a/src/scenes/main.tscn b/src/scenes/main.tscn index e6580b3..169705e 100644 --- a/src/scenes/main.tscn +++ b/src/scenes/main.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=12 format=3 uid="uid://bjah7k4bxo044"] -[ext_resource type="Script" uid="uid://n6vumf2emghl" path="res://src/Main.gd" id="1_64y3g"] -[ext_resource type="Script" path="res://src/ImageCompositor.gd" id="2_4ykh7"] -[ext_resource type="Shader" uid="uid://on6oju7dt0dj" path="res://src/shader/ivd_outline.gdshader" id="3_0fllm"] -[ext_resource type="Script" uid="uid://c51lc0hv2d7uq" path="res://src/ImageViewportDisplay.gd" id="4_pbpx2"] -[ext_resource type="Script" uid="uid://t71vu44i5cr5" path="res://src/Camera.gd" id="5_hkdq6"] +[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="Theme" uid="uid://cwqlns34rj3vx" path="res://src/theme.tres" id="6_rjp5f"] -[ext_resource type="Script" uid="uid://e5gf0r42elmx" path="res://src/MainUI.gd" id="7_5puhk"] -[ext_resource type="Script" uid="uid://b254xv4j2uexg" path="res://src/VersionLabel.gd" id="8_kod8x"] +[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"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_y2ea0"] shader = ExtResource("3_0fllm") @@ -70,7 +70,6 @@ unique_name_in_owner = true auto_translate_mode = 1 title = "Export Image" size = Vector2i(661, 175) -ok_button_text = "Save" mode_overrides_title = false access = 2 filters = PackedStringArray("*.png") diff --git a/src/shader/ivd_outline.gdshader.uid b/src/shader/ivd_outline.gdshader.uid new file mode 100644 index 0000000..b42ac31 --- /dev/null +++ b/src/shader/ivd_outline.gdshader.uid @@ -0,0 +1 @@ +uid://ctk7jomfyx0fh diff --git a/tools/get_version.gd.uid b/tools/get_version.gd.uid new file mode 100644 index 0000000..e14829d --- /dev/null +++ b/tools/get_version.gd.uid @@ -0,0 +1 @@ +uid://cdhqbascy6pvy