Ignore:
Timestamp:
Apr 26, 2012, 8:20:48 PM (9 years ago)
Author:
sam
Message:

core: prefix some member variables with m_ for clarity.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/input.cpp

    r1136 r1300  
    121121    for (int n = 0; n < data->nentities; n++)
    122122    {
    123         if (coord.x < data->entities[n]->bbox[0].x
    124              || coord.x >= data->entities[n]->bbox[1].x
    125              || coord.y < data->entities[n]->bbox[0].y
    126              || coord.y >= data->entities[n]->bbox[1].y)
     123        if (coord.x < data->entities[n]->m_bbox[0].x
     124             || coord.x >= data->entities[n]->m_bbox[1].x
     125             || coord.y < data->entities[n]->m_bbox[0].y
     126             || coord.y >= data->entities[n]->m_bbox[1].y)
    127127            continue;
    128128
    129         if (!top || top->bbox[1].z < data->entities[n]->bbox[1].z)
     129        if (!top || top->m_bbox[1].z < data->entities[n]->m_bbox[1].z)
    130130            top = data->entities[n];
    131131    }
     
    135135        if (data->entities[n] == top)
    136136        {
    137             data->entities[n]->mousepos = coord - (ivec2)top->bbox[0].xy;
     137            data->entities[n]->m_mousepos = coord - (ivec2)top->m_bbox[0].xy;
    138138            if (top != data->lastfocus)
    139                 data->entities[n]->pressed = data->buttons;
     139                data->entities[n]->m_pressed = data->buttons;
    140140            else
    141                 data->entities[n]->clicked = ivec3(0);
     141                data->entities[n]->m_clicked = ivec3(0);
    142142        }
    143143        else
    144144        {
    145             data->entities[n]->mousepos = ivec2(-1);
     145            data->entities[n]->m_mousepos = ivec2(-1);
    146146            /* FIXME */
    147             data->entities[n]->released = ivec3(0);
    148             data->entities[n]->pressed = ivec3(0);
    149             data->entities[n]->clicked = ivec3(0);
     147            data->entities[n]->m_released = ivec3(0);
     148            data->entities[n]->m_pressed = ivec3(0);
     149            data->entities[n]->m_clicked = ivec3(0);
    150150        }
    151151    }
     
    160160    if (data->lastfocus)
    161161    {
    162         if (!data->lastfocus->pressed[index])
    163             data->lastfocus->clicked[index] = 1;
    164         data->lastfocus->pressed[index] = 1;
    165         data->lastfocus->released[index] = 0;
     162        if (!data->lastfocus->m_pressed[index])
     163            data->lastfocus->m_clicked[index] = 1;
     164        data->lastfocus->m_pressed[index] = 1;
     165        data->lastfocus->m_released[index] = 0;
    166166    }
    167167}
     
    173173    if (data->lastfocus)
    174174    {
    175         if (data->lastfocus->pressed[index])
    176             data->lastfocus->released[index] = 1;
    177         data->lastfocus->pressed[index] = 0;
    178         data->lastfocus->clicked[index] = 0;
     175        if (data->lastfocus->m_pressed[index])
     176            data->lastfocus->m_released[index] = 1;
     177        data->lastfocus->m_pressed[index] = 0;
     178        data->lastfocus->m_clicked[index] = 0;
    179179    }
    180180}
Note: See TracChangeset for help on using the changeset viewer.