Skip to content
Closed
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@
[submodule "StarEngine/vendor/Box2D"]
path = StarEngine/vendor/Box2D
url = https://github.com/sheazywi/box2d
[submodule "StarEngine/vendor/FMOD-Audio"]
path = StarEngine/vendor/FMOD-Audio
url = https://github.com/sheazywi/FMOD-Audio-Engine
2 changes: 2 additions & 0 deletions Dependencies.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ IncludeDir["ImGui"] = "%{wks.location}/StarEngine/vendor/imgui"
IncludeDir["ImGuizmo"] = "%{wks.location}/StarEngine/vendor/imguizmo"
IncludeDir["glm"] = "%{wks.location}/StarEngine/vendor/glm"
IncludeDir["entt"] = "%{wks.location}/StarEngine/vendor/entt/include"
IncludeDir["FMODCore"] = "%{wks.location}/StarEngine/vendor/FMOD-Audio/AudioEngine/Include"
IncludeDir["FMODEngine"] = "%{wks.location}/StarEngine/vendor/FMOD-Audio/AudioEngine"
IncludeDir["shaderc"] = "%{wks.location}/StarEngine/vendor/shaderc/include"
IncludeDir["SPIRV_Cross"] = "%{wks.location}/StarEngine/vendor/SPIRV-Cross"
IncludeDir["VulkanSDK"] = "%{VULKAN_SDK}/Include"
Expand Down
5 changes: 4 additions & 1 deletion StarEngine/premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ project "StarEngine"
"%{IncludeDir.entt}",
"%{IncludeDir.yaml_cpp}",
"%{IncludeDir.ImGuizmo}",
"%{IncludeDir.FMODCore}",
"%{IncludeDir.FMODEngine}",
"%{IncludeDir.VulkanSDK}"
}

Expand All @@ -64,6 +66,7 @@ project "StarEngine"

defines
{

}

filter "configurations:Debug"
Expand Down Expand Up @@ -103,4 +106,4 @@ project "StarEngine"
}

filter "action:vs2022"
buildoptions { "/utf-8" }
buildoptions { "/utf-8" }
10 changes: 10 additions & 0 deletions StarEngine/src/StarEngine/Core/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ namespace StarEngine
m_Window = Window::Create(WindowProps(m_Specification.Name));
m_Window->SetEventCallback(SE_BIND_EVENT_FN(Application::OnEvent));

m_AudioEngine = new AudioEngine();

m_AudioEngine->Init();

Renderer::Init();

m_ImGuiLayer = new ImGuiLayer();
Expand All @@ -36,6 +40,10 @@ namespace StarEngine
{
SE_PROFILE_FUNCTION();

m_AudioEngine->Terminate();
m_AudioEngine = nullptr;
delete m_AudioEngine;

Renderer::Shutdown();
}

Expand Down Expand Up @@ -107,6 +115,8 @@ namespace StarEngine
m_ImGuiLayer->End();
}

m_AudioEngine->Update();

m_Window->OnUpdate();
}
}
Expand Down
6 changes: 5 additions & 1 deletion StarEngine/src/StarEngine/Core/Application.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

#include "StarEngine/ImGui/ImGuiLayer.h"

#include "AudioEngine.h"

int main(int argc, char** argv);

namespace StarEngine
Expand Down Expand Up @@ -68,8 +70,10 @@ namespace StarEngine
LayerStack m_LayerStack;
float m_LastFrameTime = 0.0f;
private:
AudioEngine* m_AudioEngine;

static Application* s_Instance;
friend int ::main(int argc, char** argv);
friend int::main(int argc, char** argv);
};

// To be defined in CLIENT
Expand Down
1 change: 1 addition & 0 deletions StarEngine/vendor/FMOD-Audio
Submodule FMOD-Audio added at df8f01
1 change: 1 addition & 0 deletions premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ group "Dependencies"
include "StarEngine/vendor/GLAD"
include "StarEngine/vendor/imgui"
include "StarEngine/vendor/yaml-cpp"
include "StarEngine/vendor/FMOD-Audio"
group ""

include "StarEngine"
Expand Down
Loading