diff --git a/assets/Models/Trees1_v2.blend b/assets/Models/Trees1_v2.blend index 035b1d5..d701a3f 100644 Binary files a/assets/Models/Trees1_v2.blend and b/assets/Models/Trees1_v2.blend differ diff --git a/assets/Models/Trees1_v2.blend1 b/assets/Models/Trees1_v2.blend1 index 4168553..035b1d5 100644 Binary files a/assets/Models/Trees1_v2.blend1 and b/assets/Models/Trees1_v2.blend1 differ diff --git a/assets/Textures/bullethole.normal.png b/assets/Textures/bullethole.normal.png index 7762f1d..f8d94b2 100644 Binary files a/assets/Textures/bullethole.normal.png and b/assets/Textures/bullethole.normal.png differ diff --git a/assets/Textures/bullethole.normal.png.import b/assets/Textures/bullethole.normal.png.import index c53bfe2..3fc7378 100644 --- a/assets/Textures/bullethole.normal.png.import +++ b/assets/Textures/bullethole.normal.png.import @@ -3,32 +3,33 @@ importer="texture" type="CompressedTexture2D" uid="uid://c03mwq2gxs7u0" -path="res://.godot/imported/bullethole.normal.png-b0b59a93054836eabe377ffaaa71e3f9.ctex" +path.s3tc="res://.godot/imported/bullethole.normal.png-b0b59a93054836eabe377ffaaa71e3f9.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/Textures/bullethole.normal.png" -dest_files=["res://.godot/imported/bullethole.normal.png-b0b59a93054836eabe377ffaaa71e3f9.ctex"] +dest_files=["res://.godot/imported/bullethole.normal.png-b0b59a93054836eabe377ffaaa71e3f9.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/normal_map=0 +compress/normal_map=1 compress/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" +roughness/mode=1 +roughness/src_normal="res://assets/Textures/bullethole.normal.png" 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 +detect_3d/compress_to=0 diff --git a/assets/Textures/bulletholeMASK.png b/assets/Textures/bulletholeMASK.png new file mode 100644 index 0000000..cb5e725 Binary files /dev/null and b/assets/Textures/bulletholeMASK.png differ diff --git a/assets/Textures/bulletholeMASK.png.import b/assets/Textures/bulletholeMASK.png.import new file mode 100644 index 0000000..39e7d27 --- /dev/null +++ b/assets/Textures/bulletholeMASK.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://clj3jr8fnrut4" +path.s3tc="res://.godot/imported/bulletholeMASK.png-619fdae216f55ef3331b1d02d6c30b80.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/Textures/bulletholeMASK.png" +dest_files=["res://.godot/imported/bulletholeMASK.png-619fdae216f55ef3331b1d02d6c30b80.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/assets/bullet_hole.tscn b/assets/bullet_hole.tscn index da4ac40..0e76c72 100644 --- a/assets/bullet_hole.tscn +++ b/assets/bullet_hole.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=5 format=3 uid="uid://crvohhc6kgshn"] +[gd_scene load_steps=6 format=3 uid="uid://crvohhc6kgshn"] -[ext_resource type="Texture2D" uid="uid://doo43x1ma0ufm" path="res://assets/UI/Crosshair/100h/Bullet Hole 1_png.png" id="1_a6hxe"] [ext_resource type="Script" path="res://scripts/bullet_hole.gd" id="1_r63bq"] +[ext_resource type="Texture2D" uid="uid://clj3jr8fnrut4" path="res://assets/Textures/bulletholeMASK.png" id="2_4q4gp"] +[ext_resource type="Texture2D" uid="uid://c03mwq2gxs7u0" path="res://assets/Textures/bullethole.normal.png" id="2_s81sk"] [sub_resource type="PlaneMesh" id="PlaneMesh_rv5u3"] size = Vector2(0.1, 0.1) @@ -11,13 +12,17 @@ transparency = 2 alpha_scissor_threshold = 0.454 alpha_antialiasing_mode = 0 blend_mode = 3 -albedo_texture = ExtResource("1_a6hxe") +albedo_texture = ExtResource("2_4q4gp") +metallic_specular = 0.0 +normal_enabled = true +normal_scale = 10.0 +normal_texture = ExtResource("2_s81sk") [node name="BulletHole" type="Node3D" groups=["spawned"]] script = ExtResource("1_r63bq") [node name="MeshInstance3D" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, -0.001) +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0) mesh = SubResource("PlaneMesh_rv5u3") surface_material_override/0 = SubResource("StandardMaterial3D_y0mpl") diff --git a/scripts/bullet.gd b/scripts/bullet.gd index 4db0f55..a09fa68 100644 --- a/scripts/bullet.gd +++ b/scripts/bullet.gd @@ -54,6 +54,7 @@ func _physics_process(delta): instance_bullethole.look_at(ray.get_collision_point() + ray.get_collision_normal(), Vector3(0,0,1)) else: instance_bullethole.look_at(ray.get_collision_point() + ray.get_collision_normal()) + instance_bullethole.rotation.z = deg_to_rad(randf_range(0,360)) if body.is_in_group("switch"): body.hit()