r690 - trunk
lordhavoc at icculus.org
lordhavoc at icculus.org
Fri Apr 7 20:48:06 EDT 2006
Author: lordhavoc
Date: 2006-04-07 20:48:06 -0400 (Fri, 07 Apr 2006)
New Revision: 690
Modified:
trunk/util.c
trunk/util.h
Log:
removed commented out portions of Util_BuildModel code
Modified: trunk/util.c
===================================================================
--- trunk/util.c 2006-04-08 00:45:02 UTC (rev 689)
+++ trunk/util.c 2006-04-08 00:48:06 UTC (rev 690)
@@ -357,14 +357,7 @@
Mem_Free(&text);
}
-#if 1
void Util_BuildModel_ImportOBJ(Util_BuildModel *b, const char *inputname, const char *text, const char *textend)
-#else
-static NUint32 default_remapcoords[3] = {0, 1, 2};
-static float default_scalecoords[3] = {1, 1, 1};
-
-void Util_BuildModel_ImportOBJ(Util_BuildModel *b, const char *inputname, const char *text, const char *textend, Nbool flip, NUint32 remapcoords[3], float scalecoords[3])
-#endif
{
NUint32 linenumber = 0;
NSint32 surfaceindex = -1;
@@ -374,12 +367,6 @@
float *data_vertex3f = NULL;
float *data_normal3f = NULL;
float *data_texcoord2f = NULL;
-#if 0
- if (remapcoords == NULL)
- remapcoords = default_remapcoords;
- if (scalecoords == NULL)
- scalecoords = default_scalecoords;
-#endif
while (text < textend)
{
Nbool comment = false;
@@ -419,15 +406,9 @@
max_vertices = Max(max_vertices * 2, 1024);
Mem_ReAlloc(Global_Zone, &data_vertex3f, max_vertices * sizeof(float[3]));
}
-#if 1
data_vertex3f[num_vertices*3+0] = atof(argv[1]);
data_vertex3f[num_vertices*3+2] = atof(argv[2]);
data_vertex3f[num_vertices*3+1] = atof(argv[3]);
-#else
- data_vertex3f[num_vertices*3+remapcoords[0]] = atof(argv[1]) * scalecoords[0];
- data_vertex3f[num_vertices*3+remapcoords[1]] = atof(argv[2]) * scalecoords[1];
- data_vertex3f[num_vertices*3+remapcoords[2]] = atof(argv[3]) * scalecoords[2];
-#endif
num_vertices++;
}
else
@@ -443,15 +424,9 @@
max_normals = Max(max_normals * 2, 1024);
Mem_ReAlloc(Global_Zone, &data_normal3f, max_normals * sizeof(float[3]));
}
-#if 1
data_normal3f[num_normals*3+0] = atof(argv[1]);
data_normal3f[num_normals*3+2] = atof(argv[2]);
data_normal3f[num_normals*3+1] = atof(argv[3]);
-#else
- data_normal3f[num_normals*3+remapcoords[0]] = atof(argv[1]) * scalecoords[0];
- data_normal3f[num_normals*3+remapcoords[1]] = atof(argv[2]) * scalecoords[1];
- data_normal3f[num_normals*3+remapcoords[2]] = atof(argv[3]) * scalecoords[2];
-#endif
num_normals++;
}
else
@@ -561,14 +536,7 @@
indices[i] = Util_BuildModel_FindOrAddVertex(b, surfaceindex, v[0], v[1], v[2], vn[0], vn[1], vn[2], tc[0], tc[1]);
// make a triangle fan if we have enough vertices
if (i >= 2)
- {
-#if 0
- if (flip)
- Util_BuildModel_AddTriangle(b, surfaceindex, indices[0], indices[i], indices[i-1]);
- else
-#endif
- Util_BuildModel_AddTriangle(b, surfaceindex, indices[0], indices[i-1], indices[i]);
- }
+ Util_BuildModel_AddTriangle(b, surfaceindex, indices[0], indices[i-1], indices[i]);
}
}
else
@@ -704,13 +672,6 @@
Util_BuildModel b;
const char *inputname = Shell_Callback_GetArg(1);
const char *outputname = Shell_Callback_GetArg(2);
-#if 0
- float scale = atof(Shell_Callback_GetArg(3));
- Nbool flip = atoi(Shell_Callback_GetArg(4)) != 0;
- NUint32 conversionmode = atoi(Shell_Callback_GetArg(5));
- NUint32 remapcoords[3];
- float scalecoords[3];
-#endif
char *objtext = File_LoadFile(inputname, &objtextsize);
if (!objtext)
{
@@ -719,24 +680,7 @@
return;
}
Util_BuildModel_Begin(&b);
-#if 1
Util_BuildModel_ImportOBJ(&b, inputname, objtext, objtext + objtextsize);
-#else
- scalecoords[0] = conversionmode & 1 ? -scale : scale;
- scalecoords[1] = conversionmode & 2 ? -scale : scale;
- scalecoords[2] = conversionmode & 4 ? -scale : scale;
- switch((conversionmode / 8) % 6)
- {
- default:
- case 0: remapcoords[0] = 0;remapcoords[1] = 1;remapcoords[2] = 2;break;
- case 1: remapcoords[0] = 0;remapcoords[1] = 2;remapcoords[2] = 1;break;
- case 2: remapcoords[0] = 1;remapcoords[1] = 0;remapcoords[2] = 2;break;
- case 3: remapcoords[0] = 1;remapcoords[1] = 2;remapcoords[2] = 0;break;
- case 4: remapcoords[0] = 2;remapcoords[1] = 0;remapcoords[2] = 1;break;
- case 5: remapcoords[0] = 2;remapcoords[1] = 1;remapcoords[2] = 0;break;
- }
- Util_BuildModel_ImportOBJ(&b, inputname, objtext, objtext + objtextsize, flip, remapcoords, scalecoords);
-#endif
Util_BuildModel_Write(&b, outputname);
Util_BuildModel_End(&b);
Mem_Free(&objtext);
@@ -745,16 +689,9 @@
static Shell_SymbolDecl Util_Shell_ConvertOBJ_Decl = {
"util_convertobj",
"Turn a .obj model into a .md5mesh model file.",
-#if 1
"Usage: util_convertobj <inputname> <outputname>\n"
"Example: util_convertobj maps/mymap/mymodel.obj maps/mymap/mymodel.md5mesh",
"ss",
-#else
- "Usage: util_convertobj <inputname> <outputname> <scale> <fliptriangles> <coordinateconversionmode>\n"
- "Example: util_convertobj maps/mymap/mymodel.obj maps/mymap/mymodel.md5mesh 1 0 8\n"
- "coordinate conversion mode is a special number that rotates and/or mirrors the geometry, it is in the range 0-47, example value for most 3D programs is 8",
- "ssvvv",
-#endif
(Shell_Symbol_Callback) Util_Shell_ConvertOBJ
};
Modified: trunk/util.h
===================================================================
--- trunk/util.h 2006-04-08 00:45:02 UTC (rev 689)
+++ trunk/util.h 2006-04-08 00:48:06 UTC (rev 690)
@@ -67,11 +67,7 @@
NUint32 Util_BuildModel_FindOrAddVertex(Util_BuildModel *b, NUint32 surfaceindex, float x, float y, float z, float nx, float ny, float nz, float s, float t);
NUint32 Util_BuildModel_AddTriangle(Util_BuildModel *b, NUint32 surfaceindex, int e0, int e1, int e2);
void Util_BuildModel_Write(Util_BuildModel *b, const char *filename);
-#if 1
void Util_BuildModel_ImportOBJ(Util_BuildModel *b, const char *inputname, const char *text, const char *textend);
-#else
-void Util_BuildModel_ImportOBJ(Util_BuildModel *b, const char *inputname, const char *text, const char *textend, Nbool flip, NUint32 remapcoords[3], float scalecoords[3]);
-#endif
void Util_Init(void);
void Util_Quit(void);
More information about the neither-commits
mailing list