Skip to content

Commit

Permalink
Support sound and shadow toggle
Browse files Browse the repository at this point in the history
  • Loading branch information
Dariasteam committed Jul 26, 2018
1 parent 985fd50 commit 2b31761
Show file tree
Hide file tree
Showing 12 changed files with 142 additions and 22 deletions.
10 changes: 6 additions & 4 deletions Scenes/Column.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,26 @@ geometry/billboard = false
geometry/billboard_y = false
geometry/depth_scale = false
geometry/visible_in_all_rooms = false
geometry/use_baked_light = false
geometry/use_baked_light = true
geometry/baked_light_tex_id = 0
mesh/mesh = ExtResource( 5 )
mesh/skeleton = NodePath("..")
material/0 = null

[node name="DirectionalLight" type="DirectionalLight" parent="."]
[node name="DirectionalLight" type="DirectionalLight" parent="." groups=[
"light",
]]

_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
transform/local = Transform( 0.403186, 0.638602, -0.65546, 0, 0.716257, 0.697836, 0.915118, -0.281357, 0.288785, 0, 0, -21.773 )
layers = 1
params/enabled = true
params/editor_only = false
params/bake_mode = 1
params/bake_mode = 3
params/energy = 0.45
colors/diffuse = Color( 1, 1, 1, 1 )
colors/specular = Color( 1, 1, 1, 1 )
shadow/shadow = false
shadow/shadow = true
shadow/darkening = 0.0
shadow/z_offset = 0.3
shadow/z_slope_scale = 5.0
Expand Down
68 changes: 67 additions & 1 deletion Scenes/Input_Handler.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=1]
[gd_scene load_steps=11 format=1]

[ext_resource path="res:https://input_handler.gd" type="Script" id=1]
[ext_resource path="res:https://Sprites/Particle.png" type="Texture" id=2]
Expand Down Expand Up @@ -36,6 +36,34 @@ func _ready():
global.connect(\"update_progress\", self, \"update_progress\")
"
[sub_resource type="GDScript" id=3]
script/source = "extends Button

onready var light = get_tree().get_nodes_in_group(\"light\")[0]

func _on_Button_toggled( pressed ):
light.set_project_shadows (pressed)

"
[sub_resource type="GDScript" id=4]
script/source = "extends Button

onready var sound_emitters = get_tree().get_nodes_in_group(\"sound_player\")

func _ready():
# Called every time the node is added to the scene.
# Initialization here
pass


func _on_Button1_toggled( pressed ):
global.sound_enabled = pressed

"
[node name="Control" type="Control"]
focus/ignore_mouse = false
Expand Down Expand Up @@ -173,6 +201,44 @@ percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
[node name="Button" type="Button" parent="."]
focus/ignore_mouse = false
focus/stop_mouse = true
size_flags/horizontal = 2
size_flags/vertical = 2
margin/left = 0.0
margin/top = 0.0
margin/right = 66.0
margin/bottom = 51.0
toggle_mode = true
is_pressed = true
enabled_focus_mode = 2
shortcut = null
flat = false
script/script = SubResource( 3 )
[node name="Button1" type="Button" parent="."]
focus/ignore_mouse = false
focus/stop_mouse = true
size_flags/horizontal = 2
size_flags/vertical = 2
margin/left = 652.0
margin/top = 0.0
margin/right = 718.0
margin/bottom = 51.0
toggle_mode = true
is_pressed = true
enabled_focus_mode = 2
shortcut = null
flat = false
script/script = SubResource( 4 )
[connection signal="pressed" from="TouchScreenButton" to="." method="_on_TouchScreenButton_pressed"]
[connection signal="toggled" from="Button" to="Button" method="_on_Button_toggled"]
[connection signal="toggled" from="Button1" to="Button1" method="_on_Button1_toggled"]
13 changes: 8 additions & 5 deletions Scenes/Player.gd
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ func die():
rigid_2.set_sleeping(true)
rigid.set_sleeping(true)

die_sound.play(0)
if (global.sound_enabled):
die_sound.play(0)

big_splash.set_emitting(true)
ball.queue_free()
area.queue_free()
Expand All @@ -89,8 +91,8 @@ func on_platform_passed():
global.update_points((counter + 1) * 10)
global.update_progress()

if (counter == 1):
acceleration_sound.play(2)
if (counter == 1 and global.sound_enabled):
acceleration_sound.play(1.5)

counter += 1
if (counter == n_platforms_to_meteorize - 1):
Expand Down Expand Up @@ -180,8 +182,9 @@ func _on_Area_body_enter(body):
rigid_2.apply_impulse(Vector3(0,0,0), Vector3(0,120,0))
release_camera()
rigid_2.apply_impulse(Vector3(0,0,0), Vector3(0,120,0))
else:
jump_sound.play(0)
else:
if (global.sound_enabled):
jump_sound.play(0)
var aux = decal.instance()
body.get_parent().add_child(aux)
var tr = aux.get_global_transform()
Expand Down
12 changes: 9 additions & 3 deletions Scenes/Player.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,9 @@ wait_time = 2.0
one_shot = false
autostart = false

[node name="JumpSound" type="StreamPlayer" parent="."]
[node name="JumpSound" type="StreamPlayer" parent="." groups=[
"sound_player",
]]

stream/stream = ExtResource( 5 )
stream/play = false
Expand All @@ -660,7 +662,9 @@ stream/paused = false
stream/loop_restart_time = 0.0
stream/buffering_ms = 500

[node name="DieSound" type="StreamPlayer" parent="."]
[node name="DieSound" type="StreamPlayer" parent="." groups=[
"sound_player",
]]

stream/stream = ExtResource( 6 )
stream/play = false
Expand All @@ -671,7 +675,9 @@ stream/paused = false
stream/loop_restart_time = 0.0
stream/buffering_ms = 500

[node name="AccelerationSound" type="StreamPlayer" parent="."]
[node name="AccelerationSound" type="StreamPlayer" parent="." groups=[
"sound_player",
]]

stream/stream = ExtResource( 7 )
stream/play = false
Expand Down
2 changes: 1 addition & 1 deletion Scenes/Segment_Tall.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ script/script = ExtResource( 1 )
[node name="REGULAR" type="MeshInstance" parent="."]

_import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
transform/local = Transform( 2, 0, 0, 0, 14, 0, 0, 0, 2, 0, 2.98308, 0 )
transform/local = Transform( 1.99, 0, 0, 0, 14, 0, 0, 0, 1.99, 0, 2.98308, 0 )
layers = 1
geometry/visible = true
geometry/material_override = null
Expand Down
33 changes: 33 additions & 0 deletions Scenes/bakedlight.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[gd_resource type="BakedLight" format=1]

[resource]

mode/mode = 0
baking/format = 0
baking/cell_subdiv = 8
baking/lattice_subdiv = 4
baking/light_bounces = 1
baking/plot_size = 2.5
baking/energy_mult = 2.0
baking/gamma_adjust = 0.7
baking/saturation = 1.0
baking_flags/diffuse = true
baking_flags/specular = false
baking_flags/translucent = true
baking_flags/conserve_energy = false
baking_flags/linear_color = false
lightmap/use_only_uv2 = false
octree = ByteArray( )
light = ByteArray( )
sampler_octree = IntArray( )
lightmaps = [ ]
advanced/cell_margin = 0.05
advanced/edge_damp = 0.0
advanced/normal_damp = 0.0
advanced/light_tint = 0.0
advanced/ao_radius = 2.5
advanced/ao_strength = 0.7
realtime/enabled = true
realtime/color = Color( 1, 1, 1, 1 )
realtime/energy = 1.0

3 changes: 2 additions & 1 deletion Scenes/end_line.gd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ onready var offset = float(360) / SEGMENTS
func _on_Area_body_enter( body ):
body.get_parent().end_animation()

get_node("StreamPlayer").play(1)
if (global.sound_enabled):
get_node("StreamPlayer").play(1)
disconnect("body_enter", self, "_on_Area_body_enter")
set_enable_monitoring(false)
get_node("Timer").start()
Expand Down
3 changes: 2 additions & 1 deletion Scenes/first_platform.gd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ func _ready():
children.add_child(aux)

func explode():
get_node("StreamPlayer").play(0)
if (global.sound_enabled):
get_node("StreamPlayer").play(0)
for child in children.get_children():
child.explode()
area.queue_free()
Expand Down
8 changes: 5 additions & 3 deletions Scenes/platform.gd
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,16 @@ func _ready():
func _process(delta):
rotate(Vector3(0,1,0), velocity * 0.0003)

func explode():
get_node("RegularExplosion").play(0)
func explode():
if (global.sound_enabled):
get_node("RegularExplosion").play()
area.queue_free()
for child in children.get_children():
child.explode()

func meteorize():
get_node("BigExplosion").play()
if (global.sound_enabled):
get_node("BigExplosion").play()
for child in children.get_children():
child.meteorize()
explode()
Expand Down
10 changes: 7 additions & 3 deletions Scenes/platform.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,22 @@ shape = SubResource( 1 )
trigger = false
_update_shape_index = 0

[node name="RegularExplosion" type="StreamPlayer" parent="."]
[node name="RegularExplosion" type="StreamPlayer" parent="." groups=[
"sound_player",
]]

stream/stream = ExtResource( 2 )
stream/play = true
stream/loop = false
stream/volume_db = 10.0
stream/autoplay = false
stream/paused = false
stream/paused = true
stream/loop_restart_time = 0.0
stream/buffering_ms = 500

[node name="BigExplosion" type="StreamPlayer" parent="."]
[node name="BigExplosion" type="StreamPlayer" parent="." groups=[
"sound_player",
]]

stream/stream = ExtResource( 3 )
stream/play = true
Expand Down
1 change: 1 addition & 0 deletions global.gd
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ var environment_palette = []
var current_palette

var player
var sound_enabled = true

var player_color = []
var decal_materials = []
Expand Down
1 change: 1 addition & 0 deletions input_handler.gd
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ func _on_TouchScreenButton_pressed():
last_pos = get_local_mouse_pos().x
game.lock_rot();


0 comments on commit 2b31761

Please sign in to comment.