Merge pull request #205 from vnen/fix-reverb-platformer

Fix reverb predelay feedback for platformer 3d

2d/isometric/dungeon.tscn

@@ -24,6 +24,7 @@ collision_mask = 1
 occluder_light_mask = 1
 format = 1
 tile_data = PoolIntArray( -851956, 0, -1200553578, -851955, 0, -1200553578, -851954, 0, -1200553578, -786420, 1, -1200553578, -786419, 0, -1200553578, -786418, 0, -1200553578, -720884, 0, -1200553578, -720883, 0, -1200553578, -720882, 0, -1200553578, -655348, 1, -1200553578, -655347, 0, -1200553578, -655346, 0, -1200553578, -589812, 1, -1200553578, -589811, 0, -1200553578, -589810, 0, -1200553578, -524276, 0, -1200553578, -524275, 1, -1200553578, -524274, 0, -1200553578, -458740, 0, -1200553578, -458739, 0, -1200553578, -458738, 0, -1200553578, -393210, 0, -1200553578, -393209, 0, -1200553578, -393208, 0, -1200553578, -393207, 0, -1200553578, -393206, 0, -1200553578, -393205, 0, -1200553578, -393204, 0, -1200553578, -393203, 0, -1200553578, -393202, 0, -1200553578, -327674, 0, -1200553578, -327673, 0, -1200553578, -327672, 1, -1200553578, -327671, 1, -1200553578, -327670, 1, -1200553578, -327669, 1, -1200553578, -327668, 1, -1200553578, -327667, 0, -1200553578, -327666, 0, -1200553578, -262138, 0, -1200553578, -262137, 0, -1200553578, -262136, 0, -1200553578, -262135, 0, -1200553578, -262134, 0, -1200553578, -262133, 0, -1200553578, -262132, 0, -1200553578, -262131, 0, -1200553578, -262130, 0, -1200553578, -196602, 0, -1200553578, -196601, 0, -1200553578, -196600, 0, -1200553578, -196599, 0, -1200553578, -196598, 0, -1200553578, -196597, 0, -1200553578, -196596, 0, -1200553578, -196595, 0, -1200553578, -196594, 0, -1200553578, -131066, 0, -1200553578, -131065, 0, -1200553578, -131064, 0, -1200553578, -131063, 0, -1200553578, -65530, 0, -1200553578, -65529, 0, -1200553578, -65528, 0, -1200553578, -65527, 0, -1200553578, 6, 0, -1200553578, 7, 1, -1200553578, 8, 0, -1200553578, 9, 0, -1200553578, 65542, 0, -1200553578, 65543, 0, -1200553578, 65544, 0, -1200553578, 65545, 0, -1200553578, 131078, 0, -1200553578, 131079, 0, -1200553578, 131080, 0, -1200553578, 131081, 0, -1200553578, 196614, 0, -1200553578, 196615, 0, -1200553578, 196616, 0, -1200553578 )
+_sections_unfolded = [ "Cell" ]
 
 [node name="walls" type="TileMap" parent="." index="1"]
 
@@ -43,7 +44,8 @@ collision_layer = 1
 collision_mask = 1
 occluder_light_mask = 1
 format = 1
