super-tux-commit

[Tobias Gl??er <to...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15368/src

Added Files:
	tile.cpp tile.h 
Log Message:
new levelformat with multiple layers and and new tileset code. Along with a new particlesystem. (the latest one was contributed by Matze Braun)

--- NEW FILE: tile.h ---
//
// C++ Interface: tile
//
// Description: 
//
//
// Author: Tobias Glaesser <tob...@gm...>, (C) 2004
//
// Copyright: See COPYING file that comes with this distribution
//
//
#ifndef TILE_H
#define TILE_H

#include <vector>
#include "texture.h"
#include "globals.h"
#include "lispreader.h"
#include "setup.h"

/**
Tile Class
*/
struct Tile
{
std::vector<texture_type> images;
bool solid;
bool brick;
bool ice;
bool fullbox;
int anim_speed;
unsigned char alpha;
};

class TileManager
{
private:
 TileManager();
 std::vector<Tile*> tiles;
 static TileManager* instance_ ;
 void load_tileset(std::string filename);
  
public:
 static TileManager* instance() { return instance_ ? instance_ : instance_ = new TileManager(); }
 Tile* get(unsigned int id) { if( id < tiles.size()) { return tiles[id]; } else { return NULL; } } ;

};

#endif

--- NEW FILE: tile.cpp ---
//
// C++ Implementation: tile
//
// Description: 
//
//
// Author: Tobias Glaesser <tob...@gm...>, (C) 2004
//
// Copyright: See COPYING file that comes with this distribution
//
//
#include "tile.h"
#include "assert.h"

TileManager* TileManager::instance_  = 0;

TileManager::TileManager()
{
  std::string filename = datadir +  "images/tilesets/main.stgt"; 
  load_tileset(filename);
}

void TileManager::load_tileset(std::string filename)
{
  lisp_object_t* root_obj = lisp_read_from_file(filename);
  
  if (!root_obj)
    st_abort("Couldn't load file", filename);

  if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-tiles") == 0)
    {
      lisp_object_t* cur = lisp_cdr(root_obj);
      int tileset_id = 0;

      while(!lisp_nil_p(cur))
        {
          lisp_object_t* element = lisp_car(cur);

          if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0)
            {
              int id = 0;
              std::vector<std::string> filenames;

              Tile* tile = new Tile;             
              tile->solid = false;
	      tile->brick = false;
	      tile->ice = false;	  
	      tile->fullbox = false;	      
              tile->alpha  = 0;
              tile->anim_speed = 25;
  
              LispReader reader(lisp_cdr(element));
              reader.read_int("id",  &id);
              reader.read_bool("solid", &tile->solid);
              reader.read_bool("brick", &tile->brick);
              reader.read_bool("ice", &tile->ice);	   
              reader.read_bool("fullbox", &tile->fullbox);
              reader.read_int("alpha",  (int*)&tile->alpha);
              reader.read_int("anim-speed",  &tile->anim_speed);
              reader.read_string_vector("images",  &filenames);

	      for(std::vector<std::string>::iterator it = filenames.begin(); it != filenames.end(); ++it)
	      {
	      texture_type cur_image;
	      tile->images.push_back(cur_image);
              texture_load(&tile->images[tile->images.size()-1], 
                           datadir +  "images/tilesets/" + (*it), 
                           USE_ALPHA);
			   }

              if (id+tileset_id >= int(tiles.size()))
                tiles.resize(id+tileset_id+1);

              tiles[id+tileset_id] = tile;
            }
	  else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0)
            {
	      LispReader reader(lisp_cdr(element));
	      std::string filename;
              reader.read_string("file",  &filename);
	      filename = datadir + "images/tilesets/" + filename; 
	      load_tileset(filename);
	    }
	  else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0)
            {
	      LispReader reader(lisp_cdr(element));
              reader.read_int("id",  &tileset_id);
	      tileset_id *= 1000;
	    }
          else
            {
              puts("Unhandled symbol");
            }

          cur = lisp_cdr(cur);
        }
    }
  else
    {
      assert(0);
    }
}