removed spotlight from torch_holder scene

fixed light not showing up on wall issue
master
Zac 4 years ago
parent 0b213bc4e1
commit 16b4ba0be4
  1. 1
      _scenes/pieces/hallway.tscn
  2. 4
      _scenes/pieces/hallway_w_torch.tscn
  3. 2
      _scenes/pieces/player.tscn
  4. 58
      _scenes/pieces/torch.tscn
  5. 6
      _scenes/pieces/torch_holder.tscn
  6. 1
      assets/ceiling_material.tres

@ -14,6 +14,7 @@ extents = Vector3( 4.02299, 1, 0.412802 )
material/0 = ExtResource( 2 )
[node name="walls" parent="." index="1"]
cast_shadow = 0
material/0 = ExtResource( 3 )
[node name="ceiling" parent="." index="2"]

@ -9,12 +9,14 @@
[sub_resource type="BoxShape" id=1]
extents = Vector3( 4.02299, 1, 0.412802 )
[node name="hallway" instance=ExtResource( 1 )]
[node name="hallway" index="0" instance=ExtResource( 1 )]
[node name="floor" parent="." index="0"]
material/0 = ExtResource( 2 )
[node name="walls" parent="." index="1"]
cast_shadow = 0
extra_cull_margin = 2688.0
material/0 = ExtResource( 3 )
[node name="ceiling" parent="." index="2"]

@ -23,8 +23,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.54634, 0 )
cull_mask = 3
environment = ExtResource( 2 )
current = true
near = 0.01
far = 360.7
[node name="RayCast" type="RayCast" parent="Head/Camera"]
transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 0, 0, -0.819098 )

