20 Nov 2008

This commit is contained in:
g-cont 2008-11-20 00:00:00 +03:00 committed by Alibek Omarov
parent 0acb446db0
commit 1dc0e78406
18 changed files with 648 additions and 44 deletions

16
baserc/baserc.plg Normal file
View File

@ -0,0 +1,16 @@
<html>
<body>
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: baserc - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
<h3>Results</h3>
baserc.dll - 0 error(s), 0 warning(s)
</pre>
</body>
</html>

View File

@ -44,6 +44,10 @@ extern bool onlyvis;
extern bool onlyrad;
extern physic_exp_t *pe;
// parms
extern bool noblock;
extern bool nocolor;
// bsplib export functions
void WradMain ( bool option );
void WvisMain ( bool option );
@ -559,54 +563,63 @@ int CountBits (byte *bits, int numbits);
//=============================================================================
// rad.c
#define LIGHTDISTBIAS 6800.0
typedef enum
{
emit_surface,
emit_point,
emit_spotlight
emit_spotlight,
emit_skylight
} emittype_t;
typedef struct directlight_s
{
struct directlight_s *next;
emittype_t type;
int style;
float intensity;
int style;
vec3_t origin;
vec3_t color;
vec3_t normal; // for surfaces and spotlights
float intensity;
float stopdot; // for spotlights
float stopdot2; // for spotlights
dplane_t *plane;
dleaf_t *leaf;
} directlight_t;
typedef struct tnode_s
{
int type;
vec3_t normal;
float dist;
int children[2];
int pad;
} tnode_t;
// the sum of all tranfer->transfer values for a given patch
// should equal exactly 0x10000, showing that all radiance
// reaches other patches
typedef struct
{
unsigned short patch;
unsigned short transfer;
word patch;
word transfer;
} transfer_t;
typedef struct patch_s
{
winding_t *winding;
struct patch_s *next; // next in face
int numtransfers;
winding_t *winding;
struct patch_s *next; // next in face
int numtransfers;
transfer_t *transfers;
int cluster; // for pvs checking
int cluster; // for pvs checking
vec3_t origin;
dplane_t *plane;
dplane_t *plane;
bool sky;
bool sky;
vec3_t totallight; // accumulated by radiosity
// does NOT include light
@ -623,17 +636,18 @@ typedef struct patch_s
int samples; // for averaging direct light
} patch_t;
extern patch_t *face_patches[MAX_MAP_SURFACES];
extern bsp_entity_t *face_entity[MAX_MAP_SURFACES];
extern vec3_t face_offset[MAX_MAP_SURFACES]; // for rotating bmodels
extern patch_t patches[MAX_PATCHES];
extern unsigned num_patches;
extern patch_t *face_patches[MAX_MAP_SURFACES];
extern bsp_entity_t *face_entity[MAX_MAP_SURFACES];
extern vec3_t face_offset[MAX_MAP_SURFACES]; // for rotating bmodels
extern patch_t patches[MAX_PATCHES];
extern tnode_t *tnodes;
extern uint num_patches;
extern int leafparents[MAX_MAP_LEAFS];
extern int nodeparents[MAX_MAP_NODES];
extern int leafparents[MAX_MAP_LEAFS];
extern int nodeparents[MAX_MAP_NODES];
extern float lightscale;
extern float ambient;
extern float lightscale;
extern float ambient;
void MakeShadowSplits (void);
@ -672,14 +686,14 @@ dleaf_t *RadPointInLeaf (vec3_t point);
extern dplane_t backplanes[MAX_MAP_PLANES];
extern int fakeplanes;// created planes for origin offset
extern int fakeplanes;// created planes for origin offset
extern float subdiv;
extern float direct_scale;
extern float entity_scale;
int PointInLeafnum (vec3_t point);
int PointInLeafnum( vec3_t point );
void MakeTnodes (dmodel_t *bm);
void MakePatches (void);
void SubdividePatches (void);

View File

