Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / video / surface.hpp

diff --git a/src/video/surface.hpp b/src/video/surface.hpp
index a9358fb..9613917 100644 (file)
--- a/src/video/surface.hpp
+++ b/src/video/surface.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  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
@@ -14,30 +12,16 @@
 //  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.
-#ifndef __SURFACE_HPP__
-#define __SURFACE_HPP__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <config.h>
+#ifndef HEADER_SUPERTUX_VIDEO_SURFACE_HPP
+#define HEADER_SUPERTUX_VIDEO_SURFACE_HPP
 
 #include <string>
-#include <SDL.h>
+
 #include "math/vector.hpp"
-#include "file_system.hpp"
-#include <unison/video/Texture.hpp>
 
-/// bitset for drawing effects
-enum DrawingEffect {
-  /** Don't apply anything */
-  NO_EFFECT,
-  /** Draw the Surface upside down */
-  VERTICAL_FLIP,
-  /** Draw the Surface from left to down */
-  HORIZONTAL_FLIP,
-  NUM_EFFECTS
-};
+class Texture;
 
 /**
  * A rectangular image.
@@ -47,82 +31,39 @@ enum DrawingEffect {
 class Surface
 {
 private:
-  Unison::Video::TextureSection texture;
+  Texture* texture;
+  void *surface_data;
+  int x;
+  int y;
+  int w;
+  int h;
   bool flipx;
 
 public:
-  Surface(const std::string& file) :
-    texture(FileSystem::normalize(file)),
-    flipx(false)
-  {
-  }
-
-  Surface(const std::string& file, int x, int y, int w, int h) :
-    texture(FileSystem::normalize(file), Unison::Video::Rect(x, y, w, h)),
-    flipx(false)
-  {
-  }
+  Surface(const std::string& file);
+  Surface(const std::string& file, int x, int y, int w, int h);
+  Surface(const Surface& other);
+  ~Surface();
 
-  Surface(const Surface& other) :
-    texture(other.texture),
-    flipx(false)
-  {
-  }
-
-  ~Surface()
-  {
-  }
+  const Surface& operator= (const Surface& other);
 
   /** flip the surface horizontally */
-  void hflip()
-  {
-    flipx = !flipx;
-  }
-
-  bool get_flipx() const
-  {
-    return flipx;
-  }
-
-  const Surface& operator= (const Surface& other)
-  {
-    texture = other.texture;
-    return *this;
-  }
-
-  Unison::Video::TextureSection get_texture() const
-  {
-    return texture;
-  }
-
-  int get_x() const
-  {
-    return texture.clip_rect.pos.x;
-  }
-
-  int get_y() const
-  {
-    return texture.clip_rect.pos.y;
-  }
-
-  int get_width() const
-  {
-    return texture.clip_rect.size.x ? texture.clip_rect.size.x : texture.image.get_size().x;
-  }
-
-  int get_height() const
-  {
-    return texture.clip_rect.size.y ? texture.clip_rect.size.y : texture.image.get_size().y;
-  }
-
-  Vector get_position() const
-  { return Vector(get_x(), get_y()); }
-
+  void hflip();
+  bool get_flipx() const;
+
+  Texture *get_texture() const;
+  void *get_surface_data() const;
+  int get_x() const;
+  int get_y() const;
+  int get_width() const;
+  int get_height() const;
+  Vector get_position() const;
   /**
    * returns a vector containing width and height
    */
-  Vector get_size() const
-  { return Vector(get_width(), get_height()); }
+  Vector get_size() const;
 };
 
 #endif
+
+/* EOF */