@ -7,7 +7,7 @@
[ext_resource path="res://textures/fire/fire_01.png" type="Texture" id=5]
[ext_resource path="res://textures/fire/smoke_04.png" type="Texture" id=6]
[sub_resource type="SpatialMaterial" id=2]
[sub_resource type="SpatialMaterial" id=1]
albedo_texture = ExtResource( 2 )
metallic_specular = 0.0
normal_enabled = true
@ -19,19 +19,19 @@ ao_texture = ExtResource( 3 )
ao_on_uv2 = false
ao_texture_channel = 0
[sub_resource type="Gradient" id=3]
[sub_resource type="Gradient" id=2]
colors = PoolColorArray( 0.933333, 0.811765, 0.529412, 1, 0.987793, 0.846993, 0.0694542, 1 )
[sub_resource type="GradientTexture" id=4]
gradient = SubResource( 3 )
[sub_resource type="GradientTexture" id=3]
gradient = SubResource( 2 )
[sub_resource type="Curve" id=5]
[sub_resource type="Curve" id=4]
_data = [ Vector2( 0, 0 ), 0.0, 0.0, 0, 0, Vector2( 0.273551, 0.9026 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ]
[sub_resource type="CurveTexture" id=6]
curve = SubResource( 5 )
[sub_resource type="CurveTexture" id=5]
curve = SubResource( 4 )
[sub_resource type="ParticlesMaterial" id=7]
[sub_resource type="ParticlesMaterial" id=6]
emission_shape = 1
emission_sphere_radius = 0.3
spread = 0.0
@ -42,10 +42,10 @@ linear_accel = 4.0
angle = 360.0
angle_random = 1.0
scale = 2.0
scale_curve = SubResource( 6 )
color_ramp = SubResource( 4 )
scale_curve = SubResource( 5 )
color_ramp = SubResource( 3 )
[sub_resource type="SpatialMaterial" id=8]
[sub_resource type="SpatialMaterial" id=7]
flags_unshaded = true
vertex_color_use_as_albedo = true
params_blend_mode = 1
@ -58,17 +58,17 @@ distance_fade_mode = 1
distance_fade_min_distance = 0.0
distance_fade_max_distance = 10.0
[sub_resource type="QuadMesh" id=9]
material = SubResource( 8 )
[sub_resource type="QuadMesh" id=8]
material = SubResource( 7 )
[sub_resource type="Gradient" id=10]
[sub_resource type="Gradient" id=9]
offsets = PoolRealArray( 0, 0.507157, 1 )
colors = PoolColorArray( 0, 0, 0, 0, 0.556237, 0.556237, 0.556237, 1, 1, 1, 1, 0 )
[sub_resource type="GradientTexture" id=11]
gradient = SubResource( 10 )
[sub_resource type="GradientTexture" id=10]
gradient = SubResource( 9 )
[sub_resource type="ParticlesMaterial" id=12]
[sub_resource type="ParticlesMaterial" id=11]
emission_shape = 1
emission_sphere_radius = 0.3
spread = 0.0
@ -78,10 +78,10 @@ angular_velocity_random = 1.0
linear_accel = 4.0
angle = 360.0
angle_random = 1.0
scale_curve = SubResource( 6 )
color_ramp = SubResource( 11 )
scale_curve = SubResource( 5 )
color_ramp = SubResource( 10 )
[sub_resource type="SpatialMaterial" id=13]
[sub_resource type="SpatialMaterial" id=12]
flags_transparent = true
flags_unshaded = true
vertex_color_use_as_albedo = true
@ -92,27 +92,27 @@ particles_anim_v_frames = 1
particles_anim_loop = false
albedo_texture = ExtResource( 6 )
[sub_resource type="QuadMesh" id=14]
material = SubResource( 13 )
[sub_resource type="QuadMesh" id=13]
material = SubResource( 12 )
[node name="torch" type="Spatial"]
[node name="MeshInstance" type="MeshInstance" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.104118, 0 )
cast_shadow = 0
mesh = ExtResource( 1 )
material/0 = SubResource( 2 )
material/0 = SubResource( 1 )
[node name="fire" type="Spatial" parent="."]
[node name="main_light" type="OmniLight" parent="fire"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.39856, 0 )
layers = 1048575
layers = 7
light_color = Color( 0.843137, 0.811765, 0.564706, 1 )
light_energy = 6.63
light_indirect_energy = 11.3
omni_range = 3.6
omni_attenuation = 2.0
omni_shadow_mode = 0
[node name="OmniLight2" type="OmniLight" parent="fire"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.592104, 1.68979, 0 )
@ -156,8 +156,8 @@ amount = 20
preprocess = 4.7
randomness = 1.0
local_coords = false
process_material = SubResource( 7 )
draw_pass_1 = SubResource( 9 )
process_material = SubResource( 6 )
draw_pass_1 = SubResource( 8 )
[node name="smoke" type="Particles" parent="fire"]
transform = Transform( 1, 0, 0, 0, -1, 8.74228e-008, 0, -8.74228e-008, -1, 0.0386006, 1.97399, 0.0386426 )
@ -166,5 +166,5 @@ lifetime = 1.5
preprocess = 41.2
randomness = 1.0
local_coords = false
process_material = SubResource( 12 )
draw_pass_1 = SubResource( 14 )
process_material = SubResource( 11 )
draw_pass_1 = SubResource( 13 )

@ -32,17 +32,13 @@ script = ExtResource( 1 )
[node name="torch_holder" type="MeshInstance" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0 )
extra_cull_margin = 3840.0
mesh = ExtResource( 2 )
material/0 = SubResource( 1 )
[node name="torch" parent="." instance=ExtResource( 7 )]
transform = Transform( 1, 0, 0, 0, 0.958212, 0.286058, 0, -0.286058, 0.958212, 0, -0.82, 0 )
[node name="SpotLight" type="SpotLight" parent="."]
transform = Transform( 0.354547, 0.598061, 1.18032, 0, -1.22195, 0.619158, 1.32319, -0.16025, -0.316265, 2.16568, 1.36521, -1.36264 )
light_energy = 16.0
editor_only = true
[node name="StaticBody" type="StaticBody" parent="."]
collision_layer = 4

@ -29,4 +29,3 @@ depth_flip_tangent = true
depth_flip_binormal = true
depth_texture = ExtResource( 3 )
uv1_scale = Vector3( 1.5, 1.5, 1 )

Loading…
Cancel
Save