From 6abbe7f82a0b85ee3df697cdcf1abe02a6718719 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Fri, 13 Dec 2024 16:33:42 -0700 Subject: [PATCH] New plasma ball texture --- asset_dev/{ => balls}/gfolfball.xcf | Bin asset_dev/balls/plasma_ball.png | 3 ++ asset_dev/balls/plasma_ball.xcf | Bin 0 -> 19792 bytes asset_dev/balls/plasma_ball_xl.png | 3 ++ assets/materials/gummy_material.tres | 1 + assets/materials/plasma_ball.tres | 11 +++++ assets/textures/plasma_ball/plasma_ball.png | 3 ++ .../plasma_ball/plasma_ball.png.import | 34 ++++++++++++++ .../plasma_ball/plasma_ball_normal_map.png | 3 ++ .../plasma_ball_normal_map.png.import | 34 ++++++++++++++ .../balls/plasma_ball/plasma_ball.tscn | 13 +++++- src/items/extra_ball/plasma_ball_item.tscn | 42 +++--------------- 12 files changed, 111 insertions(+), 36 deletions(-) rename asset_dev/{ => balls}/gfolfball.xcf (100%) create mode 100644 asset_dev/balls/plasma_ball.png create mode 100644 asset_dev/balls/plasma_ball.xcf create mode 100644 asset_dev/balls/plasma_ball_xl.png create mode 100644 assets/materials/plasma_ball.tres create mode 100644 assets/textures/plasma_ball/plasma_ball.png create mode 100644 assets/textures/plasma_ball/plasma_ball.png.import create mode 100644 assets/textures/plasma_ball/plasma_ball_normal_map.png create mode 100644 assets/textures/plasma_ball/plasma_ball_normal_map.png.import diff --git a/asset_dev/gfolfball.xcf b/asset_dev/balls/gfolfball.xcf similarity index 100% rename from asset_dev/gfolfball.xcf rename to asset_dev/balls/gfolfball.xcf diff --git a/asset_dev/balls/plasma_ball.png b/asset_dev/balls/plasma_ball.png new file mode 100644 index 0000000..78da9cc --- /dev/null +++ b/asset_dev/balls/plasma_ball.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6c4b8b3ceab5a242dafdd83d33eba542e516b7b4b5786430f474eb81d599d15 +size 767 diff --git a/asset_dev/balls/plasma_ball.xcf b/asset_dev/balls/plasma_ball.xcf new file mode 100644 index 0000000000000000000000000000000000000000..f350565deb1bce63061516af442c67293c7b2bd9 GIT binary patch literal 19792 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 XgHSu4Cp}MkUd^H>e@bfptn~i@wo+2x literal 0 HcmV?d00001 diff --git a/asset_dev/balls/plasma_ball_xl.png b/asset_dev/balls/plasma_ball_xl.png new file mode 100644 index 0000000..60e4ac1 --- /dev/null +++ b/asset_dev/balls/plasma_ball_xl.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8495e12f43d4185a0c7d890934046f2a2f6a673d602101ab56791a70280dfb63 +size 692 diff --git a/assets/materials/gummy_material.tres b/assets/materials/gummy_material.tres index f25a0f9..56b55d1 100644 --- a/assets/materials/gummy_material.tres +++ b/assets/materials/gummy_material.tres @@ -41,5 +41,6 @@ shader_parameter/edge_color = Color(0, 0, 0, 1) shader_parameter/surface_contribution = 0.9 shader_parameter/specular_contribution = 20.0 shader_parameter/refraction_contribution = 3.0 +shader_parameter/alpha = 1.0 shader_parameter/uv1_scale = Vector3(1, 1, 1) shader_parameter/uv1_offset = Vector3(0, 0, 0) diff --git a/assets/materials/plasma_ball.tres b/assets/materials/plasma_ball.tres new file mode 100644 index 0000000..5a2694d --- /dev/null +++ b/assets/materials/plasma_ball.tres @@ -0,0 +1,11 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://f3qufrkoiv66"] + +[ext_resource type="Texture2D" uid="uid://b7mexqu466hll" path="res://assets/textures/plasma_ball/plasma_ball.png" id="1_c5njv"] +[ext_resource type="Texture2D" uid="uid://bde62x0qlefmp" path="res://assets/textures/plasma_ball/plasma_ball_normal_map.png" id="2_1ari2"] + +[resource] +albedo_texture = ExtResource("1_c5njv") +normal_enabled = true +normal_texture = ExtResource("2_1ari2") +uv1_scale = Vector3(2, 1, 2) +texture_filter = 2 diff --git a/assets/textures/plasma_ball/plasma_ball.png b/assets/textures/plasma_ball/plasma_ball.png new file mode 100644 index 0000000..571c96d --- /dev/null +++ b/assets/textures/plasma_ball/plasma_ball.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c6c50b784c6e2dd6725b614433a267891e7dbc02d84ab6a354374aedffa215c +size 879 diff --git a/assets/textures/plasma_ball/plasma_ball.png.import b/assets/textures/plasma_ball/plasma_ball.png.import new file mode 100644 index 0000000..52d9aef --- /dev/null +++ b/assets/textures/plasma_ball/plasma_ball.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b7mexqu466hll" +path="res://.godot/imported/plasma_ball.png-c4d5acfe04b6c104fde28d019cb35275.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/plasma_ball/plasma_ball.png" +dest_files=["res://.godot/imported/plasma_ball.png-c4d5acfe04b6c104fde28d019cb35275.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=0 diff --git a/assets/textures/plasma_ball/plasma_ball_normal_map.png b/assets/textures/plasma_ball/plasma_ball_normal_map.png new file mode 100644 index 0000000..45f67f8 --- /dev/null +++ b/assets/textures/plasma_ball/plasma_ball_normal_map.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d6be96a82261f20f3f56b441ae632507f3ed56b0b897447b404cc35f5a20961 +size 1123 diff --git a/assets/textures/plasma_ball/plasma_ball_normal_map.png.import b/assets/textures/plasma_ball/plasma_ball_normal_map.png.import new file mode 100644 index 0000000..c2c5a0a --- /dev/null +++ b/assets/textures/plasma_ball/plasma_ball_normal_map.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bde62x0qlefmp" +path="res://.godot/imported/plasma_ball_normal_map.png-119be068fc77a5110385979340f31349.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/plasma_ball/plasma_ball_normal_map.png" +dest_files=["res://.godot/imported/plasma_ball_normal_map.png-119be068fc77a5110385979340f31349.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://assets/textures/plasma_ball/plasma_ball_normal_map.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=0 diff --git a/src/equipment/balls/plasma_ball/plasma_ball.tscn b/src/equipment/balls/plasma_ball/plasma_ball.tscn index 1f6e1ef..cd0c756 100644 --- a/src/equipment/balls/plasma_ball/plasma_ball.tscn +++ b/src/equipment/balls/plasma_ball/plasma_ball.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=11 format=3 uid="uid://dcqxlbsrubapk"] +[gd_scene load_steps=13 format=3 uid="uid://dcqxlbsrubapk"] [ext_resource type="PackedScene" uid="uid://dfttci386ohip" path="res://src/equipment/balls/physics_ball/physics_ball.tscn" id="1_yh4fp"] [ext_resource type="Texture2D" uid="uid://c47bkx508biqr" path="res://assets/sprites/particles/plasma.png" id="2_8fdyx"] [ext_resource type="Script" path="res://src/equipment/balls/plasma_ball/plasma_ball.gd" id="2_16fhh"] +[ext_resource type="Material" uid="uid://f3qufrkoiv66" path="res://assets/materials/plasma_ball.tres" id="3_6gyuc"] [sub_resource type="Curve" id="Curve_kabhn"] max_value = 2.0 @@ -47,10 +48,17 @@ grow_amount = -0.6 material = SubResource("StandardMaterial3D_tyfsm") size = Vector2(0.4, 0.4) +[sub_resource type="SphereShape3D" id="SphereShape3D_muqqr"] +radius = 0.1 + [node name="PlasmaBall" instance=ExtResource("1_yh4fp")] script = ExtResource("2_16fhh") magnetic = true +[node name="BallMesh" parent="." index="0"] +transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0) +surface_material_override/0 = ExtResource("3_6gyuc") + [node name="PlasmaFireEffect" type="GPUParticles3D" parent="BallMesh" index="0"] sorting_offset = -1.0 amount = 20 @@ -58,4 +66,7 @@ lifetime = 0.6 process_material = SubResource("ParticleProcessMaterial_uffe8") draw_pass_1 = SubResource("QuadMesh_go8iw") +[node name="CollisionShape3D" parent="." index="1"] +shape = SubResource("SphereShape3D_muqqr") + [connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/src/items/extra_ball/plasma_ball_item.tscn b/src/items/extra_ball/plasma_ball_item.tscn index b5189e1..69c69b5 100644 --- a/src/items/extra_ball/plasma_ball_item.tscn +++ b/src/items/extra_ball/plasma_ball_item.tscn @@ -1,12 +1,11 @@ -[gd_scene load_steps=22 format=3 uid="uid://mcuhy71v6ggu"] +[gd_scene load_steps=20 format=3 uid="uid://mcuhy71v6ggu"] [ext_resource type="PackedScene" uid="uid://comd88yp45mnb" path="res://src/items/item/item.tscn" id="1_f11yp"] [ext_resource type="Script" path="res://src/items/extra_ball/extra_ball.gd" id="2_tixea"] [ext_resource type="Shader" path="res://src/shaders/frosted_glass.gdshader" id="3_ljwjj"] [ext_resource type="Texture2D" uid="uid://c2p2in2p7mjyo" path="res://assets/materials/crystal_noise_normal_map.tres" id="4_da2m2"] [ext_resource type="Texture2D" uid="uid://cx33n4h5mfcdb" path="res://assets/materials/crystal_noise_map.tres" id="5_mfadb"] -[ext_resource type="Texture2D" uid="uid://ckhiq6rfjv63u" path="res://assets/textures/gfolfball/gfolfball.png" id="6_qn15y"] -[ext_resource type="Texture2D" uid="uid://btntjs7mbdigu" path="res://assets/textures/gfolfball/gfolfball_normal.png" id="7_kyc21"] +[ext_resource type="Material" uid="uid://f3qufrkoiv66" path="res://assets/materials/plasma_ball.tres" id="6_o5jva"] [ext_resource type="Texture2D" uid="uid://c47bkx508biqr" path="res://assets/sprites/particles/plasma.png" id="8_tjeqq"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_4un1r"] @@ -30,20 +29,8 @@ shader_parameter/alpha = 0.9 shader_parameter/uv1_scale = Vector3(1, 1, 1) shader_parameter/uv1_offset = Vector3(0, 0, 0) -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xqofq"] -albedo_texture = ExtResource("6_qn15y") -albedo_texture_force_srgb = true -metallic = 0.27 -roughness = 0.67 -normal_enabled = true -normal_scale = 0.2 -normal_texture = ExtResource("7_kyc21") -clearcoat_roughness = 0.0 -uv1_scale = Vector3(3, 1.5, 3) -texture_filter = 4 - [sub_resource type="SphereMesh" id="SphereMesh_2r4nb"] -material = SubResource("StandardMaterial3D_xqofq") +material = ExtResource("6_o5jva") radius = 0.05 height = 0.1 radial_segments = 6 @@ -69,8 +56,8 @@ angle_min = -720.0 angle_max = 720.0 direction = Vector3(0, 1, 0) spread = 10.0 -initial_velocity_max = 0.2 -gravity = Vector3(0, 2.4, 0) +initial_velocity_max = 0.1 +gravity = Vector3(0, 1.2, 0) scale_curve = SubResource("CurveTexture_vfusk") emission_curve = SubResource("CurveTexture_oxhrr") @@ -191,13 +178,14 @@ surface_material_override/0 = SubResource("ShaderMaterial_4un1r") transform = Transform3D(0.99863, 0.052336, 0, -0.052336, 0.99863, 0, 0, 0, 1, 0, 0, 0) [node name="BallMesh" type="MeshInstance3D" parent="Pivot/Octahedron/ItemMeshContainer/Pivot" index="1"] -transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0) +transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0) mesh = SubResource("SphereMesh_2r4nb") [node name="PlasmaFireEffect" type="GPUParticles3D" parent="Pivot/Octahedron/ItemMeshContainer/Pivot/BallMesh" index="0"] sorting_offset = -1.0 amount = 20 lifetime = 0.6 +speed_scale = 0.2 process_material = SubResource("ParticleProcessMaterial_wmn3a") draw_pass_1 = SubResource("QuadMesh_lsswf") @@ -207,20 +195,4 @@ libraries = { } autoplay = "idle" -[node name="Skeleton3D" parent="gfolf_girl/Armature" index="0"] -bones/2/scale = Vector3(1, 1, 1) -bones/3/scale = Vector3(1, 1, 1) -bones/4/scale = Vector3(1, 1, 1) -bones/6/scale = Vector3(1, 1, 1) -bones/8/scale = Vector3(1, 1, 1) -bones/11/scale = Vector3(1, 1, 1) -bones/12/scale = Vector3(1, 1, 1) -bones/13/scale = Vector3(1, 1, 1) -bones/20/scale = Vector3(1, 1, 1) -bones/21/rotation = Quaternion(-0.000222673, 0.707107, 0.707107, 0.000222504) -bones/21/scale = Vector3(1, 1, 1) -bones/22/scale = Vector3(1, 1, 1) -bones/23/scale = Vector3(1, 1, 1) - [editable path="Pivot/Octahedron"] -[editable path="gfolf_girl"]