From bebc6e955114a0907c43df9a9c00f22b1f743446 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Mon, 30 Sep 2019 15:29:49 -0400
Subject: created Audio component

---
 src/components/Audio.hpp | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 src/components/Audio.hpp

(limited to 'src/components/Audio.hpp')

diff --git a/src/components/Audio.hpp b/src/components/Audio.hpp
new file mode 100644
index 0000000..3f7296d
--- /dev/null
+++ b/src/components/Audio.hpp
@@ -0,0 +1,47 @@
+/**
+ * Copyright (C) 2019 Clyne Sullivan
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef COMPONENT_AUDIO_HPP_
+#define COMPONENT_AUDIO_HPP_
+
+#include <AL/al.h>
+
+#include "Component.hpp"
+
+struct Audio : Component<Audio>
+{
+public:
+    ALuint source;
+
+    Audio(ALuint _source = 0) :
+        source(_source) {}
+
+    Audio FromLua([[maybe_unused]] sol::object ref)
+    {
+        // TODO load from file name?
+        return *this;
+    }
+
+    void serialize([[maybe_unused]] cereal::JSONOutputArchive& ar) final {}
+    void serialize([[maybe_unused]] cereal::JSONInputArchive& ar) final {}
+
+    std::string serializeName(void) const final {
+        return "Audio";
+    }
+};
+
+#endif // COMPONENT_AUDIO_HPP_
+
-- 
cgit v1.2.3


From af39f2e08b0503db723ae707a5c7278d8c85f812 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Tue, 1 Oct 2019 20:50:28 -0400
Subject: Audio component loading, getting ready to play

---
 Assets/jump.wav          | Bin 0 -> 303194 bytes
 Scripts/init.lua         |   3 +++
 src/audio.cpp            |  25 +++++++++++++++++++++++++
 src/audio.hpp            |   3 +++
 src/components/Audio.hpp |  17 +++++++++++++----
 src/engine.cpp           |   2 ++
 src/script.cpp           |  10 ++++++++++
 7 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 Assets/jump.wav

(limited to 'src/components/Audio.hpp')

diff --git a/Assets/jump.wav b/Assets/jump.wav
new file mode 100644
index 0000000..1cd1681
Binary files /dev/null and b/Assets/jump.wav differ
diff --git a/Scripts/init.lua b/Scripts/init.lua
index ec9e350..ea5a833 100644
--- a/Scripts/init.lua
+++ b/Scripts/init.lua
@@ -37,6 +37,9 @@ player = {
     },
     Physics = 0,
     Name = "bord",
+    Audio = {
+        file = "Assets/jump.wav"
+    },
     hellotrue = true,
     hellofalse = false,
     Render = {
diff --git a/src/audio.cpp b/src/audio.cpp
index 975cfce..8bb1413 100644
--- a/src/audio.cpp
+++ b/src/audio.cpp
@@ -20,13 +20,19 @@
 
 #include "audio.hpp"
 
+#include <AL/alut.h>
+#include <iostream>
+
 AudioSystem::AudioSystem(void) :
     device(nullptr, [](ALCdevice *d) { alcCloseDevice(d); }),
     context(nullptr, [](ALCcontext *c) { alcDestroyContext(c); }) {}
 
 AudioSystem::~AudioSystem(void)
 {
+    alutExit();
+
     // Delete context before device
+    alcMakeContextCurrent(nullptr);
     context.reset();
     device.reset();
 }
@@ -46,6 +52,9 @@ void AudioSystem::configure([[maybe_unused]] entityx::EntityManager& entities,
     context.reset(alcCreateContext(device.get(), nullptr));
     if (!alcMakeContextCurrent(context.get()))
         return; // TODO Another uh oh
+
+    if (alutInitWithoutContext(nullptr, nullptr) != AL_TRUE)
+        return; // TODO Third uh oh
 }
 
 void AudioSystem::update([[maybe_unused]] entityx::EntityManager& entities,
@@ -56,10 +65,26 @@ void AudioSystem::update([[maybe_unused]] entityx::EntityManager& entities,
 void AudioSystem::receive(const entityx::ComponentAddedEvent<Audio>& cae)
 {
     alGenSources(1, const_cast<ALuint*>(&cae.component->source));
+    //alGenBuffers(1, const_cast<ALuint*>(&cae.component->buffer));
+    
+    if (auto buf = alutCreateBufferFromFile(cae.component->fileName.c_str());
+        buf != AL_NONE) {
+        const_cast<Audio*>(cae.component.get())->buffer = buf;
+        alSourcei(cae.component->source, AL_BUFFER, buf);
+
+        std::cout << "Loaded audio: " << cae.component->fileName << std::endl;
+    }
 }
 
 void AudioSystem::receive(const entityx::ComponentRemovedEvent<Audio>& cae)
 {
+    alDeleteBuffers(1, &cae.component->buffer);
     alDeleteSources(1, &cae.component->source);
 }
 
+void AudioSystem::playSound(const Position& pos, const Audio& audio)
+{
+    alSource3f(audio.source, AL_POSITION, pos.x, pos.y, 0);
+    alSourcePlay(audio.source);
+}
+
diff --git a/src/audio.hpp b/src/audio.hpp
index 97fff99..7a2076a 100644
--- a/src/audio.hpp
+++ b/src/audio.hpp
@@ -24,6 +24,7 @@
 #include <entityx/entityx.h>
 
 #include <components/Audio.hpp>
+#include <components/Position.hpp>
 
 class AudioSystem : public entityx::System<AudioSystem>,
                     public entityx::Receiver<AudioSystem>
@@ -51,6 +52,8 @@ public:
 
     void receive(const entityx::ComponentAddedEvent<Audio>& cae);
     void receive(const entityx::ComponentRemovedEvent<Audio>& cae);
+
+    void playSound(const Position& pos, const Audio& audio);
 };
 
 #endif // SYSTEM_AUDIO_HPP_
diff --git a/src/components/Audio.hpp b/src/components/Audio.hpp
index 3f7296d..a97b235 100644
--- a/src/components/Audio.hpp
+++ b/src/components/Audio.hpp
@@ -24,14 +24,23 @@
 struct Audio : Component<Audio>
 {
 public:
+    std::string fileName;
     ALuint source;
+    ALuint buffer;
 
-    Audio(ALuint _source = 0) :
-        source(_source) {}
+    Audio(std::string _fileName = "") :
+        fileName(_fileName), source(0), buffer(0) {}
 
-    Audio FromLua([[maybe_unused]] sol::object ref)
+    Audio FromLua(sol::object ref)
     {
-        // TODO load from file name?
+        if (ref.get_type() == sol::type::table) {
+            sol::table tab = ref;
+            if (tab["file"] != nullptr)
+                this->fileName = tab["file"];
+        } else {
+            throw std::string("Audio table not formatted properly");
+        }
+
         return *this;
     }
 
diff --git a/src/engine.cpp b/src/engine.cpp
index b1d9a56..3fc4fdd 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "audio.hpp"
 #include "config.hpp"
 #include "engine.hpp"
 #include "gamestate.hpp"
@@ -54,6 +55,7 @@ int Engine::init(void)
     systems.add<ScriptSystem>(entities, *(systems.system<WorldSystem>().get()));
     systems.add<PhysicsSystem>();
     systems.add<TextSystem>();
+    systems.add<AudioSystem>();
     systems.configure();
 
     // Load game script and entity data
diff --git a/src/script.cpp b/src/script.cpp
index 6cda627..20011b4 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -75,6 +75,7 @@ void ScriptSystem::doFile(void)
 /********************
 *  SCRIPT PARSING  *
 ********************/
