Changeset 6405 in orxonox.OLD for branches/preferences/src

Timestamp:

Jan 4, 2006, 5:04:07 AM (19 years ago)

Author:

bensch

Message:

prefs: compile uint on windows (as unsigned int)

Location:

branches/preferences/src/lib/graphics

Files:

• importer/tc.c (modified) (18 diffs)
• importer/tc.h (modified) (3 diffs)
• importer/vertex_array_model.cc (modified) (1 diff)
• text_engine/font.cc (modified) (1 diff)
• text_engine/font.h (modified) (1 diff)

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

@@ -47 +47 @@
 typedef struct TableIterator {
     int i1, i2, i3;
-    uint i;
+    unsigned int i;
     TableLevel3 *CurLevel3;
     int CheckLevel1, CheckLevel2;
@@ -70 +70 @@
 }
 
-int tableRetrieve(uint a, TableRoot *table, void **ref)
+int tableRetrieve(unsigned int a, TableRoot *table, void **ref)
 {
     int i1 = a / (LEVEL2COUNT * LEVEL3COUNT);
@@ -87 +87 @@
 }
 
-int tableInsert(uint a, TableRoot *table, void *ref)
+int tableInsert(unsigned int a, TableRoot *table, void *ref)
 {
     int i1 = a / (LEVEL2COUNT * LEVEL3COUNT);
@@ -120 +120 @@
 }
 
-int tableRemove(uint a, TableRoot *table, void **wasref)
+int tableRemove(unsigned int a, TableRoot *table, void **wasref)
 {
     int i1 = a / (LEVEL2COUNT * LEVEL3COUNT);
@@ -161 +161 @@
 }
 
