Work in progress

willtobyte · Jan 16, 2025 · 77336a2 · 77336a2
1 parent fdff61c
commit 77336a2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/src/entity.cpp b/src/entity.cpp
@@ -44,7 +44,6 @@ int32_t entity::y() const noexcept {
 void entity::move(float_t x_velocity, float_t y_velocity) noexcept {
   UNUSED(x_velocity);
   UNUSED(y_velocity);
-  // cpBodySetVelocity(_props.body.get(), {x_velocity, y_velocity});
 }
 
 void entity::set_velocity(const algebra::vector2d &velocity) noexcept {

diff --git a/src/eventmanager.cpp b/src/eventmanager.cpp
@@ -4,14 +4,14 @@
 using namespace input;
 
 eventmanager::eventmanager() {
-  // const auto number = SDL_NumJoysticks();
-  // for (auto id = 0; id < number; ++id) {
-  //   if (SDL_IsGameController(id)) {
-  //     if (auto controller = SDL_GameControllerOpen(id)) {
-  //       _controllers.emplace(SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(controller)), gamecontroller_ptr(controller));
-  //     }
-  //   }
-  // }
+  const auto number = SDL_NumJoysticks();
+  for (auto id = 0; id < number; ++id) {
+    if (SDL_IsGameController(id)) {
+      if (auto controller = SDL_GameControllerOpen(id)) {
+        _controllers.emplace(SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(controller)), gamecontroller_ptr(controller));
+      }
+    }
+  }
 }
 
 void eventmanager::update(float_t delta) {

diff --git a/src/scriptengine.cpp b/src/scriptengine.cpp
@@ -350,6 +350,7 @@ void framework::scriptengine::run() {
 
   lua.new_usertype<framework::statemanager>(
       "StateManager",
+      "players", sol::property(&statemanager::players),
       "player", [&_p](framework::statemanager &self, input::player player) -> playerwrapper & {
         auto [iterator, inserted] = _p.try_emplace(player, player, self);
 

diff --git a/src/statemanager.cpp b/src/statemanager.cpp
@@ -14,6 +14,10 @@ bool statemanager::on(int player, const std::variant<input::joystickevent> &type
   return false;
 }
 
+int8_t statemanager::players() const noexcept {
+  return 0; // TODO
+}
+
 constexpr std::optional<input::joystickevent> keytoctrl(const input::keyevent &event) {
   using namespace input;
 

diff --git a/src/statemanager.hpp b/src/statemanager.hpp
@@ -8,9 +8,10 @@ class statemanager : public input::eventreceiver {
   statemanager() = default;
   virtual ~statemanager() = default;
 
-  // bool is_keydown(const input::keyevent &event) const;
   bool on(int player, const std::variant<input::joystickevent> &type) const noexcept;
 
+  int8_t players() const noexcept;
+
 protected:
   virtual void on_keydown(const input::keyevent &event) noexcept;