-tile_data = PoolIntArray( -917493, 2, -1200553578, -917492, 2, -1200553578, -917491, 2, -1200553578, -917490, 2, -1200553578, -917489, 2, -1200553578, -851957, 2, -1200553578, -851956, 3, -1200553578, -851954, 3, -1200553578, -851953, 2, -1200553578, -786421, 2, -1200553578, -786420, 3, -1200553578, -786418, 3, -1200553578, -786417, 2, -1200553578, -720885, 2, -1200553578, -720881, 2, -1200553578, -655349, 2, -1200553578, -655348, 2, -1200553578, -655346, 3, -1200553578, -655345, 2, -1200553578, -589813, 2, -1200553578, -589809, 2, -1200553578, -524277, 2, -1200553578, -524273, 2, -1200553578, -458747, 2, -1200553578, -458746, 2, -1200553578, -458745, 2, -1200553578, -458744, 536870916, -1200553578, -458743, 536870916, -1200553578, -458742, 2, -1200553578, -458741, 2, -1200553578, -458740, 2, -1200553578, -458738, 2, -1200553578, -458737, 2, -1200553578, -393211, 2, -1200553578, -393209, 3, -1200553578, -393205, 3, -1200553578, -393201, 2, -1200553578, -327675, 4, -1200553578, -327665, 2, -1200553578, -262139, 4, -1200553578, -262134, 3, -1200553578, -262133, 3, -1200553578, -262129, 2, -1200553578, -196603, 2, -1200553578, -196601, 3, -1200553578, -196593, 2, -1200553578, -131067, 2, -1200553578, -131066, 3, -1200553578, -131062, 2, -1200553578, -131061, 2, -1200553578, -131060, 2, -1200553578, -131059, 2, -1200553578, -131058, 2, -1200553578, -131057, 2, -1200553578, -65531, 2, -1200553578, -65530, 2, -1200553578, -65527, 2, -1200553578, -65526, 2, -1200553578, 5, 2, -1200553578, 10, 2, -1200553578, 65541, 2, -1200553578, 65543, 3, -1200553578, 65546, 2, -1200553578, 131077, 2, -1200553578, 131082, 2, -1200553578, 196613, 2, -1200553578, 196618, 2, -1200553578, 262149, 2, -1200553578, 262150, 2, -1200553578, 262151, 2, -1200553578, 262152, 2, -1200553578, 262153, 2, -1200553578, 262154, 2, -1200553578 )
+tile_data = PoolIntArray( -917493, 2, -1200553578, -917492, 2, -1200553578, -917491, 2, -1200553578, -917490, 2, -1200553578, -917489, 2, -1200553578, -851957, 2, -1200553578, -851956, 3, -1200553578, -851954, 3, -1200553578, -851953, 2, -1200553578, -786421, 2, -1200553578, -786420, 3, -1200553578, -786418, 3, -1200553578, -786417, 2, -1200553578, -720885, 2, -1200553578, -720881, 2, -1200553578, -655349, 2, -1200553578, -655348, 2, -1200553578, -655346, 3, -1200553578, -655345, 2, -1200553578, -589813, 2, -1200553578, -589809, 2, -1200553578, -524277, 2, -1200553578, -524273, 2, -1200553578, -458747, 2, -1200553578, -458746, 2, -1200553578, -458745, 2, -1200553578, -458744, 536870916, -1200553578, -458743, 536870916, -1200553578, -458742, 2, -1200553578, -458741, 2, -1200553578, -458740, 2, -1200553578, -458738, 2, -1200553578, -458737, 2, -1200553578, -393211, 2, -1200553578, -393209, 3, -1200553578, -393205, 3, -1200553578, -393201, 2, -1200553578, -327675, 4, -1200553578, -327665, 2, -1200553578, -262139, 4, -1200553578, -262129, 2, -1200553578, -196603, 2, 0, -196601, 3, 0, -196593, 2, -1200553578, -131067, 2, 0, -131062, 2, -1200553578, -131061, 2, -1200553578, -131060, 2, -1200553578, -131059, 2, -1200553578, -131058, 2, -1200553578, -131057, 2, -1200553578, -65531, 2, 0, -65530, 2, 0, -65527, 2, -1200553578, -65526, 2, -1200553578, 5, 2, -1200553578, 10, 2, 0, 65541, 2, -1200553578, 65546, 2, 0, 131077, 2, -1200553578, 131081, 3, 0, 131082, 2, 0, 196613, 2, -1200553578, 196618, 2, 0, 262149, 2, -1200553578, 262150, 2, -1200553578, 262151, 2, -1200553578, 262152, 2, -1200553578, 262153, 2, -1200553578, 262154, 2, -1200553578 )
+_sections_unfolded = [ "Cell" ]
 
 [node name="troll" parent="walls" index="0" instance=ExtResource( 2 )]
 

2d/isometric/tileset.tres

@@ -1,72 +1,82 @@
-[gd_resource type="TileSet" load_steps=6 format=2]
+[gd_resource type="TileSet" load_steps=5 format=2]
 
 [ext_resource path="res://isotiles.png" type="Texture" id=1]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -68, 2, -4, -30, 60, 2, -4, 34 )
+points = PoolVector2Array( -4, -30, 60, 2, -4, 34, -68, 2 )
 
 [sub_resource type="ConvexPolygonShape2D" id=2]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( -20, -6, -4, -22, 12, -22, 4, 10, -4, 10 )
