[Pingus-CVS] r3684 - in trunk/pingus: . src

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-05 05:35:00 +0200 (Sat, 05 Jul 2008)
New Revision: 3684

Added:
   trunk/pingus/src/collision_map.cpp
   trunk/pingus/src/collision_map.hpp
Removed:
   trunk/pingus/src/col_map.cpp
   trunk/pingus/src/col_map.hpp
Modified:
   trunk/pingus/SConstruct
Log:
Renamed ColMap to CollisionMap

Modified: trunk/pingus/SConstruct
===================================================================
--- trunk/pingus/SConstruct     2008-07-05 03:34:22 UTC (rev 3683)
+++ trunk/pingus/SConstruct     2008-07-05 03:35:00 UTC (rev 3684)
@@ -54,7 +54,7 @@
 'src/blitter.cpp',
 'src/capture_rectangle.cpp', 
 'src/cheat.cpp', 
-'src/col_map.cpp', 
+'src/collision_map.cpp', 
 'src/collider.cpp', 
 'src/config_manager.cpp', 
 'src/colliders/pingu_collider.cpp', 

Deleted: trunk/pingus/src/col_map.cpp
===================================================================
--- trunk/pingus/src/col_map.cpp        2008-07-05 03:34:22 UTC (rev 3683)
+++ trunk/pingus/src/col_map.cpp        2008-07-05 03:35:00 UTC (rev 3684)
@@ -1,235 +0,0 @@
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 1999 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 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
-//  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, see <http://www.gnu.org/licenses/>.
-
-#include <iostream>
-#include "SDL.h"
-#include "display/drawing_context.hpp"
-#include "globals.hpp"
-#include "col_map.hpp"
-#include "collision_mask.hpp"
-#include "pingus_error.hpp"
-#include "math.hpp"
-#include "gettext.h"
-#include "sprite.hpp"
-
-CollisionMap::CollisionMap(int w, int h)
-  : serial(0),
-    width(w),
-    height(h),
-    colmap(new unsigned char[width * height])
-{
-  // Clear the colmap
-  memset(colmap, Groundtype::GP_NOTHING, sizeof(unsigned char) * width * 
height);
-}
-
-CollisionMap::~CollisionMap()
-{
-  delete[] colmap;
-}
-
-int
-CollisionMap::getpixel(int x, int y)
-{
-  if (x >= 0 && x < width && y >= 0 && y < height) {
-    return colmap[x+y*width];
-  } else {
-    return Groundtype::GP_OUTOFSCREEN;
-  }
-}
-
-int
-CollisionMap::getpixel_fast(int x, int y)
-{
-  return colmap[x+y*width];  
-}
-
-unsigned char*
-CollisionMap::get_data()
-{
-  return colmap;
-}
-
-int
-CollisionMap::get_height()
-{
-  return height;
-}
-
-int
-CollisionMap::get_width()
-{
-  return width;
-}
-
-void
-CollisionMap::remove(const CollisionMask& mask, int x_pos, int y_pos)
-{
-  ++serial;
-
-  int swidth  = mask.get_width();
-  int sheight = mask.get_height();
-  uint8_t* buffer = mask.get_data();
-
-  int start_x = Math::max(0, -x_pos);
-  int start_y = Math::max(0, -y_pos);
-  int end_x   = Math::min(swidth,  width  - x_pos);
-  int end_y   = Math::min(sheight, height - y_pos);
-
-  for (int y = start_y; y < end_y; ++y)
-    {
-      for (int x = start_x; x < end_x; ++x)
-        {
-          if (buffer[y*swidth + x])
-            {
-              uint8_t& pixel = colmap[(y+y_pos)*width + (x+x_pos)];
-              if (pixel != Groundtype::GP_SOLID)
-                pixel = Groundtype::GP_NOTHING;
-            }
-        }
-    }
-}
-
-void
-CollisionMap::put(int x, int y, Groundtype::GPType p)
-{
-  ++serial; // FIXME: Shouldn't be here but at a more heigher level function
-
-  if (x >= 0 && x < width
-      && y >= 0 && y < height)
-    {
-      colmap[x+y*width] = p;
-    }
-  else
-    {
-      if (verbose > 2)
-        std::cout << "CollisionMap: remove: Out of map" << std::endl;
-    }
-}
-
-bool
-CollisionMap::blit_allowed (int x, int y,  Groundtype::GPType gtype)
-{
-  // FIXME: Inline me
-  if (gtype == Groundtype::GP_BRIDGE)
-    {
-      int pixel = getpixel(x, y);
-      return pixel == Groundtype::GP_NOTHING;
-    }
-  else
-    {
-      return true;
-    }
-}
-
-// Puts a surface on the colmap
-void
-CollisionMap::put(const CollisionMask& mask, int sur_x, int sur_y, 
Groundtype::GPType pixel)
-{
-  // transparent groundpieces are only drawn on the gfx map, not on the colmap
-  if (pixel == Groundtype::GP_TRANSPARENT)
-    return;
-
-  if ((sur_x > width) || (sur_y > height))
-    {
-      if (verbose > 3)
-       {
-         std::cout << "Warning: CollisionMap: Spot out of screen" << std::endl;
-         std::cout << "sur_x: " << sur_x << " sur_y: " << sur_y << std::endl;
-       }
-      return;
-    }
-
-  // FIXME: This could be speed up quite a bit
-  uint8_t* source = mask.get_data();
-  for (int y = 0; y < mask.get_height(); ++y)
-    for (int x = 0; x < mask.get_width(); ++x)
-      {
-        if (source[y * mask.get_width() + x])
-          if (blit_allowed(x + sur_x, y + sur_y, pixel))
-            put(x + sur_x, y + sur_y, pixel);
-      }
-}
-
-void
-CollisionMap::draw(DrawingContext& gc)
-{
-  Surface canvas(width, height);
-  unsigned char* buffer;
-
-  canvas.lock();
-  buffer = static_cast<unsigned char*>(canvas.get_data());
-
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-  const int red   = 3;
-  const int green = 2;
-  const int blue  = 1;
-  const int alpha = 0;  
-#else
-  const int red   = 0;
-  const int green = 1;
-  const int blue  = 2;
-  const int alpha = 3;
-#endif
-
-  uint8_t trans = 220;
-
-  for(int i = 0; i < (width * height); ++i)
-    {
-      switch(colmap[i])
-       {
-       case Groundtype::GP_NOTHING:
-         buffer[i * 4 + red  ] =   0;
-         buffer[i * 4 + green] =   0;
-         buffer[i * 4 + blue ] =   0;
-         buffer[i * 4 + alpha] =   0;
-         break;
-
-       case Groundtype::GP_SOLID:
-         buffer[i * 4 + red  ] = 100;
-         buffer[i * 4 + green] = 100;
-         buffer[i * 4 + blue ] = 100;
-         buffer[i * 4 + alpha] = trans;
-         break;
-
-       case Groundtype::GP_BRIDGE:
-         buffer[i * 4 + red  ] = 200;
-         buffer[i * 4 + green] =   0;
-         buffer[i * 4 + blue ] =   0;
-         buffer[i * 4 + alpha] = trans;
-         break;
-
-       default:
-         buffer[i * 4 + red  ] = 200;
-         buffer[i * 4 + green] = 200;
-         buffer[i * 4 + blue ] = 200;
-         buffer[i * 4 + alpha] = trans;
-         break;
-       }
-    }
-
-  canvas.unlock();
-
-  Sprite sprite(canvas);
-  gc.draw(sprite, 0, 0, 1000);
-}
-
-unsigned
-CollisionMap::get_serial()
-{
-  return serial;
-}
-
-/* EOF */

