quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mbspc: add -bsp2map220 switch, writting map in Valve 220 format with correct textures alignment for Quake 1/2, SiN and Half-Life BSPs

Browse Source 
+various improvements of decompiling
This commit is contained in:
Garux 2019-02-11 18:25:50 +03:00
parent a21a5c7290
commit d1ac937b50
3 changed files with 75 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/mbspc/mbspc.html
View File

@ -52,11 +52,10 @@ with MBSPC:
<p>
When MBSPC is used for converting BSP files to MAP files, the correct
texture name is written for every brush side. However, texture alignment
info (shift, scale, rotation) is not written to the MAP file. It is not
trivial to obtain this info from the BSP, and I did not need it when I
coded this modification, sorry. If you need this functionality, add the
necessary code.
texture name is written for every brush side. However, correct texture alignment
info (shift, scale, rotation) is not written to the MAP file, when converting Quake 3 maps.
As for Quake 1/2, SiN and Half-Life, alignment info is half right for regular map format (-bsp2map)
and is correct, when using Valve 220 one (-bsp2map220).
<p>
<h3>Usage</h3>
@ -100,6 +99,7 @@ List of options recognized by MBSPC:
onlyents file.bsp update entity list from file.ent(*) file.bsp
texinfo file.bsp extract texture list file.txi
bsp2map file.bsp create MAP from BSP file.map
bsp2map220 file.bsp create Valve 220 MAP from BSP file.map
bsp2aas file.bsp create AAS from BSP file.aas
reach file.bsp compute reachability and clusters file.aas
cluster file.aas compute clusters file.aas

4
tools/mbspc/mbspc/bspc.c
View File