+#include <components/Audio.hpp>
 #include <components/EventListener.hpp>
 #include <components/Position.hpp>
 #include <components/Player.hpp>
@@ -127,6 +128,10 @@ void ScriptSystem::scriptExport(void)
             sol::constructors<Physics(void), Physics()>(),
             "standing", &Physics::standing);
 
+    lua.new_usertype<Audio>("Audio",
+            sol::constructors<Audio(std::string)>(),
+            "file", &Audio::fileName);
+
     lua.new_usertype<World>("World",
             sol::constructors<World(sol::object), World(void)>(),
             "Generate", &World::generate,
@@ -173,6 +178,11 @@ sol::table ScriptSystem::spawn(sol::object param)
                 e.assign<Name>(Name().FromLua(tab["Name"])).get();
         }
 
+        if (tab["Audio"] != nullptr) {
+            (*toRet)["Audio"] =
+                e.assign<Audio>(Audio().FromLua(tab["Audio"])).get();
+        }
+
         if (tab["Render"] != nullptr) {
             if (!e.has_component<Position>()) // Position must exist for render
                 (*toRet)["Position"] = e.assign<Position>().get();
-- 
cgit v1.2.3


From bdc0e843a4762a1abddebc53d12a351debe8d457 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Fri, 19 Aug 2022 20:52:59 -0400
Subject: add cereal and entityx submodules; fix compile errors

---
 .gitmodules                      |   7 +++++++
 Makefile                         |  15 ++++++++++-----
 lib/cereal                       |   1 +
 lib/entityx                      |   1 +
 lib/libentityx.a                 | Bin 414808 -> 945228 bytes
 src/components/Audio.hpp         |   2 +-
 src/components/Component.hpp     |   2 +-
 src/components/EventListener.hpp |   2 +-
 src/components/Light.hpp         |   2 +-
 src/components/Name.hpp          |   2 +-
 src/components/Physics.hpp       |   2 +-
 src/components/Player.hpp        |   2 +-
 src/components/Position.hpp      |   2 +-
 src/components/Render.hpp        |   2 +-
 src/components/Script.hpp        |   2 +-
 src/components/Velocity.hpp      |   2 +-
 src/gamestate.hpp                |  26 +++++++++++++++++++++++++-
 17 files changed, 55 insertions(+), 17 deletions(-)
 create mode 160000 lib/cereal
 create mode 160000 lib/entityx

(limited to 'src/components/Audio.hpp')

diff --git a/.gitmodules b/.gitmodules
index 340f9cd..e2f5cf7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,10 @@
 [submodule "lib/sol2"]
 	path = lib/sol2
 	url = https://github.com/ThePhD/sol2
+[submodule "lib/entityx"]
+	path = lib/entityx
+	url = https://github.com/tcsullivan/entityx
+	branch = remove-std-iterator
+[submodule "lib/cereal"]
+	path = lib/cereal
+	url = https://github.com/USCiLab/cereal
diff --git a/Makefile b/Makefile
index 357d7ff..23f522e 100644
--- a/Makefile
+++ b/Makefile
@@ -40,11 +40,16 @@ LIBS   = -L$(LIBDIR) -lSDL2 -lpthread -lentityx -lluajit -ldl -lGLEW -lGL \
 		 -lSDL2_image -lSOIL -lfreetype -lopenal -lalut
 
 CXXFLAGS = -ggdb -std=c++17 -Wall -Wextra -Werror -pedantic \
-		   -Wno-class-memaccess -Wno-implicit-fallthrough -m64
-
-CXXINCS = -Isrc -I$(LIBDIR)/LuaJIT/src -I$(LIBDIR)/entityx \
-		  -I$(LIBDIR)/LuaBridge/Source -I$(LIBDIR)/sol2/include \
-		  -I$(LIBDIR)/soil -I$(LIBDIR)/cereal/include -I$(LIBDIR)/freetype
+		   -Wno-class-memaccess -Wno-implicit-fallthrough -Wno-unused-parameter
+
+CXXINCS = -I$(SRCDIR) \
+          -I$(LIBDIR)/entityx \
+          -I$(LIBDIR)/LuaJIT/src \
+          -I$(LIBDIR)/LuaBridge/Source \
+          -I$(LIBDIR)/sol2/include \
+          -I$(LIBDIR)/soil \
+          -I$(LIBDIR)/cereal/include \
+	  -I$(LIBDIR)/freetype
 
 CXXSRC := $(shell find $(SRCDIR) -type f -name *.$(SRCEXT))
 CXXOBJ := $(patsubst $(SRCDIR)/%,$(OUTDIR)/%,$(CXXSRC:.$(SRCEXT)=.$(OBJEXT)))
diff --git a/lib/cereal b/lib/cereal
new file mode 160000
index 0000000..ddd4672
--- /dev/null
+++ b/lib/cereal
@@ -0,0 +1 @@
+Subproject commit ddd467244713ea4fe63733628992efcdd6a9187d
diff --git a/lib/entityx b/lib/entityx
new file mode 160000
index 0000000..39e0709
--- /dev/null
+++ b/lib/entityx
@@ -0,0 +1 @@
+Subproject commit 39e07099da7227d7d7baec072411ddc0abfd8be4
diff --git a/lib/libentityx.a b/lib/libentityx.a
index c1b2a0d..b0042eb 100644
Binary files a/lib/libentityx.a and b/lib/libentityx.a differ
diff --git a/src/components/Audio.hpp b/src/components/Audio.hpp
index a97b235..2bb63eb 100644
--- a/src/components/Audio.hpp
+++ b/src/components/Audio.hpp
@@ -47,7 +47,7 @@ public:
     void serialize([[maybe_unused]] cereal::JSONOutputArchive& ar) final {}
     void serialize([[maybe_unused]] cereal::JSONInputArchive& ar) final {}
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Audio";
     }
 };
