Ignore:
Timestamp:
Feb 18, 2011, 1:09:28 AM (10 years ago)
Author:
sam
Message:

Get rid of float3, float4, int3 etc. in favour of GLSL types.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/tileset.cpp

    r658 r664  
    4343    char *name, *path;
    4444    int *tiles, ntiles;
    45     int2 size, count;
     45    vec2i size, count;
    4646    float dilate, tx, ty;
    4747
     
    5454 */
    5555
    56 TileSet::TileSet(char const *path, int2 size, int2 count, float dilate)
     56TileSet::TileSet(char const *path, vec2i size, vec2i count, float dilate)
    5757  : data(new TileSetData())
    5858{
     
    8181    {
    8282        data->count = count;
    83         data->size = int2(data->img->w, data->img->h) / count;
     83        data->size = vec2i(data->img->w, data->img->h) / count;
    8484    }
    8585    else
     
    158158}
    159159
    160 int2 TileSet::GetSize() const
     160vec2i TileSet::GetSize() const
    161161{
    162162    return data->size;
    163163}
    164164
    165 int2 TileSet::GetCount() const
     165vec2i TileSet::GetCount() const
    166166{
    167167    return data->count;
Note: See TracChangeset for help on using the changeset viewer.