Ignore:
Timestamp:
Sep 12, 2011, 10:17:23 PM (11 years ago)
Author:
Sam Hocevar
Message:

core: rename vec2i to ivec2 and update matrix.h from Lol Engine.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/imlib/jwindow.h

    r671 r682  
    6666
    6767    virtual void set_owner(Jwindow *owner);
    68     virtual void Move(vec2i pos) { m_pos = pos; }
     68    virtual void Move(ivec2 pos) { m_pos = pos; }
    6969    virtual void area(int &x1, int &y1, int &x2, int &y2) = 0;
    7070    virtual void draw_first(image *screen) = 0;
     
    7777    virtual ifield *unlink(int id) { (void)id; return NULL; }
    7878
    79     vec2i m_pos;
     79    ivec2 m_pos;
    8080    int id;
    8181    ifield *next;
     
    9696
    9797    Jwindow(char const *name = NULL);
    98     Jwindow(vec2i pos, vec2i size, ifield *f, char const *name = NULL);
     98    Jwindow(ivec2 pos, ivec2 size, ifield *f, char const *name = NULL);
    9999    ~Jwindow();
    100100
    101101    virtual void redraw();
    102     void Resize(vec2i size);
    103     void clear(int color = 0) { m_surf->Bar(vec2i(x1(), y1()),
    104                                             vec2i(x2(), y2()), color); }
     102    void Resize(ivec2 size);
     103    void clear(int color = 0) { m_surf->Bar(ivec2(x1(), y1()),
     104                                            ivec2(x2(), y2()), color); }
    105105    void show() { _hidden = false; }
    106106    void hide() { _hidden = true; }
     
    113113    int x2() { return _x2; }
    114114    int y2() { return _y2; }
    115     void clip_in() { m_surf->SetClip(vec2i(x1(), y1()), vec2i(x2() + 1, y2() + 1)); }
    116     void clip_out() { m_surf->SetClip(vec2i(0), m_size); }
     115    void clip_in() { m_surf->SetClip(ivec2(x1(), y1()), ivec2(x2() + 1, y2() + 1)); }
     116    void clip_out() { m_surf->SetClip(ivec2(0), m_size); }
    117117    char *read(int id) { return inm->get(id)->read(); }
    118118    void local_close();
     
    123123    static int bottom_border();
    124124
    125     vec2i m_pos, m_size;
     125    ivec2 m_pos, m_size;
    126126    image *m_surf;
    127127
     
    159159    JCFont *fnt, *wframe_fnt;
    160160
    161     Jwindow *CreateWindow(vec2i pos, vec2i size,
     161    Jwindow *CreateWindow(ivec2 pos, ivec2 size,
    162162                          ifield *fields = NULL, char const *Name = NULL);
    163163
Note: See TracChangeset for help on using the changeset viewer.