aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/Audio.hpp56
-rw-r--r--src/components/Component.hpp2
-rw-r--r--src/components/EventListener.hpp7
-rw-r--r--src/components/Light.hpp2
-rw-r--r--src/components/Name.hpp2
-rw-r--r--src/components/Physics.hpp2
-rw-r--r--src/components/Player.hpp2
-rw-r--r--src/components/Position.hpp2
-rw-r--r--src/components/Render.hpp2
-rw-r--r--src/components/Script.hpp4
-rw-r--r--src/components/Velocity.hpp2
11 files changed, 70 insertions, 13 deletions
diff --git a/src/components/Audio.hpp b/src/components/Audio.hpp
new file mode 100644
index 0000000..2bb63eb
--- /dev/null
+++ b/src/components/Audio.hpp
@@ -0,0 +1,56 @@
+/**
+ * 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:
+ std::string fileName;
+ ALuint source;
+ ALuint buffer;
+
+ Audio(std::string _fileName = "") :
+ fileName(_fileName), source(0), buffer(0) {}
+
+ Audio FromLua(sol::object ref)
+ {
+ 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;
+ }
+
+ void serialize([[maybe_unused]] cereal::JSONOutputArchive& ar) final {}
+ void serialize([[maybe_unused]] cereal::JSONInputArchive& ar) final {}
+
+ virtual std::string serializeName(void) const final {
+ return "Audio";
+ }
+};
+
+#endif // COMPONENT_AUDIO_HPP_
+
diff --git a/src/components/Component.hpp b/src/components/Component.hpp
index 5b0e3af..3075cea 100644
--- a/src/components/Component.hpp
+++ b/src/components/Component.hpp
@@ -37,7 +37,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 77a004e..fb55d95 100644
--- a/src/components/EventListener.hpp
+++ b/src/components/EventListener.hpp
@@ -42,16 +42,17 @@ public:
return *this;
}
- void tryListener(const std::string& name, sol::table& self)
+ template<typename... Args>
+ void tryListener(const std::string& name, sol::table& self, Args... args)
{
if (listeners[name] == sol::type::function)
- listeners[name](self);
+ listeners[name](self, args...);
}
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 cb4d08a..2d6b9b2 100644
--- a/src/components/Physics.hpp
+++ b/src/components/Physics.hpp
@@ -63,7 +63,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 1c649b4..a0adff5 100644
--- a/src/components/Position.hpp
+++ b/src/components/Position.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 "Position";
}
};
diff --git a/src/components/Render.hpp b/src/components/Render.hpp
index a9af51a..10a04fc 100644
--- a/src/components/Render.hpp
+++ b/src/components/Render.hpp
@@ -81,7 +81,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..93997a9 100644
--- a/src/components/Script.hpp
+++ b/src/components/Script.hpp
@@ -74,7 +74,7 @@ public:
else if (value.get_type() == sol::type::number)
table_components.push_back(std::make_tuple(
key.as<std::string>(),
- std::string("return " + value.as<std::string>())
+ std::string("return ") + std::to_string(value.as<double>())
));
else if (value.get_type() == sol::type::boolean) {
table_components.push_back(std::make_tuple(
@@ -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 888cbb5..420dd3d 100644
--- a/src/components/Velocity.hpp
+++ b/src/components/Velocity.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 "Velocity";
}
};
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 16:54:10 +0000