+points = PoolVector2Array( -4, -22, 12, -22, 28, -6, 4, 10, -4, 10, -20, -6 )
 
 [sub_resource type="ConvexPolygonShape2D" id=3]
 
 custom_solver_bias = 0.0
-points = PoolVector2Array( 28, -6, 4, 10, 12, -22 )
-
-[sub_resource type="ConvexPolygonShape2D" id=4]
-
-custom_solver_bias = 0.0
-points = PoolVector2Array( 66.095, -0.62516, -5.90501, 31.3748, -21.905, 23.3748, 50.095, -8.62516 )
+points = PoolVector2Array( -21.905, 23.3748, 50.095, -8.62516, 66.095, -0.62516, -5.90501, 31.3748 )
 
 [resource]
 
 0/name = "base"
 0/texture = ExtResource( 1 )
-0/tex_offset = Vector2( -4, 6 )
+0/tex_offset = Vector2( -66, -42 )
 0/modulate = Color( 1, 1, 1, 1 )
 0/region = Rect2( 28, 92, 132, 84 )
-0/occluder_offset = Vector2( 66, 42 )
-0/navigation_offset = Vector2( 66, 42 )
-0/shape_offset = Vector2( 0, 0 )
+0/is_autotile = false
+0/occluder_offset = Vector2( 0, 0 )
+0/navigation_offset = Vector2( 0, 0 )
 0/shapes = [  ]
 1/name = "base2"
 1/texture = ExtResource( 1 )
-1/tex_offset = Vector2( -4, 6 )
+1/tex_offset = Vector2( -66, -42 )
 1/modulate = Color( 1, 1, 1, 1 )
 1/region = Rect2( 220, 92, 132, 84 )
-1/occluder_offset = Vector2( 66, 42 )
-1/navigation_offset = Vector2( 66, 42 )
-1/shape_offset = Vector2( 0, 0 )
+1/is_autotile = false
+1/occluder_offset = Vector2( 0, 0 )
+1/navigation_offset = Vector2( 0, 0 )
 1/shapes = [  ]
 2/name = "wall"
 2/texture = ExtResource( 1 )
-2/tex_offset = Vector2( -4, -32 )
+2/tex_offset = Vector2( -69.3109, -99.8051 )
 2/modulate = Color( 1, 1, 1, 1 )
 2/region = Rect2( 28, 220, 132, 136 )
