Ignore:
Timestamp:
Aug 27, 2011, 8:29:36 PM (9 years ago)
Author:
sam
Message:

core: rename vec2i to ivec2 etc. to better match GLSL.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/video.cpp

    r820 r863  
    3535    static mat4 proj_matrix, view_matrix;
    3636#if defined ANDROID_NDK || defined __CELLOS_LV2__
    37     static vec2i saved_viewport;
     37    static ivec2 saved_viewport;
    3838#endif
    3939};
     
    4343
    4444#if defined ANDROID_NDK || defined __CELLOS_LV2__
    45 vec2i VideoData::saved_viewport = 0;
     45ivec2 VideoData::saved_viewport = 0;
    4646#endif
    4747
     
    5050 */
    5151
    52 void Video::Setup(vec2i size)
     52void Video::Setup(ivec2 size)
    5353{
    5454#if defined USE_GLEW
     
    133133void Video::Clear()
    134134{
    135     vec2i size = GetSize();
     135    ivec2 size = GetSize();
    136136    glViewport(0, 0, size.x, size.y);
    137137    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
     
    177177}
    178178
    179 vec2i Video::GetSize()
     179ivec2 Video::GetSize()
    180180{
    181181#if defined ANDROID_NDK
     
    187187    GLint v[4];
    188188    glGetIntegerv(GL_VIEWPORT, v);
    189     return vec2i(v[2], v[3]);
     189    return ivec2(v[2], v[3]);
    190190#endif
    191191}
Note: See TracChangeset for help on using the changeset viewer.