Skip to content
Open
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
27 changes: 26 additions & 1 deletion Scenes/Build/Level1.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=20 format=3 uid="uid://cpmjt7h6bh6yb"]
[gd_scene load_steps=23 format=3 uid="uid://cpmjt7h6bh6yb"]

[ext_resource type="Texture2D" uid="uid://p4cq0akituxu" path="res://Assets/skybox.png" id="1_miutx"]
[ext_resource type="PackedScene" uid="uid://bq7jj8c7sqndr" path="res://Prefabs/Player.tscn" id="2_bpe4b"]
Expand All @@ -11,6 +11,8 @@
[ext_resource type="PackedScene" uid="uid://bpeptod0bu0b" path="res://Scenes/Models/Keyhole.tscn" id="7_wqp84"]
[ext_resource type="PackedScene" uid="uid://b6b7y8x4wuqx" path="res://Scenes/Models/Button.tscn" id="8_lkgv2"]
[ext_resource type="Script" path="res://Scripts/SwitchLevelButton.cs" id="9_sh175"]
[ext_resource type="BankAsset" uid="uid://d22gkr47rbgk0" path="res://addons/FMOD/editor/resources/banks/{7837a0c5-7297-0a75-088d-1759e13b91cf}.tres" id="12_y6b1m"]
[ext_resource type="BankAsset" uid="uid://dmm333fcp5vlw" path="res://addons/FMOD/editor/resources/banks/{e02a8011-03ec-4637-8ec4-9da710c89757}.tres" id="13_g04l8"]