-2/occluder_offset = Vector2( 66, 68 )
-2/navigation_offset = Vector2( 66, 68 )
-2/shape_offset = Vector2( 66, 68 )
-2/shapes = [ SubResource( 1 ) ]
+2/is_autotile = false
+2/occluder_offset = Vector2( 0, 0 )
+2/navigation_offset = Vector2( 0, 0 )
+2/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"shape": SubResource( 1 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 3/name = "column"
 3/texture = ExtResource( 1 )
-3/tex_offset = Vector2( -2, -32 )
+3/tex_offset = Vector2( -69.5632, -100.446 )
 3/modulate = Color( 1, 1, 1, 1 )
 3/region = Rect2( 220, 220, 132, 136 )
-3/occluder_offset = Vector2( 66, 68 )
-3/navigation_offset = Vector2( 66, 68 )
-3/shape_offset = Vector2( 66, 68 )
-3/shapes = [ SubResource( 2 ), SubResource( 3 ) ]
+3/is_autotile = false
+3/occluder_offset = Vector2( 0, 0 )
+3/navigation_offset = Vector2( 0, 0 )
+3/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"shape": SubResource( 2 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 4/name = "door1"
 4/texture = ExtResource( 1 )
-4/tex_offset = Vector2( 16, -22 )
+4/tex_offset = Vector2( -50.3623, -90.8164 )
 4/modulate = Color( 1, 1, 1, 1 )
 4/region = Rect2( 24, 408, 132, 136 )
-4/occluder_offset = Vector2( 66, 68 )
-4/navigation_offset = Vector2( 66, 68 )
-4/shape_offset = Vector2( 66, 68 )
-4/shapes = [ SubResource( 4 ) ]
+4/is_autotile = false
+4/occluder_offset = Vector2( 0, 0 )
+4/navigation_offset = Vector2( 0, 0 )
+4/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"shape": SubResource( 3 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 

2d/isometric/tileset_edit.tscn

@@ -4,28 +4,37 @@
 
 [node name="Node2D" type="Node2D"]
 
-[node name="base" type="Sprite" parent="."]
+[node name="base" type="Sprite" parent="." index="0"]
 
-position = Vector2( 87.5658, 0.113792 )
+position = Vector2( 150.049, 61.1264 )
 texture = ExtResource( 1 )
-offset = Vector2( -4, 6 )
+centered = false
+offset = Vector2( -66, -42 )
+region_enabled = true
 region_rect = Rect2( 28, 92, 132, 84 )
+_sections_unfolded = [ "Offset", "Region" ]
 
-[node name="base2" type="Sprite" parent="."]
+[node name="base2" type="Sprite" parent="." index="1"]
 
-position = Vector2( 196, 44 )
+position = Vector2( 257.013, 124.86 )
 texture = ExtResource( 1 )
-offset = Vector2( -4, 6 )
+centered = false
+offset = Vector2( -66, -42 )
+region_enabled = true
 region_rect = Rect2( 220, 92, 132, 84 )
+_sections_unfolded = [ "Offset", "Region" ]
 
-[node name="wall" type="Sprite" parent="."]
+[node name="wall" type="Sprite" parent="." index="2"]
 
-position = Vector2( 356, 70 )
+position = Vector2( 421.311, 137.805 )
 texture = ExtResource( 1 )
-offset = Vector2( -4, -32 )
+centered = false
+offset = Vector2( -69.3109, -99.8051 )
+region_enabled = true
 region_rect = Rect2( 28, 220, 132, 136 )
+_sections_unfolded = [ "Offset", "Region" ]
 
-[node name="StaticBody2D" type="StaticBody2D" parent="wall"]
+[node name="StaticBody2D" type="StaticBody2D" parent="wall" index="0"]
 
 input_pickable = false
 collision_layer = 1
@@ -34,20 +43,24 @@ constant_linear_velocity = Vector2( 0, 0 )
 constant_angular_velocity = 0.0
 friction = 1.0
 bounce = 0.0
+_sections_unfolded = [ "Transform" ]
 
-[node name="collision" type="CollisionPolygon2D" parent="wall/StaticBody2D"]
+[node name="collision" type="CollisionPolygon2D" parent="wall/StaticBody2D" index="0"]
 
 build_mode = 0
 polygon = PoolVector2Array( -68, 2, -4, 34, 60, 2, -4, -30 )
 
-[node name="column" type="Sprite" parent="."]
+[node name="column" type="Sprite" parent="." index="3"]
 
-position = Vector2( 292, 198 )
+position = Vector2( 359.563, 266.446 )
 texture = ExtResource( 1 )
-offset = Vector2( -2, -32 )
+centered = false
+offset = Vector2( -69.5632, -100.446 )
+region_enabled = true
 region_rect = Rect2( 220, 220, 132, 136 )
+_sections_unfolded = [ "Offset", "Region" ]
 
-[node name="StaticBody" type="StaticBody2D" parent="column"]
+[node name="StaticBody" type="StaticBody2D" parent="column" index="0"]
 
 input_pickable = false
 collision_layer = 1
@@ -56,20 +69,24 @@ constant_linear_velocity = Vector2( 0, 0 )
 constant_angular_velocity = 0.0
 friction = 1.0
 bounce = 0.0
+_sections_unfolded = [ "Transform" ]
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="column/StaticBody"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="column/StaticBody" index="0"]
 
 build_mode = 0
 polygon = PoolVector2Array( -20, -6, -4, 10, 4, 10, 28, -6, 12, -22, -4, -22 )
 
-[node name="door1" type="Sprite" parent="."]
+[node name="door1" type="Sprite" parent="." index="4"]
 
-position = Vector2( 85.905, 0.62516 )
+position = Vector2( -24.1548, 142.216 )
 texture = ExtResource( 1 )
-offset = Vector2( 16, -22 )
+centered = false
+offset = Vector2( -50.3623, -90.8164 )
+region_enabled = true
 region_rect = Rect2( 24, 408, 132, 136 )
+_sections_unfolded = [ "Offset", "Region" ]
 
-[node name="StaticBody2D" type="StaticBody2D" parent="door1"]
+[node name="StaticBody2D" type="StaticBody2D" parent="door1" index="0"]
 
 input_pickable = false
 collision_layer = 1
@@ -78,8 +95,9 @@ constant_linear_velocity = Vector2( 0, 0 )
 constant_angular_velocity = 0.0
 friction = 1.0
 bounce = 0.0
+_sections_unfolded = [ "Transform" ]
 
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="door1/StaticBody2D"]
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="door1/StaticBody2D" index="0"]
 
 build_mode = 0
 polygon = PoolVector2Array( -5.90501, 31.3748, 66.095, -0.62516, 50.095, -8.62516, -21.905, 23.3748 )

