01 Aug 2009

2009-08-01 00:00:00 +04:00 · 2009-08-01 00:00:00 +04:00 · c5e4a754cb
parent b0e1800966
commit c5e4a754cb
15 changed files with 2310 additions and 1404 deletions
--- a/baserc/baserc.plg
+++ b/baserc/baserc.plg
@ -0,0 +1,16 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: baserc - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+
+
+
+<h3>Results</h3>
+baserc.dll - 0 error(s), 0 warning(s)
+</pre>
+</body>
+</html>
--- a/client/client.plg
+++ b/client/client.plg
@ -0,0 +1,16 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: client - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+
+
+
+<h3>Results</h3>
+client.dll - 0 error(s), 0 warning(s)
+</pre>
+</body>
+</html>
--- a/engine/engine.plg
+++ b/engine/engine.plg
@ -0,0 +1,16 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: engine - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+
+
+
+<h3>Results</h3>
+engine.dll - 0 error(s), 0 warning(s)
+</pre>
+</body>
+</html>
--- a/launch/launch.plg
+++ b/launch/launch.plg
@ -0,0 +1,63 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: launch - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSPA46.tmp" with contents
+[
+/nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "./" /I "imagelib" /I "../public" /I "../common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR"..\temp\launch\!debug/" /Fo"..\temp\launch\!debug/" /Fd"..\temp\launch\!debug/" /FD /GZ /c 
+"D:\Xash3D\src_main\launch\parselib.c"
+]
+Creating command line "cl.exe @C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSPA46.tmp" 
+Creating temporary file "C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSPA47.tmp" with contents
+[
+zlib.lib png.lib user32.lib gdi32.lib advapi32.lib winmm.lib /nologo /dll /incremental:yes /pdb:"..\temp\launch\!debug/launch.pdb" /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\temp\launch\!debug/launch.dll" /implib:"..\temp\launch\!debug/launch.lib" /pdbtype:sept /libpath:"./imagelib" 
+"\Xash3D\src_main\temp\launch\!debug\cmd.obj"
+"\Xash3D\src_main\temp\launch\!debug\console.obj"
+"\Xash3D\src_main\temp\launch\!debug\cpuinfo.obj"
+"\Xash3D\src_main\temp\launch\!debug\crclib.obj"
+"\Xash3D\src_main\temp\launch\!debug\cvar.obj"
+"\Xash3D\src_main\temp\launch\!debug\export.obj"
+"\Xash3D\src_main\temp\launch\!debug\filesystem.obj"
+"\Xash3D\src_main\temp\launch\!debug\img_bmp.obj"
+"\Xash3D\src_main\temp\launch\!debug\img_dds.obj"
+"\Xash3D\src_main\temp\launch\!debug\img_jpg.obj"
+"\Xash3D\src_main\temp\launch\!debug\img_main.obj"
+"\Xash3D\src_main\temp\launch\!debug\img_pcx.obj"
+"\Xash3D\src_main\temp\launch\!debug\img_png.obj"
+"\Xash3D\src_main\temp\launch\!debug\img_tga.obj"
+"\Xash3D\src_main\temp\launch\!debug\img_utils.obj"
+"\Xash3D\src_main\temp\launch\!debug\img_vtf.obj"
+"\Xash3D\src_main\temp\launch\!debug\img_wad.obj"
+"\Xash3D\src_main\temp\launch\!debug\memlib.obj"
+"\Xash3D\src_main\temp\launch\!debug\network.obj"
+"\Xash3D\src_main\temp\launch\!debug\parselib.obj"
+"\Xash3D\src_main\temp\launch\!debug\patch.obj"
+"\Xash3D\src_main\temp\launch\!debug\stdlib.obj"
+"\Xash3D\src_main\temp\launch\!debug\system.obj"
+"\Xash3D\src_main\temp\launch\!debug\utils.obj"
+]
+Creating command line "link.exe @C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSPA47.tmp"
+Creating temporary file "C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSPA48.bat" with contents
+[
+@echo off
+copy \Xash3D\src_main\temp\launch\!debug\launch.dll "D:\Xash3D\bin\launch.dll"
+]
+Creating command line "C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSPA48.bat"
+Compiling...
+parselib.c
+Linking...
+<h3>Output Window</h3>
+Performing Custom Build Step on \Xash3D\src_main\temp\launch\!debug\launch.dll
+‘Ş®Ż¨ŕ®˘ ® ä ©«®˘:         1.
+
+
+
+<h3>Results</h3>
+launch.dll - 0 error(s), 0 warning(s)
+</pre>
+</body>
+</html>
--- a/launch/parselib.c
+++ b/launch/parselib.c
@ -1103,7 +1103,7 @@ bool PS_GetDouble( script_t *script, int flags, double *value )
 			PS_ScriptError( script, flags, "expected float value, found '%s'", token.string );
 			return false;
 		}
