Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6405 in orxonox.OLD


Ignore:
Timestamp:
Jan 4, 2006, 5:04:07 AM (18 years ago)
Author:
bensch
Message:

prefs: compile uint on windows (as unsigned int)

Location:
branches/preferences/src/lib/graphics
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/preferences/src/lib/graphics/importer/tc.c

    r6308 r6405  
    4747typedef struct TableIterator {
    4848    int i1, i2, i3;
    49     uint i;
     49    unsigned int i;
    5050    TableLevel3 *CurLevel3;
    5151    int CheckLevel1, CheckLevel2;
    … …  
    7070}
    7171
    72 int tableRetrieve(uint a, TableRoot *table, void **ref)
     72int tableRetrieve(unsigned int a, TableRoot *table, void **ref)
    7373{
    7474    int i1 = a / (LEVEL2COUNT * LEVEL3COUNT);
    … …  
    8787}
    8888
    89 int tableInsert(uint a, TableRoot *table, void *ref)
     89int tableInsert(unsigned int a, TableRoot *table, void *ref)
    9090{
    9191    int i1 = a / (LEVEL2COUNT * LEVEL3COUNT);
    … …  
    120120}
    121121
    122 int tableRemove(uint a, TableRoot *table, void **wasref)
     122int tableRemove(unsigned int a, TableRoot *table, void **wasref)
    123123{
    124124    int i1 = a / (LEVEL2COUNT * LEVEL3COUNT);
    … …  
    161161}
    162162
    163 int tableIterate(TableRoot *table, TableIterator *ti, uint *i, void **ref)
     163int tableIterate(TableRoot *table, TableIterator *ti, unsigned int *i, void **ref)
    164164{
    165165    int done;
    … …  
    287287
    288288typedef struct ACTCVertex {
    289     uint V;
     289    unsigned int V;
    290290    int Count;
    291291    struct ACTCVertex **PointsToMe;
    … …  
    315315    ACTCVertex *StaticVerts;
    316316    int UsingStaticVerts;
    317     uint VertRange;
     317    unsigned int VertRange;
    318318
    319319    /* During consolidation */
    … …  
    330330
    331331    /* actcParam-settable parameters */
    332     uint MinInputVert;
    333     uint MaxInputVert;
     332    unsigned int MinInputVert;
     333    unsigned int MaxInputVert;
    334334    int MaxVertShare;
    335335    int MaxEdgeShare;
    … …  
    464464}
    465465
    466 static void *reallocAndAppend(void **ptr, uint *itemCount, size_t itemBytes,
     466static void *reallocAndAppend(void **ptr, unsigned int *itemCount, size_t itemBytes,
    467467    void *append)
    468468{
    … …  
    487487 * going to be less than the number of vertices.)
    488488 */
    489 static int incVertexValence(ACTCData *tc, uint v, ACTCVertex **found)
     489static int incVertexValence(ACTCData *tc, unsigned int v, ACTCVertex **found)
    490490{
    491491    ACTCVertex *vertex;
    … …  
    959959}
    960960
    961 int actcParamu(ACTCData *tc, int param, uint value)
     961int actcParamu(ACTCData *tc, int param, unsigned int value)
    962962{
    963963    /*
    … …  
    10161016}
    10171017
    1018 int actcGetParamu(ACTCData *tc, int param, uint *value)
     1018int actcGetParamu(ACTCData *tc, int param, unsigned int *value)
    10191019{
    10201020    return actcGetParami(tc, param, (int *)value);
    … …  
    10651065static int mapVertexEdge(ACTCData *tc, ACTCVertex *v1, ACTCVertex *v2, ACTCEdge **edge)
    10661066{
    1067     uint i;
     1067    unsigned int i;
    10681068    ACTCEdge tmp;
    10691069    void *r;
    … …  
    11251125}
    11261126
    1127 int actcAddTriangle(ACTCData *tc, uint v1, uint v2, uint v3)
     1127int actcAddTriangle(ACTCData *tc, unsigned int v1, unsigned int v2, unsigned int v3)
    11281128{
    11291129    ACTCVertex *vertexRec1;
    … …  
    11911191}
    11921192
    1193 int actcStartNextPrim(ACTCData *tc, uint *v1Return, uint *v2Return)
     1193int actcStartNextPrim(ACTCData *tc, unsigned int *v1Return, unsigned int *v2Return)
    11941194{
    11951195    ACTCVertex *v1 = NULL;
    … …  
    12691269}
    12701270
    1271 int actcGetNextVert(ACTCData *tc, uint *vertReturn)
     1271int actcGetNextVert(ACTCData *tc, unsigned int *vertReturn)
    12721272{
    12731273    ACTCEdge *edge;
    … …  
    13591359
    13601360int actcTrianglesToPrimitives(ACTCData *tc, int triangleCount,
    1361     uint (*triangles)[3], int primTypes[], int primLengths[], uint vertices[],
     1361    unsigned int (*triangles)[3], int primTypes[], int primLengths[], unsigned int vertices[],
    13621362    int maxBatchSize)
    13631363{
    … …  
    13651365    int curTriangle;
    13661366    int curPrimitive;
    1367     uint curVertex;
     1367    unsigned int curVertex;
    13681368    int prim;
    1369     uint v1, v2, v3;
     1369    unsigned int v1, v2, v3;
    13701370    int lastPrim;
    13711371    int passesWithoutPrims;

  • branches/preferences/src/lib/graphics/importer/tc.h

    r6308 r6405  
    4848int actcParami(ACTCData *tc, int param, int value);
    4949int actcGetParami(ACTCData *tc, int param, int *value);
    50 int actcParamu(ACTCData *tc, int param, uint value);
    51 int actcGetParamu(ACTCData *tc, int param, uint *value);
     50int actcParamu(ACTCData *tc, int param, unsigned int value);
     51int actcGetParamu(ACTCData *tc, int param, unsigned int *value);
    5252int actcGetError(ACTCData *tc);
    5353int actcMakeEmpty(ACTCData *tc);
    … …  
    5757int actcBeginInput(ACTCData *tc);
    5858int actcGetIsDuringInput(ACTCData *tc);
    59 int actcAddTriangle(ACTCData *tc, uint v1, uint v2, uint v3);
     59int actcAddTriangle(ACTCData *tc, unsigned int v1, unsigned int v2, unsigned int v3);
    6060int actcEndInput(ACTCData *tc);
    6161
    6262int actcBeginOutput(ACTCData *tc);
    6363int actcGetIsDuringOutput(ACTCData *tc);
    64 int actcStartNextPrim(ACTCData *tc, uint *v1Return, uint *v2Return);
    65 int actcGetNextVert(ACTCData *tc, uint *vReturn);
     64int actcStartNextPrim(ACTCData *tc, unsigned int *v1Return, unsigned int *v2Return);
     65int actcGetNextVert(ACTCData *tc, unsigned int *vReturn);
    6666int actcEndOutput(ACTCData *tc);
    6767
    … …  
    6969
    7070int actcTrianglesToPrimitives(ACTCData *tc, int triangleCount,
    71     uint (*triangles)[3], int primTypes[], int primLengths[], uint vertices[],
     71    unsigned int (*triangles)[3], int primTypes[], int primLengths[], unsigned int vertices[],
    7272    int maxBatchSize);
    7373

  • branches/preferences/src/lib/graphics/importer/vertex_array_model.cc

    r6314 r6405  
    8989
    9090  int prim;
    91   uint v1, v2, v3;
     91  unsigned int v1, v2, v3;
    9292
    9393  actcBeginOutput(tc);

  • branches/preferences/src/lib/graphics/text_engine/font.cc

    r6349 r6405  
    247247 * @param fileName the File to write the image into.
    248248 */
    249 void Font::createAsciiImage(const char* fileName, uint size) const
     249void Font::createAsciiImage(const char* fileName, unsigned int size) const
    250250{
    251251  if (this->fontTTF == NULL)

  • branches/preferences/src/lib/graphics/text_engine/font.h

    r6349 r6405  
    7878    inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
    7979
    80     void createAsciiImage(const char* fileName, uint size) const;
     80    void createAsciiImage(const char* fileName, unsigned int size) const;
    8181    static void initDefaultFont();
    8282    static void removeDefaultFont();
Note: See TracChangeset for help on using the changeset viewer.