From 8b6ca73e54dac9a8a7acb1c1aa02e51ffd45ae21 Mon Sep 17 00:00:00 2001
From: Rob Kelly <contact@robkel.ly>
Date: Sun, 2 Mar 2025 18:01:47 -0700
Subject: [PATCH] Delightful writhing & warping of the grunk

---
 asset_dev/ui/reticle.xcf                   | Bin 1318 -> 19136 bytes
 assets/materials/gunk_material.tres        |   2 +-
 assets/ui/hud/reticle.png.import           |   9 ++-
 assets/ui/hud/reticle_large.png            |   3 +
 assets/ui/hud/reticle_large.png.import     |  35 +++++++++++
 src/equipment/point_spray/point_spray.tscn |   4 +-
 src/player/player.tscn                     |   4 +-
 src/shaders/gunk.gdshader                  |   6 ++
 src/shaders/gunkwave.gdshader              |  66 +++++++++++++++++++++
 src/world/gunk_body/gunk_body.tscn         |   3 -
 10 files changed, 119 insertions(+), 13 deletions(-)
 create mode 100644 assets/ui/hud/reticle_large.png
 create mode 100644 assets/ui/hud/reticle_large.png.import
 create mode 100644 src/shaders/gunkwave.gdshader

diff --git a/asset_dev/ui/reticle.xcf b/asset_dev/ui/reticle.xcf
index bacba50754520307e85803c870e7875dbf01dfa5..c9d004556ba7a9e898f5baf0af5f9f71a63e3b58 100644
GIT binary patch
literal 19136
zcmeHP&rcIU6dtev#6l}7A%@UJF%}eQ6AnEz5rYOaF)@t?;tk5SYyy<fs&HD4`~k*r
z@aTbf_Q1hEfIoqQr=C1`@nSfbtl#Urk~M+U^o4A;JJY;=Z|CQGWxv@syX=&mjV)`Z
zShC(_vRS26Hw!?ikC5w-t}cAtfb`8Hiv;N=BnG(x8D^d8-Gcmr43yFJbg{CrVQ<!O
ztf+8ke%oHI*{jxjr?zG-Jb(F$N|KGL&c<@to-S`YtCUBzzoe_R-F4flR@R->$^LYy
zT&%2Dwyksnrnk#0%T}iG$xfnp<(%TI)%Z~HPIYU!=xmm)Ssd*84_KdmyXn*{XS29w
zSE+ubRI1uFD?`<Nx>o<KOcwi6*P8Eu)w5rgJnJjiHK(|4QyCRd>VeP?>Osayf4qlp
z)P+z!wY$nXK;7}_qdvXgr&~V#nop1W^Z}oqfKKBzQ!f-6oBF@UIzUa3?jZs1`gH$E
zf$V1L-fC*TGmQF0>i(?p#V5u?#;+Rb`|P)a9^?F;Z@RqaJL4aXy>A$g7*7~aHTJWA
zgH0UK`GaZ39OEM6662c2A;#e*?&$pCeZ~XEL&hV<V~w{N$LMc>G&aikP~-Tl#)+ql
zuNhZ0-sgU&e(K{X_WJ?%_lWz;PU!M1_m}1VX7_b|u8C}Kj{D8Ay}4tqcf$BXW1exY
ziKjaMNgv|~W12C?xTx_N<HC|YUf5wgVEnCdk^Nq*@$m<ZN~Kh)Ad!TcDYP$cUxr4n
zO9Z3W+ZR|sqvs`p(ev#KETGXniC}cEeSrm@8&?H4rWCNwm}m4D+bc((32#Oqu#T)c
zfAm;J&@)-(f@v4_9#{Y6yNp385rc?*@Sz~%5Nr@|h}y!2x{O7zLBJwv3mft>9>E3y
zkEktd@FX*0N3<25OVV>O@b<#<SjvOI+Y31)<zUe5-6XClmngW>3u3O0XlrH|@zpZ$
zSwb>PMtX+n2nI`LFvEVs{s_+iml<17-zL5Yd<7Bo3@5oZcS73;&n`3O{zcI23wr!c
zV6ec4g!G<r+-kZ0$Gzu5c*Tt+$@+SD1s;&~`S1!nAnQfXR)TF054<q5fNaOJu|k-6
zK(@n&dYG9&w!?>fn7Kf<!w0X`+Rm)a%-Rg+fFQaFciWWkis#0Y=IKe$>x-brk1Tui
z%t0KGT`N;9*EbXwA-W8;P+SBbLM;>*!G}-_#YMrcRAg)++j+$tVm|PSImB$>6?2HW
zKr7~OGr_EHT0XrGIywq^{76S<F76%6t~TZlfw@Bv<vRrMJ<?Ba6Rp=~!v9S*GmM#G
z%nTFVS*B$KEBW8fFtiOiLJoTTNJr=<zG$_EmzJCO!o(LQzKCvoLGLq5=K#D-FWT3D
z-e-mlB7qH}oek)HW+@L~gJ^F9dY>6Kh(xlp0ky^RAMrc-=f2~QcmHMg+Fa~EaG`bB
zw?NuE{FeHT9X4cKlJN*nim}6nj7c&UH7pSFNXDUt1tJC|g!_Y}u-yx7c|_7kd-x`y
IG{>U;0@ni*IRF3v

literal 1318
zcmaKqO^(w*5QW=@u``nyg?|JgQiDOtEFvWmOG_+ffmk3R-yq{Sj-~u5F)*{^0IWFy
zD~{zGaDi#Q@{iPskjr}gUUgMhKU+?-)mGocbNy{RnJ7Zn5d8~01dhY<7<8`K5)e<o
zeQ*yvtF`n!1%JUs%IHzNS*?<FPOhZ*=xUct^JJ#KXZb>Z{Pg*YR34PA*=m|5qjZ<e
zWKX*P4EOo%GSU0ZGMinV4d-dRS#EZESkh>hUQhM7d?uHaum4k?=<<>B&3-$LvvsQ9
zlib=#tw&$iS+28nyh!%aznRbXNv_AzZs|%MHj85`oQ0J%QX>TNW}PU>vv`>xl`9M3
z0r{W?ycYf82P?fm_T}7Zts(Ws(yuIiW@&BduBFc{ePQVyTJCGYN66hW|6Q#i^;WbY
z;K0)MPr-H*?zT~|t|4;?_h-fBs#yhu`@3R!@qXm0L1a`AJy%}zLY=gttDLAy&oOtD
zA9dJo__*HW?ejf61b7+XsUJDwuE1S^y8?Fwr(3}-1@6Eh<Ep?NsQ9?v<n8l4JOp?d
z;Hh7f?n2y!xC?O?a=I1V65<XVGOj}0fr^joP2N7=!$W|V0iODyxH~mIa8=iw00Vs0
zGdML&YJqF+lsQ)pFs26&z)R(G)Q79QN3H6)Gs<n5CO3H;?QwhMLfp8uJ4gKk`4QYa

diff --git a/assets/materials/gunk_material.tres b/assets/materials/gunk_material.tres
index a277e79..97a1e98 100644
--- a/assets/materials/gunk_material.tres
+++ b/assets/materials/gunk_material.tres
@@ -28,7 +28,7 @@ shader = ExtResource("1_euy6e")
 shader_parameter/color_1 = Color(0, 0.03, 0.1, 1)
 shader_parameter/color_2 = Color(0, 0.1, 0.3, 1)
 shader_parameter/emission_color = Color(0.25, 0.875, 1, 1)
-shader_parameter/pixellation = 50.0
+shader_parameter/pixellation = 100.0
 shader_parameter/roughness = 0.15
 shader_parameter/specular_contribution = 0.8
 shader_parameter/emission_strength = 0.02
diff --git a/assets/ui/hud/reticle.png.import b/assets/ui/hud/reticle.png.import
index 2a5b5f3..3f25d04 100644
--- a/assets/ui/hud/reticle.png.import
+++ b/assets/ui/hud/reticle.png.import
@@ -3,20 +3,19 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bdnurvg7xe6k7"
-path.s3tc="res://.godot/imported/reticle.png-0a9f831dae57a5cb1ef00786d2ed0e86.s3tc.ctex"
+path="res://.godot/imported/reticle.png-0a9f831dae57a5cb1ef00786d2ed0e86.ctex"
 metadata={
-"imported_formats": ["s3tc_bptc"],
-"vram_texture": true
+"vram_texture": false
 }
 
 [deps]
 
 source_file="res://assets/ui/hud/reticle.png"
-dest_files=["res://.godot/imported/reticle.png-0a9f831dae57a5cb1ef00786d2ed0e86.s3tc.ctex"]
+dest_files=["res://.godot/imported/reticle.png-0a9f831dae57a5cb1ef00786d2ed0e86.ctex"]
 
 [params]
 
-compress/mode=2
+compress/mode=0
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1
diff --git a/assets/ui/hud/reticle_large.png b/assets/ui/hud/reticle_large.png
new file mode 100644
index 0000000..673245f
--- /dev/null
+++ b/assets/ui/hud/reticle_large.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3565a8778fed43441f81ba2e66a84ed28f32cb7c5499e3051d4539361ac2f11b
+size 2524
diff --git a/assets/ui/hud/reticle_large.png.import b/assets/ui/hud/reticle_large.png.import
new file mode 100644
index 0000000..5d1c9ec
--- /dev/null
+++ b/assets/ui/hud/reticle_large.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bn0gcsy37ahto"
+path.s3tc="res://.godot/imported/reticle_large.png-a42ebbd3708980136abe85bbfa9ef8bb.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/ui/hud/reticle_large.png"
+dest_files=["res://.godot/imported/reticle_large.png-a42ebbd3708980136abe85bbfa9ef8bb.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+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=0
diff --git a/src/equipment/point_spray/point_spray.tscn b/src/equipment/point_spray/point_spray.tscn
index 2fd65ec..3e099b3 100644
--- a/src/equipment/point_spray/point_spray.tscn
+++ b/src/equipment/point_spray/point_spray.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=3 uid="uid://cc102xko0u6yj"]
 
 [ext_resource type="Script" path="res://src/equipment/point_spray/point_spray.gd" id="1_2yl2v"]
-[ext_resource type="Texture2D" uid="uid://bdnurvg7xe6k7" path="res://assets/ui/hud/reticle.png" id="1_f2scl"]
+[ext_resource type="Texture2D" uid="uid://bn0gcsy37ahto" path="res://assets/ui/hud/reticle_large.png" id="2_qcl8j"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ng43h"]
 transparency = 1
@@ -31,5 +31,5 @@ skeleton = NodePath("../../../..")
 [node name="Decal" type="Decal" parent="."]
 transform = Transform3D(1, 0, 0, 0, -4.47035e-08, -1, 0, 1, -4.47035e-08, 0, 0, -1)
 size = Vector3(0.2, 2, 0.2)
-texture_albedo = ExtResource("1_f2scl")
+texture_albedo = ExtResource("2_qcl8j")
 cull_mask = 1048573
diff --git a/src/player/player.tscn b/src/player/player.tscn
index 73f6d0f..bf446cd 100644
--- a/src/player/player.tscn
+++ b/src/player/player.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://src/player/player.gd" id="1_npueo"]
 [ext_resource type="Script" path="res://src/player/camera_controller.gd" id="2_veeqv"]
-[ext_resource type="PackedScene" uid="uid://d2hnxr5l6w2x4" path="res://src/equipment/wide_spray/wide_spray.tscn" id="3_ibq07"]
+[ext_resource type="PackedScene" uid="uid://cc102xko0u6yj" path="res://src/equipment/point_spray/point_spray.tscn" id="3_ybw6c"]
 
 [sub_resource type="BoxMesh" id="BoxMesh_ua7a2"]
 size = Vector3(0.05, 0.05, 0.3)
@@ -30,7 +30,7 @@ mesh = SubResource("BoxMesh_ua7a2")
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 0.997564, -0.0697565, 0, 0.0697565, 0.997564, 0, 0, -0.15)
 
-[node name="WideSpray" parent="CameraPivot/SprayNozzle/SprayMuzzle" instance=ExtResource("3_ibq07")]
+[node name="PointSpray" parent="CameraPivot/SprayNozzle/SprayMuzzle" instance=ExtResource("3_ybw6c")]
 
 [node name="Camera3D" type="Camera3D" parent="CameraPivot"]
 current = true
diff --git a/src/shaders/gunk.gdshader b/src/shaders/gunk.gdshader
index dd2adce..6802419 100644
--- a/src/shaders/gunk.gdshader
+++ b/src/shaders/gunk.gdshader
@@ -31,7 +31,13 @@ float hardstep(float value) {
 
 void fragment() {
 	vec2 local_uv = floor(UV * uv_scale * pixellation) / pixellation;
+
+	// swirl
 	vec3 uvt = vec3(local_uv.x, local_uv.y, TIME * time_scale);
+	uvt.x += sin(uvt.y * 1.54 * PI + uvt.z) * cos(uvt.y * 1.31 * PI + uvt.z) * 0.2;
+	uvt.y += cos(uvt.x * 1.74 * PI + uvt.z) * -sin(uvt.y * 1.64 * PI + uvt.z) * 0.3;
+
+
 	float value = texture(gunk_noise, uvt).r;
 	vec3 color = mix(color_1, color_2, value);
 
diff --git a/src/shaders/gunkwave.gdshader b/src/shaders/gunkwave.gdshader
new file mode 100644
index 0000000..9546643
--- /dev/null
+++ b/src/shaders/gunkwave.gdshader
@@ -0,0 +1,66 @@
+shader_type spatial;
+render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_burley, specular_schlick_ggx, sss_mode_skin;
+
+uniform vec3 color_1: source_color = vec3(0.0, 0.03, 0.1);
+uniform vec3 color_2: source_color = vec3(0.0, 0.1, 0.3);
+uniform vec3 emission_color: source_color = vec3(0.25, 0.88, 1.0);
+
+uniform float pixellation = 50.0;
+
+uniform float roughness: hint_range(0.0, 1.0) = 0.15;
+uniform float specular_contribution = 0.8;
+uniform float emission_strength = 0.05;
+
+// Used ONLY by the gunk, does not affect the gunk mask.
+uniform vec2 uv_scale = vec2(1.0);
+
+uniform float time_scale = 1.0;
+
+uniform float edge_bleed = 0.1;
+
+uniform sampler2D gunk_mask;
+
+uniform highp sampler3D gunk_noise;
+uniform highp sampler3D gunk_normal_map;
+
+
+float hardstep(float value) {
+	float x = clamp(value, 0.0, 1.0);
+	return 0.5 * tanh( (20.0 * x - 10.0) * inversesqrt(x - x * x) ) + 0.5;
+}
+
+void fragment() {
+	vec2 local_uv = floor(UV * uv_scale * pixellation) / pixellation;
+
+	// wave
+	vec3 uvt = vec3(local_uv.x, local_uv.y, TIME * time_scale);
+	uvt.x += sin(uvt.y * 1.54 * PI + uvt.z) * cos(uvt.y * 1.31 * PI + uvt.z);
+	uvt.y += cos(uvt.x * 1.74 * PI + uvt.z) * -sin(uvt.y * 1.64 * PI + uvt.z);
+	
+	
+	float value = texture(gunk_noise, uvt).r;
+	vec3 color = mix(color_1, color_2, value);
+
+	ALBEDO = color.rgb;
+	ROUGHNESS = value * roughness;
+	EMISSION = (1.0 - value) * emission_color * emission_strength;
+	SPECULAR = 0.5 * inversesqrt(specular_contribution);
+	NORMAL_MAP = texture(gunk_normal_map, uvt).xyz;
+
+	float mask = texture(gunk_mask, UV).r;
+
+	// soften edges
+	NORMAL_MAP *= smoothstep(1.0, 0.0, mask);
+
+	/*
+	// Hard edge
+	if(mask + edge_bleed < 0.5) {
+		ALPHA = 1.0;
+	} else {
+		ALPHA = 0.0;
+	}
+	*/
+
+	// Hardish edge
+	ALPHA = hardstep(1.0 - mask + edge_bleed);
+}
\ No newline at end of file
diff --git a/src/world/gunk_body/gunk_body.tscn b/src/world/gunk_body/gunk_body.tscn
index fb75d50..2d76e6d 100644
--- a/src/world/gunk_body/gunk_body.tscn
+++ b/src/world/gunk_body/gunk_body.tscn
@@ -9,9 +9,6 @@ script = ExtResource("1_qqbpr")
 [node name="MaskViewport" type="SubViewport" parent="."]
 unique_name_in_owner = true
 handle_input_locally = false
-msaa_2d = 3
-canvas_item_default_texture_filter = 0
-canvas_item_default_texture_repeat = 1
 size = Vector2i(1024, 1024)
 render_target_clear_mode = 1
 render_target_update_mode = 4