TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

2
Engine/source/scene/reflector.cpp
View file

@ -760,7 +760,7 @@ MatrixF PlaneReflector::getCameraReflection( const MatrixF &camTrans )
return newTrans;
}
inline float sgn(float a)
inline F32 sgn(F32 a)
{
if (a > 0.0F) return (1.0F);
if (a < 0.0F) return (-1.0F);

2
Engine/source/scene/sceneContainer.cpp
View file

@ -1197,7 +1197,7 @@ void SceneContainer::cleanupSearchVectors()
//-----------------------------------------------------------------------------
static Point3F sgSortReferencePoint;
static int QSORT_CALLBACK cmpSearchPointers(const void* inP1, const void* inP2)
static S32 QSORT_CALLBACK cmpSearchPointers(const void* inP1, const void* inP2)
{
SimObjectPtr<SceneObject>** p1 = (SimObjectPtr<SceneObject>**)inP1;
SimObjectPtr<SceneObject>** p2 = (SimObjectPtr<SceneObject>**)inP2;

2
Engine/source/scene/zones/sceneZoneSpaceManager.h
View file

@ -79,7 +79,7 @@ class SceneZoneSpaceManager
{
public:
ZoneContentIterator( SceneZoneSpaceManager* manager, int zoneId, bool upToDate = true )
ZoneContentIterator( SceneZoneSpaceManager* manager, S32 zoneId, bool upToDate = true )
{
AssertFatal( zoneId < manager->getNumZones(), "SceneZoneSpaceManager::ZoneContentIterator - Zone ID out of range" );