@ -6,15 +6,6 @@
#include "bsplib.h"
#include "const.h"
typedef struct tnode_s
{
int type;
vec3_t normal;
float dist;
int children[2];
int pad;
} tnode_t;
tnode_t *tnodes, *tnode_p;
/*

74
common/common.plg Normal file
View File

@ -0,0 +1,74 @@
<html>
<body>
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: common - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EDC.tmp" with contents
[
/nologo /MD /W3 /GX /O2 /I "./" /I "../public" /I "./bsplib/" /I "./ripper" /I "./common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"..\temp\common\!release/" /Fd"..\temp\common\!release/" /FD /c
"D:\Xash3D\src_main\common\bsplib\lightmap.c"
]
Creating command line "cl.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EDC.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EDD.tmp" with contents
[
msvcrt.lib /nologo /dll /profile /machine:I386 /nodefaultlib:"libc.lib" /out:"..\temp\common\!release/common.dll" /implib:"..\temp\common\!release/common.lib" /opt:nowin98
"\Xash3D\src_main\temp\common\!release\brushbsp.obj"
"\Xash3D\src_main\temp\common\!release\bspfile.obj"
"\Xash3D\src_main\temp\common\!release\conv_bsplumps.obj"
"\Xash3D\src_main\temp\common\!release\conv_doom.obj"
"\Xash3D\src_main\temp\common\!release\conv_image.obj"
"\Xash3D\src_main\temp\common\!release\conv_main.obj"
"\Xash3D\src_main\temp\common\!release\conv_shader.obj"
"\Xash3D\src_main\temp\common\!release\conv_sprite.obj"
"\Xash3D\src_main\temp\common\!release\csg.obj"
"\Xash3D\src_main\temp\common\!release\faces.obj"
"\Xash3D\src_main\temp\common\!release\flow.obj"
"\Xash3D\src_main\temp\common\!release\leakfile.obj"
"\Xash3D\src_main\temp\common\!release\lightmap.obj"
"\Xash3D\src_main\temp\common\!release\map.obj"
"\Xash3D\src_main\temp\common\!release\patches.obj"
"\Xash3D\src_main\temp\common\!release\platform.obj"
"\Xash3D\src_main\temp\common\!release\portals.obj"
"\Xash3D\src_main\temp\common\!release\prtfile.obj"
"\Xash3D\src_main\temp\common\!release\qbsp3.obj"
"\Xash3D\src_main\temp\common\!release\qrad3.obj"
"\Xash3D\src_main\temp\common\!release\qvis3.obj"
"\Xash3D\src_main\temp\common\!release\shaders.obj"
"\Xash3D\src_main\temp\common\!release\spritegen.obj"
"\Xash3D\src_main\temp\common\!release\studio.obj"
"\Xash3D\src_main\temp\common\!release\studio_utils.obj"
"\Xash3D\src_main\temp\common\!release\textures.obj"
"\Xash3D\src_main\temp\common\!release\trace.obj"
"\Xash3D\src_main\temp\common\!release\tree.obj"
"\Xash3D\src_main\temp\common\!release\utils.obj"
"\Xash3D\src_main\temp\common\!release\wadlib.obj"
"\Xash3D\src_main\temp\common\!release\winding.obj"
"\Xash3D\src_main\temp\common\!release\writebsp.obj"
]
Creating command line "link.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EDD.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EDE.bat" with contents
[
@echo off
copy \Xash3D\src_main\temp\common\!release\common.dll "D:\Xash3D\bin\common.dll"
]
Creating command line ""C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EDE.bat""
Compiling...
lightmap.c
D:\Xash3D\src_main\common\bsplib\lightmap.c(1048) : warning C4013: 'Error' undefined; assuming extern returning int
D:\Xash3D\src_main\common\bsplib\lightmap.c(1059) : warning C4013: 'RayPlaneIntersect' undefined; assuming extern returning int
D:\Xash3D\src_main\common\bsplib\lightmap.c(1449) : warning C4047: 'function' : 'struct triangle_s ** ' differs in levels of indirection from 'float [3]'
D:\Xash3D\src_main\common\bsplib\lightmap.c(1449) : warning C4024: 'SampleTriangulation' : different types for formal and actual parameter 3
D:\Xash3D\src_main\common\bsplib\lightmap.c(1449) : error C2198: 'SampleTriangulation' : too few actual parameters
Error executing cl.exe.
<h3>Output Window</h3>
<h3>Results</h3>
common.dll - 1 error(s), 4 warning(s)
</pre>
</body>
</html>

141
engine/engine.plg Normal file
View File

@ -0,0 +1,141 @@
<html>
<body>
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: engine - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1ECE.tmp" with contents
[
/nologo /MD /W3 /GX /O2 /I "./" /I "common" /I "server" /I "client" /I "../public" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"..\temp\engine\!release/" /Fd"..\temp\engine\!release/" /FD /c
"D:\Xash3D\src_main\engine\common\cinematic.c"
"D:\Xash3D\src_main\engine\client\cl_cmds.c"
"D:\Xash3D\src_main\engine\client\cl_demo.c"
"D:\Xash3D\src_main\engine\client\cl_frame.c"
"D:\Xash3D\src_main\engine\client\cl_fx.c"
"D:\Xash3D\src_main\engine\client\cl_input.c"
"D:\Xash3D\src_main\engine\client\cl_main.c"
"D:\Xash3D\src_main\engine\client\cl_parse.c"
"D:\Xash3D\src_main\engine\client\cl_pred.c"
"D:\Xash3D\src_main\engine\client\cl_progs.c"
"D:\Xash3D\src_main\engine\client\cl_scrn.c"
"D:\Xash3D\src_main\engine\client\cl_tent.c"
"D:\Xash3D\src_main\engine\client\cl_view.c"
"D:\Xash3D\src_main\engine\common\con_keys.c"
"D:\Xash3D\src_main\engine\common\con_main.c"
"D:\Xash3D\src_main\engine\common\con_utils.c"
"D:\Xash3D\src_main\engine\common\engfuncs.c"
"D:\Xash3D\src_main\engine\host.c"
"D:\Xash3D\src_main\engine\common\input.c"
"D:\Xash3D\src_main\engine\common\menu.c"
"D:\Xash3D\src_main\engine\common\net_chan.c"
"D:\Xash3D\src_main\engine\common\net_msg.c"
"D:\Xash3D\src_main\engine\server\sv_client.c"
"D:\Xash3D\src_main\engine\server\sv_cmds.c"
"D:\Xash3D\src_main\engine\server\sv_frame.c"
"D:\Xash3D\src_main\engine\server\sv_init.c"
"D:\Xash3D\src_main\engine\server\sv_main.c"
"D:\Xash3D\src_main\engine\server\sv_move.c"
"D:\Xash3D\src_main\engine\server\sv_phys.c"
"D:\Xash3D\src_main\engine\server\sv_progs.c"
"D:\Xash3D\src_main\engine\server\sv_spawn.c"
"D:\Xash3D\src_main\engine\server\sv_world.c"
]
Creating command line "cl.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1ECE.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1ECF.tmp" with contents
[
user32.lib msvcrt.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /out:"..\temp\engine\!release/engine.dll" /implib:"..\temp\engine\!release/engine.lib" /opt:nowin98
"\Xash3D\src_main\temp\engine\!release\cinematic.obj"
"\Xash3D\src_main\temp\engine\!release\cl_cmds.obj"
"\Xash3D\src_main\temp\engine\!release\cl_demo.obj"
"\Xash3D\src_main\temp\engine\!release\cl_frame.obj"
"\Xash3D\src_main\temp\engine\!release\cl_fx.obj"
"\Xash3D\src_main\temp\engine\!release\cl_input.obj"
"\Xash3D\src_main\temp\engine\!release\cl_main.obj"
"\Xash3D\src_main\temp\engine\!release\cl_parse.obj"
"\Xash3D\src_main\temp\engine\!release\cl_pred.obj"
"\Xash3D\src_main\temp\engine\!release\cl_progs.obj"
"\Xash3D\src_main\temp\engine\!release\cl_scrn.obj"
"\Xash3D\src_main\temp\engine\!release\cl_tent.obj"
"\Xash3D\src_main\temp\engine\!release\cl_view.obj"
"\Xash3D\src_main\temp\engine\!release\con_keys.obj"
"\Xash3D\src_main\temp\engine\!release\con_main.obj"
"\Xash3D\src_main\temp\engine\!release\con_utils.obj"
"\Xash3D\src_main\temp\engine\!release\engfuncs.obj"
"\Xash3D\src_main\temp\engine\!release\engine.obj"
"\Xash3D\src_main\temp\engine\!release\host.obj"
"\Xash3D\src_main\temp\engine\!release\infostring.obj"
"\Xash3D\src_main\temp\engine\!release\input.obj"
"\Xash3D\src_main\temp\engine\!release\menu.obj"
"\Xash3D\src_main\temp\engine\!release\net_chan.obj"
"\Xash3D\src_main\temp\engine\!release\net_huff.obj"
"\Xash3D\src_main\temp\engine\!release\net_msg.obj"
"\Xash3D\src_main\temp\engine\!release\sv_client.obj"
"\Xash3D\src_main\temp\engine\!release\sv_cmds.obj"
"\Xash3D\src_main\temp\engine\!release\sv_frame.obj"
"\Xash3D\src_main\temp\engine\!release\sv_init.obj"
"\Xash3D\src_main\temp\engine\!release\sv_main.obj"
"\Xash3D\src_main\temp\engine\!release\sv_move.obj"
"\Xash3D\src_main\temp\engine\!release\sv_phys.obj"
"\Xash3D\src_main\temp\engine\!release\sv_progs.obj"
"\Xash3D\src_main\temp\engine\!release\sv_spawn.obj"
"\Xash3D\src_main\temp\engine\!release\sv_world.obj"
]
Creating command line "link.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1ECF.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1ED0.bat" with contents
[
@echo off
copy \Xash3D\src_main\temp\engine\!release\engine.dll "D:\Xash3D\bin\engine.dll"
]
Creating command line ""C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1ED0.bat""
Compiling...
cinematic.c
cl_cmds.c
cl_demo.c
cl_frame.c
cl_fx.c
cl_input.c
cl_main.c
cl_parse.c
cl_pred.c
cl_progs.c
cl_scrn.c
cl_tent.c
cl_view.c
con_keys.c
con_main.c
con_utils.c
engfuncs.c
host.c
input.c
menu.c
Generating Code...
Compiling...
net_chan.c
net_msg.c
sv_client.c
sv_cmds.c
sv_frame.c
sv_init.c
sv_main.c
sv_move.c
sv_phys.c
sv_progs.c
sv_spawn.c
sv_world.c
Generating Code...
D:\Xash3D\src_main\engine\server\sv_spawn.c(18) : warning C4700: local variable 'pm' used without having been initialized
Linking...
Creating library ..\temp\engine\!release/engine.lib and object ..\temp\engine\!release/engine.exp
<h3>Output Window</h3>
Performing Custom Build Step on \Xash3D\src_main\temp\engine\!release\engine.dll
‘ª®¯¨à®¢ ­® ä ©«®¢: 1.
<h3>Results</h3>
engine.dll - 0 error(s), 1 warning(s)
</pre>
</body>
</html>

74
launch/launch.plg Normal file
View File

@ -0,0 +1,74 @@
<html>
<body>
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: launch - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1ED5.tmp" with contents
[
/nologo /MD /W3 /GX /O2 /I "./" /I "./imagelib" /I "../public" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"..\temp\launch\!release/" /Fd"..\temp\launch\!release/" /FD /c
"D:\Xash3D\src_main\launch\imagelib\img_dds.c"
"D:\Xash3D\src_main\launch\imagelib\img_main.c"
"D:\Xash3D\src_main\launch\imagelib\img_utils.c"
"D:\Xash3D\src_main\launch\stdlib.c"
"D:\Xash3D\src_main\launch\system.c"
"D:\Xash3D\src_main\launch\utils.c"
]
Creating command line "cl.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1ED5.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1ED6.tmp" with contents
[
zlib.lib png.lib user32.lib gdi32.lib advapi32.lib winmm.lib /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /out:"..\temp\launch\!release/launch.dll" /implib:"..\temp\launch\!release/launch.lib" /libpath:"./imagelib" /opt:nowin98
"\Xash3D\src_main\temp\launch\!release\cmd.obj"
"\Xash3D\src_main\temp\launch\!release\console.obj"
"\Xash3D\src_main\temp\launch\!release\cpuinfo.obj"
"\Xash3D\src_main\temp\launch\!release\crclib.obj"
"\Xash3D\src_main\temp\launch\!release\cvar.obj"
"\Xash3D\src_main\temp\launch\!release\export.obj"
"\Xash3D\src_main\temp\launch\!release\filesystem.obj"
"\Xash3D\src_main\temp\launch\!release\img_bmp.obj"
"\Xash3D\src_main\temp\launch\!release\img_dds.obj"
"\Xash3D\src_main\temp\launch\!release\img_jpg.obj"
"\Xash3D\src_main\temp\launch\!release\img_main.obj"
"\Xash3D\src_main\temp\launch\!release\img_pcx.obj"
"\Xash3D\src_main\temp\launch\!release\img_png.obj"
"\Xash3D\src_main\temp\launch\!release\img_tga.obj"
"\Xash3D\src_main\temp\launch\!release\img_utils.obj"
"\Xash3D\src_main\temp\launch\!release\img_vtf.obj"
"\Xash3D\src_main\temp\launch\!release\img_wad.obj"
"\Xash3D\src_main\temp\launch\!release\memlib.obj"
"\Xash3D\src_main\temp\launch\!release\network.obj"
"\Xash3D\src_main\temp\launch\!release\parselib.obj"
"\Xash3D\src_main\temp\launch\!release\stdlib.obj"
"\Xash3D\src_main\temp\launch\!release\system.obj"
"\Xash3D\src_main\temp\launch\!release\utils.obj"
]
Creating command line "link.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1ED6.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1ED7.bat" with contents
[
@echo off
copy \Xash3D\src_main\temp\launch\!release\launch.dll "D:\Xash3D\bin\launch.dll"
]
Creating command line ""C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1ED7.bat""
Compiling...
img_dds.c
img_main.c
img_utils.c
stdlib.c
system.c
utils.c
Generating Code...
Linking...
Creating library ..\temp\launch\!release/launch.lib and object ..\temp\launch\!release/launch.exp
<h3>Output Window</h3>
Performing Custom Build Step on \Xash3D\src_main\temp\launch\!release\launch.dll
‘ª®¯¨à®¢ ­® ä ©«®¢: 1.
<h3>Results</h3>
launch.dll - 0 error(s), 0 warning(s)
</pre>
</body>
</html>

76
physic/physic.plg Normal file
View File

@ -0,0 +1,76 @@
<html>
<body>
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: physic - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EE0.tmp" with contents
[
/nologo /MD /W3 /GX /O2 /I "../public" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"..\temp\physic\!release/" /Fd"..\temp\physic\!release/" /FD /c
"D:\Xash3D\src_main\physic\cm_callback.c"
"D:\Xash3D\src_main\physic\cm_collision.c"
"D:\Xash3D\src_main\physic\cm_debug.c"
"D:\Xash3D\src_main\physic\cm_materials.c"
"D:\Xash3D\src_main\physic\cm_model.c"
"D:\Xash3D\src_main\physic\cm_pmove.c"
"D:\Xash3D\src_main\physic\cm_polygon.c"
"D:\Xash3D\src_main\physic\cm_portals.c"
"D:\Xash3D\src_main\physic\cm_rigidbody.c"
"D:\Xash3D\src_main\physic\cm_test.c"
"D:\Xash3D\src_main\physic\cm_trace.c"
"D:\Xash3D\src_main\physic\physic.c"
]
Creating command line "cl.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EE0.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EE1.tmp" with contents
[
user32.lib msvcrt.lib newton.lib opengl32.lib /nologo /dll /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /out:"..\temp\physic\!release/physic.dll" /implib:"..\temp\physic\!release/physic.lib" /libpath:"../public/libs/"
"\Xash3D\src_main\temp\physic\!release\cm_callback.obj"
"\Xash3D\src_main\temp\physic\!release\cm_collision.obj"
"\Xash3D\src_main\temp\physic\!release\cm_debug.obj"
"\Xash3D\src_main\temp\physic\!release\cm_materials.obj"
"\Xash3D\src_main\temp\physic\!release\cm_model.obj"
"\Xash3D\src_main\temp\physic\!release\cm_pmove.obj"
"\Xash3D\src_main\temp\physic\!release\cm_polygon.obj"
"\Xash3D\src_main\temp\physic\!release\cm_portals.obj"
"\Xash3D\src_main\temp\physic\!release\cm_rigidbody.obj"
"\Xash3D\src_main\temp\physic\!release\cm_test.obj"
"\Xash3D\src_main\temp\physic\!release\cm_trace.obj"
"\Xash3D\src_main\temp\physic\!release\cm_utils.obj"
"\Xash3D\src_main\temp\physic\!release\physic.obj"
]
Creating command line "link.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EE1.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EE2.bat" with contents
[
@echo off
copy \Xash3D\src_main\temp\physic\!release\physic.dll "D:\Xash3D\bin\physic.dll"
]
Creating command line ""C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EE2.bat""
Compiling...
cm_callback.c
cm_collision.c
cm_debug.c
cm_materials.c
cm_model.c
cm_pmove.c
cm_polygon.c
cm_portals.c
cm_rigidbody.c
cm_test.c
cm_trace.c
physic.c
Generating Code...
Linking...
Creating library ..\temp\physic\!release/physic.lib and object ..\temp\physic\!release/physic.exp
<h3>Output Window</h3>
Performing Custom Build Step on \Xash3D\src_main\temp\physic\!release\physic.dll
‘ª®¯¨à®¢ ­® ä ©«®¢: 1.
<h3>Results</h3>
physic.dll - 0 error(s), 0 warning(s)
</pre>
</body>
</html>

View File

@ -54,6 +54,7 @@
#define Vector4Scale(in, scale, out) ((out)[0] = (in)[0] * (scale),(out)[1] = (in)[1] * (scale),(out)[2] = (in)[2] * (scale),(out)[3] = (in)[3] * (scale))
#define VectorMultiply(a,b,c) ((c)[0]=(a)[0]*(b)[0],(c)[1]=(a)[1]*(b)[1],(c)[2]=(a)[2]*(b)[2])
#define VectorDivide( in, d, out ) VectorScale( in, (1.0f / (d)), out )
#define VectorAvg(a) ( ((a)[0] + (a)[1] + (a)[2]) / 3 )
#define VectorLength(a) (sqrt(DotProduct(a, a)))
#define VectorLength2(a) (DotProduct(a, a))
#define VectorDistance(a, b) (sqrt(VectorDistance2(a,b)))
@ -589,8 +590,25 @@ _inline bool BoundsAndSphereIntersect( const vec3_t mins, const vec3_t maxs, con
return true;
}
_inline bool PlaneIntersect( vec3_t p_n, vec_t p_d, vec3_t l_o, vec3_t l_n, vec3_t out )
{
float dot, t;
dot = DotProduct( p_n, l_n );
if( dot > -0.001 )
return false;
t = (p_d - (l_o[0] * p_n[0]) - (l_o[1] * p_n[1]) - (l_o[2] * p_n[2])) / dot;
if( out )
{
out[0] = l_o[0] + (t * l_n[0]);
out[1] = l_o[1] + (t * l_n[1]);
out[2] = l_o[2] + (t * l_n[2]);
}
return true;
}
#define PlaneDist(point,plane) ((plane)->type < 3 ? (point)[(plane)->type] : DotProduct((point), (plane)->normal))
#define PlaneDiff(point,plane) (((plane)->type < 3 ? (point)[(plane)->type] : DotProduct((point), (plane)->normal)) - (plane)->dist)

View File

@ -67,5 +67,5 @@ if exist vsound\vsound.plg del /f /q vsound\vsound.plg
echo Build succeeded!
echo Please wait. Xash is now loading
cd D:\Xash3D\
quake.exe -game tmpQuArK -dev 3 -log +map dm_qstyle
quake.exe -game tmpQuArK -dev 3 -log +map qctest
:done

View File

@ -506,7 +506,7 @@ void R_LightingDiffuse( void )
// add dynamic lights
if( r_dynamiclights->integer )
{
if( m_pCurrentEntity->ent_type == ED_NORMAL )
if( m_pCurrentEntity->ent_type == ED_NORMAL && m_pCurrentEntity->model )
radius = m_pCurrentEntity->model->radius;
else radius = m_pCurrentEntity->radius;

View File

@ -27,7 +27,7 @@ extern byte *r_temppool;
#define MAX_POLYS 4096
#define MAX_POLY_VERTS 16384
#define MAX_CLIPFLAGS 15 // all sides of bbox are valid
#define LM_SIZE 128 // LM_SIZE x LM_SIZE (width x height)
#define LM_SIZE 256 // LM_SIZE x LM_SIZE (width x height)
/*
=======================================================================

View File

@ -1860,7 +1860,7 @@ static bool R_ParseStageBumpMap( ref_shader_t *shader, shaderStage_t *stage, scr
return false;
}
if( !Com_ReadToken( script, false, &tok ))
if( !Com_ReadToken( script, SC_ALLOW_PATHNAMES2, &tok ))
{
MsgDev( D_WARN, "missing parameters for 'bumpMap' in shader '%s'\n", shader->name );
return false;
@ -1869,7 +1869,7 @@ static bool R_ParseStageBumpMap( ref_shader_t *shader, shaderStage_t *stage, scr
com.strncpy( name, tok.string, sizeof( name ));
while( 1 )
{
if( !Com_ReadToken( script, SC_PARSE_GENERIC, &tok ))
if( !Com_ReadToken( script, SC_ALLOW_PATHNAMES2, &tok ))
break;
com.strncat( name, " ", sizeof( name ));
@ -1936,7 +1936,7 @@ static bool R_ParseStageCubeMap( ref_shader_t *shader, shaderStage_t *stage, scr
return false;
}
if( !Com_ReadToken( script, SC_ALLOW_PATHNAMES, &tok ))
if( !Com_ReadToken( script, SC_ALLOW_PATHNAMES2, &tok ))
{
MsgDev( D_WARN, "missing parameters for 'cubeMap' in shader '%s'\n", shader->name );
return false;

View File

@ -1429,7 +1429,7 @@ void R_StudioDrawMeshes( dstudiotexture_t * ptexture, short *pskinref, int pass
lv = m_pvlightvalues[ptricmds[1]];
GL_Normal3fv( vec3_origin ); // needs to clear normals
GL_Normal3fv( vec3_origin ); // FIXME: apply normals
if ( m_pCurrentEntity->renderfx & RF_FULLBRIGHT )
lv = &fbright[0];

83
render/render.plg Normal file
View File

@ -0,0 +1,83 @@
<html>
<body>
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: render - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EE7.tmp" with contents
[
/nologo /MD /W3 /GX /O2 /I "../public" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"..\temp\render\!release/" /Fd"..\temp\render\!release/" /FD /c
"D:\Xash3D\src_main\render\gl_backend.c"
"D:\Xash3D\src_main\render\r_backend2.c"
"D:\Xash3D\src_main\render\r_image.c"
"D:\Xash3D\src_main\render\r_light.c"
"D:\Xash3D\src_main\render\r_main.c"
"D:\Xash3D\src_main\render\r_misc.c"
"D:\Xash3D\src_main\render\r_model.c"
"D:\Xash3D\src_main\render\r_shader.c"
"D:\Xash3D\src_main\render\r_sky.c"
"D:\Xash3D\src_main\render\r_sprite.c"
"D:\Xash3D\src_main\render\r_studio.c"
"D:\Xash3D\src_main\render\r_surface.c"
"D:\Xash3D\src_main\render\r_utils.c"
]
Creating command line "cl.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EE7.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EE8.tmp" with contents
[
msvcrt.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /nodefaultlib:"libc.lib" /out:"..\temp\render\!release/render.dll" /implib:"..\temp\render\!release/render.lib" /libpath:"../public/libs/"
"\Xash3D\src_main\temp\render\!release\gl_backend.obj"
"\Xash3D\src_main\temp\render\!release\r_backend.obj"
"\Xash3D\src_main\temp\render\!release\r_backend2.obj"
"\Xash3D\src_main\temp\render\!release\r_bloom.obj"
"\Xash3D\src_main\temp\render\!release\r_draw.obj"
"\Xash3D\src_main\temp\render\!release\r_image.obj"
"\Xash3D\src_main\temp\render\!release\r_light.obj"
"\Xash3D\src_main\temp\render\!release\r_main.obj"
"\Xash3D\src_main\temp\render\!release\r_misc.obj"
"\Xash3D\src_main\temp\render\!release\r_model.obj"
"\Xash3D\src_main\temp\render\!release\r_opengl.obj"
"\Xash3D\src_main\temp\render\!release\r_program.obj"
"\Xash3D\src_main\temp\render\!release\r_shader.obj"
"\Xash3D\src_main\temp\render\!release\r_sky.obj"
"\Xash3D\src_main\temp\render\!release\r_sprite.obj"
"\Xash3D\src_main\temp\render\!release\r_studio.obj"
"\Xash3D\src_main\temp\render\!release\r_surface.obj"
"\Xash3D\src_main\temp\render\!release\r_utils.obj"
]
Creating command line "link.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EE8.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EE9.bat" with contents
[
@echo off
copy \Xash3D\src_main\temp\render\!release\render.dll "D:\Xash3D\bin\render.dll"
]
Creating command line ""C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EE9.bat""
Compiling...
gl_backend.c
r_backend2.c
r_image.c
r_light.c
r_main.c
r_misc.c
r_model.c
r_shader.c
r_sky.c
r_sprite.c
r_studio.c
r_surface.c
r_utils.c
Generating Code...
Linking...
Creating library ..\temp\render\!release/render.lib and object ..\temp\render\!release/render.exp
<h3>Output Window</h3>
Performing Custom Build Step on \Xash3D\src_main\temp\render\!release\render.dll
‘ª®¯¨à®¢ ­® ä ©«®¢: 1.
<h3>Results</h3>
render.dll - 0 error(s), 0 warning(s)
</pre>
</body>
</html>

View File

@ -24,6 +24,7 @@ GLOBAL:
2. bsplib и финальный формат карты
3. console garbage OK
4. create indexBuffer
5. light_environment
TODO LIST
поправить поле movedir в bsplib/map.c

16
viewer/viewer.plg Normal file
View File

@ -0,0 +1,16 @@
<html>
<body>
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: viewer - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
<h3>Results</h3>
viewer.dll - 0 error(s), 0 warning(s)
</pre>
</body>
</html>

46
vprogs/vprogs.plg Normal file
View File

@ -0,0 +1,46 @@
<html>
<body>
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: vprogs - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EEE.tmp" with contents
[
/nologo /MD /W3 /GX /O2 /I "./" /I "../public" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"..\temp\vprogs\!release/" /Fd"..\temp\vprogs\!release/" /FD /c
"D:\Xash3D\src_main\vprogs\pr_lex.c"
]
Creating command line "cl.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EEE.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EEF.tmp" with contents
[
msvcrt.lib /nologo /dll /profile /machine:I386 /nodefaultlib:"libc.lib" /out:"..\temp\vprogs\!release/vprogs.dll" /implib:"..\temp\vprogs\!release/vprogs.lib" /opt:nowin98
"\Xash3D\src_main\temp\vprogs\!release\pr_comp.obj"
"\Xash3D\src_main\temp\vprogs\!release\pr_edict.obj"
"\Xash3D\src_main\temp\vprogs\!release\pr_exec.obj"
"\Xash3D\src_main\temp\vprogs\!release\pr_lex.obj"
"\Xash3D\src_main\temp\vprogs\!release\pr_main.obj"
"\Xash3D\src_main\temp\vprogs\!release\pr_utils.obj"
]
Creating command line "link.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EEF.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EF0.bat" with contents
[
@echo off
copy \Xash3D\src_main\temp\vprogs\!release\vprogs.dll "D:\Xash3D\bin\vprogs.dll"
]
Creating command line ""C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EF0.bat""
Compiling...
pr_lex.c
Linking...
Creating library ..\temp\vprogs\!release/vprogs.lib and object ..\temp\vprogs\!release/vprogs.exp
<h3>Output Window</h3>
Performing Custom Build Step on \Xash3D\src_main\temp\vprogs\!release\vprogs.dll
‘ª®¯¨à®¢ ­® ä ©«®¢: 1.
<h3>Results</h3>
vprogs.dll - 0 error(s), 0 warning(s)
</pre>
</body>
</html>

54
vsound/vsound.plg Normal file
View File

@ -0,0 +1,54 @@
<html>
<body>
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: vsound - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EF5.tmp" with contents
[
/nologo /MD /W3 /GX /O2 /I "./" /I "../public" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fo"..\temp\vsound\!release/" /Fd"..\temp\vsound\!release/" /FD /c
"D:\Xash3D\src_main\vsound\s_load.c"
"D:\Xash3D\src_main\vsound\s_main.c"
"D:\Xash3D\src_main\vsound\s_openal.c"
"D:\Xash3D\src_main\vsound\s_stream.c"
"D:\Xash3D\src_main\vsound\s_export.c"
]
Creating command line "cl.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EF5.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EF6.tmp" with contents
[
libogg.lib vorbis.lib /nologo /dll /profile /machine:I386 /nodefaultlib:"libcmt.lib" /out:"..\temp\vsound\!release/vsound.dll" /implib:"..\temp\vsound\!release/vsound.lib" /opt:nowin98
"\Xash3D\src_main\temp\vsound\!release\s_load.obj"
"\Xash3D\src_main\temp\vsound\!release\s_main.obj"
"\Xash3D\src_main\temp\vsound\!release\s_openal.obj"
"\Xash3D\src_main\temp\vsound\!release\s_stream.obj"
"\Xash3D\src_main\temp\vsound\!release\s_export.obj"
]
Creating command line "link.exe @"C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EF6.tmp""
Creating temporary file "C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EF7.bat" with contents
[
@echo off
copy \Xash3D\src_main\temp\vsound\!release\vsound.dll "D:\Xash3D\bin\vsound.dll"
]
Creating command line ""C:\DOCUME~1\ÀÄÌÈÍÈ~1.9CC\LOCALS~1\Temp\RSP1EF7.bat""
Compiling...
s_load.c
s_main.c
s_openal.c
s_stream.c
s_export.c
Generating Code...
Linking...
Creating library ..\temp\vsound\!release/vsound.lib and object ..\temp\vsound\!release/vsound.exp
<h3>Output Window</h3>
Performing Custom Build Step on \Xash3D\src_main\temp\vsound\!release\vsound.dll
‘ª®¯¨à®¢ ­® ä ©«®¢: 1.
<h3>Results</h3>
vsound.dll - 0 error(s), 0 warning(s)
</pre>
</body>
</html>