From: LMH <lmh.0013@gmail.com>
Date: Tue, 16 Apr 2013 00:56:21 +0000 (-1000)
Subject: Powerups placed outside of bonus blocks glow if default sprites are used
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e1dc012bf3027fec03bd5819cede85aa6b64a920;p=supertux.git

Powerups placed outside of bonus blocks glow if default sprites are used
---

diff --git a/data/levels/test/glow_effects.stl b/data/levels/test/glow_effects.stl
index f0d5db68a..a072fc01e 100755
--- a/data/levels/test/glow_effects.stl
+++ b/data/levels/test/glow_effects.stl
@@ -104,6 +104,7 @@
     (willowisp (x 48 )(y 544)(spawnpoint "top" ))
     (willowisp (x 1232 )(y 544)(spawnpoint "top" ))
 
+    (powerup (x 0 )(y 320 )(sprite "images/powerups/iceflower/iceflower.sprite" ))
     (powerup (x 0 )(y 480 )(sprite "images/powerups/fireflower/fireflower.sprite" ))
 
     (weak_block (x 0 )(y 352 )(linked #f ))
diff --git a/src/object/powerup.cpp b/src/object/powerup.cpp
index eb9cd5c7f..a70560f31 100644
--- a/src/object/powerup.cpp
+++ b/src/object/powerup.cpp
@@ -19,6 +19,8 @@
 #include "object/powerup.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/sector.hpp"
+#include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
 #include "util/reader.hpp"
 
 #include <sstream>
@@ -27,7 +29,9 @@ PowerUp::PowerUp(const Reader& lisp) :
   MovingSprite(lisp, LAYER_OBJECTS, COLGROUP_MOVING),
   physic(),
   script(),
-  no_physics()
+  no_physics(),
+  light(0.0f,0.0f,0.0f),
+  lightsprite(sprite_manager->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
 {
   lisp.get("script", script);
   no_physics = false;
@@ -35,6 +39,19 @@ PowerUp::PowerUp(const Reader& lisp) :
   physic.enable_gravity(true);
   sound_manager->preload("sounds/grow.ogg");
   sound_manager->preload("sounds/fire-flower.wav");
+  //set default light for glow effect for standard sprites
+  lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
+  lightsprite->set_color(Color(0.0f, 0.0f, 0.0f));
+  if (sprite_name == "images/powerups/egg/egg.sprite") {
+    lightsprite->set_color(Color(0.2f, 0.2f, 0.0f));
+  } else if (sprite_name == "images/powerups/fireflower/fireflower.sprite") {
+    lightsprite->set_color(Color(0.3f, 0.0f, 0.0f));
+  } else if (sprite_name == "images/powerups/iceflower/iceflower.sprite") {
+    lightsprite->set_color(Color(0.0f, 0.1f, 0.2f));
+  } else if (sprite_name == "images/powerups/star/star.sprite") {
+    lightsprite->set_color(Color(0.4f, 0.4f, 0.4f));
+  }
+
 }
 
 void
@@ -71,6 +88,10 @@ PowerUp::collision(GameObject& other, const CollisionHit&)
     if(!player->add_bonus(FIRE_BONUS, true))
       return FORCE_MOVE;
     sound_manager->play("sounds/fire-flower.wav");
+  } else if (sprite_name == "images/powerups/iceflower/iceflower.sprite") {
+    if(!player->add_bonus(ICE_BONUS, true))
+      return FORCE_MOVE;
+    sound_manager->play("sounds/fire-flower.wav");
   } else if (sprite_name == "images/powerups/star/star.sprite") {
     player->make_invincible();
   } else if (sprite_name == "images/powerups/1up/1up.sprite") {
@@ -88,4 +109,21 @@ PowerUp::update(float elapsed_time)
     movement = physic.get_movement(elapsed_time);
 }
 
+void
+PowerUp::draw(DrawingContext& context){
+  //Draw the Sprite.
+  sprite->draw(context, get_pos(), layer);
+  //Draw light when dark for defaults
+  context.get_light( get_bbox().get_middle(), &light );
+  if (light.red + light.green + light.blue < 3.0){
+    //Stars are brighter
+    if (sprite_name == "images/powerups/star/star.sprite") {
+      sprite->draw(context, get_pos(), layer);
+    }
+    context.push_target();
+    context.set_target(DrawingContext::LIGHTMAP);
+    lightsprite->draw(context, get_bbox().get_middle(), 0);
+    context.pop_target();
+  }
+}
 /* EOF */
diff --git a/src/object/powerup.hpp b/src/object/powerup.hpp
index bca1be0fd..a1d814bdf 100644
--- a/src/object/powerup.hpp
+++ b/src/object/powerup.hpp
@@ -25,6 +25,7 @@ public:
   PowerUp(const Reader& lisp);
 
   virtual void update(float elapsed_time);
+  virtual void draw(DrawingContext& context);
   virtual void collision_solid(const CollisionHit& hit);
   virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
 
@@ -32,6 +33,8 @@ private:
   Physic physic;
   std::string script;
   bool no_physics;
+  Color light;
+  SpritePtr lightsprite;
 };
 
 #endif
diff --git a/src/object/star.cpp b/src/object/star.cpp
index 119c28ab3..2d3cd03bb 100644
--- a/src/object/star.cpp
+++ b/src/object/star.cpp
@@ -48,6 +48,7 @@ Star::draw(DrawingContext& context){
   //Draw the light when dark
   context.get_light( get_bbox().get_middle(), &light );
   if (light.red + light.green + light.blue < 3.0){
+    MovingSprite::draw(context);
     context.push_target();
     context.set_target(DrawingContext::LIGHTMAP);
     lightsprite->draw(context, get_bbox().get_middle(), 0);