diff --git a/src/components/Component.hpp b/src/components/Component.hpp
index 2928366..576a059 100644
--- a/src/components/Component.hpp
+++ b/src/components/Component.hpp
@@ -33,7 +33,7 @@ public:
     virtual void serialize(cereal::JSONOutputArchive& ar) = 0;
     virtual void serialize(cereal::JSONInputArchive& ar) = 0;
 
-    void internal_serialize(bool save, void *ar) final {
+    virtual void internal_serialize(bool save, void *ar) final {
         if (save)
             serialize(*reinterpret_cast<cereal::JSONOutputArchive*>(ar));
         else
diff --git a/src/components/EventListener.hpp b/src/components/EventListener.hpp
index c39b6ad..fb55d95 100644
--- a/src/components/EventListener.hpp
+++ b/src/components/EventListener.hpp
@@ -52,7 +52,7 @@ public:
     void serialize([[maybe_unused]] cereal::JSONOutputArchive& ar) final {}
     void serialize([[maybe_unused]] cereal::JSONInputArchive& ar) final {}
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "EventListener";
     }
 };
diff --git a/src/components/Light.hpp b/src/components/Light.hpp
index 6849d7c..c63b6cc 100644
--- a/src/components/Light.hpp
+++ b/src/components/Light.hpp
@@ -58,7 +58,7 @@ public:
         ar(CEREAL_NVP(r), CEREAL_NVP(g), CEREAL_NVP(b), CEREAL_NVP(strength));
     }
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Light";
     }
 };
