* Fixed Source Mod back-compatability by reordering methods in a couple interfaces.
authorJoe Ludwig <joe@valvesoftware.com>
Tue Sep 03 16:02:10 2013 -0700 (2013-09-03)
changeset 16d68c4587dc00
parent 15 4de0151ff6a3
child 17 881d178a75b3
* Fixed Source Mod back-compatability by reordering methods in a couple interfaces.
* Added missing singleplayer OSX libs
* Updated vpc and libs.
dx10sdk/Utilities/dx9_30/dx_proxy.dll
dx9sdk/utilities/dx_proxy.dll
lib/public/linux32/bitmap.a
lib/public/linux32/choreoobjects.a
lib/public/linux32/dmxloader.a
lib/public/linux32/libtier0.so
lib/public/linux32/matsys_controls.a
lib/public/linux32/particles.a
lib/public/linux32/shaderlib.a
lib/public/linux32/tier2.a
lib/public/linux32/tier3.a
lib/public/linux32/vtf.a
lib/public/tier0.lib
lib/public/vstdlib.lib
public/engine/IStaticPropMgr.h
public/engine/ivmodelrender.h
public/gamebspfile.h
utils/common/mstristrip.cpp
utils/vbsp/cubemap.cpp
utils/vbsp/detailobjects.cpp
utils/vbsp/ivp.cpp
utils/vrad/vrad.cpp
utils/vrad/vrad.h
utils/vrad/vraddetailprops.cpp
     1.1 Binary file dx10sdk/Utilities/dx9_30/dx_proxy.dll has changed
     2.1 Binary file dx9sdk/utilities/dx_proxy.dll has changed
     3.1 Binary file lib/public/linux32/bitmap.a has changed
     4.1 Binary file lib/public/linux32/choreoobjects.a has changed
     5.1 Binary file lib/public/linux32/dmxloader.a has changed
     6.1 Binary file lib/public/linux32/libtier0.so has changed
     7.1 Binary file lib/public/linux32/matsys_controls.a has changed
     8.1 Binary file lib/public/linux32/particles.a has changed
     9.1 Binary file lib/public/linux32/shaderlib.a has changed
    10.1 Binary file lib/public/linux32/tier2.a has changed
    11.1 Binary file lib/public/linux32/tier3.a has changed
    12.1 Binary file lib/public/linux32/vtf.a has changed
    13.1 Binary file lib/public/tier0.lib has changed
    14.1 Binary file lib/public/vstdlib.lib has changed
    15.1 --- a/public/engine/IStaticPropMgr.h	Mon Sep 02 11:39:10 2013 -0700
    15.2 +++ b/public/engine/IStaticPropMgr.h	Tue Sep 03 16:02:10 2013 -0700
    15.3 @@ -63,8 +63,6 @@
    15.4  	// Adds decals to static props, returns point of decal in trace_t
    15.5  	virtual void	AddDecalToStaticProp( const Vector& rayStart, const Vector& rayEnd,
    15.6  		int staticPropIndex, int decalIndex, bool doTrace, trace_t& tr ) = 0;
    15.7 -	virtual void AddColorDecalToStaticProp( Vector const& rayStart, Vector const& rayEnd,
    15.8 -		int staticPropIndex, int decalIndex, bool doTrace, trace_t& tr, bool bUseColor, Color cColor ) = 0;
    15.9  	// Adds/removes shadows from static props
   15.10  	virtual void	AddShadowToStaticProp( unsigned short shadowHandle, IClientRenderable* pRenderable ) = 0;
   15.11  	virtual void	RemoveAllShadowsFromStaticProp( IClientRenderable* pRenderable ) = 0;
   15.12 @@ -81,6 +79,8 @@
   15.13  	//===================================================================
   15.14  
   15.15  	virtual void DrawStaticProps( IClientRenderable **pProps, int count, bool bShadowDepth, bool drawVCollideWireframe ) = 0;
   15.16 +	virtual void AddColorDecalToStaticProp( Vector const& rayStart, Vector const& rayEnd,
   15.17 +		int staticPropIndex, int decalIndex, bool doTrace, trace_t& tr, bool bUseColor, Color cColor ) = 0;
   15.18  };
   15.19  
   15.20  class IStaticPropMgrServer : public IStaticPropMgr
    16.1 --- a/public/engine/ivmodelrender.h	Mon Sep 02 11:39:10 2013 -0700
    16.2 +++ b/public/engine/ivmodelrender.h	Tue Sep 03 16:02:10 2013 -0700
    16.3 @@ -138,8 +138,6 @@
    16.4  	// radius of the decal to create.
    16.5  	virtual void AddDecal( ModelInstanceHandle_t handle, Ray_t const& ray, 
    16.6  		Vector const& decalUp, int decalIndex, int body, bool noPokeThru = false, int maxLODToDecal = ADDDECAL_TO_ALL_LODS ) = 0;
    16.7 -	virtual void AddColoredDecal( ModelInstanceHandle_t handle, Ray_t const& ray, 
    16.8 -		Vector const& decalUp, int decalIndex, int body, Color cColor, bool noPokeThru = false, int maxLODToDecal = ADDDECAL_TO_ALL_LODS ) = 0;
    16.9  
   16.10  	// Removes all the decals on a model instance
   16.11  	virtual void RemoveAllDecals( ModelInstanceHandle_t handle ) = 0;
   16.12 @@ -176,6 +174,9 @@
   16.13  	virtual void SuppressEngineLighting( bool bSuppress ) = 0;
   16.14  
   16.15  	virtual void SetupColorMeshes( int nTotalVerts ) = 0;
   16.16 +
   16.17 +	virtual void AddColoredDecal( ModelInstanceHandle_t handle, Ray_t const& ray, 
   16.18 +		Vector const& decalUp, int decalIndex, int body, Color cColor, bool noPokeThru = false, int maxLODToDecal = ADDDECAL_TO_ALL_LODS ) = 0;
   16.19  };
   16.20  
   16.21  
    17.1 --- a/public/gamebspfile.h	Mon Sep 02 11:39:10 2013 -0700
    17.2 +++ b/public/gamebspfile.h	Tue Sep 03 16:02:10 2013 -0700
    17.3 @@ -21,12 +21,14 @@
    17.4  //-----------------------------------------------------------------------------
    17.5  // This enumerations defines all the four-CC codes for the client lump names
    17.6  //-----------------------------------------------------------------------------
    17.7 +// TODO: We may have some endian considerations here!
    17.8 +#define GAMELUMP_MAKE_CODE(a, b, c, d) ((a) << 24 | (b) << 16 | (c) << 8 | (d) << 0)
    17.9  enum
   17.10  {
   17.11 -	GAMELUMP_DETAIL_PROPS = 'dprp',
   17.12 -	GAMELUMP_DETAIL_PROP_LIGHTING = 'dplt',
   17.13 -	GAMELUMP_STATIC_PROPS = 'sprp',
   17.14 -	GAMELUMP_DETAIL_PROP_LIGHTING_HDR = 'dplh',
   17.15 +	GAMELUMP_DETAIL_PROPS = GAMELUMP_MAKE_CODE('d', 'p', 'r', 'p'),
   17.16 +	GAMELUMP_DETAIL_PROP_LIGHTING = GAMELUMP_MAKE_CODE('d', 'p', 'l', 't'),
   17.17 +	GAMELUMP_STATIC_PROPS = GAMELUMP_MAKE_CODE('s', 'p', 'r', 'p'),
   17.18 +	GAMELUMP_DETAIL_PROP_LIGHTING_HDR = GAMELUMP_MAKE_CODE('d', 'p', 'l', 'h'),
   17.19  };
   17.20  
   17.21  // Versions...
    18.1 --- a/utils/common/mstristrip.cpp	Mon Sep 02 11:39:10 2013 -0700
    18.2 +++ b/utils/common/mstristrip.cpp	Tue Sep 03 16:02:10 2013 -0700
    18.3 @@ -867,7 +867,7 @@
    18.4      int iFirstUsed;
    18.5      int iOrigIndex;
    18.6  
    18.7 -    bool operator<(const SortEntry& rhs)
    18.8 +    bool operator<(const SortEntry& rhs) const
    18.9      {
   18.10          return iFirstUsed < rhs.iFirstUsed;
   18.11      }
    19.1 --- a/utils/vbsp/cubemap.cpp	Mon Sep 02 11:39:10 2013 -0700
    19.2 +++ b/utils/vbsp/cubemap.cpp	Tue Sep 03 16:02:10 2013 -0700
    19.3 @@ -286,12 +286,8 @@
    19.4  	// NOTE: This implementation depends on the fact that all VTF files contain
    19.5  	// all mipmap levels
    19.6  	const char *pSkyboxBaseName = FindSkyboxMaterialName();
    19.7 -	char skyboxMaterialName[MAX_PATH];
    19.8 -	Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
    19.9  
   19.10 -	IVTFTexture *pSrcVTFTextures[6];
   19.11 -
   19.12 -	if( !skyboxMaterialName )
   19.13 +	if( !pSkyboxBaseName )
   19.14  	{
   19.15  		if( s_DefaultCubemapNames.Count() )
   19.16  		{
   19.17 @@ -300,6 +296,11 @@
   19.18  		return;
   19.19  	}
   19.20  
   19.21 +	char skyboxMaterialName[MAX_PATH];
   19.22 +	Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
   19.23 +
   19.24 +	IVTFTexture *pSrcVTFTextures[6];
   19.25 +
   19.26  	int unionTextureFlags = 0;
   19.27  	if( !LoadSrcVTFFiles( pSrcVTFTextures, skyboxMaterialName, &unionTextureFlags, bHDR ) )
   19.28  	{
    20.1 --- a/utils/vbsp/detailobjects.cpp	Mon Sep 02 11:39:10 2013 -0700
    20.2 +++ b/utils/vbsp/detailobjects.cpp	Tue Sep 03 16:02:10 2013 -0700
    20.3 @@ -379,7 +379,7 @@
    20.4  static int AddDetailDictLump( const char* pModelName )
    20.5  {
    20.6  	DetailObjectDictLump_t dictLump;
    20.7 -	strncpy( dictLump.m_Name, pModelName, DETAIL_NAME_LENGTH );
    20.8 +	Q_strncpy( dictLump.m_Name, pModelName, DETAIL_NAME_LENGTH );
    20.9  
   20.10  	for (int i = s_DetailObjectDictLump.Count(); --i >= 0; )
   20.11  	{
    21.1 --- a/utils/vbsp/ivp.cpp	Mon Sep 02 11:39:10 2013 -0700
    21.2 +++ b/utils/vbsp/ivp.cpp	Tue Sep 03 16:02:10 2013 -0700
    21.3 @@ -432,7 +432,7 @@
    21.4  
    21.5  private:
    21.6  
    21.7 -	CPhysConvex *CPlaneList::BuildConvexForBrush( int brushnumber, float shrink, CPhysCollide *pCollideTest, float shrinkMinimum );
    21.8 +	CPhysConvex *BuildConvexForBrush( int brushnumber, float shrink, CPhysCollide *pCollideTest, float shrinkMinimum );
    21.9  
   21.10  public:
   21.11  	CUtlVector<CPhysConvex *>	m_convex;
    22.1 --- a/utils/vrad/vrad.cpp	Mon Sep 02 11:39:10 2013 -0700
    22.2 +++ b/utils/vrad/vrad.cpp	Tue Sep 03 16:02:10 2013 -0700
    22.3 @@ -93,7 +93,7 @@
    22.4  bool g_bShowStaticPropNormals = false;
    22.5  
    22.6  
    22.7 -float		gamma = 0.5;
    22.8 +float		gamma_value = 0.5;
    22.9  float		indirect_sun = 1.0;
   22.10  float		reflectivityScale = 1.0;
   22.11  qboolean	do_extra = true;
    23.1 --- a/utils/vrad/vrad.h	Mon Sep 02 11:39:10 2013 -0700
    23.2 +++ b/utils/vrad/vrad.h	Tue Sep 03 16:02:10 2013 -0700
    23.3 @@ -336,7 +336,7 @@
    23.4  extern bool g_bMPIProps;
    23.5  
    23.6  extern	byte	nodehit[MAX_MAP_NODES];
    23.7 -extern  float	gamma;
    23.8 +extern  float	gamma_value;
    23.9  extern	float	indirect_sun;
   23.10  extern	float	smoothing_threshold;
   23.11  extern	int		dlight_map;
    24.1 --- a/utils/vrad/vraddetailprops.cpp	Mon Sep 02 11:39:10 2013 -0700
    24.2 +++ b/utils/vrad/vraddetailprops.cpp	Tue Sep 03 16:02:10 2013 -0700
    24.3 @@ -524,7 +524,8 @@
    24.4  	bool TestPointAgainstSkySurface( Vector const &pt, dface_t *pFace )
    24.5  	{
    24.6  		// Create sky face winding.
    24.7 -		winding_t *pWinding = WindingFromFace( pFace, Vector( 0.0f, 0.0f, 0.0f ) );
    24.8 +		Vector v( 0.0f, 0.0f, 0.0f );
    24.9 +		winding_t *pWinding = WindingFromFace( pFace, v );
   24.10  
   24.11  		// Test point in winding. (Since it is at the node, it is in the plane.)
   24.12  		bool bRet = PointInWinding( pt, pWinding );