Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6608 in orxonox.OLD for trunk


Ignore:
Timestamp:
Jan 18, 2006, 11:21:04 PM (19 years ago)
Author:
bensch
Message:

trunk: copy the tc version from spaceshipcontrol

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/graphics/importer/tc.cc

    r6455 r6608  
    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);
     
    10281028    tmp.FinalVert = v3;
    10291029    chartedSetLabel("triangle list");
    1030     r = reallocAndAppend((void **)&edge->Triangles, (uint*)&edge->TriangleCount,
     1030    r = reallocAndAppend((void **)&edge->Triangles, (unsigned int*)&edge->TriangleCount,
    10311031        sizeof(tmp), &tmp);
    10321032    if(r == NULL) {
     
    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;
     
    10831083
    10841084        chartedSetLabel("vert-to-edge mapping");
    1085         r = reallocAndAppend((void **)&v1->Edges, (uint*)&v1->EdgeCount,
     1085        r = reallocAndAppend((void **)&v1->Edges, (unsigned int*)&v1->EdgeCount,
    10861086            sizeof(tmp), &tmp);
    10871087        if(r == NULL) {
     
    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;
Note: See TracChangeset for help on using the changeset viewer.