mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 23:54:35 +00:00
Update for float, double and unsigned char, unsigned short, short, etc. char was left alone: read why here http://msdn.microsoft.com/en-us/library/cc953fe1.aspx
This commit is contained in:
parent
4c35fd37af
commit
7a8f46b19f
36 changed files with 75 additions and 75 deletions
|
|
@ -1546,7 +1546,7 @@ void Camera::_validateEyePoint(F32 pos, MatrixF *mat)
|
|||
float dot = mDot(dir, collision.normal);
|
||||
if (dot > 0.01f)
|
||||
{
|
||||
float colDist = mDot(startPos - collision.point, dir) - (1 / dot) * CameraRadius;
|
||||
F32 colDist = mDot(startPos - collision.point, dir) - (1 / dot) * CameraRadius;
|
||||
if (colDist > pos)
|
||||
colDist = pos;
|
||||
if (colDist < 0.0f)
|
||||
|
|
|
|||
|
|
@ -66,11 +66,11 @@ ConsoleDocClass( ParticleData,
|
|||
"@see ParticleEmitterNode\n"
|
||||
);
|
||||
|
||||
static const float sgDefaultWindCoefficient = 0.0f;
|
||||
static const float sgDefaultConstantAcceleration = 0.f;
|
||||
static const float sgDefaultSpinSpeed = 1.f;
|
||||
static const float sgDefaultSpinRandomMin = 0.f;
|
||||
static const float sgDefaultSpinRandomMax = 0.f;
|
||||
static const F32 sgDefaultWindCoefficient = 0.0f;
|
||||
static const F32 sgDefaultConstantAcceleration = 0.f;
|
||||
static const F32 sgDefaultSpinSpeed = 1.f;
|
||||
static const F32 sgDefaultSpinRandomMin = 0.f;
|
||||
static const F32 sgDefaultSpinRandomMax = 0.f;
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -100,9 +100,9 @@ ConsoleDocClass( ParticleEmitterData,
|
|||
"@see ParticleEmitterNode\n"
|
||||
);
|
||||
|
||||
static const float sgDefaultEjectionOffset = 0.f;
|
||||
static const float sgDefaultPhiReferenceVel = 0.f;
|
||||
static const float sgDefaultPhiVariance = 360.f;
|
||||
static const F32 sgDefaultEjectionOffset = 0.f;
|
||||
static const F32 sgDefaultPhiReferenceVel = 0.f;
|
||||
static const F32 sgDefaultPhiVariance = 360.f;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// ParticleEmitterData
|
||||
|
|
|
|||
|
|
@ -215,9 +215,9 @@ public:
|
|||
|
||||
void updateSound();
|
||||
|
||||
virtual bool calculateImpact( float simTime,
|
||||
virtual bool calculateImpact( F32 simTime,
|
||||
Point3F &pointOfImpact,
|
||||
float &impactTime );
|
||||
F32 &impactTime );
|
||||
|
||||
void setInitialPosition( const Point3F& pos );
|
||||
void setInitialVelocity( const Point3F& vel );
|
||||
|
|
|
|||
|
|
@ -3061,7 +3061,7 @@ TICKAGAIN:
|
|||
|
||||
if (image.spinThread[i])
|
||||
{
|
||||
float timeScale;
|
||||
F32 timeScale;
|
||||
|
||||
switch (stateData.spin)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue