projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switched from tinygettext/tags/tinygetext-supertux/ to tinygettext/trunk/
[supertux.git]
/
src
/
object
/
light.cpp
diff --git
a/src/object/light.cpp
b/src/object/light.cpp
index
ba08bc6
..
bd00cef
100644
(file)
--- a/
src/object/light.cpp
+++ b/
src/object/light.cpp
@@
-1,12
+1,10
@@
-// $Id$
-//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
-// This program is free software
; you can redistribute it and/or
-//
modify it under the terms of the GNU General Public License
-//
as published by the Free Software Foundation; either version 2
-//
of the License, or
(at your option) any later version.
+// This program is free software
: you can redistribute it and/or modify
+//
it under the terms of the GNU General Public License as published by
+//
the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,27
+12,22
@@
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-#include <config.h>
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "light.hpp"
+#include "object/light.hpp"
+#include "sprite/sprite.hpp"
#include "sprite/sprite_manager.hpp"
#include "sprite/sprite_manager.hpp"
-#include "resources.hpp"
-#include "video/drawing_context.hpp"
-#include "object_factory.hpp"
-#include "player.hpp"
-#include "sector.hpp"
-Light::Light(const lisp::Lisp& )
+Light::Light(const Vector& center, const Color& color) :
+ position(center),
+ color(color),
+ sprite()
{
sprite = sprite_manager->create("images/objects/lightmap_light/lightmap_light.sprite");
}
Light::~Light()
{
{
sprite = sprite_manager->create("images/objects/lightmap_light/lightmap_light.sprite");
}
Light::~Light()
{
- delete sprite;
}
void
}
void
@@
-48,9
+41,12
@@
Light::draw(DrawingContext& context)
context.push_target();
context.set_target(DrawingContext::LIGHTMAP);
context.push_target();
context.set_target(DrawingContext::LIGHTMAP);
- sprite->draw(context, Sector::current()->player->get_pos(), 0);
+ sprite->set_color(color);
+ sprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
+ sprite->set_angle(90); // FIXME: color won't get applied for angle=0
+ sprite->draw(context, position, 0);
context.pop_target();
}
context.pop_target();
}
-IMPLEMENT_FACTORY(Light, "light");
+/* EOF */