Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add simple sound node #27

Merged
merged 2 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions addons/block_code/ui/picker/categories/category_factory.gd
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,23 @@ static func get_general_categories() -> Array[BlockCategory]:
var input_list: Array[Block] = _get_input_blocks()
var input_category: BlockCategory = BlockCategory.new("Input", input_list, Color.SLATE_GRAY)

# Sound
var sound_list: Array[Block] = []

b = BLOCKS["statement_block"].instantiate()
b.block_type = Types.BlockType.EXECUTE
b.block_format = "Load file {file_path: STRING} as sound {name: STRING}"
b.statement = "var sound = AudioStreamPlayer.new()\nsound.name = {name}\nsound.set_stream(load({file_path}))\nadd_child(sound)\nsound.set_owner(self)"
sound_list.append(b)

b = BLOCKS["statement_block"].instantiate()
b.block_type = Types.BlockType.EXECUTE
b.block_format = "Play the sound {name: STRING} with Volume dB {db: FLOAT} and Pitch Scale {pitch: FLOAT}"
b.statement = "var sound = find_child({name})\nsound.volume_db = {db}\nsound.pitch_scale = {pitch}\nsound.play()"
sound_list.append(b)

var sound_category: BlockCategory = BlockCategory.new("Sound", sound_list, Color("e30fc0"))

return [
lifecycle_category,
signal_category,
Expand All @@ -244,6 +261,7 @@ static func get_general_categories() -> Array[BlockCategory]:
logic_category,
variable_category,
input_category,
sound_category,
]


Expand Down
Binary file added test_game/test_audio.ogg
Binary file not shown.
19 changes: 19 additions & 0 deletions test_game/test_audio.ogg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://dm0l3peg0ecpe"
path="res://.godot/imported/test_audio.ogg-b11846356471724ec6b59b00f5e31b53.oggvorbisstr"

[deps]

source_file="res://test_game/test_audio.ogg"
dest_files=["res://.godot/imported/test_audio.ogg-b11846356471724ec6b59b00f5e31b53.oggvorbisstr"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
148 changes: 107 additions & 41 deletions test_game/test_game.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=169 format=3 uid="uid://bbwmxee7ukgul"]
[gd_scene load_steps=177 format=3 uid="uid://bbwmxee7ukgul"]

[ext_resource type="PackedScene" uid="uid://ddx1cd5q6t61o" path="res://addons/block_code/simple_nodes/simple_character/simple_character.tscn" id="1_hrpwq"]
[ext_resource type="Script" path="res://addons/block_code/block_code_node/block_code.gd" id="2_ewral"]
Expand All @@ -8,30 +8,24 @@
[ext_resource type="Script" path="res://addons/block_code/block_script_data/block_script_data.gd" id="5_q37d3"]
[ext_resource type="Texture2D" uid="uid://dr8e0tvfxjy1f" path="res://icon.svg" id="7_a27o8"]

[sub_resource type="Resource" id="Resource_bq364"]
[sub_resource type="Resource" id="Resource_uwmna"]
script = ExtResource("3_dpt5n")
block_class = &"StatementBlock"
serialized_props = [["block_name", "statement_block"], ["label", "StatementBlock"], ["color", Color(0.290196, 0.52549, 0.835294, 1)], ["block_type", 1], ["position", Vector2(0, 0)], ["block_format", "Move with player 2 buttons, speed {speed: INT}"], ["statement", "velocity = Input.get_vector(\"player_2_left\", \"player_2_right\", \"player_2_up\", \"player_2_down\")*{speed}
move_and_slide()"], ["param_input_strings", {
"speed": "600"
serialized_props = [["block_name", "statement_block"], ["label", "StatementBlock"], ["color", Color(0.890196, 0.0588235, 0.752941, 1)], ["block_type", 2], ["position", Vector2(0, 0)], ["block_format", "Load file {file_path: STRING} as sound {name: STRING}"], ["statement", "var sound = AudioStreamPlayer.new()
sound.name = {name}
sound.set_stream(load({file_path}))
add_child(sound)
sound.set_owner(self)"], ["param_input_strings", {
"file_path": "res://test_game/test_audio.ogg",
"name": "testsound"
}]]

[sub_resource type="Resource" id="Resource_y4nnw"]
[sub_resource type="Resource" id="Resource_5jnoq"]
script = ExtResource("2_pqvcj")
serialized_block = SubResource("Resource_bq364")
serialized_block = SubResource("Resource_uwmna")
path_child_pairs = []

[sub_resource type="Resource" id="Resource_a8l73"]
script = ExtResource("3_dpt5n")
block_class = &"EntryBlock"
serialized_props = [["block_name", "physics_process_block"], ["label", "EntryBlock"], ["color", Color(0.980392, 0.34902, 0.337255, 1)], ["block_type", 2], ["position", Vector2(460, 94)], ["block_format", "On Physics Process"], ["statement", "func _physics_process(delta):"], ["param_input_strings", {}]]

[sub_resource type="Resource" id="Resource_cel1g"]
script = ExtResource("2_pqvcj")
serialized_block = SubResource("Resource_a8l73")
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_y4nnw")]]

[sub_resource type="Resource" id="Resource_xcbw7"]
[sub_resource type="Resource" id="Resource_2niad"]
script = ExtResource("3_dpt5n")
block_class = &"StatementBlock"
serialized_props = [["block_name", "statement_block"], ["label", "StatementBlock"], ["color", Color(0.941176, 0.764706, 0, 1)], ["block_type", 1], ["position", Vector2(0, 0)], ["block_format", "Send signal {signal: STRING} to group {group: STRING}"], ["statement", "var signal_manager = get_tree().root.get_node_or_null(\"SignalManager\")
Expand All @@ -41,67 +35,139 @@ if signal_manager:
"signal": "will_hi"
}]]

