qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support Quests' map format. 

This is mostly because I have a few maps in this format.
This commit is contained in:
Bill Currie 2010-10-09 15:34:03 +09:00
parent ae1d5245ad
commit 1928780af6
1 changed files with 69 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
tools/Forge/Bundles/MapEdit/SetBrush.m
View File

@ -616,9 +616,34 @@ initOwner: fromTokens
*/ */
int numsb; int numsb;
static vec3_t *
ParseVerts (script_t *script, int *n_verts)
{
vec3_t *verts;
int i;
if (strcmp (Script_Token (script), ":"))
Sys_Error ("parsing map file");
Script_GetToken (script, false);
*n_verts = atoi (Script_Token (script));
verts = malloc (sizeof (vec3_t) * *n_verts);
for (i = 0; i < *n_verts; i++) {
Script_GetToken (script, true);
verts[i][0] = atof (Script_Token (script));
Script_GetToken (script, true);
verts[i][1] = atof (Script_Token (script));
Script_GetToken (script, true);
verts[i][2] = atof (Script_Token (script));
}
return verts;
}
- (id) initFromScript: (script_t *)script owner: own - (id) initFromScript: (script_t *)script owner: own
{ {
face_t *f; face_t *f;
vec3_t *verts = 0;
int n_verts = 0;
int i, j; int i, j;
[self init]; [self init];
@ -627,26 +652,50 @@ int numsb;
f = faces; f = faces;
numfaces = 0; numfaces = 0;
if (!Script_GetToken (script, true))
return self;
if (strcmp (Script_Token (script), "(")) {
verts = ParseVerts (script, &n_verts);
} else {
Script_UngetToken (script);
}
do { do {
if (!Script_GetToken (script, true)) if (!Script_GetToken (script, true))
break; break;
if (!strcmp (Script_Token (script), "}")) if (!strcmp (Script_Token (script), "}"))
break; break;
for (i = 0; i < 3; i++) { if (verts) {
if (i != 0) int n_v, v;
Script_GetToken (script, true); n_v = atoi (Script_Token (script));
if (strcmp (Script_Token (script), "("))
Sys_Error ("parsing map file");
for (j = 0; j < 3; j++) {
Script_GetToken (script, false);
f->planepts[i][j] = atoi (Script_Token (script));
}
Script_GetToken (script, false); Script_GetToken (script, false);
for (i = 0; i < n_v; i++) {
Script_GetToken (script, false);
v = atoi (Script_Token (script));
if (i < 3)
VectorCopy (verts[v], f->planepts[i]);
}
printf ("\n");
Script_GetToken (script, false);
} else {
for (i = 0; i < 3; i++) {
if (i != 0)
Script_GetToken (script, true);
if (strcmp (Script_Token (script), "("))
Sys_Error ("parsing map file");
if (strcmp (Script_Token (script), ")")) for (j = 0; j < 3; j++) {
Sys_Error ("parsing map file"); Script_GetToken (script, false);
f->planepts[i][j] = atoi (Script_Token (script));
}
Script_GetToken (script, false);
if (strcmp (Script_Token (script), ")"))
Sys_Error ("parsing map file");
}
} }
Script_GetToken (script, false); Script_GetToken (script, false);
@ -662,6 +711,14 @@ int numsb;
Script_GetToken (script, false); Script_GetToken (script, false);
f->texture.scale[1] = atof (Script_Token (script)); f->texture.scale[1] = atof (Script_Token (script));
while (Script_TokenAvailable (script, false)) {
Script_GetToken (script, false);
if (!strcmp (Script_Token (script), "detail"))
; // XXX implement
else
Sys_Error ("parsing map file");
}
#if 0 #if 0
flags = atoi (Script_Token (script)); flags = atoi (Script_Token (script));