WIP improvement: Egg powerup rotation

SuperTux · Jan 24, 2014 · 0bf0ca2 · 0bf0ca2
1 parent 951d08c
commit 0bf0ca2
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 3 deletions.
diff --git a/data/images/powerups/egg/egg.png → data/images/powerups/egg/egg-0.png b/data/images/powerups/egg/egg.png → data/images/powerups/egg/egg-0.png
diff --git a/data/images/powerups/egg/egg-1.png b/data/images/powerups/egg/egg-1.png
diff --git a/data/images/powerups/egg/egg-10.png b/data/images/powerups/egg/egg-10.png
diff --git a/data/images/powerups/egg/egg-11.png b/data/images/powerups/egg/egg-11.png
diff --git a/data/images/powerups/egg/egg-12.png b/data/images/powerups/egg/egg-12.png
diff --git a/data/images/powerups/egg/egg-13.png b/data/images/powerups/egg/egg-13.png
diff --git a/data/images/powerups/egg/egg-14.png b/data/images/powerups/egg/egg-14.png
diff --git a/data/images/powerups/egg/egg-15.png b/data/images/powerups/egg/egg-15.png
diff --git a/data/images/powerups/egg/egg-16.png b/data/images/powerups/egg/egg-16.png
diff --git a/data/images/powerups/egg/egg-17.png b/data/images/powerups/egg/egg-17.png
diff --git a/data/images/powerups/egg/egg-18.png b/data/images/powerups/egg/egg-18.png
diff --git a/data/images/powerups/egg/egg-19.png b/data/images/powerups/egg/egg-19.png
diff --git a/data/images/powerups/egg/egg-2.png b/data/images/powerups/egg/egg-2.png
diff --git a/data/images/powerups/egg/egg-3.png b/data/images/powerups/egg/egg-3.png
diff --git a/data/images/powerups/egg/egg-4.png b/data/images/powerups/egg/egg-4.png
diff --git a/data/images/powerups/egg/egg-5.png b/data/images/powerups/egg/egg-5.png
diff --git a/data/images/powerups/egg/egg-6.png b/data/images/powerups/egg/egg-6.png
diff --git a/data/images/powerups/egg/egg-7.png b/data/images/powerups/egg/egg-7.png
diff --git a/data/images/powerups/egg/egg-8.png b/data/images/powerups/egg/egg-8.png
diff --git a/data/images/powerups/egg/egg-9.png b/data/images/powerups/egg/egg-9.png
diff --git a/data/images/powerups/egg/egg.sprite b/data/images/powerups/egg/egg.sprite
@@ -1,4 +1,31 @@
 (supertux-sprite
        (action
-         (name "default")
-         (images "egg.png")))
+         (name "right")
+         (images "egg-0.png"
+         		 "egg-1.png"
+                 "egg-2.png"
+                 "egg-3.png"
+                 "egg-4.png"
+                 "egg-5.png"
+                 "egg-6.png"
+                 "egg-7.png"
+                 "egg-8.png"
+                 "egg-9.png"
+                 "egg-10.png"
+                 "egg-11.png"
+                 "egg-12.png"
+                 "egg-13.png"
+                 "egg-14.png"
+                 "egg-16.png"
+                 "egg-17.png"
+                 "egg-18.png"
+        )
+        (fps 25)
+        )
+            (action
+  		 (name "left")
+  		 (mirror-action "right")
+  		         (fps 25)
+       )        
+)
+
diff --git a/src/object/growup.cpp b/src/object/growup.cpp
@@ -32,6 +32,8 @@ GrowUp::GrowUp(Direction direction) :
   //set light for glow effect
   lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
   lightsprite->set_color(Color(0.2f, 0.2f, 0.0f));
+
+  sprite->set_action((direction == LEFT) ? "left" : "right");
 }
 
 void
@@ -61,8 +63,15 @@ GrowUp::collision_solid(const CollisionHit& hit)
     physic.set_velocity_y(0);
   if(hit.bottom && physic.get_velocity_y() > 0)
     physic.set_velocity_y(0);
-  if(hit.left || hit.right)
+  if(hit.left || hit.right) {
     physic.set_velocity_x(-physic.get_velocity_x());
+    if(hit.left)
+      sprite->set_action("right");
+    else {
+      sprite->set_action("left");
+    }
+
+  }
 }
 
 HitResponse