[sub_resource type="Resource" id="Resource_8fbr0"]
[sub_resource type="Resource" id="Resource_hb8ii"]
script = ExtResource("2_pqvcj")
serialized_block = SubResource("Resource_xcbw7")
path_child_pairs = []
serialized_block = SubResource("Resource_2niad")
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_5jnoq")]]

[sub_resource type="Resource" id="Resource_k0oqj"]
[sub_resource type="Resource" id="Resource_nfmdk"]
script = ExtResource("3_dpt5n")
block_class = &"StatementBlock"
serialized_props = [["block_name", "statement_block"], ["label", "StatementBlock"], ["color", Color(0.941176, 0.764706, 0, 1)], ["block_type", 1], ["position", Vector2(0, 0)], ["block_format", "Add to group {group: STRING}"], ["statement", "add_to_group({group})"], ["param_input_strings", {
"group": "Player"
}]]

[sub_resource type="Resource" id="Resource_itbdf"]
[sub_resource type="Resource" id="Resource_kiuvv"]
script = ExtResource("2_pqvcj")
serialized_block = SubResource("Resource_k0oqj")
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_8fbr0")]]
serialized_block = SubResource("Resource_nfmdk")
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_hb8ii")]]

[sub_resource type="Resource" id="Resource_mg1oj"]
[sub_resource type="Resource" id="Resource_4xja7"]
script = ExtResource("3_dpt5n")
block_class = &"StatementBlock"
serialized_props = [["block_name", "statement_block"], ["label", "StatementBlock"], ["color", Color(0.6, 0.537255, 0.87451, 1)], ["block_type", 1], ["position", Vector2(0, 0)], ["block_format", "print {text: STRING}"], ["statement", "print({text})"], ["param_input_strings", {
"text": "Hi Manuel!"
}]]

[sub_resource type="Resource" id="Resource_3b5w0"]
[sub_resource type="Resource" id="Resource_u6g84"]
script = ExtResource("2_pqvcj")
serialized_block = SubResource("Resource_mg1oj")
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_itbdf")]]
serialized_block = SubResource("Resource_4xja7")
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_kiuvv")]]

[sub_resource type="Resource" id="Resource_hu4fg"]
[sub_resource type="Resource" id="Resource_6xoyl"]
script = ExtResource("3_dpt5n")
block_class = &"EntryBlock"
serialized_props = [["block_name", "ready_block"], ["label", "EntryBlock"], ["color", Color(0.980392, 0.34902, 0.337255, 1)], ["block_type", 2], ["position", Vector2(104, 85)], ["block_format", "On Ready"], ["statement", "func _ready():"], ["param_input_strings", {}]]
serialized_props = [["block_name", "ready_block"], ["label", "EntryBlock"], ["color", Color(0.980392, 0.34902, 0.337255, 1)], ["block_type", 1], ["position", Vector2(84, 33)], ["block_format", "On Ready"], ["statement", "func _ready():"], ["param_input_strings", {}]]

[sub_resource type="Resource" id="Resource_xdg8y"]
script = ExtResource("2_pqvcj")
serialized_block = SubResource("Resource_6xoyl")
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_u6g84")]]

[sub_resource type="Resource" id="Resource_7ot84"]
script = ExtResource("3_dpt5n")
block_class = &"ParameterBlock"
serialized_props = [["block_name", "parameter_block"], ["label", "Param"], ["color", Color(0.439216, 0.501961, 0.564706, 1)], ["block_type", 3], ["position", Vector2(0, 0)], ["block_format", "Is action ui_right pressed"], ["statement", "Input.is_action_pressed(\"ui_right\")"], ["param_input_strings", {}]]

[sub_resource type="Resource" id="Resource_pyh8n"]
[sub_resource type="Resource" id="Resource_xyinc"]
script = ExtResource("2_pqvcj")
serialized_block = SubResource("Resource_hu4fg")
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_3b5w0")]]
serialized_block = SubResource("Resource_7ot84")
path_child_pairs = []

