Changeset 6405 in orxonox.OLD for branches/preferences/src/lib/graphics
- Timestamp:
- Jan 4, 2006, 5:04:07 AM (19 years ago)
- Location:
- branches/preferences/src/lib/graphics
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/preferences/src/lib/graphics/importer/tc.c
r6308 r6405 47 47 typedef struct TableIterator { 48 48 int i1, i2, i3; 49 u int i;49 unsigned int i; 50 50 TableLevel3 *CurLevel3; 51 51 int CheckLevel1, CheckLevel2; … … 70 70 } 71 71 72 int tableRetrieve(u int a, TableRoot *table, void **ref)72 int tableRetrieve(unsigned int a, TableRoot *table, void **ref) 73 73 { 74 74 int i1 = a / (LEVEL2COUNT * LEVEL3COUNT); … … 87 87 } 88 88 89 int tableInsert(u int a, TableRoot *table, void *ref)89 int tableInsert(unsigned int a, TableRoot *table, void *ref) 90 90 { 91 91 int i1 = a / (LEVEL2COUNT * LEVEL3COUNT); … … 120 120 } 121 121 122 int tableRemove(u int a, TableRoot *table, void **wasref)122 int tableRemove(unsigned int a, TableRoot *table, void **wasref) 123 123 { 124 124 int i1 = a / (LEVEL2COUNT * LEVEL3COUNT); … … 161 161 } 162 162 163 int tableIterate(TableRoot *table, TableIterator *ti, u int *i, void **ref)163 int tableIterate(TableRoot *table, TableIterator *ti, unsigned int *i, void **ref) 164 164 { 165 165 int done; … … 287 287 288 288 typedef struct ACTCVertex { 289 u int V;289 unsigned int V; 290 290 int Count; 291 291 struct ACTCVertex **PointsToMe; … … 315 315 ACTCVertex *StaticVerts; 316 316 int UsingStaticVerts; 317 u int VertRange;317 unsigned int VertRange; 318 318 319 319 /* During consolidation */ … … 330 330 331 331 /* actcParam-settable parameters */ 332 u int MinInputVert;333 u int MaxInputVert;332 unsigned int MinInputVert; 333 unsigned int MaxInputVert; 334 334 int MaxVertShare; 335 335 int MaxEdgeShare; … … 464 464 } 465 465 466 static void *reallocAndAppend(void **ptr, u int *itemCount, size_t itemBytes,466 static void *reallocAndAppend(void **ptr, unsigned int *itemCount, size_t itemBytes, 467 467 void *append) 468 468 { … … 487 487 * going to be less than the number of vertices.) 488 488 */ 489 static int incVertexValence(ACTCData *tc, u int v, ACTCVertex **found)489 static int incVertexValence(ACTCData *tc, unsigned int v, ACTCVertex **found) 490 490 { 491 491 ACTCVertex *vertex; … … 959 959 } 960 960 961 int actcParamu(ACTCData *tc, int param, u int value)961 int actcParamu(ACTCData *tc, int param, unsigned int value) 962 962 { 963 963 /* … … 1016 1016 } 1017 1017 1018 int actcGetParamu(ACTCData *tc, int param, u int *value)1018 int actcGetParamu(ACTCData *tc, int param, unsigned int *value) 1019 1019 { 1020 1020 return actcGetParami(tc, param, (int *)value); … … 1065 1065 static int mapVertexEdge(ACTCData *tc, ACTCVertex *v1, ACTCVertex *v2, ACTCEdge **edge) 1066 1066 { 1067 u int i;1067 unsigned int i; 1068 1068 ACTCEdge tmp; 1069 1069 void *r; … … 1125 1125 } 1126 1126 1127 int actcAddTriangle(ACTCData *tc, u int v1, uint v2, uint v3)1127 int actcAddTriangle(ACTCData *tc, unsigned int v1, unsigned int v2, unsigned int v3) 1128 1128 { 1129 1129 ACTCVertex *vertexRec1; … … 1191 1191 } 1192 1192 1193 int actcStartNextPrim(ACTCData *tc, u int *v1Return, uint *v2Return)1193 int actcStartNextPrim(ACTCData *tc, unsigned int *v1Return, unsigned int *v2Return) 1194 1194 { 1195 1195 ACTCVertex *v1 = NULL; … … 1269 1269 } 1270 1270 1271 int actcGetNextVert(ACTCData *tc, u int *vertReturn)1271 int actcGetNextVert(ACTCData *tc, unsigned int *vertReturn) 1272 1272 { 1273 1273 ACTCEdge *edge; … … 1359 1359 1360 1360 int actcTrianglesToPrimitives(ACTCData *tc, int triangleCount, 1361 u int (*triangles)[3], int primTypes[], int primLengths[], uint vertices[],1361 unsigned int (*triangles)[3], int primTypes[], int primLengths[], unsigned int vertices[], 1362 1362 int maxBatchSize) 1363 1363 { … … 1365 1365 int curTriangle; 1366 1366 int curPrimitive; 1367 u int curVertex;1367 unsigned int curVertex; 1368 1368 int prim; 1369 u int v1, v2, v3;1369 unsigned int v1, v2, v3; 1370 1370 int lastPrim; 1371 1371 int passesWithoutPrims; -
branches/preferences/src/lib/graphics/importer/tc.h
r6308 r6405 48 48 int actcParami(ACTCData *tc, int param, int value); 49 49 int actcGetParami(ACTCData *tc, int param, int *value); 50 int actcParamu(ACTCData *tc, int param, u int value);51 int actcGetParamu(ACTCData *tc, int param, u int *value);50 int actcParamu(ACTCData *tc, int param, unsigned int value); 51 int actcGetParamu(ACTCData *tc, int param, unsigned int *value); 52 52 int actcGetError(ACTCData *tc); 53 53 int actcMakeEmpty(ACTCData *tc); … … 57 57 int actcBeginInput(ACTCData *tc); 58 58 int actcGetIsDuringInput(ACTCData *tc); 59 int actcAddTriangle(ACTCData *tc, u int v1, uint v2, uint v3);59 int actcAddTriangle(ACTCData *tc, unsigned int v1, unsigned int v2, unsigned int v3); 60 60 int actcEndInput(ACTCData *tc); 61 61 62 62 int actcBeginOutput(ACTCData *tc); 63 63 int actcGetIsDuringOutput(ACTCData *tc); 64 int actcStartNextPrim(ACTCData *tc, u int *v1Return, uint *v2Return);65 int actcGetNextVert(ACTCData *tc, u int *vReturn);64 int actcStartNextPrim(ACTCData *tc, unsigned int *v1Return, unsigned int *v2Return); 65 int actcGetNextVert(ACTCData *tc, unsigned int *vReturn); 66 66 int actcEndOutput(ACTCData *tc); 67 67 … … 69 69 70 70 int actcTrianglesToPrimitives(ACTCData *tc, int triangleCount, 71 u int (*triangles)[3], int primTypes[], int primLengths[], uint vertices[],71 unsigned int (*triangles)[3], int primTypes[], int primLengths[], unsigned int vertices[], 72 72 int maxBatchSize); 73 73 -
branches/preferences/src/lib/graphics/importer/vertex_array_model.cc
r6314 r6405 89 89 90 90 int prim; 91 u int v1, v2, v3;91 unsigned int v1, v2, v3; 92 92 93 93 actcBeginOutput(tc); -
branches/preferences/src/lib/graphics/text_engine/font.cc
r6349 r6405 247 247 * @param fileName the File to write the image into. 248 248 */ 249 void Font::createAsciiImage(const char* fileName, u int size) const249 void Font::createAsciiImage(const char* fileName, unsigned int size) const 250 250 { 251 251 if (this->fontTTF == NULL) -
branches/preferences/src/lib/graphics/text_engine/font.h
r6349 r6405 78 78 inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; }; 79 79 80 void createAsciiImage(const char* fileName, u int size) const;80 void createAsciiImage(const char* fileName, unsigned int size) const; 81 81 static void initDefaultFont(); 82 82 static void removeDefaultFont();
Note: See TracChangeset
for help on using the changeset viewer.