-int tableIterate(TableRoot *table, TableIterator *ti, uint *i, void **ref)
+int tableIterate(TableRoot *table, TableIterator *ti, unsigned int *i, void **ref)
 {
     int done;
@@ -287 +287 @@
 
 typedef struct ACTCVertex {
-    uint V;
+    unsigned int V;
     int Count;
     struct ACTCVertex **PointsToMe;
@@ -315 +315 @@
     ACTCVertex *StaticVerts;
     int UsingStaticVerts;
-    uint VertRange;
+    unsigned int VertRange;
 
     /* During consolidation */
@@ -330 +330 @@
 
     /* actcParam-settable parameters */
-    uint MinInputVert;
-    uint MaxInputVert;
+    unsigned int MinInputVert;
+    unsigned int MaxInputVert;
     int MaxVertShare;
     int MaxEdgeShare;
@@ -464 +464 @@
 }
 
-static void *reallocAndAppend(void **ptr, uint *itemCount, size_t itemBytes,
+static void *reallocAndAppend(void **ptr, unsigned int *itemCount, size_t itemBytes,
     void *append)
 {
@@ -487 +487 @@
  * going to be less than the number of vertices.)
  */
-static int incVertexValence(ACTCData *tc, uint v, ACTCVertex **found)
+static int incVertexValence(ACTCData *tc, unsigned int v, ACTCVertex **found)
 {
     ACTCVertex *vertex;
@@ -959 +959 @@
 }
 
-int actcParamu(ACTCData *tc, int param, uint value)
+int actcParamu(ACTCData *tc, int param, unsigned int value)
 {
     /*
@@ -1016 +1016 @@
 }
 
-int actcGetParamu(ACTCData *tc, int param, uint *value)
+int actcGetParamu(ACTCData *tc, int param, unsigned int *value)
 {
     return actcGetParami(tc, param, (int *)value);
@@ -1065 +1065 @@
 static int mapVertexEdge(ACTCData *tc, ACTCVertex *v1, ACTCVertex *v2, ACTCEdge **edge)
 {
-    uint i;
+    unsigned int i;
     ACTCEdge tmp;
     void *r;
@@ -1125 +1125 @@
 }
 
-int actcAddTriangle(ACTCData *tc, uint v1, uint v2, uint v3)
+int actcAddTriangle(ACTCData *tc, unsigned int v1, unsigned int v2, unsigned int v3)
 {
     ACTCVertex *vertexRec1;
@@ -1191 +1191 @@
 }
 
-int actcStartNextPrim(ACTCData *tc, uint *v1Return, uint *v2Return)
+int actcStartNextPrim(ACTCData *tc, unsigned int *v1Return, unsigned int *v2Return)
 {
     ACTCVertex *v1 = NULL;
@@ -1269 +1269 @@
 }
 
-int actcGetNextVert(ACTCData *tc, uint *vertReturn)
+int actcGetNextVert(ACTCData *tc, unsigned int *vertReturn)
 {
     ACTCEdge *edge;
@@ -1359 +1359 @@
 
 int actcTrianglesToPrimitives(ACTCData *tc, int triangleCount,
-    uint (*triangles)[3], int primTypes[], int primLengths[], uint vertices[],
+    unsigned int (*triangles)[3], int primTypes[], int primLengths[], unsigned int vertices[],
     int maxBatchSize)
 {
@@ -1365 +1365 @@
     int curTriangle;
     int curPrimitive;
-    uint curVertex;
+    unsigned int curVertex;
     int prim;
-    uint v1, v2, v3;
+    unsigned int v1, v2, v3;
     int lastPrim;
     int passesWithoutPrims;

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

@@ -48 +48 @@
 int actcParami(ACTCData *tc, int param, int value);
 int actcGetParami(ACTCData *tc, int param, int *value);
-int actcParamu(ACTCData *tc, int param, uint value);
-int actcGetParamu(ACTCData *tc, int param, uint *value);
+int actcParamu(ACTCData *tc, int param, unsigned int value);
+int actcGetParamu(ACTCData *tc, int param, unsigned int *value);
 int actcGetError(ACTCData *tc);
 int actcMakeEmpty(ACTCData *tc);
@@ -57 +57 @@
 int actcBeginInput(ACTCData *tc);
 int actcGetIsDuringInput(ACTCData *tc);
-int actcAddTriangle(ACTCData *tc, uint v1, uint v2, uint v3);
+int actcAddTriangle(ACTCData *tc, unsigned int v1, unsigned int v2, unsigned int v3);
 int actcEndInput(ACTCData *tc);
 
 int actcBeginOutput(ACTCData *tc);
 int actcGetIsDuringOutput(ACTCData *tc);
-int actcStartNextPrim(ACTCData *tc, uint *v1Return, uint *v2Return);
-int actcGetNextVert(ACTCData *tc, uint *vReturn);
+int actcStartNextPrim(ACTCData *tc, unsigned int *v1Return, unsigned int *v2Return);
+int actcGetNextVert(ACTCData *tc, unsigned int *vReturn);
 int actcEndOutput(ACTCData *tc);
 
@@ -69 +69 @@
 
 int actcTrianglesToPrimitives(ACTCData *tc, int triangleCount,
-    uint (*triangles)[3], int primTypes[], int primLengths[], uint vertices[],
+    unsigned int (*triangles)[3], int primTypes[], int primLengths[], unsigned int vertices[],
     int maxBatchSize);
 

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

@@ -89 +89 @@
 
   int prim;
-  uint v1, v2, v3;
+  unsigned int v1, v2, v3;
 
   actcBeginOutput(tc);

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

@@ -247 +247 @@
  * @param fileName the File to write the image into.
  */
-void Font::createAsciiImage(const char* fileName, uint size) const
+void Font::createAsciiImage(const char* fileName, unsigned int size) const
 {
   if (this->fontTTF == NULL)

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

@@ -78 +78 @@
     inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
 
-    void createAsciiImage(const char* fileName, uint size) const;
+    void createAsciiImage(const char* fileName, unsigned int size) const;
     static void initDefaultFont();
     static void removeDefaultFont();