[Pingus-CVS] CVS: Games/Pingus/src blitter_impl.hxx,NONE,1.1 Makefile.am,1.117,1.118 blitter.cxx,1.18,1.19

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv5932

Modified Files:
        Makefile.am blitter.cxx 
Added Files:
        blitter_impl.hxx 
Log Message:
some try around to optimize the rot/flip features

--- NEW FILE: blitter_impl.hxx ---
//  $Id: blitter_impl.hxx,v 1.1 2002/10/16 11:29:30 grumbel Exp $
// 
//  Pingus - A free Lemmings clone
//  Copyright (C) 2002 Ingo Ruhnke <address@hidden>
//
//  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 distributed in the hope that it will be useful,
//  but WITHOUT ANY WARRANTY; without even the implied warranty of
//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
//  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 HEADER_PINGUS_BLITTER_IMPL_HXX
#define HEADER_PINGUS_BLITTER_IMPL_HXX

/** A collection of helper functions for the blitter class */
namespace BlitterImpl
{

struct transform_rot90
{
  static inline int get_index(int width, int height, int x, int y) {
    return (x * height) + (height - y - 1);
  }

  static inline int get_x(int width, int height, int x, int y) {
    return (height - y - 1);
  }

  static inline int get_y(int width, int height, int x, int y) {
    return x;
  }

  static inline int get_width(int width, int height) { return height; }
  static inline int get_height(int width, int height) { return width; }
};

struct transform_rot180
{
  static inline int get_index(int width, int height, int x, int y) {
    return (width * height) - (y * width + x);
  }

  static inline int get_x(int width, int height, int x, int y) {
    return width - x - 1;
  }

  static inline int get_y(int width, int height, int x, int y) {
    return height - y - 1;
  }

  static inline int get_width(int width, int height) { return width; }
  static inline int get_height(int width, int height) { return height; }
};

struct transform_rot270
{
  static inline int get_index(int width, int height, int x, int y) {
    return (x * width) + y;
  }

  static inline int get_x(int width, int height, int x, int y) {
    return y;
  }

  static inline int get_y(int width, int height, int x, int y) {
    return height - x - 1;
  }

  static inline int get_width(int width, int height) { return height; }
  static inline int get_height(int width, int height) { return width; }
};

template<class TransF>
CL_Surface modify(const CL_Surface& sur, TransF transf) 
{
  CL_SurfaceProvider* prov = sur.get_provider ();
  int pwidth  = prov->get_width();
  int pheight = prov->get_height();

  if (prov->is_indexed())
    {
      std::cout << "Using indexed blitter" << std::endl;

      IndexedCanvas* canvas = new IndexedCanvas(TransF::get_width (pwidth, 
pheight),
                                                TransF::get_height(pwidth, 
pheight));
      if (prov->uses_src_colorkey())
        canvas->set_src_colorkey(prov->get_src_colorkey());
      
      prov->lock ();
      canvas->lock ();

      canvas->set_palette(prov->get_palette());

      unsigned char* source_buf = static_cast<unsigned char*>(prov->get_data());
      unsigned char* target_buf = static_cast<unsigned 
char*>(canvas->get_data());

      for (int y = 0; y < pheight; ++y)
        for (int x = 0; x < pwidth; ++x)
          {
            target_buf[TransF::get_index(pwidth, pheight, x, y)] = source_buf[y 
* pwidth + x];
          }

      canvas->unlock ();
      prov->unlock ();
      return CL_Surface(canvas, true);     
    }
  else
    {
      CL_Canvas* canvas = new CL_Canvas (sur.get_height (), sur.get_width ());

      prov->lock ();
      canvas->lock ();

      float r, b, g, a;
      for (unsigned int y = 0; y < sur.get_height (); ++y)
        for (unsigned int x = 0; x < sur.get_width (); ++x)
          {
            prov->get_pixel (x, y, &r, &g, &b, &a);
            canvas->draw_pixel (TransF::get_x(pwidth, pheight, x, y),
                                TransF::get_y(pwidth, pheight, x, y),
                                r, g, b, a);
          }

      canvas->unlock ();
      prov->unlock ();
      return CL_Surface(canvas, true);
    }

}

} // namespace BlitterImpl

#endif

/* EOF */

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- Makefile.am 12 Oct 2002 00:24:26 -0000      1.117
+++ Makefile.am 16 Oct 2002 11:29:30 -0000      1.118
@@ -88,6 +88,7 @@
 audio.hxx \
 blitter.cxx \
 blitter.hxx \
+blitter_impl.hxx \
 button_panel.cxx \
 button_panel.hxx \
 capture_rectangle.cxx \

Index: blitter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/blitter.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- blitter.cxx 16 Oct 2002 10:27:30 -0000      1.18
+++ blitter.cxx 16 Oct 2002 11:29:30 -0000      1.19
@@ -28,6 +28,7 @@
 #include "blitter.hxx"
 #include "debug.hxx"
 #include "indexed_canvas.hxx"
+#include "blitter_impl.hxx"
 
 /* Headers needed for i18n / gettext */
 #include <clocale>
@@ -669,13 +670,13 @@
 CL_Surface
 Blitter::rotate_180 (const CL_Surface& sur)
 {
-  return Blitter::rotate_90(Blitter::rotate_90(sur));
+  return BlitterImpl::modify(sur, BlitterImpl::transform_rot180());
 }
 
 CL_Surface
 Blitter::rotate_270 (const CL_Surface& sur)
 {
-  return Blitter::rotate_90(Blitter::rotate_90(Blitter::rotate_90(sur)));
+  return BlitterImpl::modify(sur, BlitterImpl::transform_rot270());
 }
 
 CL_Surface
@@ -687,13 +688,13 @@
 CL_Surface
 Blitter::rotate_180_flip (const CL_Surface& sur)
 {
-  return Blitter::flip_horizontal(Blitter::rotate_90(Blitter::rotate_90(sur)));
+  return Blitter::flip_horizontal(Blitter::rotate_180(sur));
 }
 
 CL_Surface
 Blitter::rotate_270_flip (const CL_Surface& sur)
 {
-  return 
Blitter::flip_horizontal(Blitter::rotate_90(Blitter::rotate_90(Blitter::rotate_90(sur))));
+  return Blitter::flip_horizontal(Blitter::rotate_270(sur));
 }
 
 /* EOF */