OverviewFilesCommitsIssuesDocsReleasesPeers

godot-witchy_world_demo commits / 3cfd79e

tweaking light postion + shader
3cfd79ec095334ea98a73435fceaa4a3489a4c97
by plankatron <fleeky@gmail.com> · 2022-04-25T19:41:20.000Z

Changed files (4) +71 -7

assets/shaders/Fire.tscn +7 -6
……@@ -1,17 +1,17 @@
11[gd_scene load_steps=11 format=2]
22
3[ext_resource path="res://assets/shaders/FireMask.png" type="Texture" id=1]
4[ext_resource path="res://assets/shaders/HoleNoise.png" type="Texture" id=2]
5[ext_resource path="res://assets/shaders/stylized_fire.shader" type="Shader" id=3]
3[ext_resource path="res://assets/shaders/stylized_fire.shader" type="Shader" id=1]
4[ext_resource path="res://assets/shaders/FireMask.png" type="Texture" id=2]
5[ext_resource path="res://assets/shaders/HoleNoise.png" type="Texture" id=3]
66
77[sub_resource type="ShaderMaterial" id=1]
8shader = ExtResource( 3 )
8shader = ExtResource( 1 )
99shader_param/emission_intensity = 2.0
1010shader_param/time_scale = 3.0
1111shader_param/texture_scale = Vector2( 1, 1 )
1212shader_param/edge_softness = 0.1
13shader_param/noise_texture = ExtResource( 2 )
14shader_param/texture_mask = ExtResource( 1 )
13shader_param/noise_texture = ExtResource( 3 )
14shader_param/texture_mask = ExtResource( 2 )
1515
1616[sub_resource type="Gradient" id=2]
1717colors = PoolColorArray( 0.980957, 0.801817, 0, 1, 1, 0, 0.447059, 0 )
……@@ -54,5 +54,6 @@ process_material = SubResource( 6 )
5454draw_pass_1 = SubResource( 7 )
5555
5656[node name="OmniLight" type="OmniLight" parent="."]
57transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00670671, 0, 0.00680065 )
5758light_color = Color( 1, 0.901961, 0.560784, 1 )
5859light_energy = 2.0
assets/shaders/HeadFire.tscn +54 -0
……@@ -0,0 +1,54 @@
1[gd_scene load_steps=11 format=2]
2
3[ext_resource path="res://assets/shaders/FireMask.png" type="Texture" id=1]
4[ext_resource path="res://assets/shaders/HoleNoise.png" type="Texture" id=2]
5[ext_resource path="res://assets/shaders/stylized_fire.shader" type="Shader" id=3]
6
7[sub_resource type="ShaderMaterial" id=1]
8shader = ExtResource( 3 )
9shader_param/emission_intensity = 2.0
10shader_param/time_scale = 3.0
11shader_param/texture_scale = Vector2( 1, 1 )
12shader_param/edge_softness = 0.1
13shader_param/noise_texture = ExtResource( 2 )
14shader_param/texture_mask = ExtResource( 1 )
15
16[sub_resource type="Gradient" id=2]
17colors = PoolColorArray( 0.980957, 0.801817, 0, 1, 1, 0, 0.447059, 0 )
18
19[sub_resource type="GradientTexture" id=3]
20gradient = SubResource( 2 )
21width = 128
22
23[sub_resource type="Curve" id=4]
24_data = [ Vector2( 0, 0 ), 0.0, 3.65289, 0, 0, Vector2( 0.556561, 1 ), 0.0, 0.0, 0, 0 ]
25
26[sub_resource type="CurveTexture" id=5]
27width = 128
28curve = SubResource( 4 )
29
30[sub_resource type="ParticlesMaterial" id=6]
31lifetime_randomness = 0.81
32direction = Vector3( 0, 1, 0 )
33spread = 0.0
34gravity = Vector3( 0, 0, 0 )
35initial_velocity = 0.5
36linear_accel = 4.0
37scale = 2.0
38scale_random = 1.0
39scale_curve = SubResource( 5 )
40color_ramp = SubResource( 3 )
41
42[sub_resource type="QuadMesh" id=7]
43size = Vector2( 0.5, 0.5 )
44
45[node name="Fire" type="Particles"]
46transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.26708, 0 )
47material_override = SubResource( 1 )
48cast_shadow = 0
49amount = 50
50randomness = 0.74
51local_coords = false
52draw_order = 1
53process_material = SubResource( 6 )
54draw_pass_1 = SubResource( 7 )
game/maps/map_witch_island/map_witch_island.scn +0 -0
(no content changes — binary or rename)
game/player/player_core_local.tscn +10 -1
……@@ -1,8 +1,9 @@
1[gd_scene load_steps=6 format=2]
1[gd_scene load_steps=7 format=2]
22
33[ext_resource path="res://game/player/player_core.tscn" type="PackedScene" id=1]
44[ext_resource path="res://game/player/player_core_local_input.gd" type="Script" id=2]
55[ext_resource path="res://game/player/player_core_local_input_special.gd" type="Script" id=3]
6[ext_resource path="res://assets/shaders/HeadFire.tscn" type="PackedScene" id=4]
67[ext_resource path="res://game/player/player_core_local_debugui.tscn" type="PackedScene" id=5]
78[ext_resource path="res://assets/sounds/player/fire_grapplinghook1.mp3" type="AudioStream" id=9]
89
……@@ -34,6 +35,14 @@ far = 8192.0
3435
3536[node name="PlayerDebugUI" parent="." index="7" instance=ExtResource( 5 )]
3637
38[node name="OmniLight" parent="." index="9"]
39transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.73959, 0 )
40light_color = Color( 1, 0.901961, 0.560784, 1 )
41omni_attenuation = 4.75683
42
43[node name="Fire" parent="OmniLight" index="0" instance=ExtResource( 4 )]
44transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.123843, 0 )
45
3746[connection signal="player_jump" from="Input" to="." method="_on_Input_player_jump"]
3847[connection signal="player_mousemotion_event" from="Input" to="." method="_on_Input_player_mousemotion_event"]
3948[connection signal="player_move" from="Input" to="." method="_on_Input_player_move"]