[sub_resource type="Resource" id="Resource_j1v52"]
[sub_resource type="Resource" id="Resource_2ykxc"]
script = ExtResource("3_dpt5n")
block_class = &"StatementBlock"
serialized_props = [["block_name", "statement_block"], ["label", "StatementBlock"], ["color", Color(0.890196, 0.0588235, 0.752941, 1)], ["block_type", 2], ["position", Vector2(0, 0)], ["block_format", "Play the sound {name: STRING} with Volume dB {db: FLOAT} and Pitch Scale {pitch: FLOAT}"], ["statement", "var sound = find_child({name})
sound.volume_db = {db}
sound.pitch_scale = {pitch}
sound.play()"], ["param_input_strings", {
"db": "0.0",
"name": "testsound",
"pitch": "1.0"
}]]

[sub_resource type="Resource" id="Resource_s07iu"]
script = ExtResource("2_pqvcj")
serialized_block = SubResource("Resource_2ykxc")
path_child_pairs = []

[sub_resource type="Resource" id="Resource_tu70f"]
script = ExtResource("3_dpt5n")
block_class = &"ControlBlock"
serialized_props = [["block_name", "control_block"], ["label", "Control Block"], ["color", Color(1, 0.678431, 0.462745, 1)], ["block_type", 2], ["position", Vector2(0, 0)], ["block_formats", ["if {cond: BOOL}"]], ["statements", ["if {cond}:"]], ["param_input_strings_array", [{
"cond": ""
}]]]

[sub_resource type="Resource" id="Resource_2hh05"]
script = ExtResource("2_pqvcj")
serialized_block = SubResource("Resource_tu70f")
path_child_pairs = [[NodePath("VBoxContainer/MarginContainer/Rows/Row0/RowHBoxContainer/RowHBox/ParameterInput0/SnapPoint"), SubResource("Resource_xyinc")], [NodePath("VBoxContainer/MarginContainer/Rows/SnapContainer0/SnapPoint"), SubResource("Resource_s07iu")]]

[sub_resource type="Resource" id="Resource_iskmc"]
script = ExtResource("3_dpt5n")
block_class = &"StatementBlock"
serialized_props = [["block_name", "statement_block"], ["label", "StatementBlock"], ["color", Color(0.290196, 0.52549, 0.835294, 1)], ["block_type", 1], ["position", Vector2(0, 0)], ["block_format", "Move with player 2 buttons, speed {speed: INT}"], ["statement", "velocity = Input.get_vector(\"player_2_left\", \"player_2_right\", \"player_2_up\", \"player_2_down\")*{speed}
move_and_slide()"], ["param_input_strings", {
"speed": "600"
}]]

[sub_resource type="Resource" id="Resource_xmana"]
script = ExtResource("2_pqvcj")
serialized_block = SubResource("Resource_iskmc")
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_2hh05")]]

[sub_resource type="Resource" id="Resource_1yx4d"]
script = ExtResource("3_dpt5n")
block_class = &"EntryBlock"
serialized_props = [["block_name", "physics_process_block"], ["label", "EntryBlock"], ["color", Color(0.980392, 0.34902, 0.337255, 1)], ["block_type", 1], ["position", Vector2(79, 270)], ["block_format", "On Physics Process"], ["statement", "func _physics_process(delta):"], ["param_input_strings", {}]]

[sub_resource type="Resource" id="Resource_eifs0"]
script = ExtResource("2_pqvcj")
serialized_block = SubResource("Resource_1yx4d")
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_xmana")]]

[sub_resource type="Resource" id="Resource_2hn5u"]
script = ExtResource("4_xt862")
array = Array[ExtResource("2_pqvcj")]([SubResource("Resource_cel1g"), SubResource("Resource_pyh8n")])
array = Array[ExtResource("2_pqvcj")]([SubResource("Resource_xdg8y"), SubResource("Resource_eifs0")])

[sub_resource type="Resource" id="Resource_l007i"]
script = ExtResource("5_q37d3")
script_inherits = "SimpleCharacter"
block_trees = SubResource("Resource_j1v52")
block_trees = SubResource("Resource_2hn5u")
generated_script = "extends SimpleCharacter

var VAR_DICT := {}

func _physics_process(delta):
velocity = Input.get_vector(\"player_2_left\", \"player_2_right\", \"player_2_up\", \"player_2_down\")*600
move_and_slide()

func _ready():
print('Hi Manuel!')
add_to_group('Player')
var signal_manager = get_tree().root.get_node_or_null(\"SignalManager\")
if signal_manager:
signal_manager.broadcast_signal('Player', 'will_hi')
var sound = AudioStreamPlayer.new()
sound.name = 'testsound'
sound.set_stream(load('res://test_game/test_audio.ogg'))
add_child(sound)
sound.set_owner(self)

func _physics_process(delta):
velocity = Input.get_vector(\"player_2_left\", \"player_2_right\", \"player_2_up\", \"player_2_down\")*600
move_and_slide()
if Input.is_action_pressed(\"ui_right\"):
var sound = find_child('testsound')
sound.volume_db = 0.0
sound.pitch_scale = 1.0
sound.play()

"

Expand Down
Loading