From 80e65ccad34120865b1ac430dd37f3fd25fd0e32 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Sun, 2 Mar 2025 18:26:22 -0700 Subject: [PATCH] Scaling reticle for wide spray --- asset_dev/ui/reticle.xcf | Bin 19136 -> 2749 bytes asset_dev/ui/wide_reticle.xcf | Bin 0 -> 3759 bytes assets/ui/hud/reticle_crosshair.png | 3 ++ assets/ui/hud/reticle_crosshair.png.import | 34 ++++++++++++++ assets/ui/hud/reticle_large.png.import | 9 ++-- assets/ui/hud/reticle_left.png | 3 ++ assets/ui/hud/reticle_left.png.import | 34 ++++++++++++++ assets/ui/hud/reticle_right.png | 3 ++ assets/ui/hud/reticle_right.png.import | 34 ++++++++++++++ assets/ui/hud/wide_reticle.png | 3 ++ assets/ui/hud/wide_reticle.png.import | 34 ++++++++++++++ assets/ui/hud/wide_reticle_large.png | 3 ++ assets/ui/hud/wide_reticle_large.png.import | 35 +++++++++++++++ src/equipment/wide_spray/wide_spray.tscn | 47 +++++++++++++++++--- src/player/player.tscn | 4 +- 15 files changed, 234 insertions(+), 12 deletions(-) create mode 100644 asset_dev/ui/wide_reticle.xcf create mode 100644 assets/ui/hud/reticle_crosshair.png create mode 100644 assets/ui/hud/reticle_crosshair.png.import create mode 100644 assets/ui/hud/reticle_left.png create mode 100644 assets/ui/hud/reticle_left.png.import create mode 100644 assets/ui/hud/reticle_right.png create mode 100644 assets/ui/hud/reticle_right.png.import create mode 100644 assets/ui/hud/wide_reticle.png create mode 100644 assets/ui/hud/wide_reticle.png.import create mode 100644 assets/ui/hud/wide_reticle_large.png create mode 100644 assets/ui/hud/wide_reticle_large.png.import diff --git a/asset_dev/ui/reticle.xcf b/asset_dev/ui/reticle.xcf index c9d004556ba7a9e898f5baf0af5f9f71a63e3b58..388116500f1b594a733c19e41764bf94f55d4ff8 100644 GIT binary patch literal 2749 zcmds&&2G~`5XaYcouqNXNBO8|NVE`;+C!v9;%JFO4~PR2@)HnJ$FY=;DoLRghjQhF zIKUfl0EtK7W&8#_f%#2rBR5K;gcD+;|IX~r?EJ^}Og0FIC;F`0({B#jZN<fas1xiP32^hD*7PtoPrn>mu0lz>sAatuc9uED{jI|Qu&e6p0%=}~hHk|eKv*#~f zisi=KH5_&VzZFcvW7!k$@B7o)`M}rH@gO`tDDU@z?szbs=>559O@h}QeK`NM4=}%8 zVs7jCPt0f2lTJ4r1^Nk#^ZX*!Tc@LNro&OU?@z^l-0MyKnLZTvoSvwcoh9SkFwT<2 z*1JR&FLK6Al^3UhJgGhKd-Io6U?Fcc1`kAk`kt9L4`g4Qw^JRV9_IA>IlY|IbxwD3 zdL^efY?Khfjw)OgPdGsYZv<~djI{x0Bv}891xFRGN+g`Xh1Z4GCC1u- z(-o|L#)6{?SH%@hLv6>Va`>oDY$z*+KPJ|da8w+>0?rDb$(T9U3W% z!Xym(|6C93keQ6X?EyPEp3U}orXd%4!2Z0%#+Lmf+m~vrP?=RK)Y_n;lMX0t&^3H9 zI2v#z9RM$tS*1d)4Jtb60C+bzW5UsZE9n4usmv-BYHd)_Ne95Y!5I^d23*nsSr14b zzEXj)d#s-O8v}fzp@eAb8B$qll)#$(r$^LYy zT&%2Dwyksnrnk#0%T}iG$xfnp<(%TI)%Z~HPIYU!=xmm)Ssd*84_KdmyXn*{XS29w zSE+ubRI1uFD?`oVeP?>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&hVG&aikP~-Tl#)+ql zuNhZ0-sgU&e(K{X_WJ?%_lWz;PU!M1_m}1VX7_b|u8C}Kj{D8Ay}4tqcf$BXW1exY ziKjaMNgv|~W12C?xTx_N9>E3y zkEktd@FX*0N3<25OVV>O@b<#3u3O0XlrH|@zpZ$ zSwb>PMtX+n2nI`LFvEVs{s_+iml<17-zL5Yd<7Bo3@5oZcS73;&n`3O{zcI23wr!c zV6ec4g!Gfn7Kfx-brk1Tui z%t0KGT`N;9*EbXwA-W8;P+SBbLM;>*!G}-_#YMrcRAg)++j+$tVm|PSImB$>6?2HW zKr7~OGr_EHT0XrGIywq^{76S6Kh(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 diff --git a/asset_dev/ui/wide_reticle.xcf b/asset_dev/ui/wide_reticle.xcf new file mode 100644 index 0000000000000000000000000000000000000000..fdbce8a97b85685e375ead74ab5d422bc9206f9c GIT binary patch literal 3759 zcmd6qO>Y}T7{_Prgt!TzdErH_Yk3j}DG805NJv0Bp@$v-2}HG0#o2Wn$5Ijp+dy(a zM&isB#0?2?;a2eh_$Wm44LEaHe$TVJ(jc*0slIfg|IFi=$N%5%_}SUEKRCa%SKSl) z_5Q(uq5Xm^lJ+B7MNvezj%tsX6472qbLcjDGm9nf4fHo!?qj{z9iE@}E+%|7vbgqW z)ay)o$M&1SJ9cZX-g zk=@o|Z`6OD~lP-W)R;E;>94gLA(^iuLkjQ5X&zsyu2+C2wVK$&SD0$C2>My zYzJ{(A)yD$m2c_tmT!Xi(kefvqxSil%s59mK7n?yzu&o`vLip+ePof; z>`GYZwyj4_g?VW&Q_X*wUXppynwMuYX!E(B%;o!$)%^SqL1Mnf)ckMx{2JA`PGyRA zsrh%P2Y z)xjziENUK>gH@U-Zm=9I-0Lnfcc{h&l__F1fmJG4)I6*NR%xcV-NCi4?yHHExw%0W z$%n=6XgD69b_Ork$@z-?J{)XOa zWNLq;mLEC)-^X;^x$lj({Ci>CpWgH@Q7ep}oc>JH1b z&6IcYhVEgLH)$(wv5#+|7CTf&vy4k7ikC8vqPS)j;#!sy#zpzz{A|~k-)D>aZfXrh zvJ?EmP2Te@&rW!Dg0bQu%`|e=o}EySqL{n)?1bioaZ!FaKil=?_u1mUn_A(z6VzXm ze}%LhJK@*~#)^Y9)5ujjc0xUhV(#9t6PgpoMfu_UY}c3HXN&u8>hl+wY4yH|lA}zA zW+8bG9R_pL>TP|F9vUEb8NJRB9P z9!{xXd1ZN6rJ3Re%frH5-qf%hEETH`R;ge)WjR=-nc@b^!NOhM)YJ5hamjhVlAZbQ JGwS~${sjaDPRRfO literal 0 HcmV?d00001 diff --git a/assets/ui/hud/reticle_crosshair.png b/assets/ui/hud/reticle_crosshair.png new file mode 100644 index 0000000..f147712 --- /dev/null +++ b/assets/ui/hud/reticle_crosshair.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ec0c07b2ce8737ec368dd202d979d5ed0d5bc8e6781bb15fc2770a982a72f16 +size 1821 diff --git a/assets/ui/hud/reticle_crosshair.png.import b/assets/ui/hud/reticle_crosshair.png.import new file mode 100644 index 0000000..c99f85e --- /dev/null +++ b/assets/ui/hud/reticle_crosshair.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cx28sj02y31kj" +path="res://.godot/imported/reticle_crosshair.png-c625bb63292edc79da1eabda647ac14a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/hud/reticle_crosshair.png" +dest_files=["res://.godot/imported/reticle_crosshair.png-c625bb63292edc79da1eabda647ac14a.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/assets/ui/hud/reticle_large.png.import b/assets/ui/hud/reticle_large.png.import index 5d1c9ec..eeea6a6 100644 --- a/assets/ui/hud/reticle_large.png.import +++ b/assets/ui/hud/reticle_large.png.import @@ -3,20 +3,19 @@ importer="texture" type="CompressedTexture2D" uid="uid://bn0gcsy37ahto" -path.s3tc="res://.godot/imported/reticle_large.png-a42ebbd3708980136abe85bbfa9ef8bb.s3tc.ctex" +path="res://.godot/imported/reticle_large.png-a42ebbd3708980136abe85bbfa9ef8bb.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true +"vram_texture": false } [deps] source_file="res://assets/ui/hud/reticle_large.png" -dest_files=["res://.godot/imported/reticle_large.png-a42ebbd3708980136abe85bbfa9ef8bb.s3tc.ctex"] +dest_files=["res://.godot/imported/reticle_large.png-a42ebbd3708980136abe85bbfa9ef8bb.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_left.png b/assets/ui/hud/reticle_left.png new file mode 100644 index 0000000..b99478b --- /dev/null +++ b/assets/ui/hud/reticle_left.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bca85319e4e10989184db34a6e8a329febc59838bfc590f46ffa8a056b79b36 +size 2308 diff --git a/assets/ui/hud/reticle_left.png.import b/assets/ui/hud/reticle_left.png.import new file mode 100644 index 0000000..ef11766 --- /dev/null +++ b/assets/ui/hud/reticle_left.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://carrggw6kp14w" +path="res://.godot/imported/reticle_left.png-cea2c552fbce347d0d17bf8c5c749c4e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/hud/reticle_left.png" +dest_files=["res://.godot/imported/reticle_left.png-cea2c552fbce347d0d17bf8c5c749c4e.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/assets/ui/hud/reticle_right.png b/assets/ui/hud/reticle_right.png new file mode 100644 index 0000000..3125ca2 --- /dev/null +++ b/assets/ui/hud/reticle_right.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d64dfe707a1b52fced2372bd2d7ddc06d2ab64d98ca4aeac02d352d91e2a4a7 +size 2304 diff --git a/assets/ui/hud/reticle_right.png.import b/assets/ui/hud/reticle_right.png.import new file mode 100644 index 0000000..382e18e --- /dev/null +++ b/assets/ui/hud/reticle_right.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://wp03nuwt8hp5" +path="res://.godot/imported/reticle_right.png-3ddec1ee6b78f3769f0453faac9d4a79.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/hud/reticle_right.png" +dest_files=["res://.godot/imported/reticle_right.png-3ddec1ee6b78f3769f0453faac9d4a79.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/assets/ui/hud/wide_reticle.png b/assets/ui/hud/wide_reticle.png new file mode 100644 index 0000000..87c545e --- /dev/null +++ b/assets/ui/hud/wide_reticle.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0acc9c297a5560bd412f329ef167526e3cf250ec2c50339c19fab00e740bd638 +size 738 diff --git a/assets/ui/hud/wide_reticle.png.import b/assets/ui/hud/wide_reticle.png.import new file mode 100644 index 0000000..322182f --- /dev/null +++ b/assets/ui/hud/wide_reticle.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cslqiqktyqc37" +path="res://.godot/imported/wide_reticle.png-8e706f08a0fcb55a894cc878141464e7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ui/hud/wide_reticle.png" +dest_files=["res://.godot/imported/wide_reticle.png-8e706f08a0fcb55a894cc878141464e7.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=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=1 diff --git a/assets/ui/hud/wide_reticle_large.png b/assets/ui/hud/wide_reticle_large.png new file mode 100644 index 0000000..6d25337 --- /dev/null +++ b/assets/ui/hud/wide_reticle_large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dc8d626760be5bf5c6e170dd86d5233b812c3cac9aa8f3211afed36419c15f2 +size 7176 diff --git a/assets/ui/hud/wide_reticle_large.png.import b/assets/ui/hud/wide_reticle_large.png.import new file mode 100644 index 0000000..1cc9936 --- /dev/null +++ b/assets/ui/hud/wide_reticle_large.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dwavqltjrmupx" +path.s3tc="res://.godot/imported/wide_reticle_large.png-d22306bf06a9fb7176f83f491e3ed607.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/ui/hud/wide_reticle_large.png" +dest_files=["res://.godot/imported/wide_reticle_large.png-d22306bf06a9fb7176f83f491e3ed607.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/wide_spray/wide_spray.tscn b/src/equipment/wide_spray/wide_spray.tscn index 4977ce7..ce3f73f 100644 --- a/src/equipment/wide_spray/wide_spray.tscn +++ b/src/equipment/wide_spray/wide_spray.tscn @@ -1,6 +1,10 @@ -[gd_scene load_steps=5 format=3 uid="uid://d2hnxr5l6w2x4"] +[gd_scene load_steps=9 format=3 uid="uid://d2hnxr5l6w2x4"] [ext_resource type="Script" path="res://src/equipment/wide_spray/wide_spray.gd" id="1_ggkto"] +[ext_resource type="Texture2D" uid="uid://dwavqltjrmupx" path="res://assets/ui/hud/wide_reticle_large.png" id="2_d01sr"] +[ext_resource type="Texture2D" uid="uid://cx28sj02y31kj" path="res://assets/ui/hud/reticle_crosshair.png" id="3_78jy6"] +[ext_resource type="Texture2D" uid="uid://carrggw6kp14w" path="res://assets/ui/hud/reticle_left.png" id="4_rotxf"] +[ext_resource type="Texture2D" uid="uid://wp03nuwt8hp5" path="res://assets/ui/hud/reticle_right.png" id="5_xo3vu"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cdyoo"] transparency = 1 @@ -12,8 +16,8 @@ albedo_color = Color(0, 1, 0.301961, 0.254902) material = SubResource("StandardMaterial3D_cdyoo") size = Vector3(1, 2, 0.2) -[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_c3qhn"] -load_path = "res://.godot/imported/reticle.png-0a9f831dae57a5cb1ef00786d2ed0e86.s3tc.ctex" +[sub_resource type="QuadMesh" id="QuadMesh_lvw1u"] +size = Vector2(2, 2) [node name="WideSpray" type="Node3D"] script = ExtResource("1_ggkto") @@ -45,12 +49,45 @@ target_position = Vector3(0.5, 0, -2) [node name="SprayEffect" type="MeshInstance3D" parent="."] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, -4.47035e-08, -1, 0, 1, -4.47035e-08, 0, 0, -1) +visible = false layers = 2 mesh = SubResource("PrismMesh_vh2mt") 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 = SubResource("CompressedTexture2D_c3qhn") +visible = false +size = Vector3(1, 10, 0.2) +texture_albedo = ExtResource("2_d01sr") cull_mask = 1048573 + +[node name="ReticleDecals" type="Node3D" parent="."] + +[node name="CrosshairDecal" type="Decal" parent="ReticleDecals"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, -1) +size = Vector3(0.2, 2, 0.2) +texture_albedo = ExtResource("3_78jy6") +cull_mask = 1048573 + +[node name="LeftPivot" type="Node3D" parent="ReticleDecals"] +transform = Transform3D(0.970296, 0, 0.241922, 0, 1, 0, -0.241922, 0, 0.970296, 0, 0, 0) + +[node name="LeftDecal" type="Decal" parent="ReticleDecals/LeftPivot"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, -1) +size = Vector3(0.2, 2, 0.2) +texture_albedo = ExtResource("4_rotxf") +cull_mask = 1048573 + +[node name="RightPivot" type="Node3D" parent="ReticleDecals"] +transform = Transform3D(0.970296, 0, -0.241922, 0, 1, 0, 0.241922, 0, 0.970296, 0, 0, 0) + +[node name="RightDecal" type="Decal" parent="ReticleDecals/RightPivot"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, -1) +size = Vector3(0.2, 2, 0.2) +texture_albedo = ExtResource("5_xo3vu") +cull_mask = 1048573 + +[node name="DebugMesh" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.67743) +visible = false +mesh = SubResource("QuadMesh_lvw1u") diff --git a/src/player/player.tscn b/src/player/player.tscn index bf446cd..73f6d0f 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://cc102xko0u6yj" path="res://src/equipment/point_spray/point_spray.tscn" id="3_ybw6c"] +[ext_resource type="PackedScene" uid="uid://d2hnxr5l6w2x4" path="res://src/equipment/wide_spray/wide_spray.tscn" id="3_ibq07"] [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="PointSpray" parent="CameraPivot/SprayNozzle/SprayMuzzle" instance=ExtResource("3_ybw6c")] +[node name="WideSpray" parent="CameraPivot/SprayNozzle/SprayMuzzle" instance=ExtResource("3_ibq07")] [node name="Camera3D" type="Camera3D" parent="CameraPivot"] current = true