Merge pull request #43 from ChaoticByte/release/v7.0

Release/v7.0

Author: ChaoticByte

LICENSE

@@ -1,21 +1,28 @@
-MIT License
+BSD 3-Clause License
 
-Copyright (c) 2024 Julian Müller (ChaoticByte)
+Copyright (c) 2025, Julian Müller (ChaoticByte)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -74,3 +74,33 @@ void fragment() {
 	COLOR = hsv_offset(COLOR, 0.32, 0.2, 0.0);
 }
 ```
+
+## Commandline interface
+
+You can run Fragmented from the commandline or scripts.
+
+> Note: Headless mode is not supported. Using the commandline interface still opens a window.
+
+### Usage
+
+```
+./Fragmented cmd --shader PATH [--load-image PATH]
+
+  --shader PATH      The path to the shader
+  --output PATH      Where to write the resulting image to
+  --load-image PATH  The path to the image. This will overwrite the
+                     load directive of the shader file (optional)
+
+```
+
+You can also run `./Fragmented cmd help` to show the help message.
+
+#### Examples
+
+```
+./Fragmented cmd --shader ./examples/oklab.gdshader --output ./output.png
+```
+
+```
+./Fragmented cmd --shader ./examples/oklab.gdshader --load-image ~/Pictures/test.png --output ./output.png
+```

examples/blur.gdshader

@@ -0,0 +1,8 @@
+shader_type canvas_item;
+
+//!load ./images/swamp.jpg
+#include "res://shaderlib/blur.gdshaderinc"
+
+void fragment() {
+	COLOR = gaussian_blur(TEXTURE, UV, 48, 24.0);
+}

examples/color_and_pixelate.gdshader

@@ -1,13 +1,14 @@
 shader_type canvas_item;
 
-#include "res://shaderlib/hsv.gdshaderinc"
+#include "res://shaderlib/colorspaces.gdshaderinc"
 #include "res://shaderlib/effects.gdshaderinc"
 
 //!load ./images/swamp.jpg
 
 void fragment() {
 	COLOR = pixelate(TEXTURE, UV, 200.0);
 	vec4 hsv = rgb2hsv(COLOR);
-	COLOR = hsv_offset(COLOR, 0.65, .42-(hsv.y*.3), -.125);
-	COLOR = hsv_multiply(COLOR, 1.0, 1.0, 1.25);
+	hsv.xyz += vec3(0.65, .42-(hsv.y*.3), -.125);
+	hsv.xyz *= vec3(1.0, 1.0, 1.25);
+	COLOR = hsv2rgb(hsv);
 }

examples/oklab.gdshader

@@ -0,0 +1,12 @@
+shader_type canvas_item;
+
+#include "res://shaderlib/colorspaces.gdshaderinc"
+
+//!load ./images/swamp.jpg
+
+void fragment() {
+	vec4 oklab = rgb2oklab(COLOR);
+	vec4 oklch = oklab2oklch(oklab);
+	oklch.z -= 2.0;
+	COLOR = oklab2rgb(oklch2oklab(oklch));
+}

project.godot

@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="Fragmented"
-config/version="v6.2"
+config/version="v7.0"
 run/main_scene="res://scenes/main.tscn"
 config/features=PackedStringArray("4.3", "Mobile")
 run/low_processor_mode=true

scenes/main.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=10 format=3 uid="uid://bjah7k4bxo044"]
 
 [ext_resource type="Script" path="res://src/Main.gd" id="1_2625y"]
-[ext_resource type="Script" path="res://src/Compositor.gd" id="2_hvo65"]
+[ext_resource type="Script" path="res://src/ImageCompositor.gd" id="2_4thch"]
 [ext_resource type="Shader" path="res://src/shader/ivd_outline.gdshader" id="3_6xihe"]
 [ext_resource type="Script" path="res://src/ImageViewportDisplay.gd" id="3_n4itb"]
 [ext_resource type="Script" path="res://src/UIWindow.gd" id="6_8k0ha"]
@@ -20,14 +20,7 @@ script = ExtResource("1_2625y")
 
 [node name="Compositor" type="SubViewport" parent="."]
 unique_name_in_owner = true
-disable_3d = true
-transparent_bg = true
-canvas_item_default_texture_filter = 0
-render_target_update_mode = 4
-script = ExtResource("2_hvo65")
-
-[node name="ImageSprite" type="Sprite2D" parent="Compositor"]
-unique_name_in_owner = true
+script = ExtResource("2_4thch")
 
 [node name="ImageViewportDisplay" type="Sprite2D" parent="."]
 unique_name_in_owner = true
@@ -44,6 +37,7 @@ unique_name_in_owner = true
 disable_3d = true
 position = Vector2i(48, 36)
 size = Vector2i(704, 704)
+visible = false
 script = ExtResource("6_8k0ha")
 
 [node name="UserInterfaceContainer" parent="EditorWindow" instance=ExtResource("7_5ci0e")]

screenshot.png

@@ -0,0 +1,32 @@
+
+/*
+	gaussian_blur adapted from https://godotshaders.com/shader/customizable-gausian-blur/
+	original code by https://godotshaders.com/author/djbob-gaming-yt/
+	maximum radius is 64
+*/
+vec4 gaussian_blur(sampler2D texture, vec2 uv, int radius, float sigma) {
+	vec2 resolution = 1.0 / vec2(textureSize(texture, 0));
+	// calculate kernel
+	float kernel[64];
+	float sum = 0.0;
+	for (int i = 0; i <= radius; i++) {
+		kernel[i] = exp(-0.5 * float(i * i) / (sigma * sigma));
+		sum += i == 0 ? kernel[i] : 2.0 * kernel[i];
+	}
+	for (int i = 0; i <= radius; i++) {
+		kernel[i] /= sum;
+	}
+	//
+	vec4 final_color = vec4(0.0);
+	float total_weight = 0.0;
+	for (int x = -radius; x <= radius; x++) {
+		for (int y = -radius; y <= radius; y++) {
+			float weight = kernel[abs(x)] * kernel[abs(y)];
+			vec2 offset = vec2(float(x), float(y)) * resolution;
+			final_color += texture(texture, uv + offset) * weight;
+			total_weight += weight;
+		}
+	}
+	final_color /= total_weight;
+	return final_color;
+}

shaderlib/blur.gdshaderinc

@@ -0,0 +1,90 @@
+
+/*
+	Color space conversion functions always work with vec4.
+	The fourth value is always alpha.
+*/
+
+#include "res://shaderlib/common.gdshaderinc"
+
+/*
+	rgb2hsv and hsv2rgb functions adapted
+	from https://godotshaders.com/shader/hsv-adjustment/
+	original code by https://godotshaders.com/author/al1-ce/
+*/
+
+// Convert RGB to HSV (hue, saturation, brightness)
+vec4 rgb2hsv(vec4 c) {
+	vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
+	vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
+	vec4 q = mix(vec4(p.xyw, c.r), vec4(c.r, p.yzx), step(p.x, c.r));
+	float d = q.x - min(q.w, q.y);
+	float e = 1.0e-10;
+	return vec4(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x, c.a);
+}
+
+// Convert HSV back to RGB (red, green, blue)
+vec4 hsv2rgb(vec4 c) {
+	vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
+	vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
+	vec3 rgb =  c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
+	return vec4(rgb.r, rgb.g, rgb.b, c.a);
+}
+
+/*
+	OkLab and OkLCh
+	For more details on oklab, see
+		- https://bottosson.github.io/posts/oklab/
+		- https://en.wikipedia.org/wiki/Oklab_color_space
+*/
+
+vec4 rgb2oklab(vec4 c) {
+	float l = 0.4122214708f * c.r + 0.5363325363f * c.g + 0.0514459929f * c.b;
+	float m = 0.2119034982f * c.r + 0.6806995451f * c.g + 0.1073969566f * c.b;
+	float s = 0.0883024619f * c.r + 0.2817188376f * c.g + 0.6299787005f * c.b;
+
+	float l_ = cbrt(l);
+	float m_ = cbrt(m);
+	float s_ = cbrt(s);
+
+	return vec4(
+		0.2104542553f*l_ + 0.7936177850f*m_ - 0.0040720468f*s_,
+		1.9779984951f*l_ - 2.4285922050f*m_ + 0.4505937099f*s_,
+		0.0259040371f*l_ + 0.7827717662f*m_ - 0.8086757660f*s_,
+		c.a
+	);
+}
+
+vec4 oklab2rgb(vec4 c) {
+	float l_ = c.x + 0.3963377774f * c.y + 0.2158037573f * c.z;
+	float m_ = c.x - 0.1055613458f * c.y - 0.0638541728f * c.z;
+	float s_ = c.x - 0.0894841775f * c.y - 1.2914855480f * c.z;
+
+	float l = l_*l_*l_;
+	float m = m_*m_*m_;
+	float s = s_*s_*s_;
+
+	return vec4(
+		+4.0767416621f * l - 3.3077115913f * m + 0.2309699292f * s,
+		-1.2684380046f * l + 2.6097574011f * m - 0.3413193965f * s,
+		-0.0041960863f * l - 0.7034186147f * m + 1.7076147010f * s,
+		c.a
+	);
+}
+
+vec4 oklab2oklch(vec4 c) {
+	return vec4(
+		c.x,
+		sqrt((c.y * c.y) + (c.z * c.z)),
+		atan(c.z, c.y),
+		c.a
+	);
+}
+
+vec4 oklch2oklab(vec4 c) {
+	return vec4(
+		c.x,
+		c.y * cos(c.z),
+		c.y * sin(c.z),
+		c.a
+	);
+}