Change anims to have Model* as member variable

diff --git a/src/3d/anim_concurrent.cc b/src/3d/anim_concurrent.cc
index 4475d770e14a38b9fca3d32214618cfb4590ec1d..5dc66f1c2fb5c31ff6b7fdf78a2c6cc135e9cfcd 100644 (file)
--- a/src/3d/anim_concurrent.cc
+++ b/src/3d/anim_concurrent.cc
@@ -1,6 +1,6 @@
 #include "anim_concurrent.h"
 
-AnimConcurrent::AnimConcurrent() {}
+AnimConcurrent::AnimConcurrent(Model *model) : Anims(model) {}
 
 AnimConcurrent::~AnimConcurrent() {}
 
@@ -17,9 +17,9 @@ void AnimConcurrent::do_update(float dt) {
   }
 }
 
-void AnimConcurrent::do_draw(Model *m) {
+void AnimConcurrent::do_draw() {
   for (auto &anim : anims) {
-    anim->do_draw(m);
+    anim->do_draw();
   }
 }
 

diff --git a/src/3d/anim_concurrent.h b/src/3d/anim_concurrent.h
index 89def910c19b7b015c14dc4d036629e74a70e51b..a77318769056e377429c14239020c338147afbd3 100644 (file)
--- a/src/3d/anim_concurrent.h
+++ b/src/3d/anim_concurrent.h
@@ -8,13 +8,13 @@
 
 class AnimConcurrent : public Anims {
  public:
-  AnimConcurrent();
+  AnimConcurrent(Model *model);
   ~AnimConcurrent() override;
 
   bool is_done() override;
 
   void do_update(float dt) override;
-  void do_draw(Model *m) override;
+  void do_draw() override;
 
   void push_anim(UPtr &&p);
 

diff --git a/src/3d/anim_sequence.cc b/src/3d/anim_sequence.cc
index 4dd156098f5740155387eb5b07d90f2947c0b876..81d0c90754f2206052d44a6accf079b3b3b176e7 100644 (file)
--- a/src/3d/anim_sequence.cc
+++ b/src/3d/anim_sequence.cc
@@ -1,6 +1,6 @@
 #include "anim_sequence.h"
 
-AnimSequence::AnimSequence() {}
+AnimSequence::AnimSequence(Model *model) : Anims(model) {}
 
 AnimSequence::~AnimSequence() {}
 
@@ -15,9 +15,9 @@ void AnimSequence::do_update(float dt) {
   }
 }
 
-void AnimSequence::do_draw(Model *m) {
+void AnimSequence::do_draw() {
   if (!anims.empty()) {
-    anims.front()->do_draw(m);
+    anims.front()->do_draw();
   }
 }
 

diff --git a/src/3d/anim_sequence.h b/src/3d/anim_sequence.h
index d88ddabded46e5b94f2c1a486d015dae2ea58569..d08d615148de301e6a1521909e3a2673b663267e 100644 (file)
--- a/src/3d/anim_sequence.h
+++ b/src/3d/anim_sequence.h
@@ -8,13 +8,13 @@
 
 class AnimSequence : public Anims {
  public:
-  AnimSequence();
+  AnimSequence(Model *model);
   ~AnimSequence() override;
 
   bool is_done() override;
 
   void do_update(float dt) override;
-  void do_draw(Model *m) override;
+  void do_draw() override;
 
   void push_anim(UPtr &&p);
 

diff --git a/src/3d/anims.h b/src/3d/anims.h
index 10e22bba19062075beebb9d0f5b0aa8af2f8aac8..1411fed0b1c7f08416e3c4bdbe01b444553677ed 100644 (file)
--- a/src/3d/anims.h
+++ b/src/3d/anims.h
@@ -12,13 +12,16 @@ class Anims {
   using UPtr = std::unique_ptr<Anims>;
   using SPtr = std::shared_ptr<Anims>;
 
-  Anims() {}
+  Anims(Model *model) : model(model) {}
   virtual ~Anims() {}
 
   virtual bool is_done() = 0;
 
   virtual void do_update(float dt) = 0;
-  virtual void do_draw(Model *m) = 0;
+  virtual void do_draw() = 0;
+
+ protected:
+  Model *model;
 };
 
 #endif