-		*value = -token.floatValue;
+		if( value ) *value = -token.floatValue;
 		return true;
 	}

@ -1113,7 +1113,7 @@ bool PS_GetDouble( script_t *script, int flags, double *value )
 		return false;
 	}

-	*value = token.floatValue;
+	if( value ) *value = token.floatValue;
 	return true;
 }

@ -1139,7 +1139,7 @@ bool PS_GetFloat( script_t *script, int flags, float *value )
 			PS_ScriptError( script, flags, "expected float value, found '%s'", token.string );
 			return false;
 		}
-		*value = -((float)token.floatValue);
+		if( value ) *value = -((float)token.floatValue);
 		return true;
 	}

@ -1149,7 +1149,7 @@ bool PS_GetFloat( script_t *script, int flags, float *value )
 		return false;
 	}

-	*value = (float)token.floatValue;
+	if( value ) *value = (float)token.floatValue;
 	return true;
 }

@ -1171,7 +1171,7 @@ bool PS_GetUnsigned( script_t *script, int flags, uint *value )
 		return false;
 	}

-	*value = token.integerValue;
+	if( value ) *value = token.integerValue;
 	return true;
 }

@ -1198,7 +1198,7 @@ bool PS_GetInteger( script_t *script, int flags, int *value )
 			return false;
 		}

-		*value = -((int)token.integerValue);
+		if( value ) *value = -((int)token.integerValue);
 		return true;
 	}

@ -1208,7 +1208,7 @@ bool PS_GetInteger( script_t *script, int flags, int *value )
 		return false;
 	}

-	*value = (int)token.integerValue;
+	if( value ) *value = (int)token.integerValue;
 	return true;
 }

--- a/physic/physic.plg
+++ b/physic/physic.plg
@ -0,0 +1,16 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: physic - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+
+
+
+<h3>Results</h3>
+physic.dll - 0 error(s), 0 warning(s)
+</pre>
+</body>
+</html>
--- a/render/r_backend.h
+++ b/render/r_backend.h
@ -91,6 +91,7 @@ typedef struct
 	texture_t		*blankbumpTexture;
 	texture_t		*dlightTexture;
 	texture_t		*fogTexture;
+	texture_t		*skyTexture;
 	texture_t		*coronaTexture;
 	texture_t		*defaultConchars;
 	texture_t		*shadowmapTextures[MAX_SHADOWGROUPS];
--- a/render/r_local.h
+++ b/render/r_local.h
@ -498,7 +498,7 @@ void		R_InitImages( void );
 void		R_ShutdownImages( void );
 void		R_InitPortalTexture( texture_t **texture, int id, int screenWidth, int screenHeight );
 void		R_InitShadowmapTexture( texture_t **texture, int id, int screenWidth, int screenHeight );
-void		R_FreeImageBuffers( void );
+void		R_FreeImage( texture_t *image );

 void		R_TextureList_f( void );
 void		R_SetTextureParameters( void );
