fortressforever/fortressforever-2013
0
0
Fork 0
mirror of https://github.com/fortressforever/fortressforever-2013.git synced 2024-11-23 04:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '82fe37f'

Browse source
This commit is contained in:
Jørgen P. Tjernø 2013-09-03 14:23:08 -07:00
commit 10e2714784
16 changed files with 38 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mp/src/public/gamebspfile.h
View file

@ -21,12 +21,14 @@
//-----------------------------------------------------------------------------
// This enumerations defines all the four-CC codes for the client lump names
//-----------------------------------------------------------------------------
// TODO: We may have some endian considerations here!
#define GAMELUMP_MAKE_CODE(a, b, c, d) ((a) << 24 | (b) << 16 | (c) << 8 | (d) << 0)
enum
{
GAMELUMP_DETAIL_PROPS = 'dprp',
GAMELUMP_DETAIL_PROP_LIGHTING = 'dplt',
GAMELUMP_STATIC_PROPS = 'sprp',
GAMELUMP_DETAIL_PROP_LIGHTING_HDR = 'dplh',
GAMELUMP_DETAIL_PROPS = GAMELUMP_MAKE_CODE('d', 'p', 'r', 'p'),
GAMELUMP_DETAIL_PROP_LIGHTING = GAMELUMP_MAKE_CODE('d', 'p', 'l', 't'),
GAMELUMP_STATIC_PROPS = GAMELUMP_MAKE_CODE('s', 'p', 'r', 'p'),
GAMELUMP_DETAIL_PROP_LIGHTING_HDR = GAMELUMP_MAKE_CODE('d', 'p', 'l', 'h'),
};
// Versions...

2
mp/src/utils/common/mstristrip.cpp
View file

@ -867,7 +867,7 @@ public:
int iFirstUsed;
int iOrigIndex;
bool operator<(const SortEntry& rhs)
bool operator<(const SortEntry& rhs) const
{
return iFirstUsed < rhs.iFirstUsed;
}

11
mp/src/utils/vbsp/cubemap.cpp
View file