@ -44,6 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
extern int use_nodequeue; //brushbsp.c
extern int calcgrapplereach; //be_aas_reach.c
extern qboolean g_bsp2map220; //map.c
float subdivide_size = 240;
char source[1024];
@ -706,8 +707,9 @@ int main (int argc, char **argv)
qfiles = GetArgumentFiles(argc, argv, &i, "bsp");
} //end else if
else if (!stricmp(argv[i], "-bsp2map"))
else if (!stricmp(argv[i], "-bsp2map") || !stricmp(argv[i], "-bsp2map220"))
{
g_bsp2map220 = !stricmp(argv[i], "-bsp2map220");
if (i + 1 >= argc) {i = 0; break;}
comp = COMP_BSP2MAP;
qfiles = GetArgumentFiles(argc, argv, &i, "bsp");

104
tools/mbspc/mbspc/map.c
View File

@ -682,6 +682,8 @@ get_shader_ptr(int bidx, int sidx)
return &q3_dshaders[dside->shaderNum];
}
qboolean g_bsp2map220;
//===========================================================================
//
// Parameter: -
@ -697,6 +699,7 @@ qboolean WriteMapBrush(FILE *fp, mapbrush_t *brush, vec3_t origin)
winding_t *w;
side_t *s;
plane_t *plane;
const char* defAlign = g_bsp2map220? "[ 1 0 0 0 ] [ 0 1 0 0 ] 0 1 1" : "0 0 0 1 1";
if (noliquids)
{
@ -727,7 +730,7 @@ qboolean WriteMapBrush(FILE *fp, mapbrush_t *brush, vec3_t origin)
{
planenum = s->planenum;
} //end else
//always take the first plane, then flip the points if necesary
//always take the first plane, then flip the points if necessary
plane = &mapplanes[planenum & ~1];
w = BaseWindingForPlane(plane->normal, plane->dist);
//
@ -735,17 +738,17 @@ qboolean WriteMapBrush(FILE *fp, mapbrush_t *brush, vec3_t origin)
{
for (j = 0; j < 3; j++)
{
if (fabs(w->p[i][j]) < 0.2) w->p[i][j] = 0;
else if (fabs((int)w->p[i][j] - w->p[i][j]) < 0.3) w->p[i][j] = (int) w->p[i][j];
if (fabs(w->p[i][j]) < 0.001) w->p[i][j] = 0;
else if (fabs((int)w->p[i][j] - w->p[i][j]) < 0.1) w->p[i][j] = (int) w->p[i][j];
//w->p[i][j] = (int) (w->p[i][j] + 0.2);
} //end for
} //end for
//three non-colinear points to define the plane
if (planenum & 1) p1 = 1;
else p1 = 0;
if (fprintf(fp," ( %5i %5i %5i ) ", (int)w->p[p1][0], (int)w->p[p1][1], (int)w->p[p1][2]) < 0) return false;
if (fprintf(fp,"( %5i %5i %5i ) ", (int)w->p[!p1][0], (int)w->p[!p1][1], (int)w->p[!p1][2]) < 0) return false;
if (fprintf(fp,"( %5i %5i %5i ) ", (int)w->p[2][0], (int)w->p[2][1], (int)w->p[2][2]) < 0) return false;
if (fprintf(fp," ( %g %g %g ) ", w->p[p1][0], w->p[p1][1], w->p[p1][2]) < 0) return false;
if (fprintf(fp,"( %g %g %g ) ", w->p[!p1][0], w->p[!p1][1], w->p[!p1][2]) < 0) return false;
if (fprintf(fp,"( %g %g %g ) ", w->p[2][0], w->p[2][1], w->p[2][2]) < 0) return false;
//free the winding
FreeWinding(w);
//
@ -756,19 +759,19 @@ qboolean WriteMapBrush(FILE *fp, mapbrush_t *brush, vec3_t origin)
//player clip
if (loadedmaptype == MAPTYPE_SIN)
{
if (fprintf(fp, "generic/misc/clip 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "generic/misc/clip") < 0) return false;
} //end if
else if (loadedmaptype == MAPTYPE_QUAKE2)
{ //FIXME: don't always use e1u1
if (fprintf(fp, "e1u1/clip 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "e1u1/clip") < 0) return false;
} //end else
else if (loadedmaptype == MAPTYPE_QUAKE3)
{
if (fprintf(fp, "common/clip 0 0 0 1 1 1 0 0") < 0) return false;
if (fprintf(fp, "common/clip") < 0) return false;
} //end else if
else
{
if (fprintf(fp, "clip 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "clip") < 0) return false;
} //end else
} //end if
else if (brush->contents == CONTENTS_MONSTERCLIP)
@ -776,37 +779,44 @@ qboolean WriteMapBrush(FILE *fp, mapbrush_t *brush, vec3_t origin)
//monster clip
if (loadedmaptype == MAPTYPE_SIN)
{
if (fprintf(fp, "generic/misc/monster 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "generic/misc/monster") < 0) return false;
} //end if
else if (loadedmaptype == MAPTYPE_QUAKE2)
{
if (fprintf(fp, "e1u1/clip_mon 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "e1u1/clip_mon") < 0) return false;
} //end else
else
{
if (fprintf(fp, "clip 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "clip") < 0) return false;
} //end else
} //end else
else
{
if (fprintf(fp, "clip 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "clip") < 0) return false;
Log_Write("brush->contents = %d\n", brush->contents);
} //end else
if ( fprintf( fp, " %s", defAlign ) < 0 ) return false;
if ( loadedmaptype == MAPTYPE_QUAKE3 )
if ( fprintf( fp, " 0 0 0" ) < 0 ) return false;
} //end if
else if (loadedmaptype == MAPTYPE_SIN && s->texinfo == 0)
{
if (brush->contents & CONTENTS_DUMMYFENCE)
{
if (fprintf(fp, "generic/misc/fence 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "generic/misc/fence") < 0) return false;
} //end if
else if (brush->contents & CONTENTS_MIST)
{
if (fprintf(fp, "generic/misc/volumetric_base 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "generic/misc/volumetric_base") < 0) return false;
} //end if
else //unknown so far
{
if (fprintf(fp, "generic/misc/red 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "generic/misc/red") < 0) return false;
} //end else
if ( fprintf( fp, " %s", defAlign ) < 0 ) return false;
} //end if
else if (loadedmaptype == MAPTYPE_QUAKE3)
{
@ -817,7 +827,7 @@ qboolean WriteMapBrush(FILE *fp, mapbrush_t *brush, vec3_t origin)
if (dshader == NULL)
{
if (fprintf(fp, "***unknown*** 0 0 0 1 1 1 0 0") < 0)
if (fprintf(fp, "***unknown***") < 0)
return false;
}
else
@ -827,18 +837,20 @@ qboolean WriteMapBrush(FILE *fp, mapbrush_t *brush, vec3_t origin)
while (*cp != '/' && *cp != 0)
cp++;
if (*cp == '/')
if (*cp == '/' && *( cp + 1 ) != 0 )
{
cp++;
if (fprintf(fp, "%s 0 0 0 1 1 1 0 0", cp) < 0)
if (fprintf(fp, "%s", cp) < 0)
return false;
}
else
{
if (fprintf(fp, "***unknown*** 0 0 0 1 1 1 0 0") < 0)
if (fprintf(fp, "***unknown***") < 0)
return false;
}
}
if ( fprintf( fp, " %s 0 0 0", defAlign ) < 0 ) return false;
}
else
@ -876,23 +888,18 @@ qboolean WriteMapBrush(FILE *fp, mapbrush_t *brush, vec3_t origin)
if (rotate < 0) rotate += 360;
if (rotate >= 360) rotate -= 360;
//write the texture info
if (fprintf(fp, "%s %d %d %d", ti->texture, shift[0], shift[1], rotate) < 0) return false;
if (fabs(scale[0] - ((int) scale[0])) < 0.001)
{
if (fprintf(fp, " %d", (int) scale[0]) < 0) return false;
} //end if
else
{
if (fprintf(fp, " %4f", scale[0]) < 0) return false;
} //end if
if (fabs(scale[1] - ((int) scale[1])) < 0.001)
{
if (fprintf(fp, " %d", (int) scale[1]) < 0) return false;
} //end if
else
{
if (fprintf(fp, " %4f", scale[1]) < 0) return false;
} //end else
if( g_bsp2map220 ){
if( fprintf(fp, "%s [ %g %g %g %g ] [ %g %g %g %g ] %d %g %g", ti->texture,
vecs[0][0], vecs[0][1], vecs[0][2], ti->vecs[0][3] - DotProduct( origin, vecs[0] ),
vecs[1][0], vecs[1][1], vecs[1][2], ti->vecs[1][3] - DotProduct( origin, vecs[1] ),
rotate, scale[0], scale[1] ) < 0 )
return false;
}
else{
if (fprintf(fp, "%s %d %d %d", ti->texture, shift[0], shift[1], rotate) < 0) return false;
if (fprintf(fp, " %g %g", scale[0], scale[1]) < 0) return false;
}
//write the extra brush side info
if (loadedmaptype == MAPTYPE_QUAKE2)
{
@ -919,6 +926,7 @@ qboolean WriteOriginBrush(FILE *fp, vec3_t origin)
float dist;
int i, s;
winding_t *w;
const char* defAlign = g_bsp2map220? "[ 1 0 0 0 ] [ 0 1 0 0 ] 0 1 1" : "0 0 0 1 1";
if (fprintf(fp, " {\n") < 0) return false;
//
@ -943,16 +951,26 @@ qboolean WriteOriginBrush(FILE *fp, vec3_t origin)
// SURF_NODRAW = 128
if (loadedmaptype == MAPTYPE_SIN)
{
if (fprintf(fp, "generic/misc/origin 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "generic/misc/origin") < 0) return false;
} //end if
else if (loadedmaptype == MAPTYPE_HALFLIFE)
else if (loadedmaptype == MAPTYPE_QUAKE2)
{
if (fprintf(fp, "origin 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "e1u1/origin") < 0) return false;
} //end if
else
else if (loadedmaptype == MAPTYPE_QUAKE3)
{
if (fprintf(fp, "e1u1/origin 0 0 0 1 1") < 0) return false;
if (fprintf(fp, "common/origin") < 0) return false;
} //end if
else //MAPTYPE_HALFLIFE (and quake1?)
{
if (fprintf(fp, "origin") < 0) return false;
} //end else
if ( fprintf( fp, " %s", defAlign ) < 0 ) return false;
if ( loadedmaptype == MAPTYPE_QUAKE3 )
if ( fprintf( fp, " 0 0 0" ) < 0 ) return false;
//Quake2 extra brush side info
if (loadedmaptype == MAPTYPE_QUAKE2)
{