Minor tweaks to anims

diff --git a/src/3d/anim_model_still.cc b/src/3d/anim_model_still.cc
index a27e1fecb43eedd4f610f470d09ca0dfdfeadf53..508215734c0a3a7454f36ca4c2a0f1512ded4b67 100644 (file)
--- a/src/3d/anim_model_still.cc
+++ b/src/3d/anim_model_still.cc
@@ -14,7 +14,9 @@ AnimModelStill::~AnimModelStill() {}
 void AnimModelStill::do_update(float dt) { timer -= dt; }
 
 void AnimModelStill::do_draw() {
-  DrawModel(*model, A3FToRV3(pos), 1.0F, A4CToC(color));
+  if (model) {
+    DrawModel(*model, A3FToRV3(pos), 1.0F, A4CToC(color));
+  }
 }
 
 bool AnimModelStill::is_done_impl() { return timer <= 0.0F; }

diff --git a/src/3d_renderer.cc b/src/3d_renderer.cc
index 255613db8d0372700f373d45bbc63a0766e2f7db..4af02b36a01d905e8b9e6d839271818fdfb1b269 100644 (file)
--- a/src/3d_renderer.cc
+++ b/src/3d_renderer.cc
@@ -731,12 +731,15 @@ int Renderer3D::setup_anims(int idx, int score) {
         p2_model, A3F{score * 2.0F + 1.0F, 0.0F, 0.0F},
         A4C{200, 200, 255, 255}));
   } else {
-    newAnim->push_anim(std::make_unique<AnimModelShrink>(
-        p1_model, A3F{score * 2.0F - 1.0F, 0.0F, 0.0F},
-        A4C{255, 200, 200, 255}));
-    newAnim->push_anim(std::make_unique<AnimModelShrink>(
-        p2_model, A3F{score * 2.0F + 1.0F, 0.0F, 0.0F},
-        A4C{200, 200, 255, 255}));
+    newAnim->push_anim(std::make_unique<AnimFalling2D>(
+        A3F{p1_pos.x, p1_pos.y, 0.0F}, A4C{255, 200, 200, 255}, &spriteSheet,
+        p1_dims, false, &deferred_2d_draw_map));
+    newAnim->push_anim(std::make_unique<AnimFalling2D>(
+        A3F{p2_pos.x, p2_pos.y, 0.0F}, A4C{200, 200, 255, 255}, &spriteSheet,
+        p2_dims, true, &deferred_2d_draw_map));
+    newAnim->push_anim(std::make_unique<AnimModelStill>(
+        nullptr, A3F{0.0F, 0.0F, 0.0F}, A4C{255, 255, 255, 255},
+        MODEL_STILL_FALLING_WAIT_TIME));
   }
 
   using DataT = std::tuple<int *, int>;

diff --git a/src/constants.h b/src/constants.h
index c9a080b77a0f959924b8100cbb61a2c164ce1917..48a41989d0ddd32c3c7fc2557fd61e09a37210e2 100644 (file)
--- a/src/constants.h
+++ b/src/constants.h
@@ -93,9 +93,11 @@ constexpr float MODEL_ATTACK_2_Y = 0.0F;
 constexpr float MODEL_ATTACK_ANGLE_START = 0.0F;
 constexpr float MODEL_ATTACK_ANGLE_END = 90.0F;
 
-constexpr float MODEL_FALLING_2D_DX = 80.0F;
-constexpr float MODEL_FALLING_2D_DY = -30.0F;
-constexpr float MODEL_FALLING_2D_DDY = 150.0F;
+constexpr float MODEL_FALLING_2D_DX = 90.0F;
+constexpr float MODEL_FALLING_2D_DY = -40.0F;
+constexpr float MODEL_FALLING_2D_DDY = 180.0F;
 constexpr float MODEL_FALLING_2D_DA = 270.0F;
 
+constexpr float MODEL_STILL_FALLING_WAIT_TIME = 0.5F;
+
 #endif