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

patches by jal: fix some warnings, and spawnflags 64 on misc_model to not smooth the normals

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@324 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-04-23 16:32:45 +00:00
parent a28f548b54
commit d909e5b8c7
7 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/mathlib.h
View File

@ -273,6 +273,8 @@ void m4x4_transform_normal(const m4x4_t matrix, vec3_t normal);
void m4x4_transpose(m4x4_t matrix); void m4x4_transpose(m4x4_t matrix);
/*! invert an orthogonal 4x3 subset of a 4x4 matrix */ /*! invert an orthogonal 4x3 subset of a 4x4 matrix */
int m4x4_orthogonal_invert(m4x4_t matrix); int m4x4_orthogonal_invert(m4x4_t matrix);
/*! m4_det */
float m4_det( m4x4_t mr );
/*! invert any m4x4 using Kramer's rule.. return 1 if matrix is singular, else return 0 */ /*! invert any m4x4 using Kramer's rule.. return 1 if matrix is singular, else return 0 */
int m4x4_invert(m4x4_t matrix); int m4x4_invert(m4x4_t matrix);

2
tools/quake3/q3map2/bspfile_abstract.c
View File

@ -331,8 +331,6 @@ int CopyLump( bspHeader_t *header, int lump, void *dest, int size )
int CopyLump_Allocate( bspHeader_t *header, int lump, void **dest, int size, int *allocationVariable ) int CopyLump_Allocate( bspHeader_t *header, int lump, void **dest, int size, int *allocationVariable )
{ {
int length, offset;
/* get lump length and offset */ /* get lump length and offset */
*allocationVariable = header->lumps[ lump ].length / size; *allocationVariable = header->lumps[ lump ].length / size;
*dest = realloc(*dest, size * *allocationVariable); *dest = realloc(*dest, size * *allocationVariable);

2
tools/quake3/q3map2/light_ydnar.c
View File

@ -1867,8 +1867,6 @@ void IlluminateRawLightmap( int rawLightmapNum )
float tests[ 4 ][ 2 ] = { { 0.0f, 0 }, { 1, 0 }, { 0, 1 }, { 1, 1 } }; float tests[ 4 ][ 2 ] = { { 0.0f, 0 }, { 1, 0 }, { 0, 1 }, { 1, 1 } };
trace_t trace; trace_t trace;
float stackLightLuxels[ STACK_LL_SIZE ]; float stackLightLuxels[ STACK_LL_SIZE ];
vec3_t flood;
float *floodlight;
/* bail if this number exceeds the number of raw lightmaps */ /* bail if this number exceeds the number of raw lightmaps */

1
tools/quake3/q3map2/map.c
View File

@ -626,7 +626,6 @@ brush_t *FinishBrush( void )
after the entire entity is parsed, the planenums and texinfos will be adjusted for the origin brush */ after the entire entity is parsed, the planenums and texinfos will be adjusted for the origin brush */
if( buildBrush->compileFlags & C_ORIGIN ) if( buildBrush->compileFlags & C_ORIGIN )
{ {
char string[ 32 ];
vec3_t origin; vec3_t origin;
Sys_Printf( "Entity %i, Brush %i: origin brush detected\n", Sys_Printf( "Entity %i, Brush %i: origin brush detected\n",

3
tools/quake3/q3map2/model.c
View File

@ -268,7 +268,8 @@ void InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shade
continue; continue;
/* fix the surface's normals */ /* fix the surface's normals */
PicoFixSurfaceNormals( surface ); /* why did vortex comment this out? FIXME */ if( !(spawnFlags & 64) )
PicoFixSurfaceNormals( surface );
/* allocate a surface (ydnar: gs mods) */ /* allocate a surface (ydnar: gs mods) */
ds = AllocDrawSurface( SURFACE_TRIANGLES ); ds = AllocDrawSurface( SURFACE_TRIANGLES );

9
tools/quake3/q3map2/prtfile.c
View File

@ -65,11 +65,9 @@ void WriteFloat (FILE *f, vec_t v)
void CountVisportals_r(node_t *node) void CountVisportals_r(node_t *node)
{ {
int i, s; int s;
portal_t *p; portal_t *p;
winding_t *w; winding_t *w;
vec3_t normal;
vec_t dist;
// decision node // decision node
if (node->planenum != PLANENUM_LEAF) { if (node->planenum != PLANENUM_LEAF) {
@ -170,7 +168,7 @@ void WritePortalFile_r (node_t *node)
void CountSolidFaces_r (node_t *node) void CountSolidFaces_r (node_t *node)
{ {
int i, s; int s;
portal_t *p; portal_t *p;
winding_t *w; winding_t *w;
@ -273,8 +271,9 @@ NumberLeafs_r
*/ */
void NumberLeafs_r (node_t *node, int c) void NumberLeafs_r (node_t *node, int c)
{ {
#if 0
portal_t *p; portal_t *p;
#endif
if ( node->planenum != PLANENUM_LEAF ) { if ( node->planenum != PLANENUM_LEAF ) {
// decision node // decision node
node->cluster = -99; node->cluster = -99;

2
tools/quake3/q3map2/q3map2.h
View File

@ -83,7 +83,7 @@ dependencies
#include "vfs.h" #include "vfs.h"
#include "png.h" #include "png.h"
#include "md4.h" #include "md4.h"
#include "radiant_jpeglib.h"
#include <stdlib.h> #include <stdlib.h>