diff --git a/src/components/Name.hpp b/src/components/Name.hpp
index a6a6d8a..6390d5e 100644
--- a/src/components/Name.hpp
+++ b/src/components/Name.hpp
@@ -47,7 +47,7 @@ public:
         ar(CEREAL_NVP(name));
     }
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Name";
     }
 };
diff --git a/src/components/Physics.hpp b/src/components/Physics.hpp
index 378e87f..edf5ac5 100644
--- a/src/components/Physics.hpp
+++ b/src/components/Physics.hpp
@@ -33,7 +33,7 @@ public:
     void serialize([[maybe_unused]] cereal::JSONOutputArchive& ar) final {}
     void serialize([[maybe_unused]] cereal::JSONInputArchive& ar) final {}
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Physics";
     }
 };
diff --git a/src/components/Player.hpp b/src/components/Player.hpp
index a550c4f..43d083e 100644
--- a/src/components/Player.hpp
+++ b/src/components/Player.hpp
@@ -36,7 +36,7 @@ public:
     void serialize([[maybe_unused]] cereal::JSONOutputArchive& ar) final {}
     void serialize([[maybe_unused]] cereal::JSONInputArchive& ar) final {}
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Player";
     }
 };
diff --git a/src/components/Position.hpp b/src/components/Position.hpp
index 56e8707..fcd62f8 100644
--- a/src/components/Position.hpp
+++ b/src/components/Position.hpp
@@ -51,7 +51,7 @@ public:
         ar(CEREAL_NVP(x), CEREAL_NVP(y));
     }
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Position";
     }
 };
diff --git a/src/components/Render.hpp b/src/components/Render.hpp
index 81ca591..93be5d8 100644
--- a/src/components/Render.hpp
+++ b/src/components/Render.hpp
@@ -62,7 +62,7 @@ public:
         ar(CEREAL_NVP(visible), CEREAL_NVP(flipX));
     }
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Render";
     }
 };
diff --git a/src/components/Script.hpp b/src/components/Script.hpp
index 3f96be5..d7bc147 100644
--- a/src/components/Script.hpp
+++ b/src/components/Script.hpp
@@ -119,7 +119,7 @@ public:
 
     }
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Scripted";
     }
 };
diff --git a/src/components/Velocity.hpp b/src/components/Velocity.hpp
index 776c1dd..f48a9f3 100644
--- a/src/components/Velocity.hpp
+++ b/src/components/Velocity.hpp
@@ -52,7 +52,7 @@ public:
         ar(CEREAL_NVP(x), CEREAL_NVP(y));
     }
 
-    std::string serializeName(void) const final {
+    virtual std::string serializeName(void) const final {
         return "Velocity";
     }
 };
diff --git a/src/gamestate.hpp b/src/gamestate.hpp
index 55f4e47..86a4198 100644
--- a/src/gamestate.hpp
+++ b/src/gamestate.hpp
@@ -27,6 +27,30 @@
 
 #include <fstream>
 
+struct EntitySerializer
+{
+    template<class Archive>
+    static void serialize(entityx::EntityManager& entities, entityx::Entity entity, bool save, Archive& ar)
+    {
+        // TODO try and reimplement without modifying entityx?
+        // Or, make a new branch...
+
+        //const auto mask = entity.component_mask();
+
+        //for (size_t i = 0; i < entities.component_helpers_.size(); i++) {
+        //    auto helper = entities.component_helpers_[i];
+        //    if (helper && mask.test(i)) {
+        //        auto* c = helper->get_component(entity);
+        //        ar.setNextName(c->serializeName().c_str());
+        //        ar.startNode();
+        //        c->internal_serialize(save, static_cast<void*>(&ar));
+        //        ar.finishNode();
+        //    }
+        //}
+    }
+};
+
+
 /**
  * @class GameState
  * Manages save files that contain entity data.
@@ -98,7 +122,7 @@ private:
         for (auto entity : entities.entities_for_debugging()) {
             archive.setNextName((name + std::to_string(i++)).c_str());
             archive.startNode();
-            entities.entity_serialize(entity, save, archive);
+            EntitySerializer::serialize(entities, entity, save, archive);
             archive.finishNode();
         }
     }
-- 
cgit v1.2.3