Ignore:
Timestamp:
Jul 23, 2011, 11:14:40 PM (9 years ago)
Author:
sam
Message:

tileset: replace the Tiler ID system with real TileSet objects. The only
thing that is still broken is the Layer <--> Map interface.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/emitter.cpp

    r735 r790  
    3131
    3232private:
    33     int tiler;
     33    TileSet *tileset;
    3434    vec3 gravity;
    3535    int particles[MAX_PARTICLES];
     
    4343 */
    4444
    45 Emitter::Emitter(int tiler, vec3 gravity)
     45Emitter::Emitter(TileSet *tileset, vec3 gravity)
    4646  : data(new EmitterData())
    4747{
    48     data->tiler = tiler;
     48    data->tileset = tileset;
    4949    data->gravity = gravity;
    5050    data->nparticles = 0;
     
    7474
    7575    for (int i = 0; i < data->nparticles; i++)
    76         Scene::GetDefault()->AddTile((data->tiler << 16) | data->particles[i],
     76        Scene::GetDefault()->AddTile(data->tileset, data->particles[i],
    7777                                     data->positions[i].x,
    7878                                     data->positions[i].y,
Note: See TracChangeset for help on using the changeset viewer.