3d/platformer/default_bus_layout.tres

@@ -4,7 +4,7 @@
 
 resource_name = "Reverb"
 predelay_msec = 150.0
-predelay_feedback = 150.0
+predelay_feedback = 0.8
 room_size = 0.33
 damping = 0.32
 spread = 1.0
@@ -21,7 +21,7 @@ volume_db = 0.0
 
 resource_name = "Reverb"
 predelay_msec = 150.0
-predelay_feedback = 150.0
+predelay_feedback = 0.8
 room_size = 0.89
 damping = 0.17
 spread = 1.0

3d/platformer/robot_walk.wav.import

@@ -10,7 +10,7 @@ source_file="res://robot_walk.wav"
 source_md5="96695430153c689bb7d67c72b2668656"
 
 dest_files=[ "res://.import/robot_walk.wav-4313e7d5f563e62e3923080b14a79c15.sample" ]
-dest_md5="02aaa8a5ac8872165cc05a71fe9cf2fa"
+dest_md5="4d8de1222f5b661316e32ed612fe5e3f"
 
 [params]
 

3d/platformer/sound_coin.wav.import

@@ -10,7 +10,7 @@ source_file="res://sound_coin.wav"
 source_md5="c9b8b4e85a53ce0e7add721a872d0479"
 
 dest_files=[ "res://.import/sound_coin.wav-b4defacd1a1eab95585c7b5095506878.sample" ]
-dest_md5="a5c99ee24792b7e1b62ffe0c66a8edbe"
+dest_md5="542f0e54992f13943960a4ba3d92d25b"
 
 [params]
 

3d/platformer/sound_explode.wav.import

@@ -10,7 +10,7 @@ source_file="res://sound_explode.wav"
 source_md5="c49bffd6268c2fb061a578c559fbd988"
 
 dest_files=[ "res://.import/sound_explode.wav-23e94be75a4346bffb517c7e07035977.sample" ]
-dest_md5="7415ca619baef1372a2b639078e6614f"
+dest_md5="389669f4f619bc262f193e2690441702"
 
 [params]
 

3d/platformer/sound_hit.wav.import

@@ -10,7 +10,7 @@ source_file="res://sound_hit.wav"
 source_md5="ce60125d5b1639a3b88d652aea6ca0c3"
 
 dest_files=[ "res://.import/sound_hit.wav-d8455980ada2d4a9a73508948d7317cc.sample" ]
-dest_md5="5c03dd1fa4210af447e9218d29e7add5"
+dest_md5="8fd07bb22183997827c99038f32cfce6"
 
 [params]
 

3d/platformer/sound_jump.wav.import

@@ -10,7 +10,7 @@ source_file="res://sound_jump.wav"
 source_md5="f15f2f75683475fb46217cb108a91d44"
 
 dest_files=[ "res://.import/sound_jump.wav-4966d1f327e26a176b56ab335c03b5e1.sample" ]
-dest_md5="d93302188764fedd122195b34b711ceb"
+dest_md5="ed4b4900592085ee75dcc3a9cbd8d999"
 
 [params]
 

3d/platformer/sound_shoot.wav.import

@@ -10,7 +10,7 @@ source_file="res://sound_shoot.wav"
 source_md5="5c1909840119124623da414167fad697"
 
 dest_files=[ "res://.import/sound_shoot.wav-f0f26619cba21d411b53ad23b8788116.sample" ]
-dest_md5="8c33ecb945ea94e05e6be5ee5a7b0c6b"
+dest_md5="f8ee1819f359ada59454d9e368103a8e"
 
 [params]
 

3d/platformer/texture.png.import

@@ -10,7 +10,7 @@ source_file="res://texture.png"
 source_md5="46505d8c8180cb3fcbdc17f7b684c754"
 
 dest_files=[ "res://.import/texture.png-77dc6ecaf884a35cd9dbaf886cacc46d.stex" ]
-dest_md5="b822a0e9914c432cab879950ec20de54"
+dest_md5="4c56ebe2f7c52c891e77b4b40ea15664"
 
 [params]