TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-09 15:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency

Browse source 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
This commit is contained in:
Daniel Buckmaster 2014-04-04 13:43:25 +11:00
commit 87d9e245b7
210 changed files with 896 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/lighting/advanced/advancedLightManager.cpp
View file

@ -606,7 +606,7 @@ GFXVertexBufferHandle<AdvancedLightManager::LightVertex> AdvancedLightManager::g
mConeIndices.lock( &idx );
// Build the cone
U32 idxIdx = 0;
for( int i = 1; i < numPoints + 1; i++ )
for( U32 i = 1; i < numPoints + 1; i++ )
{
idx[idxIdx++] = 0; // Triangles on cone start at top point
idx[idxIdx++] = i;
@ -614,7 +614,7 @@ GFXVertexBufferHandle<AdvancedLightManager::LightVertex> AdvancedLightManager::g
}
// Build the bottom of the cone (reverse winding order)
for( int i = 1; i < numPoints - 1; i++ )
for( U32 i = 1; i < numPoints - 1; i++ )
{
idx[idxIdx++] = 1;
idx[idxIdx++] = i + 2;

4
Engine/source/lighting/common/projectedShadow.cpp
View file

@ -53,8 +53,8 @@ SimObjectPtr<RenderPassManager> ProjectedShadow::smRenderPass = NULL;
SimObjectPtr<PostEffect> ProjectedShadow::smShadowFilter = NULL;
F32 ProjectedShadow::smDepthAdjust = 10.0f;
float ProjectedShadow::smFadeStartPixelSize = 200.0f;
float ProjectedShadow::smFadeEndPixelSize = 35.0f;
F32 ProjectedShadow::smFadeStartPixelSize = 200.0f;
F32 ProjectedShadow::smFadeEndPixelSize = 35.0f;
GFX_ImplementTextureProfile( BLProjectedShadowProfile,

4
Engine/source/lighting/common/projectedShadow.h
View file

@ -109,8 +109,8 @@ protected:
public:
/// @see DecalData
static float smFadeStartPixelSize;
static float smFadeEndPixelSize;
static F32 smFadeStartPixelSize;
static F32 smFadeEndPixelSize;
ProjectedShadow( SceneObject *object );
virtual ~ProjectedShadow();

10
Engine/source/lighting/common/sceneLighting.cpp
View file

@ -859,7 +859,7 @@ struct CacheEntry {
};
// object list sort methods: want list in reverse
static int QSORT_CALLBACK minSizeSort(const void * p1, const void * p2)
static S32 QSORT_CALLBACK minSizeSort(const void * p1, const void * p2)
{
const CacheEntry * entry1 = (const CacheEntry *)p1;
const CacheEntry * entry2 = (const CacheEntry *)p2;
@ -867,7 +867,7 @@ static int QSORT_CALLBACK minSizeSort(const void * p1, const void * p2)
return(entry2->mFileObject->getSize() - entry1->mFileObject->getSize());
}
static int QSORT_CALLBACK maxSizeSort(const void * p1, const void * p2)
static S32 QSORT_CALLBACK maxSizeSort(const void * p1, const void * p2)
{
const CacheEntry * entry1 = (const CacheEntry *)p1;
const CacheEntry * entry2 = (const CacheEntry *)p2;
@ -875,7 +875,7 @@ static int QSORT_CALLBACK maxSizeSort(const void * p1, const void * p2)
return(entry1->mFileObject->getSize() - entry2->mFileObject->getSize());
}
static int QSORT_CALLBACK lastCreatedSort(const void * p1, const void * p2)
static S32 QSORT_CALLBACK lastCreatedSort(const void * p1, const void * p2)
{
const CacheEntry * entry1 = (const CacheEntry *)p1;
const CacheEntry * entry2 = (const CacheEntry *)p2;
@ -899,7 +899,7 @@ static int QSORT_CALLBACK lastCreatedSort(const void * p1, const void * p2)
return(Platform::compareFileTimes(create[1], create[0]));
}
static int QSORT_CALLBACK lastModifiedSort(const void * p1, const void * p2)
static S32 QSORT_CALLBACK lastModifiedSort(const void * p1, const void * p2)
{
const CacheEntry * entry1 = (const CacheEntry *)p1;
const CacheEntry * entry2 = (const CacheEntry *)p2;
@ -1051,7 +1051,7 @@ U32 SceneLighting::calcMissionCRC()
// of U32's, and so the result will be different on big/little endian hardware.
// To fix this, swap endians on the CRC's in the vector. This must be done
// _after_ the qsort.
for( int i = 0; i < crc.size(); i++ )
for( S32 i = 0; i < crc.size(); i++ )
crc[i] = endianSwap( crc[i] );
#endif

2
Engine/source/lighting/shadowMap/pssmLightShadowMap.h
View file

@ -58,7 +58,7 @@ protected:
Box3F _calcClipSpaceAABB(const Frustum& f, const MatrixF& transform, F32 farDist);
void _roundProjection(const MatrixF& lightMat, const MatrixF& cropMatrix, Point3F &offset, U32 splitNum);
static const int MAX_SPLITS = 4;
static const S32 MAX_SPLITS = 4;
U32 mNumSplits;
F32 mSplitDist[MAX_SPLITS+1]; // +1 because we store a cap
RectI mViewports[MAX_SPLITS];