Deleted: trunk/pingus/src/col_map.hpp
===================================================================
--- trunk/pingus/src/col_map.hpp        2008-07-05 03:34:22 UTC (rev 3683)
+++ trunk/pingus/src/col_map.hpp        2008-07-05 03:35:00 UTC (rev 3684)
@@ -1,93 +0,0 @@
-//  Pingus - A free Lemmings clone
-//  Copyright (C) 1999 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 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
-//  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, see <http://www.gnu.org/licenses/>.
-
-#ifndef HEADER_PINGUS_COL_MAP_HPP
-#define HEADER_PINGUS_COL_MAP_HPP
-
-#include "SDL.h"
-#include "groundtype.hpp"
-
-class CollisionMask;
-
-class DrawingContext;
-class ResDescriptor;
-class PixelStatus;
-
-/** The CollisionMap is used to represent the enviroment where the
-    Pingus walk around. The ground can have different properties, it
-    can contain lava or water, it can be solid and many more. */
-class CollisionMap
-{
-private:
-  /** The serial number indicates the state of the colmap, on every
-      change of the colmap it will get increased. */
-  unsigned int serial;
-
-  /** The width of the collision map. */
-  int    width;
-
-  /** The height of the collision map. */
-  int   height;
-
-  /** A array of uchar, each uchar represents a pixel on the map. */
-  uint8_t* colmap;
-
-public:
-  /** Init the colmap from a given area of memory.
-      The memory will be deleted in the destructor. */
-  CollisionMap(int w, int h);
-
-  /** delete[] the uchar array used for the colmap */
-  ~CollisionMap();
-
-  /** Returns the raw uchar array used for the inner representation of
-      the colmap. This is used by the smallmap to create the radar  */
-  unsigned char* get_data();
-
-  /** Returns the height of the collision map. */
-  int get_height();
-
-  /** Returns the height of the collision map. */
-  int get_width();
-
-  int  getpixel(int x, int y);
-
-  /** Same as getpixel() but without the range check */
-  int  getpixel_fast(int x, int y);
-
-  /** @return a number which represents the state of the collision
-      map, once it changes the serial changes also */
-  unsigned get_serial();
-
-  /** Return true if the given GroundType i*/
-  bool blit_allowed (int x, int y,  Groundtype::GPType);
-
-  void put(int x, int y, Groundtype::GPType p = Groundtype::GP_GROUND);
-  void put(const CollisionMask& mask, int x, int y, Groundtype::GPType);
-
-  void remove(int x, int y);
-  void remove(const CollisionMask& mask, int x, int y);
-
-  void draw(DrawingContext& gc);
-
-private:
-  CollisionMap (const CollisionMap&);
-  CollisionMap& operator= (const CollisionMap&);
-};
-
-#endif
-
-/* EOF */

Copied: trunk/pingus/src/collision_map.cpp (from rev 3683, 
trunk/pingus/src/col_map.cpp)

Copied: trunk/pingus/src/collision_map.hpp (from rev 3683, 
trunk/pingus/src/col_map.hpp)