From 9ce0b5f068976f97988b31474225835c0fc84c6e Mon Sep 17 00:00:00 2001 From: derek Date: Tue, 13 Aug 2024 15:14:19 -0500 Subject: [PATCH] added placeholder hands --- assets/mac_10.tscn | 16 +++++++++++++++- assets/materials/prototype/prototype_purple.tres | 7 +++++++ assets/revolver_1.tscn | 14 +++++++++++++- assets/rocket_launcher.tscn | 14 +++++++++++++- .../Purple/texture_01.png.import | 13 +++++++------ .../Purple/texture_02.png.import | 13 +++++++------ scenes/enemy_working_scene.tscn | 9 ++++++--- scripts/player.gd | 2 +- 8 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 assets/materials/prototype/prototype_purple.tres diff --git a/assets/mac_10.tscn b/assets/mac_10.tscn index b4735cd..e58b452 100644 --- a/assets/mac_10.tscn +++ b/assets/mac_10.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=22 format=3 uid="uid://brl0bsqjl5dg3"] +[gd_scene load_steps=24 format=3 uid="uid://brl0bsqjl5dg3"] [ext_resource type="PackedScene" uid="uid://c33b6ldlxxfro" path="res://assets/Models/mac10.blend" id="1_nb4p5"] [ext_resource type="Script" path="res://scripts/gun.gd" id="2_6i1l4"] @@ -54,6 +54,15 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_vvaau") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ks515"] +albedo_color = Color(0.859131, 0.597594, 0.456011, 1) +subsurf_scatter_enabled = true +subsurf_scatter_strength = 1.0 + +[sub_resource type="BoxMesh" id="BoxMesh_3phrt"] +material = SubResource("StandardMaterial3D_ks515") +size = Vector3(0.1, 0.1, 1) + [sub_resource type="Animation" id="Animation_u008m"] resource_name = "empty" length = 0.25 @@ -455,6 +464,11 @@ target_position = Vector3(1, 0, 0) [node name="Trigger" parent="mac10" index="7"] transform = Transform3D(0.978226, 0.207541, 0, -0.207541, 0.978226, 0, 0, 0, 1, -0.13807, -0.230628, 0.00528617) +[node name="armStandin" type="MeshInstance3D" parent="mac10" index="8"] +transform = Transform3D(-1.20667e-05, 0, 3.33333, 0, 3.33333, 0, -3.33333, 0, -1.20667e-05, 1.48458, -0.467889, 0.0751227) +mesh = SubResource("BoxMesh_3phrt") +skeleton = NodePath("../../../../../..") + [node name="GunAnims" type="AnimationPlayer" parent="." index="1"] libraries = { "": SubResource("AnimationLibrary_vkrtt") diff --git a/assets/materials/prototype/prototype_purple.tres b/assets/materials/prototype/prototype_purple.tres new file mode 100644 index 0000000..56b9fa9 --- /dev/null +++ b/assets/materials/prototype/prototype_purple.tres @@ -0,0 +1,7 @@ +[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://clw2jno0fjwco"] + +[ext_resource type="Texture2D" uid="uid://by5ovt7vcra1x" path="res://assets/textures/Prototype Textures/Purple/texture_02.png" id="1_hfxvu"] + +[resource] +albedo_texture = ExtResource("1_hfxvu") +uv1_triplanar = true diff --git a/assets/revolver_1.tscn b/assets/revolver_1.tscn index 6f5f1d9..d4e2067 100644 --- a/assets/revolver_1.tscn +++ b/assets/revolver_1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=3 uid="uid://b5eclfg0cmmal"] +[gd_scene load_steps=26 format=3 uid="uid://b5eclfg0cmmal"] [ext_resource type="PackedScene" uid="uid://dgogd08c0ubt6" path="res://assets/Models/revolver1.blend" id="1_i5f84"] [ext_resource type="Script" path="res://scripts/revolver_1.gd" id="2_7rsti"] @@ -97,6 +97,13 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_0sgiw") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_r3lw3"] +albedo_color = Color(0.859131, 0.597594, 0.456011, 1) + +[sub_resource type="BoxMesh" id="BoxMesh_7fcc1"] +material = SubResource("StandardMaterial3D_r3lw3") +size = Vector3(0.1, 0.1, 1) + [sub_resource type="Animation" id="Animation_8akx8"] resource_name = "empty" length = 0.3 @@ -518,6 +525,11 @@ spot_range = 7.0 spot_angle = 70.0 spot_angle_attenuation = 0.353554 +[node name="armStandin" type="MeshInstance3D" parent="revolver1" index="6"] +transform = Transform3D(2.01151e-05, -5.55667, -1.75852e-12, -5.55667, -2.01151e-05, 4.85779e-07, -4.85779e-07, 0, -5.55667, 0.502168, 0.0410088, 2.79972) +mesh = SubResource("BoxMesh_7fcc1") +skeleton = NodePath("../../../../../../../..") + [node name="AnimationPlayer" type="AnimationPlayer" parent="." index="1"] libraries = { "": SubResource("AnimationLibrary_2kb78") diff --git a/assets/rocket_launcher.tscn b/assets/rocket_launcher.tscn index 0f18605..016dc4a 100644 --- a/assets/rocket_launcher.tscn +++ b/assets/rocket_launcher.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=3 uid="uid://2o2wcc5i1al4"] +[gd_scene load_steps=32 format=3 uid="uid://2o2wcc5i1al4"] [ext_resource type="Texture2D" uid="uid://b82yqx4tml6hn" path="res://assets/Models/rocketlauncher1.rough.png" id="1_b5b37"] [ext_resource type="Script" path="res://scripts/rocket_launcher.gd" id="1_ra4f1"] @@ -265,6 +265,13 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_xh68t") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a5xi3"] +albedo_color = Color(0.859131, 0.597594, 0.456011, 1) + +[sub_resource type="BoxMesh" id="BoxMesh_scq3u"] +material = SubResource("StandardMaterial3D_a5xi3") +size = Vector3(0.1, 0.1, 1) + [sub_resource type="Animation" id="Animation_0783b"] resource_name = "empty" @@ -481,6 +488,11 @@ visible = false mesh = SubResource("ArrayMesh_wxc50") skeleton = NodePath("") +[node name="armStandin" type="MeshInstance3D" parent="rocketlauncher1"] +transform = Transform3D(-1.667, -1.45734e-07, 2.6077e-08, -2.6077e-08, -7.28669e-08, -1.667, 1.45734e-07, -1.667, 7.28714e-08, 0.298684, 0.50374, 0.0300984) +mesh = SubResource("BoxMesh_scq3u") +skeleton = NodePath("../../../../../../..") + [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { "": SubResource("AnimationLibrary_lrhqi") diff --git a/assets/textures/Prototype Textures/Purple/texture_01.png.import b/assets/textures/Prototype Textures/Purple/texture_01.png.import index e4fae11..322d9b2 100644 --- a/assets/textures/Prototype Textures/Purple/texture_01.png.import +++ b/assets/textures/Prototype Textures/Purple/texture_01.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://clixexp1mht0t" -path="res://.godot/imported/texture_01.png-0608031460c2c60b34d6ea500a5acb21.ctex" +path.s3tc="res://.godot/imported/texture_01.png-0608031460c2c60b34d6ea500a5acb21.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/Prototype Textures/Purple/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-0608031460c2c60b34d6ea500a5acb21.ctex"] +dest_files=["res://.godot/imported/texture_01.png-0608031460c2c60b34d6ea500a5acb21.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/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ 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/Prototype Textures/Purple/texture_02.png.import b/assets/textures/Prototype Textures/Purple/texture_02.png.import index 8b13baf..4a5157f 100644 --- a/assets/textures/Prototype Textures/Purple/texture_02.png.import +++ b/assets/textures/Prototype Textures/Purple/texture_02.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://by5ovt7vcra1x" -path="res://.godot/imported/texture_02.png-d0bb757d7f08a549f6ce95e441eb315d.ctex" +path.s3tc="res://.godot/imported/texture_02.png-d0bb757d7f08a549f6ce95e441eb315d.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://assets/textures/Prototype Textures/Purple/texture_02.png" -dest_files=["res://.godot/imported/texture_02.png-d0bb757d7f08a549f6ce95e441eb315d.ctex"] +dest_files=["res://.godot/imported/texture_02.png-d0bb757d7f08a549f6ce95e441eb315d.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/channel_pack=0 -mipmaps/generate=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ 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/scenes/enemy_working_scene.tscn b/scenes/enemy_working_scene.tscn index 9fbc7bc..0518909 100644 --- a/scenes/enemy_working_scene.tscn +++ b/scenes/enemy_working_scene.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=3 uid="uid://dsnddbrlqkav2"] +[gd_scene load_steps=20 format=3 uid="uid://dsnddbrlqkav2"] [ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_laua1"] [ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_poauc"] @@ -13,6 +13,7 @@ [ext_resource type="PackedScene" uid="uid://dws4iro7820fc" path="res://assets/pistol1_pickup.tscn" id="8_qwtxj"] [ext_resource type="PackedScene" uid="uid://clu76sc4uoswn" path="res://assets/rocketlauncher_pickup.tscn" id="9_r8miu"] [ext_resource type="PackedScene" uid="uid://dyu46bns8mesv" path="res://assets/mac10_pickup.tscn" id="10_pos4p"] +[ext_resource type="PackedScene" uid="uid://by3n26uvps8tb" path="res://assets/water_tower.tscn" id="14_yn32s"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_w6vpl"] sky_top_color = Color(0.623488, 0.812575, 0.900791, 1) @@ -105,7 +106,7 @@ navigation_mesh = SubResource("NavigationMesh_8aw3d") [node name="CSGBox3D" type="CSGBox3D" parent="NavigationRegion3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.420555, -2.24341) -material_override = ExtResource("7_1bmnm") +material_override = ExtResource("7_l3crk") use_collision = true collision_layer = 7 collision_mask = 7 @@ -140,7 +141,6 @@ material = SubResource("StandardMaterial3D_6yrih") [node name="CSGBox3D6" type="CSGBox3D" parent="NavigationRegion3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.7148, 2.4345, -24.1421) -material_override = ExtResource("8_faibh") use_collision = true size = Vector3(16.626, 5.39923, 1) material = ExtResource("7_l3crk") @@ -215,3 +215,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -25, 1, 8) [node name="mac10_pickup" parent="." instance=ExtResource("10_pos4p")] transform = Transform3D(0.866025, -0.5, 0, 0.5, 0.866025, 0, 0, 0, 1, -28, 1, 10) + +[node name="Water Tower" parent="." instance=ExtResource("14_yn32s")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 29.687, -0.170555, 25.9723) diff --git a/scripts/player.gd b/scripts/player.gd index 78e664c..9e9c86e 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -212,7 +212,7 @@ func _physics_process(delta): if gun_ray.is_colliding() and !gun_ray.get_collider().is_in_group("player"): #check distance to wall later ? gun.rotation = lerp(gun.rotation, Vector3(1, -1, -.25), delta * 10) - gun.position = lerp(gun.position, Vector3(gun.start_position.x+.25,gun.start_position.y +.2,gun.start_position.z +.6),(delta*10)) + gun.position = lerp(gun.position, Vector3(gun.start_position.x-.15,gun.start_position.y +.2,gun.start_position.z +.6),(delta*10)) gun_folded = true elif !gun_ray.is_colliding(): gun.rotation = lerp(gun.rotation, gun.start_rotation,delta*7)