--- a/render/r_program.c
+++ b/render/r_program.c
@ -216,28 +216,28 @@ int R_FindGLSLProgram( const char *name )

 static const glsl_feature_t glsl_features[] =
 {
-	{ PROGRAM_APPLY_LIGHTSTYLE0, "#define APPLY_LIGHTSTYLE0\n", "_ls0" },
-	{ PROGRAM_APPLY_FB_LIGHTMAP, "#define APPLY_FBLIGHTMAP\n", "_fb" },
-	{ PROGRAM_APPLY_LIGHTSTYLE1, "#define APPLY_LIGHTSTYLE1\n", "_ls1" },
-	{ PROGRAM_APPLY_LIGHTSTYLE2, "#define APPLY_LIGHTSTYLE2\n", "_ls2" },
-	{ PROGRAM_APPLY_LIGHTSTYLE3, "#define APPLY_LIGHTSTYLE3\n", "_ls3" },
-	{ PROGRAM_APPLY_DIRECTIONAL_LIGHT, "#define APPLY_DIRECTIONAL_LIGHT\n", "_dirlight" },
-	{ PROGRAM_APPLY_SPECULAR, "#define APPLY_SPECULAR\n", "_gloss" },
-	{ PROGRAM_APPLY_OFFSETMAPPING, "#define APPLY_OFFSETMAPPING\n", "_offmap" },
-	{ PROGRAM_APPLY_RELIEFMAPPING, "#define APPLY_RELIEFMAPPING\n", "_relmap" },
-	{ PROGRAM_APPLY_AMBIENT_COMPENSATION, "#define APPLY_AMBIENT_COMPENSATION\n", "_amb" },
-	{ PROGRAM_APPLY_DECAL, "#define APPLY_DECAL\n", "_decal" },
-	{ PROGRAM_APPLY_BASETEX_ALPHA_ONLY, "#define APPLY_BASETEX_ALPHA_ONLY\n", "_alpha" },
+{ PROGRAM_APPLY_LIGHTSTYLE0, "#define APPLY_LIGHTSTYLE0\n", "_ls0" },
+{ PROGRAM_APPLY_FB_LIGHTMAP, "#define APPLY_FBLIGHTMAP\n", "_fb" },
+{ PROGRAM_APPLY_LIGHTSTYLE1, "#define APPLY_LIGHTSTYLE1\n", "_ls1" },
+{ PROGRAM_APPLY_LIGHTSTYLE2, "#define APPLY_LIGHTSTYLE2\n", "_ls2" },
+{ PROGRAM_APPLY_LIGHTSTYLE3, "#define APPLY_LIGHTSTYLE3\n", "_ls3" },
+{ PROGRAM_APPLY_DIRECTIONAL_LIGHT, "#define APPLY_DIRECTIONAL_LIGHT\n", "_dirlight" },
+{ PROGRAM_APPLY_SPECULAR, "#define APPLY_SPECULAR\n", "_gloss" },
+{ PROGRAM_APPLY_OFFSETMAPPING, "#define APPLY_OFFSETMAPPING\n", "_offmap" },
+{ PROGRAM_APPLY_RELIEFMAPPING, "#define APPLY_RELIEFMAPPING\n", "_relmap" },
+{ PROGRAM_APPLY_AMBIENT_COMPENSATION, "#define APPLY_AMBIENT_COMPENSATION\n", "_amb" },
+{ PROGRAM_APPLY_DECAL, "#define APPLY_DECAL\n", "_decal" },
+{ PROGRAM_APPLY_BASETEX_ALPHA_ONLY, "#define APPLY_BASETEX_ALPHA_ONLY\n", "_alpha" },

-	{ PROGRAM_APPLY_EYEDOT, "#define APPLY_EYEDOT\n", "_eyedot" },
-	{ PROGRAM_APPLY_DISTORTION_ALPHA, "#define APPLY_DISTORTION_ALPHA\n", "_alpha" },
+{ PROGRAM_APPLY_EYEDOT, "#define APPLY_EYEDOT\n", "_eyedot" },
+{ PROGRAM_APPLY_DISTORTION_ALPHA, "#define APPLY_DISTORTION_ALPHA\n", "_alpha" },

-	{ PROGRAM_APPLY_PCF2x2, "#define APPLY_PCF2x2\n", "_pcf2x2" },
-	{ PROGRAM_APPLY_PCF3x3, "#define APPLY_PCF3x3\n", "_pcf3x3" },
+{ PROGRAM_APPLY_PCF2x2, "#define APPLY_PCF2x2\n", "_pcf2x2" },
+{ PROGRAM_APPLY_PCF3x3, "#define APPLY_PCF3x3\n", "_pcf3x3" },

-	{ PROGRAM_APPLY_BRANCHING, "#define APPLY_BRANCHING\n", "_branch" },
-	{ PROGRAM_APPLY_CLIPPING, "#define APPLY_CLIPPING\n", "_clip" },
-	{ PROGRAM_APPLY_NO_HALF_TYPES, "#define APPLY_NO_HALF_TYPES\n", "_nohalf" }
+{ PROGRAM_APPLY_BRANCHING, "#define APPLY_BRANCHING\n", "_branch" },
+{ PROGRAM_APPLY_CLIPPING, "#define APPLY_CLIPPING\n", "_clip" },
+{ PROGRAM_APPLY_NO_HALF_TYPES, "#define APPLY_NO_HALF_TYPES\n", "_nohalf" }
 };

 static const char *r_defaultGLSLProgram =
