Reworked Thunderstorm scripting

[supertux.git] / src / object / spotlight.cpp

diff --git a/src/object/spotlight.cpp b/src/object/spotlight.cpp
index e15cdf3..6a29688 100644 (file)
--- a/src/object/spotlight.cpp
+++ b/src/object/spotlight.cpp
@@ -27,14 +27,27 @@
 #include "player.hpp"
 #include "sector.hpp"
 
-Spotlight::Spotlight(const lisp::Lisp& )
+Spotlight::Spotlight(const lisp::Lisp& lisp)
+  : angle(0.0f),
+    color(1.0f, 1.0f, 1.0f)
 {
+  lisp.get("x", position.x);
+  lisp.get("y", position.y);
+
+  lisp.get("angle", angle);
+
+  lisp.get("red",   color.red);
+  lisp.get("green", color.green);
+  lisp.get("blue",  color.blue);
+  lisp.get("alpha", color.alpha);
+  
   center    = sprite_manager->create("images/objects/spotlight/spotlight_center.sprite");
   base      = sprite_manager->create("images/objects/spotlight/spotlight_base.sprite");
   lights    = sprite_manager->create("images/objects/spotlight/spotlight_lights.sprite");
   lightcone = sprite_manager->create("images/objects/spotlight/lightcone.sprite");
+  light     = sprite_manager->create("images/objects/spotlight/light.sprite");
+
 
-  angle = 0.0f;
 }
 
 Spotlight::~Spotlight()
@@ -43,6 +56,7 @@ Spotlight::~Spotlight()
   delete base;
   delete lights;
   delete lightcone;
+  delete light;
 }
 
 void
@@ -57,23 +71,26 @@ Spotlight::draw(DrawingContext& context)
   context.push_target(); 
   context.set_target(DrawingContext::LIGHTMAP);
  
-  Vector pos(100, 300);
+  light->set_color(color);
+  light->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
+  light->set_angle(angle);
+  light->draw(context, position, 0);
 
-  lightcone->set_angle(angle);
-  lightcone->draw(context, pos, 0);
-
-  lightcone->set_angle(angle + 180.0f);
-  lightcone->draw(context, pos, 0);
+  //lightcone->set_angle(angle);
+  //lightcone->draw(context, position, 0);
   
   context.set_target(DrawingContext::NORMAL);
 
   lights->set_angle(angle);
-  lights->draw(context, pos, 0);
+  lights->draw(context, position, 0);
 
   base->set_angle(angle);
-  base->draw(context, pos, 0);
+  base->draw(context, position, 0);
 
-  center->draw(context, pos, 0);
+  center->draw(context, position, 0);
+
+  lightcone->set_angle(angle);
+  lightcone->draw(context, position, LAYER_FOREGROUND1 + 10);
 
   context.pop_target();
 }