Wind: Add current subtype and fix particle orientation (#3270)

* Wind: Add current subtype and fix particle orientation

* Wind: I forgot to delete his TODO lol

* Wind: fix float to double conversion

* Wind: code style

Author: Hypernoot

src/object/sprite_particle.cpp

@@ -26,7 +26,7 @@
 
 SpriteParticle::SpriteParticle(const std::string& sprite_name, const std::string& action,
                                const Vector& position_, AnchorPoint anchor, const Vector& velocity_, const Vector& acceleration_,
-                               int drawing_layer_, bool notimeout, Color color_) :
+                               int drawing_layer_, bool notimeout, Color color_, float angle) :
   SpriteParticle(SpriteManager::current()->create(sprite_name), action,
                  position_, anchor, velocity_, acceleration_,
                  drawing_layer_, notimeout, color_)
@@ -46,11 +46,12 @@ SpriteParticle::SpriteParticle(const std::string& sprite_name, const std::string
   }
   no_time_out = notimeout;
   sprite->set_color(color_);
+  sprite->set_angle(angle);
 }
 
 SpriteParticle::SpriteParticle(SpritePtr sprite_, const std::string& action,
                                const Vector& position_, AnchorPoint anchor, const Vector& velocity_, const Vector& acceleration_,
-                               int drawing_layer_, bool notimeout, Color color_) :
+                               int drawing_layer_, bool notimeout, Color color_, float angle) :
   sprite(std::move(sprite_)),
   position(position_),
   velocity(velocity_),
@@ -64,6 +65,7 @@ SpriteParticle::SpriteParticle(SpritePtr sprite_, const std::string& action,
   sprite->set_action(action, 1);
   sprite->set_animation_loops(1); //TODO: this is necessary because set_action will not set "loops" when "action" is the default action
   sprite->set_color(color_);
+  sprite->set_angle(angle);
 
   position -= get_anchor_pos(sprite->get_current_hitbox(), anchor);
   no_time_out = notimeout;

src/object/sprite_particle.hpp

@@ -32,11 +32,11 @@ class SpriteParticle final : public GameObject
   SpriteParticle(SpritePtr sprite, const std::string& action,
                  const Vector& position, AnchorPoint anchor,
                  const Vector& velocity, const Vector& acceleration,
-                 int drawing_layer = LAYER_OBJECTS-1, bool notimeout = false, Color color = Color::WHITE);
+                 int drawing_layer = LAYER_OBJECTS - 1, bool notimeout = false, Color color = Color::WHITE, float angle = 0);
   SpriteParticle(const std::string& sprite_name, const std::string& action,
                  const Vector& position, AnchorPoint anchor,
                  const Vector& velocity, const Vector& acceleration,
-                 int drawing_layer = LAYER_OBJECTS-1, bool notimeout = false, Color color = Color::WHITE);
+                 int drawing_layer = LAYER_OBJECTS - 1, bool notimeout = false, Color color = Color::WHITE, float angle = 0);
   virtual GameObjectClasses get_class_types() const override { return GameObject::get_class_types().add(typeid(SpriteParticle)); }
   ~SpriteParticle() override;
 

src/object/wind.cpp

@@ -47,6 +47,7 @@ Wind::Wind(const ReaderMapping& reader) :
   particles_enabled(true)
 {
   float w,h;
+  parse_type(reader);
   reader.get("x", m_col.m_bbox.get_left(), 0.0f);
   reader.get("y", m_col.m_bbox.get_top(), 0.0f);
   reader.get("width", w, 32.0f);
@@ -96,6 +97,15 @@ Wind::get_settings()
   return result;
 }
 
+GameObjectTypes
+Wind::get_types() const
+{
+  return {
+    { "wind", _("Wind") },
+    { "current", _("Current") }
+  };
+}
+
 void
 Wind::update(float dt_sec_)
 {
@@ -107,19 +117,26 @@ Wind::update(float dt_sec_)
   Vector ppos = Vector(graphicsRandom.randf(m_col.m_bbox.get_left() + 8, m_col.m_bbox.get_right() - 8), graphicsRandom.randf(m_col.m_bbox.get_top() + 8, m_col.m_bbox.get_bottom() - 8));
   Vector pspeed = Vector(graphicsRandom.randf(speed.x - 20, speed.x + 20), graphicsRandom.randf(speed.y - 20, speed.y + 20));
 
-  // TODO: Rotate sprite rather than just use 2 different actions
   // Approx. 1 particle per tile
   if (graphicsRandom.randf(0.f, 100.f) < (m_col.m_bbox.get_width() / 32.f) * (m_col.m_bbox.get_height() / 32.f))
   {
     // Emit a particle
-	  if (fancy_wind)
+    if (fancy_wind)
     {
-	    Sector::get().add<SpriteParticle>("images/particles/wind.sprite", (std::abs(speed.x) > std::abs(speed.y)) ? "default" : "flip", ppos, ANCHOR_MIDDLE, pspeed, Vector(0, 0), m_layer); 
-	  }
-	  else
+      const float angle = std::atan2(speed.y, speed.x) * float(180.0 / M_PI);
+      switch (m_type) {
+        case WIND: // Normal wind
+          Sector::get().add<SpriteParticle>("images/particles/wind.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, Vector(0, 0), m_layer, false, Color::WHITE, angle);
+          break;
+        case CURRENT: // Current variant
+          Sector::get().add<SpriteParticle>("images/particles/water_piece1.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, Vector(0, 0), m_layer, false, Color::WHITE, angle);
+          break;
+      }
+    }
+    else
     {
-	    Sector::get().add<Particles>(ppos, 44, 46, pspeed, Vector(0, 0), 1, Color(.4f, .4f, .4f), 3, .1f, m_layer);
-	  }
+      Sector::get().add<Particles>(ppos, 44, 46, pspeed, Vector(0, 0), 1, Color(.4f, .4f, .4f), 3, .1f, m_layer);
+    }
   }
 }
 

src/object/wind.hpp

@@ -45,7 +45,8 @@ class Wind final : public MovingObject
   virtual GameObjectClasses get_class_types() const override { return MovingObject::get_class_types().add(typeid(Wind)); }
 
   virtual ObjectSettings get_settings() override;
-
+  virtual GameObjectTypes get_types() const override;
+  
   virtual void on_flip(float height) override;
 
   /**
@@ -85,6 +86,11 @@ class Wind final : public MovingObject
   bool fancy_wind;
   bool particles_enabled;
 
+  enum Type {
+    WIND,
+    CURRENT,
+  };
+  
 private:
   Wind(const Wind&) = delete;
   Wind& operator=(const Wind&) = delete;