Ignore:
Timestamp:
Feb 18, 2011, 1:09:28 AM (11 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/monsterz/interface.cpp

    r639 r664  
    5555    data->title = NULL;
    5656    data->board = NULL;
    57     data->screen = Tiler::Register(PNG_BACKGROUND, int2(640, 480), 0, 1.0f);
     57    data->screen = Tiler::Register(PNG_BACKGROUND, vec2i(640, 480), 0, 1.0f);
    5858    data->tiles = Tiler::Register(PNG_TILES, 48, 0, 1.0f);
    5959    data->state = InterfaceData::INIT;
    6060
    61     position = int3(0, 0, 1);
     61    position = vec3i(0, 0, 1);
    6262    bbox[0] = position;
    63     bbox[1] = bbox[0] + int3(640, 480, 0);
     63    bbox[1] = bbox[0] + vec3i(640, 480, 0);
    6464}
    6565
     
    8181            data->title = NULL;
    8282            if (rand() & 1)
    83                 data->board = new Board(Board::GAME_FUSION, int2(6, 8), 3, 12);
     83                data->board = new Board(Board::GAME_FUSION, vec2i(6, 8), 3, 12);
    8484            else
    85                 data->board = new Board(Board::GAME_HUNT, int2(8, 8), 8, 8);
     85                data->board = new Board(Board::GAME_HUNT, vec2i(8, 8), 8, 8);
    8686            Ticker::Ref(data->board);
    8787            data->state = InterfaceData::GAME;
     
    9797    WorldEntity::TickDraw(deltams);
    9898
    99     int2 mouse = Input::GetMousePos();
     99    vec2i mouse = Input::GetMousePos();
    100100
    101101    Scene::GetDefault()->AddTile((data->screen << 16) | 0, 0, 0, 10, 0);
     
    103103    if (mouse.x >= 0 && mouse.y >= 0)
    104104    {
    105         int2 m = mouse + int2(-6, 6 - 48);
     105        vec2i m = mouse + vec2i(-6, 6 - 48);
    106106        Scene::GetDefault()->AddTile((data->tiles << 16) | 22, m.x, m.y, 30, 0);
    107107    }
Note: See TracChangeset for help on using the changeset viewer.