Initial integration of audio to entity structure
This commit is contained in:
+13
-36
@@ -93,6 +93,19 @@ int main()
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
glCullFace(GL_BACK);
|
||||
|
||||
/*
|
||||
*******************
|
||||
* INITIALISE AUDIO
|
||||
*******************
|
||||
*/
|
||||
i32 result = audio_init();
|
||||
if (result)
|
||||
{
|
||||
#ifdef DENGINE_DEBUG
|
||||
ASSERT(INVALID_CODE_PATH);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
*******************
|
||||
* INITIALISE GAME
|
||||
@@ -108,40 +121,6 @@ int main()
|
||||
|
||||
glfwSetWindowUserPointer(window, CAST(void *)(&worldTraveller));
|
||||
|
||||
/*
|
||||
*******************
|
||||
* INITIALISE AUDIO
|
||||
*******************
|
||||
*/
|
||||
i32 result = audio_init();
|
||||
if (result)
|
||||
{
|
||||
#ifdef DENGINE_DEBUG
|
||||
ASSERT(INVALID_CODE_PATH);
|
||||
#endif
|
||||
}
|
||||
|
||||
AudioRenderer audioRenderer = {0};
|
||||
audio_rendererInit(&audioRenderer);
|
||||
|
||||
/* Load audio assets */
|
||||
char *audioPath = "data/audio/Nobuo Uematsu - Battle 1.ogg";
|
||||
asset_loadVorbis(&worldTraveller.assetManager, &worldTraveller.arena,
|
||||
audioPath, audiolist_battle);
|
||||
audioPath = "data/audio/Yuki Kajiura - Swordland.ogg";
|
||||
asset_loadVorbis(&worldTraveller.assetManager, &worldTraveller.arena,
|
||||
audioPath, audiolist_overworld);
|
||||
AudioVorbis *audio =
|
||||
asset_getVorbis(&worldTraveller.assetManager, audiolist_battle);
|
||||
|
||||
audio_streamVorbis(&audioRenderer, audio);
|
||||
|
||||
AudioRenderer overworldAudioRenderer = {0};
|
||||
audio_rendererInit(&overworldAudioRenderer);
|
||||
AudioVorbis *overworldAudio =
|
||||
asset_getVorbis(&worldTraveller.assetManager, audiolist_overworld);
|
||||
audio_streamVorbis(&overworldAudioRenderer, overworldAudio);
|
||||
|
||||
/*
|
||||
*******************
|
||||
* GAME LOOP
|
||||
@@ -172,8 +151,6 @@ int main()
|
||||
|
||||
worldTraveller_gameUpdateAndRender(&worldTraveller, secondsElapsed);
|
||||
GL_CHECK_ERROR();
|
||||
audio_updateAndPlay(&audioRenderer);
|
||||
//audio_updateAndPlay(&overworldAudioRenderer);
|
||||
|
||||
/* Swap the buffers */
|
||||
glfwSwapBuffers(window);
|
||||
|
||||
Reference in New Issue
Block a user