Added sound debug UI, removed sound command

ChangeLog.md

@@ -5,6 +5,7 @@
     [ 20141127 ]
     * Started work on loading the object texture mapping, with debug UI
     * Textiles debug UI also draws triangles “properly”
+    * Removed Sound command, added Sound Debug UI
 
     [ 20141126 ]
     * Reduced code duplication for BinaryFile/BinaryMemory

include/commands/CommandSound.h

@@ -1,22 +0,0 @@
-/*!
- * \file include/commands/CommandSound.h
- * \brief Sound Command interface
- *
- * \author xythobuz
- */
-
-#ifndef _COMMAND_SOUND_H_
-#define _COMMAND_SOUND_H_
-
-#include "commands/Command.h"
-
-class CommandSound : public Command {
-  public:
-    virtual std::string name();
-    virtual std::string brief();
-    virtual void printHelp();
-    virtual int execute(std::istream& args);
-};
-
-#endif
-

src/Game.cpp

@@ -50,7 +50,7 @@ void Game::display() {
 void Game::destroy() {
     mLoaded = false;
     mLara = -1;
-    getRender().setMode(Render::modeDisabled);
+    getRender().setMode(Render::modeLoadScreen);
 
     getWorld().destroy();
     getRender().ClearWorld();
@@ -62,8 +62,7 @@ bool Game::isLoaded() {
 }
 
 int Game::loadLevel(const char* level) {
-    if (mLoaded)
-        destroy();
+    destroy();
 
     levelName = level;
 

src/SoundAL.cpp

@@ -56,6 +56,8 @@ int SoundAL::initialize() {
 
 void SoundAL::setEnabled(bool on) {
     mEnabled = on;
+    if (on && (!mInit))
+        initialize();
 }
 
 void SoundAL::setVolume(float vol) {

src/UI.cpp

@@ -14,6 +14,7 @@
 #include "Menu.h"
 #include "Render.h"
 #include "RunTime.h"
+#include "Sound.h"
 #include "TextureManager.h"
 #include "Window.h"
 #include "commands/Command.h"
@@ -287,6 +288,40 @@ void UI::display() {
             }
         }
 
+        if (ImGui::CollapsingHeader("SoundSamples")) {
+            if (!getSound().getEnabled()) {
+                ImGui::Text("Please enable Sound before loading a level!");
+                if (ImGui::Button("Enable Sound!")) {
+                    getSound().setEnabled(true);
+                }
+            } else if (getSound().registeredSources() == 0) {
+                ImGui::Text("Please load a level!");
+            } else {
+                static int index = 0;
+                ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.5f);
+                ImGui::SliderInt("##soundslide", &index, 0, getSound().registeredSources() - 1);
+                ImGui::PopItemWidth();
+                ImGui::SameLine();
+                if (ImGui::Button("+##soundplus", ImVec2(0, 0), true)) {
+                    if (index < (getSound().registeredSources() - 1))
+                        index++;
+                    else
+                        index = 0;
+                }
+                ImGui::SameLine();
+                if (ImGui::Button("-##soundminus", ImVec2(0, 0), true)) {
+                    if (index > 0)
+                        index--;
+                    else
+                        index = getSound().registeredSources() - 1;
+                }
+                ImGui::SameLine();
+                if (ImGui::Button("Play##soundplay")) {
+                    getSound().play(index);
+                }
+            }
+        }
+
         /*
         if (ImGui::CollapsingHeader("UI Help")) {
             ImGui::ShowUserGuide();

src/commands/CMakeLists.txt

@@ -7,7 +7,6 @@ set (CMD_SRCS ${CMD_SRCS} "CommandGame.cpp")
 set (CMD_SRCS ${CMD_SRCS} "CommandMove.cpp")
 set (CMD_SRCS ${CMD_SRCS} "CommandRender.cpp")
 set (CMD_SRCS ${CMD_SRCS} "CommandSet.cpp")
-set (CMD_SRCS ${CMD_SRCS} "CommandSound.cpp")
 
 # Add library
 add_library (OpenRaider_commands OBJECT ${CMD_SRCS})

src/commands/Command.cpp

@@ -19,7 +19,6 @@
 #include "commands/CommandMove.h"
 #include "commands/CommandRender.h"
 #include "commands/CommandSet.h"
-#include "commands/CommandSound.h"
 
 std::vector<std::shared_ptr<Command>> Command::commands;
 
@@ -41,7 +40,6 @@ void Command::fillCommandList() {
     commands.push_back(std::shared_ptr<Command>(new CommandMove()));
     commands.push_back(std::shared_ptr<Command>(new CommandMode()));
     commands.push_back(std::shared_ptr<Command>(new CommandRenderflag()));
-    commands.push_back(std::shared_ptr<Command>(new CommandSound()));
     commands.push_back(std::shared_ptr<Command>(new CommandPos()));
     commands.push_back(std::shared_ptr<Command>(new CommandViewmodel()));
     commands.push_back(std::shared_ptr<Command>(new CommandPigtail()));

src/commands/CommandSound.cpp

@@ -1,42 +0,0 @@
-/*!
- * \file src/commands/CommandSound.cpp
- * \brief Sound command
- *
- * \author xythobuz
- */
-
-#include "global.h"
-#include "Game.h"
-#include "Log.h"
-#include "RunTime.h"
-#include "Sound.h"
-#include "commands/CommandSound.h"
-
-std::string CommandSound::name() {
-    return "sound";
-}
-
-std::string CommandSound::brief() {
-    return "INT - Test play sound";
-}
-
-void CommandSound::printHelp() {
-    getLog() << "sound-Command Usage:" << Log::endl;
-    getLog() << "sound-Command Usage:" << Log::endl;
-    getLog() << "  sound INT" << Log::endl;
-    getLog() << "Where INT is a valid sound ID integer" << Log::endl;
-}
-
-int CommandSound::execute(std::istream& args) {
-    if (!getGame().isLoaded()) {
-        getLog() << "Use sound command interactively!" << Log::endl;
-        return -1;
-    }
-
-    std::string s;
-    args >> s;
-
-    getSound().play(atoi(s.c_str()));
-    return 0;
-}
-

src/loader/LoaderTR2.cpp

@@ -13,6 +13,7 @@
 #include "Log.h"
 #include "Mesh.h"
 #include "Room.h"
+#include "Sound.h"
 #include "TextureManager.h"
 #include "utils/pixel.h"
 #include "loader/LoaderTR2.h"
@@ -687,8 +688,7 @@ void LoaderTR2::loadExternalSoundFile(std::string f) {
     }
 
     int riffCount = 0;
-    bool done = false;
-    while (!done) {
+    while (!sfx.eof()) {
         char test[5];
         test[4] = '\0';
         for (int i = 0; i < 4; i++)
@@ -700,27 +700,22 @@ void LoaderTR2::loadExternalSoundFile(std::string f) {
             return;
         }
 
+        // riffSize is (fileLength - 8)
         uint32_t riffSize = sfx.readU32();
 
-        for (int i = 0; i < 4; i++)
-            test[i] = sfx.read8();
+        unsigned char buff[riffSize + 8];
+        sfx.seek(sfx.tell() - 8);
+        for (int i = 0; i < (riffSize + 8); i++)
+            buff[i] = sfx.readU8();
 
-        if (std::string("WAVE") != std::string(test)) {
-            getLog() << "LoaderTR2: External SFX invalid! (" << riffCount
-                << ", \"" << test << "\" != \"WAVE\")" << Log::endl;
-            return;
-        }
+        unsigned long src;
+        int ret = getSound().addWave(buff, riffSize + 8, &src, 0);
+        assert(ret >= 0);
 
-        // TODO load riff somehow somewhere
-
-        // riffSize is (fileLength - 8)
-        sfx.seek(sfx.tell() + riffSize - 4);
         riffCount++;
-
-        if (sfx.eof()) {
-            done = true;
-            getLog() << "LoaderTR2: Found " << riffCount << " SoundSamples" << Log::endl;
-        }
     }
+
+    if (riffCount > 0)
+        getLog() << "LoaderTR2: Found " << riffCount << " SoundSamples" << Log::endl;
 }