Minor - Adds basic audio component functionality - V13.2.0
Adds basic audio component and loads default sound for testing Adds default sounds to the assets folder and includes them in the project.
This commit is contained in:
13
.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
generated
13
.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
generated
@@ -6,17 +6,9 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="">
|
<list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/component.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/component.h" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj.filters" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj.filters" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/audio_component.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/audio_component.h" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/audio_component.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/audio_component.h" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/identity_component.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/identity_component.h" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/model_path_component.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/model_path_component.h" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/physics_component.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/physics_component.h" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/render_component.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/render_component.h" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/shader_component.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/shader_component.h" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/transform_component.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/components/transform_component.h" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/entity_manager.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/ecs/entity_manager.h" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/imguiManager.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/imguiManager.h" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@@ -258,6 +250,7 @@
|
|||||||
<workItem from="1757449929378" duration="1107000" />
|
<workItem from="1757449929378" duration="1107000" />
|
||||||
<workItem from="1757456559331" duration="2094000" />
|
<workItem from="1757456559331" duration="2094000" />
|
||||||
<workItem from="1757458683204" duration="3628000" />
|
<workItem from="1757458683204" duration="3628000" />
|
||||||
|
<workItem from="1757938327874" duration="1257000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="Minor update - viewport window tweak">
|
<task id="LOCAL-00001" summary="Minor update - viewport window tweak">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
|
|||||||
@@ -474,6 +474,8 @@
|
|||||||
<Content Include="assets\Model\TXT\wall.txt" />
|
<Content Include="assets\Model\TXT\wall.txt" />
|
||||||
<Content Include="assets\Model\TXT\water.txt" />
|
<Content Include="assets\Model\TXT\water.txt" />
|
||||||
<CopyFileToFolders Include="assets\Texture\alpha01.png" />
|
<CopyFileToFolders Include="assets\Texture\alpha01.png" />
|
||||||
|
<Content Include="assets\sounds\default.mp3" />
|
||||||
|
<Content Include="assets\sounds\default.opus" />
|
||||||
<Content Include="assets\Texture\dirt01.png" />
|
<Content Include="assets\Texture\dirt01.png" />
|
||||||
<Content Include="assets\Texture\EmptyTexture.png" />
|
<Content Include="assets\Texture\EmptyTexture.png" />
|
||||||
<Content Include="assets\Texture\font01.png" />
|
<Content Include="assets\Texture\font01.png" />
|
||||||
@@ -503,6 +505,7 @@
|
|||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<None Include="assets\sounds\default.opus" />
|
||||||
<None Include="assets\Texture\imgui.ini" />
|
<None Include="assets\Texture\imgui.ini" />
|
||||||
<None Include="packages.config" />
|
<None Include="packages.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@@ -586,6 +589,13 @@
|
|||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<CopyFileToFolders Include="assets\sounds\default.mp3">
|
||||||
|
<FileType>Document</FileType>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)sounds</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)sounds</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<VCProjectVersion>17.0</VCProjectVersion>
|
<VCProjectVersion>17.0</VCProjectVersion>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
|||||||
@@ -64,6 +64,9 @@
|
|||||||
<Filter Include="Fichiers d%27en-tête\System">
|
<Filter Include="Fichiers d%27en-tête\System">
|
||||||
<UniqueIdentifier>{567548ae-97a4-413e-8d44-86d6e8252487}</UniqueIdentifier>
|
<UniqueIdentifier>{567548ae-97a4-413e-8d44-86d6e8252487}</UniqueIdentifier>
|
||||||
</Filter>
|
</Filter>
|
||||||
|
<Filter Include="Assets\sounds">
|
||||||
|
<UniqueIdentifier>{07d9b560-f7ad-4828-9317-3638b07359f1}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="include\backends\imgui_impl_dx11.cpp">
|
<ClCompile Include="include\backends\imgui_impl_dx11.cpp">
|
||||||
@@ -470,6 +473,9 @@
|
|||||||
<ClInclude Include="src\inc\system\ecs\systems\render_system.h">
|
<ClInclude Include="src\inc\system\ecs\systems\render_system.h">
|
||||||
<Filter>Fichiers d%27en-tête</Filter>
|
<Filter>Fichiers d%27en-tête</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="src\inc\system\ecs\components\audio_component.h">
|
||||||
|
<Filter>Fichiers d%27en-tête</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Image Include="KhaoticIcon.ico">
|
<Image Include="KhaoticIcon.ico">
|
||||||
@@ -662,11 +668,17 @@
|
|||||||
<CopyFileToFolders Include="assets\Model\TXT\water.txt">
|
<CopyFileToFolders Include="assets\Model\TXT\water.txt">
|
||||||
<Filter>Assets\Model\TXT</Filter>
|
<Filter>Assets\Model\TXT</Filter>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="assets\sounds\default.mp3">
|
||||||
|
<Filter>Assets\sounds</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="packages.config" />
|
<None Include="packages.config" />
|
||||||
<None Include="assets\Texture\imgui.ini">
|
<None Include="assets\Texture\imgui.ini">
|
||||||
<Filter>Texture</Filter>
|
<Filter>Texture</Filter>
|
||||||
</None>
|
</None>
|
||||||
|
<None Include="assets\sounds\default.opus">
|
||||||
|
<Filter>Assets\sounds</Filter>
|
||||||
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -98,9 +98,14 @@ public:
|
|||||||
ImGui::TextColored(ImVec4(1.0f, 0.0f, 0.0f, 1.0f), "Erreur: %s", m_lastError.c_str());
|
ImGui::TextColored(ImVec4(1.0f, 0.0f, 0.0f, 1.0f), "Erreur: %s", m_lastError.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
static char path[256] = "F:/Github_Repo/khaotic-engine-Reborn/x64/Release/assets/sounds/default.mp3";
|
// exe path + assets/sounds/default.mp3
|
||||||
|
std::filesystem::path defaultSoundPath = std::filesystem::current_path() / "assets" / "sounds" / "default.mp3";
|
||||||
|
std::string defaultSoundPathStr = defaultSoundPath.string();// Input text with default path
|
||||||
|
char path[260];
|
||||||
|
strncpy_s(path, m_soundPath.empty() ? defaultSoundPathStr.c_str() : m_soundPath.c_str(), sizeof(path));
|
||||||
|
path[sizeof(path) - 1] = '\0'; // Assurer la termination nulle
|
||||||
ImGui::InputText("Chemin du fichier", path, sizeof(path));
|
ImGui::InputText("Chemin du fichier", path, sizeof(path));
|
||||||
|
|
||||||
if (ImGui::Button("Charger le son")) {
|
if (ImGui::Button("Charger le son")) {
|
||||||
if (!Load(path)) {
|
if (!Load(path)) {
|
||||||
// L'erreur est d<>j<EFBFBD> d<>finie dans Load()
|
// L'erreur est d<>j<EFBFBD> d<>finie dans Load()
|
||||||
|
|||||||
Reference in New Issue
Block a user