Work in progress

src/engine.cpp

@@ -128,8 +128,6 @@ void engine::_loop() {
 
   prior = now;
 
-  // const auto now = SDL_GetTicks();
-
   _resourcemanager->update(delta);
   _eventmanager->update(delta);
   _entitymanager->update(delta);
@@ -141,8 +139,6 @@ void engine::_loop() {
   _entitymanager->draw();
   // _scenegraph->render();
   _renderer->end();
-
-  // const auto delta = SDL_GetTicks() - now;
 }
 
 int32_t engine::width() const { return _window->width(); }

src/entity.cpp

@@ -8,10 +8,11 @@
 #include "resourcemanager.hpp"
 #include "soundmanager.hpp"
 #include <iostream>
+#include <iterator>
 
 using namespace framework;
 
-// constexpr double_t GRAVITY = .5;
+constexpr double_t GRAVITY = .1;
 
 entity::entity(const entityprops &&props)
     : _props(std::move(props)), _fn(nullptr) {
@@ -36,6 +37,8 @@ void entity::set_props(entityprops props) noexcept {
 }
 
 void entity::update(double delta) noexcept {
+  const int32_t GROUND_LEVEL = 580; // Substitua com o valor correspondente ao nível do chão no seu jogo.
+
   if (!_props.action.empty()) {
     const auto now = SDL_GetTicks();
     const auto animation = _props.animations.at(_props.action);
@@ -44,18 +47,57 @@ void entity::update(double delta) noexcept {
       _props.last_frame = now;
     }
 
+    // Aplicação da gravidade apenas se a entidade estiver acima do chão
+    if (_props.gravitic && _props.position.y() < GROUND_LEVEL) {
+      _props.velocity.set_y(_props.velocity.y() + GRAVITY * delta);
+    }
+
+    // Atualiza a posição com base na velocidade
     if (_props.gravitic || _props.velocity.x() != 0.0 || _props.velocity.y() != 0.0) {
-      const auto x = _props.position.x() + static_cast<int32_t>(_props.velocity.x() * delta);
-      const auto y = _props.position.y() + static_cast<int32_t>(_props.velocity.y() * delta);
-      _props.position.set(x, y);
+      const auto new_x = _props.position.x() + static_cast<int32_t>(_props.velocity.x() * delta);
+      auto new_y = _props.position.y() + static_cast<int32_t>(_props.velocity.y() * delta);
+
+      // Verifica se a entidade está abaixo do nível do chão
+      if (new_y >= GROUND_LEVEL) {
+        new_y = GROUND_LEVEL;       // Posiciona a entidade no nível do chão
+        _props.velocity.set_y(0.0); // Zera a velocidade vertical
+      }
+
+      _props.position.set(new_x, new_y);
     }
   }
 
+  // Executa a função de callback, se existir
   if (_fn) {
     _fn(shared_from_this());
   }
 }
 
+// void entity::update(double delta) noexcept {
+//   if (!_props.action.empty()) {
+//     const auto now = SDL_GetTicks();
+//     const auto animation = _props.animations.at(_props.action);
+//     if (now - _props.last_frame >= animation[_props.frame].duration) {
+//       _props.frame = (_props.frame + 1) % animation.size();
+//       _props.last_frame = now;
+//     }
+
+//     if (_props.gravitic) {
+//       _props.velocity.set_y(_props.velocity.y() + GRAVITY * delta);
+//     }
+
+//     if (_props.velocity.x() != 0.0 || _props.velocity.y() != 0.0) {
+//       const auto x = _props.position.x() + static_cast<int32_t>(_props.velocity.x() * delta);
+//       const auto y = _props.position.y() + static_cast<int32_t>(_props.velocity.y() * delta);
+//       _props.position.set(x, y);
+//     }
+//   }
+
+//   if (_fn) {
+//     _fn(shared_from_this());
+//   }
+// }
+
 void entity::draw() const noexcept {
   if (!_props.action.empty()) {
     const auto source = _props.animations.at(_props.action)[_props.frame].frame;
@@ -65,9 +107,9 @@ void entity::draw() const noexcept {
     _props.spritesheet->draw(
         source,
         destination,
-        .0f,
-        graphics::flip::none,
-        255);
+        _props.angle,
+        _props.flip,
+        _props.alpha);
   }
 }
 
@@ -122,6 +164,10 @@ void entity::set_onupdate(const std::function<void(std::shared_ptr<entity>)> &fn
   _fn = fn;
 }
 
+void entity::set_flip(graphics::flip flip) noexcept {
+  _props.flip = flip;
+}
+
 void entity::set_action(const std::string_view action) noexcept {
   _props.action = action;
 }

src/entity.hpp

@@ -4,6 +4,7 @@
 
 #include "anchor.hpp"
 #include "entityprops.hpp"
+#include "pixmap.hpp"
 #include "vector2d.hpp"
 #include <string_view>
 
@@ -38,6 +39,8 @@ class entity : public std::enable_shared_from_this<entity> {
 
   void play_sound(const std::string_view filename);
 
+  void set_flip(graphics::flip flip) noexcept;
+
   void set_action(const std::string_view action) noexcept;
 
   std::string action() const noexcept;

src/pixmap.cpp

@@ -1,6 +1,7 @@
 #include "pixmap.hpp"
 
 #include "deleters.hpp"
+#include "helpers.hpp"
 #include "io.hpp"
 #include "rect.hpp"
 #include "renderer.hpp"

src/scriptengine.cpp

@@ -10,13 +10,13 @@
 #include "eventreceiver.hpp"
 #include "io.hpp"
 #include "loopable.hpp"
-#include "noncopyable.hpp"
 #include "pixmap.hpp"
 #include "point.hpp"
 #include "resourcemanager.hpp"
 #include "soundmanager.hpp"
 #include "statemanager.hpp"
 #include "ticks.hpp"
+#include "vector2d.hpp"
 #include <sol/property.hpp>
 #include <sol/types.hpp>
 
@@ -59,6 +59,13 @@ void scriptengine::run() {
       "right", anchor::right,
       "none", anchor::none);
 
+  lua.new_enum(
+      "Flip",
+      "none", graphics::flip::none,
+      "horizontal", graphics::flip::horizontal,
+      "vertical", graphics::flip::vertical,
+      "both", graphics::flip::both);
+
   lua.new_usertype<geometry::point>(
       "Point",
       sol::constructors<geometry::point(int32_t, int32_t)>(),
@@ -112,6 +119,7 @@ void scriptengine::run() {
       // "pixmap", sol::property(&entity::set_pixmap),
       // "play", &entity::play_sound,
       "on_update", &entity::set_onupdate,
+      "set_flip", &entity::set_flip,
       "set_action", &entity::set_action,
       "set_velocity", &entity::set_velocity,
       "set_placement", &entity::set_placement);
@@ -144,7 +152,12 @@ void scriptengine::run() {
       "mul_assign", &vector2d::operator*=,
       "div_assign", &vector2d::operator/=,
 
-      sol::meta_function::equal_to, &vector2d::operator==);
+      sol::meta_function::equal_to, &vector2d::operator==,
+
+      "stationary", &vector2d::stationary,
+      "moving", &vector2d::moving,
+      "right", &vector2d::right,
+      "left", &vector2d::left);
   // sol::meta_function::not_equal_to, &vector2d::operator!=);
 
   lua.set_function("sleep", &sleep);

src/vector2d.cpp

@@ -73,3 +73,19 @@ vector2d vector2d::unit() const noexcept {
 double_t vector2d::dot(const vector2d &other) const noexcept {
   return _x * other._x + _y * other._y;
 }
+
+bool vector2d::stationary() const noexcept {
+  return _x == 0.0 && _y == 0.0;
+}
+
+bool vector2d::moving() const noexcept {
+  return !stationary();
+}
+
+bool vector2d::right() const noexcept {
+  return _x > 0;
+}
+
+bool vector2d::left() const noexcept {
+  return _x < 0;
+}

src/vector2d.hpp

@@ -31,6 +31,14 @@ class vector2d {
 
   double_t dot(const vector2d &other) const noexcept;
 
+  bool stationary() const noexcept;
+
+  bool moving() const noexcept;
+
+  bool right() const noexcept;
+
+  bool left() const noexcept;
+
 private:
   double_t _x, _y;
 };