Changeset 33 for trunk/src


Ignore:
Timestamp:
Jul 3, 2010, 7:21:51 PM (10 years ago)
Author:
sam
Message:

Test collisions.

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/test-map.cpp

    r25 r33  
    2020void LoadMap(void)
    2121{
    22     FILE *fp = popen("grep '^   ' maps/testmap.tmx | while read i; do echo -n \"$i\" | perl -MMIME::Base64 -ne 'print decode_base64($_)' | gunzip; done", "r");
     22    FILE *fp = popen("grep '^   [^< ]' maps/testmap.tmx | while read i; do echo -n \"$i\" | perl -MMIME::Base64 -ne 'print decode_base64($_)' | gunzip; done", "r");
    2323    while (fp && !feof(fp))
    2424    {
  • trunk/src/tiler.cpp

    r24 r33  
    107107    {
    108108        int tile = data->tiles[4 * n];
    109         float ty = .0625f * (tile / 16);
     109        float ty = .03125f * (tile / 16);
    110110        float tx = .0625f * (tile % 16);
    111111        uvs[8 * n + 0] = tx;
     
    114114        uvs[8 * n + 3] = ty;
    115115        uvs[8 * n + 4] = tx + .0625f;
    116         uvs[8 * n + 5] = ty + .0625f;
     116        uvs[8 * n + 5] = ty + .03125f;
    117117        uvs[8 * n + 6] = tx;
    118         uvs[8 * n + 7] = ty + .0625f;
     118        uvs[8 * n + 7] = ty + .03125f;
    119119    }
    120120    glBindBuffer(GL_ARRAY_BUFFER, data->buflist[1]);
Note: See TracChangeset for help on using the changeset viewer.