Changeset 33


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

Test collisions.

Location:
trunk
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/maps/testmap.tmx

    r32 r33  
    66   <properties>
    77    <property name="coll" value="LR"/>
     8    <property name="coll" value="LR"/>
    89   </properties>
    910  </tile>
     
    1112   <properties>
    1213    <property name="coll" value="LR"/>
     14    <property name="coll" value="LR"/>
    1315   </properties>
    1416  </tile>
    15  </tileset>
    16  <tileset firstgid="257" name="charatest" tilewidth="32" tileheight="32">
    17   <image source="../art/test/charatest.png"/>
    1817 </tileset>
    1918 <layer name="Layer 0" width="32" height="32">
     
    2221  </data>
    2322 </layer>
    24  <layer name="Perso" width="32" height="32">
    25   <data encoding="base64" compression="gzip">
    26    H4sIAAAAAAAAA+3OIRUAIABDQaISAU8EOhGBTFgeEjPEnZv6K4WfzHB/hfs/6uH+uHZNnDi0cB8AAHizAQGLAwYAEAAA
    27   </data>
    28  </layer>
    2923 <layer name="Layer 1" width="32" height="32">
    3024  <data encoding="base64" compression="gzip">
    31    H4sIAAAAAAAAA2NgGAWDBSRC6RQScDoV7S8kQ0/5qP2j9o/aPwpGwSgYBaNgFIyCUTAKRsGQAAAgqWCmABAAAA==
     25   H4sIAAAAAAAAA2NgGAWDBSQC8T4gTiEBp1PR/kIgPkeinnIq208qoIf91QNsfzcaP4HO9qODggG2HxkMJ/tHwSgYBaNgFIyCUTAKRsEooDUAADAif2cAEAAA
    3226  </data>
    3327 </layer>
  • 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.