Changeset 6480 in orxonox.OLD

Timestamp:

Jan 11, 2006, 3:32:25 PM (18 years ago)

Author:

bensch

Message:

uint to unsigned int

File:

• trunk/src/lib/graphics/importer/tc.h (modified) (3 diffs)

trunk/src/lib/graphics/importer/tc.h

@@ -12 +12 @@
 /*
     Abbreviated:
-        vertex          vert
-        primitive       prim
-        maximum         max
-        minimum         min
-        parameter       param
+        vertex          vert
+        primitive       prim
+        maximum         max
+        minimum         min
+        parameter       param
  */
 
-#define ACTC_NO_ERROR                   0
-#define ACTC_ALLOC_FAILED               -0x2000
-#define ACTC_DURING_INPUT               -0x2001
-#define ACTC_DURING_OUTPUT              -0x2002
-#define ACTC_IDLE                       -0x2003
-#define ACTC_INVALID_VALUE              -0x2004
-#define ACTC_DATABASE_EMPTY             -0x2005
-#define ACTC_DATABASE_CORRUPT           -0x2006
-#define ACTC_PRIM_COMPLETE              -0x2007
+#define ACTC_NO_ERROR                   0
+#define ACTC_ALLOC_FAILED               -0x2000
+#define ACTC_DURING_INPUT               -0x2001
+#define ACTC_DURING_OUTPUT              -0x2002
+#define ACTC_IDLE                       -0x2003
+#define ACTC_INVALID_VALUE              -0x2004
+#define ACTC_DATABASE_EMPTY             -0x2005
+#define ACTC_DATABASE_CORRUPT           -0x2006
+#define ACTC_PRIM_COMPLETE              -0x2007
 
-#define ACTC_OUT_MIN_FAN_VERTS          0x1000
-#define ACTC_OUT_HONOR_WINDING          0x1001
-#define ACTC_OUT_MAX_PRIM_VERTS         0x1004
-#define ACTC_IN_MIN_VERT                0x1005
-#define ACTC_IN_MAX_VERT                0x1006
-#define ACTC_IN_MAX_VERT_SHARING        0x1007
-#define ACTC_IN_MAX_EDGE_SHARING        0x1008
-#define ACTC_MINOR_VERSION              0x1009
-#define ACTC_MAJOR_VERSION              0x1010
+#define ACTC_OUT_MIN_FAN_VERTS          0x1000
+#define ACTC_OUT_HONOR_WINDING          0x1001
+#define ACTC_OUT_MAX_PRIM_VERTS         0x1004
+#define ACTC_IN_MIN_VERT                0x1005
+#define ACTC_IN_MAX_VERT                0x1006
+#define ACTC_IN_MAX_VERT_SHARING        0x1007
+#define ACTC_IN_MAX_EDGE_SHARING        0x1008
+#define ACTC_MINOR_VERSION              0x1009
+#define ACTC_MAJOR_VERSION              0x1010
 
-#define ACTC_PRIM_FAN                   0x2000
-#define ACTC_PRIM_STRIP                 0x2001
+#define ACTC_PRIM_FAN                   0x2000
+#define ACTC_PRIM_STRIP                 0x2001
 
-#define ACTC_TRUE                       1
-#define ACTC_FALSE                      0
+#define ACTC_TRUE                       1
+#define ACTC_FALSE                      0
 
 ACTCData *actcNew(void);
 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);