@ -286,12 +286,8 @@ void CreateDefaultCubemaps( bool bHDR )
// NOTE: This implementation depends on the fact that all VTF files contain
// all mipmap levels
const char *pSkyboxBaseName = FindSkyboxMaterialName();
char skyboxMaterialName[MAX_PATH];
Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
IVTFTexture *pSrcVTFTextures[6];
if( !skyboxMaterialName )
if( !pSkyboxBaseName )
{
if( s_DefaultCubemapNames.Count() )
{
@ -300,6 +296,11 @@ void CreateDefaultCubemaps( bool bHDR )
return;
}
char skyboxMaterialName[MAX_PATH];
Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
IVTFTexture *pSrcVTFTextures[6];
int unionTextureFlags = 0;
if( !LoadSrcVTFFiles( pSrcVTFTextures, skyboxMaterialName, &unionTextureFlags, bHDR ) )
{

2
mp/src/utils/vbsp/detailobjects.cpp
View file

@ -379,7 +379,7 @@ static int SelectDetail( DetailObjectGroup_t const& group )
static int AddDetailDictLump( const char* pModelName )
{
DetailObjectDictLump_t dictLump;
strncpy( dictLump.m_Name, pModelName, DETAIL_NAME_LENGTH );
Q_strncpy( dictLump.m_Name, pModelName, DETAIL_NAME_LENGTH );
for (int i = s_DetailObjectDictLump.Count(); --i >= 0; )
{

2
mp/src/utils/vbsp/ivp.cpp
View file

@ -432,7 +432,7 @@ public:
private:
CPhysConvex *CPlaneList::BuildConvexForBrush( int brushnumber, float shrink, CPhysCollide *pCollideTest, float shrinkMinimum );
CPhysConvex *BuildConvexForBrush( int brushnumber, float shrink, CPhysCollide *pCollideTest, float shrinkMinimum );
public:
CUtlVector<CPhysConvex *> m_convex;

2
mp/src/utils/vrad/vrad.cpp
View file

@ -93,7 +93,7 @@ bool g_bOnlyStaticProps = false;
bool g_bShowStaticPropNormals = false;
float gamma = 0.5;
float gamma_value = 0.5;
float indirect_sun = 1.0;
float reflectivityScale = 1.0;
qboolean do_extra = true;

2
mp/src/utils/vrad/vrad.h
View file

@ -336,7 +336,7 @@ extern dface_t *g_pFaces;
extern bool g_bMPIProps;
extern byte nodehit[MAX_MAP_NODES];
extern float gamma;
extern float gamma_value;
extern float indirect_sun;
extern float smoothing_threshold;
extern int dlight_map;

3
mp/src/utils/vrad/vraddetailprops.cpp
View file

@ -524,7 +524,8 @@ private:
bool TestPointAgainstSkySurface( Vector const &pt, dface_t *pFace )
{
// Create sky face winding.
winding_t *pWinding = WindingFromFace( pFace, Vector( 0.0f, 0.0f, 0.0f ) );
Vector v( 0.0f, 0.0f, 0.0f );
winding_t *pWinding = WindingFromFace( pFace, v );
// Test point in winding. (Since it is at the node, it is in the plane.)
bool bRet = PointInWinding( pt, pWinding );

10
sp/src/public/gamebspfile.h
View file

@ -21,12 +21,14 @@
//-----------------------------------------------------------------------------
// This enumerations defines all the four-CC codes for the client lump names
//-----------------------------------------------------------------------------
// TODO: We may have some endian considerations here!
#define GAMELUMP_MAKE_CODE(a, b, c, d) ((a) << 24 | (b) << 16 | (c) << 8 | (d) << 0)
enum
{
GAMELUMP_DETAIL_PROPS = 'dprp',
GAMELUMP_DETAIL_PROP_LIGHTING = 'dplt',
GAMELUMP_STATIC_PROPS = 'sprp',
GAMELUMP_DETAIL_PROP_LIGHTING_HDR = 'dplh',
GAMELUMP_DETAIL_PROPS = GAMELUMP_MAKE_CODE('d', 'p', 'r', 'p'),
GAMELUMP_DETAIL_PROP_LIGHTING = GAMELUMP_MAKE_CODE('d', 'p', 'l', 't'),
GAMELUMP_STATIC_PROPS = GAMELUMP_MAKE_CODE('s', 'p', 'r', 'p'),
GAMELUMP_DETAIL_PROP_LIGHTING_HDR = GAMELUMP_MAKE_CODE('d', 'p', 'l', 'h'),
};
// Versions...

2
sp/src/utils/common/mstristrip.cpp
View file

@ -867,7 +867,7 @@ public:
int iFirstUsed;
int iOrigIndex;
bool operator<(const SortEntry& rhs)
bool operator<(const SortEntry& rhs) const
{
return iFirstUsed < rhs.iFirstUsed;
}

11
sp/src/utils/vbsp/cubemap.cpp
View file

@ -286,12 +286,8 @@ void CreateDefaultCubemaps( bool bHDR )
// NOTE: This implementation depends on the fact that all VTF files contain
// all mipmap levels
const char *pSkyboxBaseName = FindSkyboxMaterialName();
char skyboxMaterialName[MAX_PATH];
Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
IVTFTexture *pSrcVTFTextures[6];
if( !skyboxMaterialName )
if( !pSkyboxBaseName )
{
if( s_DefaultCubemapNames.Count() )
{
@ -300,6 +296,11 @@ void CreateDefaultCubemaps( bool bHDR )
return;
}
char skyboxMaterialName[MAX_PATH];
Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );
IVTFTexture *pSrcVTFTextures[6];
int unionTextureFlags = 0;
if( !LoadSrcVTFFiles( pSrcVTFTextures, skyboxMaterialName, &unionTextureFlags, bHDR ) )
{

2
sp/src/utils/vbsp/detailobjects.cpp
View file

@ -379,7 +379,7 @@ static int SelectDetail( DetailObjectGroup_t const& group )
static int AddDetailDictLump( const char* pModelName )
{
DetailObjectDictLump_t dictLump;
strncpy( dictLump.m_Name, pModelName, DETAIL_NAME_LENGTH );
Q_strncpy( dictLump.m_Name, pModelName, DETAIL_NAME_LENGTH );
for (int i = s_DetailObjectDictLump.Count(); --i >= 0; )
{

2
sp/src/utils/vbsp/ivp.cpp
View file

@ -432,7 +432,7 @@ public:
private:
CPhysConvex *CPlaneList::BuildConvexForBrush( int brushnumber, float shrink, CPhysCollide *pCollideTest, float shrinkMinimum );
CPhysConvex *BuildConvexForBrush( int brushnumber, float shrink, CPhysCollide *pCollideTest, float shrinkMinimum );
public:
CUtlVector<CPhysConvex *> m_convex;

2
sp/src/utils/vrad/vrad.cpp
View file

@ -93,7 +93,7 @@ bool g_bOnlyStaticProps = false;
bool g_bShowStaticPropNormals = false;
float gamma = 0.5;
float gamma_value = 0.5;
float indirect_sun = 1.0;
float reflectivityScale = 1.0;
qboolean do_extra = true;

2
sp/src/utils/vrad/vrad.h
View file

@ -336,7 +336,7 @@ extern dface_t *g_pFaces;
extern bool g_bMPIProps;
extern byte nodehit[MAX_MAP_NODES];
extern float gamma;
extern float gamma_value;
extern float indirect_sun;
extern float smoothing_threshold;
extern int dlight_map;

3
sp/src/utils/vrad/vraddetailprops.cpp
View file

@ -524,7 +524,8 @@ private:
bool TestPointAgainstSkySurface( Vector const &pt, dface_t *pFace )
{
// Create sky face winding.
winding_t *pWinding = WindingFromFace( pFace, Vector( 0.0f, 0.0f, 0.0f ) );
Vector v( 0.0f, 0.0f, 0.0f );
winding_t *pWinding = WindingFromFace( pFace, v );
// Test point in winding. (Since it is at the node, it is in the plane.)
bool bRet = PointInWinding( pt, pWinding );