- Reworked Surface class and drawing stuff:

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

diff --git a/src/object/text_object.cpp b/src/object/text_object.cpp
index a623a34..348d934 100644 (file)
--- a/src/object/text_object.cpp
+++ b/src/object/text_object.cpp
@@ -1,13 +1,16 @@
 #include <config.h>
 
-#include "text_object.h"
-#include "resources.h"
-#include "video/drawing_context.h"
+#include "text_object.hpp"
+
+#include <iostream>
+#include "resources.hpp"
+#include "video/drawing_context.hpp"
 
 TextObject::TextObject()
   : fading(0), fadetime(0), visible(false)
 {
   font = blue_text;
+  centered = false;
 }
 
 TextObject::~TextObject()
@@ -25,8 +28,6 @@ TextObject::set_font(const std::string& name)
     font = blue_text;
   } else if(name == "gray") {
     font = gray_text;
-  } else if(name == "white") {
-    font = white_text;
   } else if(name == "big") {
     font = white_big_text;
   } else if(name == "small") {
@@ -64,29 +65,37 @@ TextObject::set_visible(bool visible)
 }
 
 void
+TextObject::set_centered(bool centered)
+{
+  this->centered = centered;
+}
+
+void
 TextObject::draw(DrawingContext& context)
 {
   context.push_transform();
   context.set_translation(Vector(0, 0));
   if(fading > 0) {
-    context.set_alpha(static_cast<uint8_t> 
-        ((fadetime-fading) * 255.0 / fadetime));
+    context.set_alpha((fadetime-fading) / fadetime);
   } else if(fading < 0) {
-    context.set_alpha(static_cast<uint8_t> (-fading * 255.0 / fadetime));
+    context.set_alpha(-fading / fadetime);
   } else if(!visible) {
     context.pop_transform();
     return;
   }
 
   context.draw_filled_rect(Vector(125, 50), Vector(550, 120),
-      Color(150, 180, 200, 125), LAYER_GUI-50);
-  context.draw_text(font, text, Vector(125+35, 50+35), LEFT_ALLIGN, LAYER_GUI-40);
+      Color(0.6, 0.7, 0.8, 0.5), LAYER_GUI-50);
+  if (centered) {
+    context.draw_center_text(font, text, Vector(0, 50+35), LAYER_GUI-40);
+  }
+  else context.draw_text(font, text, Vector(125+35, 50+35), LEFT_ALLIGN, LAYER_GUI-40);
 
   context.pop_transform();
 }
 
 void
-TextObject::action(float elapsed_time)
+TextObject::update(float elapsed_time)
 {
   if(fading > 0) {
     fading -= elapsed_time;