--- a/render/r_register.c
+++ b/render/r_register.c
@ -617,7 +617,6 @@ void GL_InitCommands( void )

 	Cmd_AddCommand( "texturelist", R_TextureList_f, "display loaded textures list" );
 	Cmd_AddCommand( "shaderlist", R_ShaderList_f, "display loaded shaders list" );
-	Cmd_AddCommand( "shaderdump", R_ShaderDump_f, "dump shaders into text file" );
 	Cmd_AddCommand( "modellist", Mod_Modellist_f, "display loaded models list" );
 	Cmd_AddCommand( "r_info", R_RenderInfo_f, "display openGL supported extensions" );
 	Cmd_AddCommand( "glslprogramlist", R_ProgramList_f, "display loaded GLSL shaders list" );
--- a/render/r_shader.c
+++ b/render/r_shader.c
--- a/render/r_shader.h
+++ b/render/r_shader.h
@ -40,12 +40,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define SHADER_TEXTURE		5
 #define SHADER_VERTEX		6
 #define SHADER_FLARE		7
-#define SHADER_MD3			8
-#define SHADER_FARBOX		9
-#define SHADER_NEARBOX		10
-#define SHADER_PLANAR_SHADOW		11
-#define SHADER_OPAQUE_OCCLUDER	12
-#define SHADER_OUTLINE		13
+#define SHADER_ALIAS		8
+#define SHADER_STUDIO		9
+#define SHADER_SPRITE		10
+#define SHADER_FARBOX		11
+#define SHADER_NEARBOX		12
+#define SHADER_PLANAR_SHADOW		13
+#define SHADER_OPAQUE_OCCLUDER	14
+#define SHADER_OUTLINE		15

 // shader flags
 typedef enum
@ -84,10 +86,11 @@ enum
 	SHADERSTAGE_DLIGHT		= BIT(6),
 	SHADERSTAGE_PORTALMAP	= BIT(7),
 	SHADERSTAGE_STENCILSHADOW	= BIT(8),
-	SHADERSTAGE_BLEND_REPLACE	= BIT(9),
-	SHADERSTAGE_BLEND_MODULATE	= BIT(10),
-	SHADERSTAGE_BLEND_ADD	= BIT(11),
-	SHADERSTAGE_BLEND_DECAL	= BIT(12)
+	SHADERSTAGE_RENDERMODE	= BIT(9),
+	SHADERSTAGE_BLEND_REPLACE	= BIT(10),
+	SHADERSTAGE_BLEND_MODULATE	= BIT(11),
+	SHADERSTAGE_BLEND_ADD	= BIT(12),
+	SHADERSTAGE_BLEND_DECAL	= BIT(13)
 } stageFlags_t;

 #define SHADERSTAGE_BLENDMODE		(SHADERSTAGE_BLEND_REPLACE|SHADERSTAGE_BLEND_MODULATE|SHADERSTAGE_BLEND_ADD|SHADERSTAGE_BLEND_DECAL)
@ -138,8 +141,8 @@ typedef enum
 	RGBGEN_EXACT_VERTEX,
 	RGBGEN_LIGHTING_DIFFUSE_ONLY,
 	RGBGEN_LIGHTING_AMBIENT_ONLY,
-	RGBGEN_FOG,
 	RGBGEN_CUSTOM,
+	RGBGEN_FOG,		// followed extensions only for internal use
 	RGBGEN_OUTLINE,
 	RGBGEN_ENVIRONMENT
 } rgbGenType_t;
@ -162,7 +165,7 @@ typedef enum
 	ALPHAGEN_ONE_MINUS_FADE,
 	ALPHAGEN_DOT,
 	ALPHAGEN_ONE_MINUS_DOT,
-	ALPHAGEN_OUTLINE
+	ALPHAGEN_OUTLINE			// only for internal use
 } alphaGenType_t;

 // texture coordinates generation
@ -294,7 +297,8 @@ typedef struct ref_shader_s
 {
 	char		*name;
 	word		type;
-	
+
+	shader_t		shadernum;	// 0 = free	
 	uint		flags;
 	word		features;
 	sort_t		sort;
@ -315,16 +319,18 @@ typedef struct ref_shader_s

 	float		offsetmapping_scale;

+	struct ref_script_s	*cache;
 	struct ref_shader_s	*nextHash;
 } ref_shader_t;

 // memory management
