wanp/soil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove old water_bomb_model, put shaders into /assets/

Browse Source
This commit is contained in:
veclavtalica 2025-02-13 06:56:47 +03:00
parent c2841fbf0c
commit 3a5d90e50a
7 changed files with 4 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
scenes/interactivity_outline.gdshader → assets/shaders/interactivity_outline.gdshader
View File

0
scenes/interactivity_outline2.gdshader → assets/shaders/interactivity_outline2.gdshader
View File

2
assets/water_bomb_sphere_mat.tres
View File

@ -1,6 +1,6 @@
[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://ruycqsmlhsiw"]
[ext_resource type="Shader" path="res://scenes/interactivity_outline.gdshader" id="1_nmq18"]
[ext_resource type="Shader" path="res://assets/shaders/interactivity_outline.gdshader" id="1_nmq18"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_gi5rt"]
resource_local_to_scene = true

2
assets/water_bomb_top_mat.tres
View File

@ -1,6 +1,6 @@
[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://cm6b807gcxn4w"]
[ext_resource type="Shader" path="res://scenes/interactivity_outline.gdshader" id="1_wfrf5"]
[ext_resource type="Shader" path="res://assets/shaders/interactivity_outline.gdshader" id="1_wfrf5"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_phi16"]
resource_local_to_scene = true

23
scenes/water_bomb_model.tscn
View File

@ -1,23 +0,0 @@
[gd_scene load_steps=4 format=3 uid="uid://s2a1pry5fw8f"]
[ext_resource type="Shader" path="res://scenes/interactivity_outline.gdshader" id="1_m18kw"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_gi5rt"]
resource_local_to_scene = true
render_priority = 0
shader = ExtResource("1_m18kw")
shader_parameter/color = Color(1, 1, 1, 0)
shader_parameter/size = 1.24
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ptaep"]
resource_local_to_scene = true
next_pass = SubResource("ShaderMaterial_gi5rt")
albedo_color = Color(0.0936238, 0.825356, 1, 1)
metallic = 0.8
roughness = 0.4
[node name="Model" type="CSGSphere3D"]
material_override = SubResource("StandardMaterial3D_ptaep")
radius = 0.2
radial_segments = 24
rings = 12

24
src/ingame/player.tscn
View File

@ -1,10 +1,8 @@
[gd_scene load_steps=12 format=3 uid="uid://cs8c570bxh6u"]
[gd_scene load_steps=8 format=3 uid="uid://cs8c570bxh6u"]
[ext_resource type="Script" path="res://src/lib/player_character.gd" id="1_sba4x"]
[ext_resource type="PackedScene" uid="uid://tdsbo3e5ic86" path="res://src/ingame/water_bomb.tscn" id="2_naek4"]
[ext_resource type="AudioStream" uid="uid://3dlhs18w1fa2" path="res://assets/sfx/boom.wav" id="3_u2hxa"]
[ext_resource type="Shader" path="res://scenes/interactivity_outline.gdshader" id="4_a2qfj"]
[ext_resource type="PackedScene" uid="uid://s2a1pry5fw8f" path="res://scenes/water_bomb_model.tscn" id="4_bfvih"]
[sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_2xotl"]
properties/0/path = NodePath(".:position")
@ -32,22 +30,6 @@ properties/5/replication_mode = 2
[sub_resource type="SphereShape3D" id="SphereShape3D_rsfjy"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_nch7m"]
resource_local_to_scene = true
render_priority = 0
shader = ExtResource("4_a2qfj")
shader_parameter/color = Color(1, 1, 1, 0)
shader_parameter/size = 1.24
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_x7r08"]
resource_local_to_scene = true
render_priority = 1
next_pass = SubResource("ShaderMaterial_nch7m")
no_depth_test = true
albedo_color = Color(0.0936238, 0.825356, 1, 1)
metallic = 0.8
roughness = 0.4
[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("_projectile_holder", "_projectile_point", "_camera_pivot", "_camera", "_line_of_sight", "_shot_sound")]
collision_layer = 2
script = ExtResource("1_sba4x")
@ -98,10 +80,6 @@ debug_shape_custom_color = Color(0.628721, 0, 0.256939, 1)
[node name="HeldViewmodel" type="Node3D" parent="CameraPivot"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.2, -1)
[node name="Model" parent="CameraPivot/HeldViewmodel" instance=ExtResource("4_bfvih")]
material_override = null
material = SubResource("StandardMaterial3D_x7r08")
[node name="ShotSound" type="AudioStreamPlayer3D" parent="."]
stream = ExtResource("3_u2hxa")
bus = &"SoundEffects"

2
src/ingame/sprout.tscn
View File

@ -3,7 +3,7 @@
[ext_resource type="Script" path="res://src/ingame/sprout.gd" id="1_snma1"]
[ext_resource type="Resource" uid="uid://nrpcuqveh7io" path="res://data/coin_flower.tres" id="2_amjnn"]
[ext_resource type="Texture2D" uid="uid://d35y5ckne72qe" path="res://assets/sprout1.png" id="2_ipgad"]
[ext_resource type="Shader" path="res://scenes/interactivity_outline2.gdshader" id="2_oa2it"]
[ext_resource type="Shader" path="res://assets/shaders/interactivity_outline2.gdshader" id="2_oa2it"]
[ext_resource type="Texture2D" uid="uid://cwbl0r1e26eja" path="res://assets/drop.png" id="3_kghdv"]
[sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_rs2qp"]