fix some more timings and the long standing gradient software bug (which was function...

[supertux.git] / lib / video / drawing_context.cpp

diff --git a/lib/video/drawing_context.cpp b/lib/video/drawing_context.cpp
index c7718c5..5c98f13 100644 (file)
--- a/lib/video/drawing_context.cpp
+++ b/lib/video/drawing_context.cpp
@@ -16,6 +16,8 @@
 //  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>
+
 #include <algorithm>
 #include <cassert>
 #include <iostream>
@@ -29,9 +31,6 @@ using namespace SuperTux;
 
 DrawingContext::DrawingContext()
 {
-transform.draw_effect = NONE_EFFECT;
-transform.zoom = 1;
-transform.alpha = 255;
 }
 
 DrawingContext::~DrawingContext()
@@ -47,13 +46,17 @@ DrawingContext::draw_surface(const Surface* surface, const Vector& position,
   DrawingRequest request;
 
   request.type = SURFACE;
-  request.layer = layer;
-  request.request_data = const_cast<Surface*> (surface);
   request.pos = transform.apply(position);
-  request.drawing_effect = drawing_effect;
-  request.drawing_effect = transform.draw_effect | drawing_effect;
+
+  if(request.pos.x >= screen->w || request.pos.y >= screen->h
+      || request.pos.x + surface->w < 0 || request.pos.y + surface->h < 0)
+    return;
+
+  request.layer = layer;
+  request.drawing_effect = transform.drawing_effect | drawing_effect;
   request.zoom = transform.zoom;
   request.alpha = transform.alpha;
+  request.request_data = const_cast<Surface*> (surface);  
 
   drawingrequests.push_back(request);
 }
@@ -67,9 +70,9 @@ DrawingContext::draw_surface_part(const Surface* surface, const Vector& source,
   DrawingRequest request;
 
   request.type = SURFACE_PART;
-  request.layer = layer;
   request.pos = transform.apply(dest);
-  request.drawing_effect = drawing_effect;
+  request.layer = layer;
+  request.drawing_effect = transform.drawing_effect | drawing_effect;
   request.alpha = transform.alpha;
   
   SurfacePartRequest* surfacepartrequest = new SurfacePartRequest();
@@ -89,9 +92,10 @@ DrawingContext::draw_text(Font* font, const std::string& text,
   DrawingRequest request;
 
   request.type = TEXT;
-  request.layer = layer;
   request.pos = transform.apply(position);
-  request.drawing_effect = drawing_effect;
+  request.layer = layer;
+  request.drawing_effect = transform.drawing_effect | drawing_effect;
+  request.zoom = transform.zoom;
   request.alpha = transform.alpha;
 
   TextRequest* textrequest = new TextRequest;
@@ -104,13 +108,25 @@ DrawingContext::draw_text(Font* font, const std::string& text,
 }
 
 void
+DrawingContext::draw_center_text(Font* font, const std::string& text,
+    const Vector& position, int layer, Uint32 drawing_effect)
+{
+draw_text(font, text, Vector(position.x + screen->w/2, position.y),
+          CENTER_ALLIGN, layer, drawing_effect);
+}
+
+void
 DrawingContext::draw_gradient(Color top, Color bottom, int layer)
 {
   DrawingRequest request;
 
   request.type = GRADIENT;
-  request.layer = layer;
   request.pos = Vector(0,0);
+  request.layer = layer;
+
+  request.drawing_effect = transform.drawing_effect;
+  request.zoom = transform.zoom;
+  request.alpha = transform.alpha;
 
   GradientRequest* gradientrequest = new GradientRequest;
   gradientrequest->top = top;
@@ -127,8 +143,12 @@ DrawingContext::draw_filled_rect(const Vector& topleft, const Vector& size,
   DrawingRequest request;
 
   request.type = FILLRECT;
-  request.layer = layer;
   request.pos = transform.apply(topleft);
+  request.layer = layer;
+
+  request.drawing_effect = transform.drawing_effect;
+  request.zoom = transform.zoom;
+  request.alpha = transform.alpha;                    
 
   FillRectRequest* fillrectrequest = new FillRectRequest;
   fillrectrequest->size = size;
@@ -345,7 +365,7 @@ DrawingContext::pop_transform()
 void
 DrawingContext::set_drawing_effect(int effect)
 {
-  transform.draw_effect = effect;
+  transform.drawing_effect = effect;
 }
 
 void