TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-26 10:03:48 +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

2
Engine/source/util/fpsTracker.cpp
View file

@ -46,7 +46,7 @@ void FPSTracker::reset()
void FPSTracker::update()
{
const float alpha = 0.07f;
const F32 alpha = 0.07f;
F32 realSeconds = (F32)Platform::getRealMilliseconds()/1000.0f;
F32 virtualSeconds = (F32)Platform::getVirtualMilliseconds()/1000.0f;

2
Engine/source/util/noise2d.cpp
View file

@ -267,7 +267,7 @@ bool Noise2D::erodeHydraulic( Vector<F32> *src, Vector<F32> *dst, U32 iterations
for (S32 k=0; k < (size*size); k++)
c[k] = 0.0f;
for (int i=0; i<iterations; i++)
for (S32 i=0; i<iterations; i++)
{
b = a;

28
Engine/source/util/scopeTracker.h
View file

@ -47,7 +47,7 @@
/// Base class for objects registered with a ScopeTracker.
template< int NUM_DIMENSIONS >
template< S32 NUM_DIMENSIONS >
class ScopeTrackerObject
{
public:
@ -264,7 +264,7 @@ class ScopeTrackerObject
///
/// @param NUM_DIMENSIONS Number of dimensions to track; must be <=4.
/// @param Object Value type for objects tracked by the ScopeTracker. Must have pointer behavior.
template< int NUM_DIMENSIONS, typename Object >
template< S32 NUM_DIMENSIONS, typename Object >
class ScopeTracker
{
public:
@ -356,7 +356,7 @@ class ScopeTracker
//-----------------------------------------------------------------------------
template< int NUM_DIMENSIONS, class Object >
template< S32 NUM_DIMENSIONS, class Object >
ScopeTracker< NUM_DIMENSIONS, Object >::ScopeTracker()
: mReferenceObject( NULL )
{
@ -385,7 +385,7 @@ ScopeTracker< NUM_DIMENSIONS, Object >::ScopeTracker()
//-----------------------------------------------------------------------------
template< int NUM_DIMENSIONS, class Object >
template< S32 NUM_DIMENSIONS, class Object >
void ScopeTracker< NUM_DIMENSIONS, Object >::setReferenceObject( Object object )
{
AssertFatal( !object || !Deref( object ).isRegistered(),
@ -433,7 +433,7 @@ void ScopeTracker< NUM_DIMENSIONS, Object >::setReferenceObject( Object object )
//-----------------------------------------------------------------------------
template< int NUM_DIMENSIONS, class Object >
template< S32 NUM_DIMENSIONS, class Object >
void ScopeTracker< NUM_DIMENSIONS, Object >::registerObject( Object object )
{
PROFILE_SCOPE( ScopeTracker_registerObject );
@ -469,7 +469,7 @@ void ScopeTracker< NUM_DIMENSIONS, Object >::registerObject( Object object )
//-----------------------------------------------------------------------------
template< int NUM_DIMENSIONS, class Object >
template< S32 NUM_DIMENSIONS, class Object >
void ScopeTracker< NUM_DIMENSIONS, Object >::unregisterObject( Object object )
{
PROFILE_SCOPE( ScopeTracker_unregisterObject );
@ -494,7 +494,7 @@ void ScopeTracker< NUM_DIMENSIONS, Object >::unregisterObject( Object object )
//-----------------------------------------------------------------------------
template< int NUM_DIMENSIONS, class Object >
template< S32 NUM_DIMENSIONS, class Object >
void ScopeTracker< NUM_DIMENSIONS, Object >::updateObject( Object object )
{
PROFILE_SCOPE( ScopeTracker_updateObject );
@ -554,7 +554,7 @@ void ScopeTracker< NUM_DIMENSIONS, Object >::updateObject( Object object )
//-----------------------------------------------------------------------------
template< int NUM_DIMENSIONS, class Object >
template< S32 NUM_DIMENSIONS, class Object >
void ScopeTracker< NUM_DIMENSIONS, Object >::_insertTrackingNode( U32 dimension, NodeType* node )
{
//RDTODO: substitute brute-force search with some smarter insertion algorithm
@ -579,7 +579,7 @@ void ScopeTracker< NUM_DIMENSIONS, Object >::_insertTrackingNode( U32 dimension,
//-----------------------------------------------------------------------------
template< int NUM_DIMENSIONS, class Object >
template< S32 NUM_DIMENSIONS, class Object >
void ScopeTracker< NUM_DIMENSIONS, Object >::_removeTrackingNode( U32 dimension, NodeType* node )
{
NodeType* next = node->getNext();
@ -597,7 +597,7 @@ void ScopeTracker< NUM_DIMENSIONS, Object >::_removeTrackingNode( U32 dimension,
//-----------------------------------------------------------------------------
template< int NUM_DIMENSIONS, class Object >
template< S32 NUM_DIMENSIONS, class Object >
void ScopeTracker< NUM_DIMENSIONS, Object >::_moveTrackingNode( U32 dimension, NodeType* node, F32 newPosition )
{
PROFILE_SCOPE( ScopeTracker_moveTrackingNode );
@ -713,7 +713,7 @@ void ScopeTracker< NUM_DIMENSIONS, Object >::_moveTrackingNode( U32 dimension, N
//-----------------------------------------------------------------------------
template< int NUM_DIMENSIONS, class Object >
template< S32 NUM_DIMENSIONS, class Object >
void ScopeTracker< NUM_DIMENSIONS, Object >::_setScope( Object object )
{
// If there's no reference object, all objects are out of scope.
@ -756,7 +756,7 @@ void ScopeTracker< NUM_DIMENSIONS, Object >::_setScope( Object object )
//-----------------------------------------------------------------------------
template< int NUM_DIMENSIONS, class Object >
template< S32 NUM_DIMENSIONS, class Object >
void ScopeTracker< NUM_DIMENSIONS, Object >::_initTracking()
{
PROFILE_SCOPE( ScopeTracker_initTracking );
@ -813,7 +813,7 @@ void ScopeTracker< NUM_DIMENSIONS, Object >::_initTracking()
//-----------------------------------------------------------------------------
template< int NUM_DIMENSIONS, class Object >
template< S32 NUM_DIMENSIONS, class Object >
void ScopeTracker< NUM_DIMENSIONS, Object >::_uninitTracking()
{
PROFILE_SCOPE( ScopeTracker_uninitTracking );
@ -842,7 +842,7 @@ void ScopeTracker< NUM_DIMENSIONS, Object >::_uninitTracking()
//-----------------------------------------------------------------------------
template< int NUM_DIMENSIONS, class Object >
template< S32 NUM_DIMENSIONS, class Object >
void ScopeTracker< NUM_DIMENSIONS, Object >::debugDump()
{
for( U32 n = 0; n < NUM_DIMENSIONS; ++ n )

4
Engine/source/util/settings.cpp
View file

@ -633,13 +633,13 @@ void SettingSaveNode::buildDocument(SimXMLDocument *document, bool skipWrite)
document->addText(mValue);
} else
{
for(int i=0; i<mSettingNodes.size(); i++)
for(S32 i=0; i<mSettingNodes.size(); i++)
{
SettingSaveNode *node = mSettingNodes[i];
node->buildDocument(document);
}
for(int i=0; i<mGroupNodes.size(); i++)
for(S32 i=0; i<mGroupNodes.size(); i++)
{
SettingSaveNode *node = mGroupNodes[i];
node->buildDocument(document);