[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_1iwyd"]
panorama = ExtResource("1_miutx")
Expand Down Expand Up @@ -42,6 +44,14 @@ size = Vector3(100, 20, 100)
[sub_resource type="BoxShape3D" id="BoxShape3D_rmrxc"]
size = Vector3(100, 20, 100)

[sub_resource type="EventAsset" id="EventAsset_xjejs"]
is_oneshot = true
min_distance = 1.0
max_distance = 20.0
path = "event:/Level"
guid = "{aeb67668-fa9d-4d10-8ded-31b9a391c15e}"
name = "Level"

[node name="Level1" type="Node3D"]

[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
Expand Down Expand Up @@ -202,6 +212,21 @@ transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 35.482
text = "SANDBOX HERE"
font_size = 128

[node name="StudioBankLoader" type="StudioBankLoader" parent="."]
load_on = 1
unload_on = 3
preload_sample_data = true
num_banks = 2
bank_0 = ExtResource("12_y6b1m")
bank_1 = ExtResource("13_g04l8")

[node name="StudioEventEmitter3D" type="StudioEventEmitter3D" parent="."]
play_event = 1
stop_event = 3
event = SubResource("EventAsset_xjejs")
preload_samples = true
allow_fadeout = false

[connection signal="body_entered" from="Elements/Button" to="Elements/Button" method="OnSwitchLevelButtonActivated"]
[connection signal="body_entered" from="Elements/Button/Area3D" to="Elements/Button/Area3D" method="OnSwitchLevelButtonActivated"]

Expand Down
27 changes: 26 additions & 1 deletion Scenes/Build/Level2.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=23 format=3 uid="uid://bofdbddgtahl4"]
[gd_scene load_steps=26 format=3 uid="uid://bofdbddgtahl4"]

[ext_resource type="Texture2D" uid="uid://p4cq0akituxu" path="res://Assets/skybox.png" id="1_kyvo3"]
[ext_resource type="PackedScene" uid="uid://bq7jj8c7sqndr" path="res://Prefabs/Player.tscn" id="2_fprf6"]
Expand All @@ -14,6 +14,8 @@
[ext_resource type="PackedScene" uid="uid://dthp8c3eggmju" path="res://Prefabs/Laser/PlasmaBolt.tscn" id="10_vvl8g"]
[ext_resource type="Script" path="res://Scripts/PlasmaBolt.cs" id="11_y4011"]
[ext_resource type="AudioStream" uid="uid://c1fsn0od7m1n2" path="res://Sounds/77087__defunct3__laser-short.wav" id="12_vn1xh"]
[ext_resource type="BankAsset" uid="uid://d22gkr47rbgk0" path="res://addons/FMOD/editor/resources/banks/{7837a0c5-7297-0a75-088d-1759e13b91cf}.tres" id="15_rh1ka"]
[ext_resource type="BankAsset" uid="uid://dmm333fcp5vlw" path="res://addons/FMOD/editor/resources/banks/{e02a8011-03ec-4637-8ec4-9da710c89757}.tres" id="16_b11p2"]

[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_1iwyd"]
panorama = ExtResource("1_kyvo3")
Expand Down Expand Up @@ -45,6 +47,14 @@ size = Vector3(100, 20, 100)
[sub_resource type="BoxShape3D" id="BoxShape3D_rmrxc"]
size = Vector3(100, 20, 100)

[sub_resource type="EventAsset" id="EventAsset_6c25x"]
is_oneshot = true
min_distance = 1.0
max_distance = 20.0
path = "event:/Level"
guid = "{aeb67668-fa9d-4d10-8ded-31b9a391c15e}"
name = "Level"

[node name="Level2" type="Node3D"]

[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
Expand Down Expand Up @@ -225,6 +235,21 @@ script = ExtResource("8_w2kfi")
[node name="CollisionShape3D" type="CollisionShape3D" parent="DeathPlane/Area3D"]
shape = SubResource("BoxShape3D_rmrxc")

[node name="StudioBankLoader" type="StudioBankLoader" parent="."]
load_on = 1
unload_on = 3
preload_sample_data = true
num_banks = 2
bank_0 = ExtResource("15_rh1ka")
bank_1 = ExtResource("16_b11p2")

[node name="StudioEventEmitter3D" type="StudioEventEmitter3D" parent="."]
play_event = 1
stop_event = 3
event = SubResource("EventAsset_6c25x")
preload_samples = true
allow_fadeout = false

[connection signal="body_entered" from="Elements/LaserBlaster/PlasmaBolt" to="Elements/LaserBlaster/PlasmaBolt" method="OnPlayerEntered"]

[editable path="Elements/Keyhole"]
Expand Down
27 changes: 26 additions & 1 deletion Scenes/DebugScenes/StartScene.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
[gd_scene load_steps=3 format=3 uid="uid://dkbywpu12oe2c"]
[gd_scene load_steps=6 format=3 uid="uid://dkbywpu12oe2c"]

[ext_resource type="Script" path="res://Scripts/StartGame.cs" id="1_4rdpe"]
[ext_resource type="BankAsset" uid="uid://d22gkr47rbgk0" path="res://addons/FMOD/editor/resources/banks/{7837a0c5-7297-0a75-088d-1759e13b91cf}.tres" id="2_34up4"]
[ext_resource type="Texture2D" uid="uid://c1iadtlo28ile" path="res://icon.png" id="2_vrcsc"]
[ext_resource type="BankAsset" uid="uid://dmm333fcp5vlw" path="res://addons/FMOD/editor/resources/banks/{e02a8011-03ec-4637-8ec4-9da710c89757}.tres" id="3_fufmf"]

[sub_resource type="EventAsset" id="EventAsset_iguhq"]
min_distance = 1.0
max_distance = 20.0
path = "event:/Title"
guid = "{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}"
name = "Title"

[node name="StartScene" type="Control"]
layout_mode = 3
Expand All @@ -12,6 +21,22 @@ grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_4rdpe")

[node name="StudioBankLoader" type="StudioBankLoader" parent="."]
load_on = 1
unload_on = 3
preload_sample_data = true
num_banks = 2
bank_0 = ExtResource("2_34up4")
bank_1 = ExtResource("3_fufmf")

[node name="StudioEventEmitter2D" type="StudioEventEmitter2D" parent="."]
play_event = 2
stop_event = 3
event = SubResource("EventAsset_iguhq")
preload_samples = true

[node name="StudioListener2D" type="StudioListener2D" parent="."]

[node name="Menu" type="VBoxContainer" parent="."]
layout_mode = 1
anchors_preset = -1
Expand Down
6 changes: 6 additions & 0 deletions Scenes/DebugScenes/Title_Theme_Player.gd
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
extends Node2D

@export var event: EventAsset

# Called when the node enters the scene tree for the first time.
func _ready():
8 changes: 4 additions & 4 deletions Scripts/LoadingScene.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ public partial class LoadingScene : Control
//Set as path to intended target scene
private string targetScenePath;
public static int currLevel = 1;
public override void _Ready()
{
public override void _Ready()
{

targetScenePath = "res://Scenes/Build/Level" + currLevel + ".tscn";
ResourceLoader.LoadThreadedRequest(targetScenePath);
TimedSceneSwap();
}
TimedSceneSwap();
}

private async void TimedSceneSwap() {
await Task.Delay(TimeSpan.FromMilliseconds(1500));
Expand Down
Binary file modified addons/FMOD/banks/Desktop/Master.bank
Binary file not shown.
Binary file modified addons/FMOD/banks/Desktop/Master.strings.bank
Binary file not shown.
74 changes: 32 additions & 42 deletions addons/FMOD/editor/cache/fmod_project_cache.tres
Original file line number Diff line number Diff line change
@@ -1,79 +1,69 @@
[gd_resource type="ProjectCache" load_steps=6 format=3 uid="uid://b2ka56j3u141v"]
[gd_resource type="ProjectCache" load_steps=8 format=3 uid="uid://btyguqvq7mhgd"]

[sub_resource type="BankAsset" id="BankAsset_633rn"]
file_path = "res://addons/FMOD/banks/Desktop/Master.bank"
modified_time = 1699599297
path = "bank:/Master"
guid = "{e02a8011-03ec-4637-8ec4-9da710c89757}"
name = "Master"

[sub_resource type="BankAsset" id="BankAsset_m552l"]
file_path = "res://addons/FMOD/banks/Desktop/Master.strings.bank"
modified_time = 1699599297
path = "bank:/Master.strings"
guid = "{7837a0c5-7297-0a75-088d-1759e13b91cf}"
name = "Master.strings"

[sub_resource type="BusAsset" id="BusAsset_sdi5l"]
path = "bus:/Reverb"
guid = "{cc9589d3-1926-4912-82a9-29aca17eb8ae}"
name = "Reverb"

[sub_resource type="BusAsset" id="BusAsset_rc8w5"]
path = "bus:/"
guid = "{a4c296f8-f077-452b-8546-ea7f7bfb8858}"
name = "Master"

[sub_resource type="EventAsset" id="EventAsset_44wlx"]
is_oneshot = true
min_distance = 1.0
max_distance = 20.0
path = "event:/Test"
guid = "{2ab79860-442a-42b0-b956-380fa1dc9a89}"
name = "Test"
[ext_resource type="BankAsset" uid="uid://dmm333fcp5vlw" path="res://addons/FMOD/editor/resources/banks/{e02a8011-03ec-4637-8ec4-9da710c89757}.tres" id="1_dksv3"]
[ext_resource type="BankAsset" uid="uid://d22gkr47rbgk0" path="res://addons/FMOD/editor/resources/banks/{7837a0c5-7297-0a75-088d-1759e13b91cf}.tres" id="2_qis8k"]
[ext_resource type="BusAsset" uid="uid://bpiekrg483d80" path="res://addons/FMOD/editor/resources/busses/{a4c296f8-f077-452b-8546-ea7f7bfb8858}.tres" id="3_cs203"]
[ext_resource type="BusAsset" uid="uid://gvokqkhuthmt" path="res://addons/FMOD/editor/resources/busses/{cc9589d3-1926-4912-82a9-29aca17eb8ae}.tres" id="4_6wfm7"]
[ext_resource type="EventAsset" uid="uid://d3foryxvp0j0e" path="res://addons/FMOD/editor/resources/events/{aeb67668-fa9d-4d10-8ded-31b9a391c15e}.tres" id="5_741pi"]
[ext_resource type="EventAsset" uid="uid://dgq3vinfxngpt" path="res://addons/FMOD/editor/resources/events/{2ab79860-442a-42b0-b956-380fa1dc9a89}.tres" id="5_l8eew"]
[ext_resource type="EventAsset" uid="uid://b1ecmybpopxfm" path="res://addons/FMOD/editor/resources/events/{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}.tres" id="6_sh1gj"]

[resource]
banks = {
"{7837a0c5-7297-0a75-088d-1759e13b91cf}": SubResource("BankAsset_m552l"),
"{e02a8011-03ec-4637-8ec4-9da710c89757}": SubResource("BankAsset_633rn")
"{7837a0c5-7297-0a75-088d-1759e13b91cf}": ExtResource("2_qis8k"),
"{e02a8011-03ec-4637-8ec4-9da710c89757}": ExtResource("1_dksv3")
}
events = {
"{2ab79860-442a-42b0-b956-380fa1dc9a89}": SubResource("EventAsset_44wlx")
"{2ab79860-442a-42b0-b956-380fa1dc9a89}": ExtResource("5_l8eew"),
"{aeb67668-fa9d-4d10-8ded-31b9a391c15e}": ExtResource("5_741pi"),
"{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}": ExtResource("6_sh1gj")
}
busses = {
"{a4c296f8-f077-452b-8546-ea7f7bfb8858}": SubResource("BusAsset_rc8w5"),
"{cc9589d3-1926-4912-82a9-29aca17eb8ae}": SubResource("BusAsset_sdi5l")
"{a4c296f8-f077-452b-8546-ea7f7bfb8858}": ExtResource("3_cs203"),
"{cc9589d3-1926-4912-82a9-29aca17eb8ae}": ExtResource("4_6wfm7")
}
bank_tree = [{
"children": [],
"item_type": 3,
"node_name": "Master",
"path": "bank:/Master",
"resource": SubResource("BankAsset_633rn")
"resource": ExtResource("1_dksv3")
}, {
"children": [],
"item_type": 3,
"node_name": "Master.strings",
"path": "bank:/Master.strings",
"resource": SubResource("BankAsset_m552l")
"resource": ExtResource("2_qis8k")
}]
event_tree = [{
"children": [],
"item_type": 1,
"node_name": "Level",
"path": "event:/Level",
"resource": ExtResource("5_741pi")
}, {
"children": [],
"item_type": 1,
"node_name": "Test",
"path": "event:/Test",
"resource": SubResource("EventAsset_44wlx")
"resource": ExtResource("5_l8eew")
}, {
"children": [],
"item_type": 1,
"node_name": "Title",
"path": "event:/Title",
"resource": ExtResource("6_sh1gj")
}]
bus_tree = [{
"children": [{
"children": [],
"item_type": 4,
"node_name": "Reverb",
"path": "bus:/Reverb",
"resource": SubResource("BusAsset_sdi5l")
"resource": ExtResource("4_6wfm7")
}],
"item_type": 4,
"node_name": "bus:",
"path": "bus:/",
"resource": SubResource("BusAsset_rc8w5")
"resource": ExtResource("3_cs203")
}]
1 change: 1 addition & 0 deletions addons/FMOD/editor/fmod_guids.gd
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class_name FMODGuids

class Events:
const TEST = "{2ab79860-442a-42b0-b956-380fa1dc9a89}"
const TITLE = "{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}"

class Busses:
const MASTER_BUS = "{a4c296f8-f077-452b-8546-ea7f7bfb8858}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[resource]
file_path = "res://addons/FMOD/banks/Desktop/Master.strings.bank"
modified_time = 1699599297
modified_time = 1713509527
path = "bank:/Master.strings"
guid = "{7837a0c5-7297-0a75-088d-1759e13b91cf}"
name = "Master.strings"
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[resource]
file_path = "res://addons/FMOD/banks/Desktop/Master.bank"
modified_time = 1699599297
modified_time = 1713509527
path = "bank:/Master"
guid = "{e02a8011-03ec-4637-8ec4-9da710c89757}"
name = "Master"
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[gd_resource type="EventAsset" format=3 uid="uid://d3foryxvp0j0e"]

[resource]
min_distance = 1.0
max_distance = 20.0
path = "event:/Level"
guid = "{aeb67668-fa9d-4d10-8ded-31b9a391c15e}"
name = "Level"
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[gd_resource type="EventAsset" format=3 uid="uid://b1ecmybpopxfm"]

[resource]
min_distance = 1.0
max_distance = 20.0
path = "event:/Title"
guid = "{f2bfa74c-e31b-4f48-b50c-c85a4989b16d}"
name = "Title"
2 changes: 1 addition & 1 deletion addons/FMOD/fmod.gd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@tool
extends EditorPlugin
extends EditorPlugin
Binary file modified addons/FMOD/test/.cache/buildrecords/Desktop/Master.br
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

4 changes: 0 additions & 4 deletions addons/FMOD/test/.unsaved/.user/Metadata/Mixer.user.xml

This file was deleted.

16 changes: 0 additions & 16 deletions addons/FMOD/test/.unsaved/.user/Metadata/Workspace.user.xml

This file was deleted.

9 changes: 8 additions & 1 deletion addons/FMOD/test/.user/Metadata/Workspace.user.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,20 @@
<relationship name="projectSettings">
<destination>{4e134e64-d867-4bce-8d4a-8dd470e089be}</destination>
</relationship>
<relationship name="changelist">
<destination>{94bffe4b-b542-45f9-8fec-6abe7fff7aff}</destination>
</relationship>
</object>
<object class="ProjectSettings" id="{4e134e64-d867-4bce-8d4a-8dd470e089be}">
<property name="openWindows">
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAAAQAAABYAQQB1AGQAaQBvACAAQgBpAG4AIAAxAAAAQgHZ0MsAAwAAAAAC9wAAAIEAAASIAAADcAAAAvgAAACgAAAEhwAAA28AAAAAAAAAAAeAAAAC+AAAAKAAAASHAAADbw==</value>
<value>AAAAAgAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAoAAAAEYAAAGnwAAArsAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABYAQQB1AGQAaQBvACAAQgBpAG4AIAAxAAAAQgHZ0MsAAwAAAAAC9wAAAIEAAASIAAADcAAAAvgAAACgAAAEhwAAA28AAAAAAAAAAAeAAAAC+AAAAKAAAASHAAADbw==</value>
</property>
<relationship name="activePlatform">
<destination>{29cd3426-e730-466e-a5c3-fddf27a2e065}</destination>
</relationship>
</object>
<object class="WorkspaceChangelist" id="{94bffe4b-b542-45f9-8fec-6abe7fff7aff}" />
</objects>
Binary file added addons/FMOD/test/Assets/Tip_ical_419.wav
Binary file not shown.
Loading