Add jiggleObject

This references #38

include/engge/Entities/Entity.hpp

@@ -108,6 +108,7 @@ class Entity : public ScriptObject, public ngf::Drawable {
   void rotateTo(float destination, ngf::TimeSpan time, InterpolationMethod method);
   void scaleTo(float destination, ngf::TimeSpan time, InterpolationMethod method);
   void shake(float amount);
+  void jiggle(float amount);
 
   void stopObjectMotors();
 

src/CMakeLists.txt

@@ -40,6 +40,7 @@ set(SOURCES
         Entities/BlinkState.cpp
         Entities/Costume.cpp
         Entities/LipAnimation.cpp
+        Entities/JiggleFunction.cpp
         Entities/ShakeFunction.cpp
         Entities/TalkingState.cpp
         Entities/Entity.cpp

src/Entities/Entity.cpp

@@ -7,6 +7,7 @@
 #include <engge/Audio/SoundTrigger.hpp>
 #include <engge/Engine/Camera.hpp>
 #include <engge/Engine/Trigger.hpp>
+#include "JiggleFunction.hpp"
 #include "ShakeFunction.hpp"
 #include "TalkingState.hpp"
 
@@ -25,11 +26,12 @@ struct Entity::Impl {
   std::optional<UseDirection> m_useDir;
   glm::vec2 m_offset{0, 0};
   glm::vec2 m_shakeOffset{0, 0};
+  float m_jiggleOffset{0.f};
   bool m_isLit{false};
   bool m_isVisible{true};
   bool m_isTouchable{true};
   glm::ivec2 m_renderOffset{0, 0};
-  Motor m_offsetTo, m_scaleTo, m_rotateTo, m_moveTo, m_alphaTo, m_shake;
+  Motor m_offsetTo, m_scaleTo, m_rotateTo, m_moveTo, m_alphaTo, m_shake, m_jiggle;
   ngf::Color m_color{ngf::Colors::White};
   bool m_objectBumperCycle{true};
   ngf::Color m_talkColor;
@@ -75,6 +77,7 @@ void Entity::update(const ngf::TimeSpan &elapsed) {
   update(m_pImpl->m_moveTo, elapsed);
   update(m_pImpl->m_alphaTo, elapsed);
   update(m_pImpl->m_shake, elapsed);
+  update(m_pImpl->m_jiggle, elapsed);
 }
 
 void Entity::update(Motor &motor, const ngf::TimeSpan &elapsed) {
@@ -167,6 +170,7 @@ float Entity::getScale() const {
 ngf::Transform Entity::getTransform() const {
   auto transform = m_pImpl->m_transform;
   transform.move(getOffset());
+  transform.rotate(m_pImpl->m_jiggleOffset);
   return transform;
 }
 
@@ -249,6 +253,13 @@ void Entity::shake(float amount) {
   m_pImpl->m_shake.isEnabled = true;
 }
 
+void Entity::jiggle(float amount) {
+  auto setJiggle = [this](const auto &offset) { m_pImpl->m_jiggleOffset = offset; };
+  auto jiggle = std::make_unique<JiggleFunction>(setJiggle, amount);
+  m_pImpl->m_jiggle.function = std::move(jiggle);
+  m_pImpl->m_jiggle.isEnabled = true;
+}
+
 void Entity::alphaTo(float destination, ngf::TimeSpan time, InterpolationMethod method) {
   auto getAlpha = [this] { return m_pImpl->m_color.a; };
   auto setAlpha = [this](const float &a) { m_pImpl->m_color.a = a; };
@@ -307,6 +318,8 @@ void Entity::stopObjectMotors() {
   m_pImpl->m_rotateTo.isEnabled = false;
   m_pImpl->m_moveTo.isEnabled = false;
   m_pImpl->m_alphaTo.isEnabled = false;
+  m_pImpl->m_shake.isEnabled = false;
+  m_pImpl->m_jiggle.isEnabled = false;
   for (auto &&child : m_pImpl->m_children) {
     child->stopObjectMotors();
   }

src/Entities/JiggleFunction.cpp

@@ -0,0 +1,15 @@
+#include "JiggleFunction.hpp"
+
+namespace ng {
+JiggleFunction::JiggleFunction(std::function<void(float)> jiggle, float amount)
+    : m_jiggle(std::move(jiggle)), m_amount(amount) {}
+
+JiggleFunction::~JiggleFunction() = default;
+
+bool JiggleFunction::isElapsed() { return false; }
+
+void JiggleFunction::operator()(const ngf::TimeSpan &elapsed) {
+  m_jiggleTime += 20.f * elapsed.getTotalSeconds();
+  m_jiggle(m_amount * sinf(m_jiggleTime));
+}
+}

src/Entities/JiggleFunction.hpp

@@ -0,0 +1,21 @@
+#pragma once
+#include <functional>
+#include <glm/vec2.hpp>
+#include <ngf/System/TimeSpan.h>
+#include <engge/Engine/Function.hpp>
+
+namespace ng {
+class JiggleFunction final : public Function {
+public:
+  JiggleFunction(std::function<void(float)> jiggle, float amount);
+  ~JiggleFunction() final;
+
+  bool isElapsed() final;
+  void operator()(const ngf::TimeSpan &elapsed) final;
+
+private:
+  std::function<void(float)> m_jiggle;
+  float m_amount{0.f};
+  float m_jiggleTime{0.f};
+};
+}

src/Entities/ShakeFunction.cpp

@@ -4,7 +4,7 @@ namespace ng {
 ShakeFunction::ShakeFunction(std::function<void(const glm::vec2 &)> shake, float amount)
     : m_shake(std::move(shake)), m_amount(amount) {}
 
-    ShakeFunction::~ShakeFunction() = default;
+ShakeFunction::~ShakeFunction() = default;
 
 bool ShakeFunction::isElapsed() { return false; }
 

src/Scripting/ObjectPack.hpp

@@ -141,16 +141,18 @@ class ObjectPack final : public Pack {
   }
 
   static SQInteger jiggleObject(HSQUIRRELVM v) {
-    error("TODO: jiggleObject: not implemented");
-    Object *obj = EntityManager::getObject(v, 2);
+    if (sq_gettype(v, 2) == OT_NULL)
+      return 0;
+
+    auto *obj = EntityManager::getEntity(v, 2);
     if (!obj) {
-      return sq_throwerror(v, _SC("failed to get object"));
+      return sq_throwerror(v, _SC("failed to get object/actor"));
     }
     SQFloat amount = 0;
     if (SQ_FAILED(sq_getfloat(v, 3, &amount))) {
       return sq_throwerror(v, _SC("failed to get amount"));
     }
-    // obj->jiggle(amount);
+    obj->jiggle(amount);
     return 0;
   }