diff --git a/asset_dev/ui/reticle.xcf b/asset_dev/ui/reticle.xcf index c9d0045..3881165 100644 Binary files a/asset_dev/ui/reticle.xcf and b/asset_dev/ui/reticle.xcf differ diff --git a/asset_dev/ui/wide_reticle.xcf b/asset_dev/ui/wide_reticle.xcf new file mode 100644 index 0000000..fdbce8a Binary files /dev/null and b/asset_dev/ui/wide_reticle.xcf differ 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