-extern byte	*r_shadersmempool;
-extern ref_shader_t	r_shaders[MAX_SHADERS];
-extern skydome_t	*r_skydomes[MAX_SHADERS];
+extern byte		*r_shaderpool;
+extern ref_shader_t		r_shaders[MAX_SHADERS];
+extern skydome_t		*r_skydomes[MAX_SHADERS];

+#define Shader_CopyString( str )	com.stralloc( r_shaderpool, str, __FILE__, __LINE__ )
 #define Shader_Sortkey( shader, sort )	((( sort )<<26 )|( shader - r_shaders ))
-#define Shader_Malloc( size )		Mem_Alloc( r_shadersmempool, size )
+#define Shader_Malloc( size )		Mem_Alloc( r_shaderpool, size )
 #define Shader_Free( data )		Mem_Free( data )


@ -333,7 +339,6 @@ void R_ShutdownShaders( void );
 void R_UploadCinematicShader( const ref_shader_t *shader );
 void R_DeformvBBoxForShader( const ref_shader_t *shader, vec3_t ebbox );
 void R_ShaderList_f( void );
-void R_ShaderDump_f( void );
 ref_shader_t *R_LoadShader( const char *name, int type, bool forceDefault, int addFlags, int ignoreType );


--- a/render/render.plg
+++ b/render/render.plg
@ -6,13 +6,13 @@
 --------------------Configuration: render - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSP39A.tmp" with contents
+Creating temporary file "C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSPA97.tmp" with contents
 [
 /nologo /MDd /W3 /Gm /Gi /GX /ZI /Od /I "../public" /I "../common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR"..\temp\render\!debug/" /Fo"..\temp\render\!debug/" /Fd"..\temp\render\!debug/" /FD /c 
 "D:\Xash3D\src_main\render\r_shader.c"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSP39A.tmp" 
-Creating temporary file "C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSP39B.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSPA97.tmp" 
+Creating temporary file "C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSPA98.tmp" with contents
 [
 msvcrtd.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:yes /pdb:"..\temp\render\!debug/render.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"..\temp\render\!debug/render.dll" /implib:"..\temp\render\!debug/render.lib" /pdbtype:sept 
 "\Xash3D\src_main\temp\render\!debug\cin.obj"
@ -39,13 +39,13 @@ msvcrtd.lib user32.lib gdi32.lib /nologo /subsystem:windows /dll /incremental:ye
 "\Xash3D\src_main\temp\render\!debug\r_sky.obj"
 "\Xash3D\src_main\temp\render\!debug\r_surf.obj"
 ]
-Creating command line "link.exe @C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSP39B.tmp"
-Creating temporary file "C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSP39C.bat" with contents
+Creating command line "link.exe @C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSPA98.tmp"
+Creating temporary file "C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSPA99.bat" with contents
 [
@echo off
 copy \Xash3D\src_main\temp\render\!debug\render.dll "D:\Xash3D\bin\render.dll"
 ]
-Creating command line "C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSP39C.bat"
+Creating command line "C:\DOCUME~1\MIKE~1.MIK\LOCALS~1\Temp\RSPA99.bat"
 Compiling...
 r_shader.c
 Linking...
--- a/server/server.plg
+++ b/server/server.plg
@ -0,0 +1,16 @@
+<html>
+<body>
+<pre>
+<h1>Build Log</h1>
+<h3>
+--------------------Configuration: server - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+
+
+
+<h3>Results</h3>
+server.dll - 0 error(s), 0 warning(s)
+</pre>
+</body>
+</html>
--- a/todo.log
+++ b/todo.log
@ -94,14 +94,15 @@ Beta 13.12.08
 63. portal rendering angles			OK
 64. ImageLoading from old render		OK
 65. envshot, skyshot swap angles to right pos
-66. ShaderSystem from old render
+66. ShaderSystem from old render		OK
 67. fixup NPOT textures loading (screen textures)
 68. add new shader types			OK
 69. implement oldareabits			OK
 70. repair fog texture			OK
 71. fixup hardware gamma adjusting		OK
 72. screenshots VID_AdjustGamma		OK
-73. shaders pasring
+73. shaders pasring				OK
 74. fixup 3D textures loading			OK
+75. ignore shader errors - just throw warnings