OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-21 12:49:10 +00:00
Code Releases Activity

Eliminate hsScalar and hsFixed

Browse Source 
Modern CPUs support floats just fine... hsFixed was crazy.
This commit is contained in:
Adam Johnson
2012-01-21 02:03:37 -05:00
parent 5027b5a4ac
commit e020651e4b
584 changed files with 5401 additions and 6399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleGenerator.cpp
View File

@ -54,14 +54,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsResMgr.h"
#include "plMath/plRandom.h"
static const hsScalar DEFAULT_INVERSE_MASS = 1.f;
static const float DEFAULT_INVERSE_MASS = 1.f;
static plRandom sRandom;
const void plParticleGenerator::ComputeDirection(float pitch, float yaw, hsVector3 &direction)
{
hsScalar cosPitch, sinPitch;
hsScalar cosYaw, sinYaw;
float cosPitch, sinPitch;
float cosYaw, sinYaw;
hsFastMath::SinCos(pitch, sinPitch, cosPitch);
hsFastMath::SinCos(yaw, sinYaw, cosYaw);
@ -101,13 +101,13 @@ plSimpleParticleGenerator::~plSimpleParticleGenerator()
delete [] fInitYaw;
}
void plSimpleParticleGenerator::Init(hsScalar genLife, hsScalar partLifeMin, hsScalar partLifeMax,
hsScalar particlesPerSecond, uint32_t numSources, hsPoint3 *initPos,
hsScalar *initPitch, hsScalar *initYaw, hsScalar angleRange,
hsScalar initVelMin, hsScalar initVelMax,
hsScalar xSize, hsScalar ySize,
hsScalar scaleMin, hsScalar scaleMax,
hsScalar massRange, hsScalar radsPerSecRange)
void plSimpleParticleGenerator::Init(float genLife, float partLifeMin, float partLifeMax,
float particlesPerSecond, uint32_t numSources, hsPoint3 *initPos,
float *initPitch, float *initYaw, float angleRange,
float initVelMin, float initVelMax,
float xSize, float ySize,
float scaleMin, float scaleMax,
float massRange, float radsPerSecRange)
{
fGenLife = genLife;
fPartLifeMin = partLifeMin;
@ -162,21 +162,21 @@ hsBool plSimpleParticleGenerator::AddAutoParticles(plParticleEmitter *emitter, f
hsPoint3 orientation;
hsVector3 initDirection;
hsScalar vel = (fVelMax + fVelMin) * 0.5f;
hsScalar velRange = vel - fVelMin;
hsScalar initVelocity;
hsScalar initLife;
hsScalar life = (fPartLifeMax + fPartLifeMin) * 0.5f;
hsScalar lifeRange = life - fPartLifeMin;
hsScalar currSizeVar;
hsScalar scale = (fScaleMax + fScaleMin) * 0.5f;
hsScalar scaleRange = scale - fScaleMin;
hsScalar radsPerSec = 0;
float vel = (fVelMax + fVelMin) * 0.5f;
float velRange = vel - fVelMin;
float initVelocity;
float initLife;
float life = (fPartLifeMax + fPartLifeMin) * 0.5f;
float lifeRange = life - fPartLifeMin;
float currSizeVar;
float scale = (fScaleMax + fScaleMin) * 0.5f;
float scaleRange = scale - fScaleMin;
float radsPerSec = 0;
uint32_t tile;
uint32_t sourceIndex;
const hsScalar lifeDiff = dt / numNewParticles;
hsScalar lifeSoFar;
const float lifeDiff = dt / numNewParticles;
float lifeSoFar;
int i;
for (i = 0, lifeSoFar = 0; i < numNewParticles; i++, lifeSoFar += lifeDiff)
{
@ -208,7 +208,7 @@ hsBool plSimpleParticleGenerator::AddAutoParticles(plParticleEmitter *emitter, f
tile = (uint32_t)(sRandom.RandZeroToOne() * emitter->GetNumTiles());
currSizeVar = scale + scaleRange * sRandom.RandMinusOneToOne();
hsScalar invMass = fPartInvMassMin;
float invMass = fPartInvMassMin;
// Might be faster to just do the math instead of checking for zero...
if( fPartInvMassRange > 0 )
invMass += fPartInvMassRange * sRandom.RandZeroToOne();
@ -224,7 +224,7 @@ hsBool plSimpleParticleGenerator::AddAutoParticles(plParticleEmitter *emitter, f
return true;
}
void plSimpleParticleGenerator::UpdateParam(uint32_t paramID, hsScalar paramValue)
void plSimpleParticleGenerator::UpdateParam(uint32_t paramID, float paramValue)
{
switch (paramID)
{
@ -296,14 +296,14 @@ void plSimpleParticleGenerator::UpdateParam(uint32_t paramID, hsScalar paramValu
void plSimpleParticleGenerator::Read(hsStream* s, hsResMgr *mgr)
{
hsScalar genLife = s->ReadLEScalar();
hsScalar partLifeMin = s->ReadLEScalar();
hsScalar partLifeMax = s->ReadLEScalar();
hsScalar pps = s->ReadLEScalar();
float genLife = s->ReadLEScalar();
float partLifeMin = s->ReadLEScalar();
float partLifeMax = s->ReadLEScalar();
float pps = s->ReadLEScalar();
uint32_t numSources = s->ReadLE32();
hsPoint3 *pos = TRACKED_NEW hsPoint3[numSources];
hsScalar *pitch = TRACKED_NEW hsScalar[numSources];
hsScalar *yaw = TRACKED_NEW hsScalar[numSources];
float *pitch = TRACKED_NEW float[numSources];
float *yaw = TRACKED_NEW float[numSources];
int i;
for (i = 0; i < numSources; i++)
{
@ -311,15 +311,15 @@ void plSimpleParticleGenerator::Read(hsStream* s, hsResMgr *mgr)
pitch[i] = s->ReadLEScalar();
yaw[i] = s->ReadLEScalar();
}
hsScalar angleRange = s->ReadLEScalar();
hsScalar velMin = s->ReadLEScalar();
hsScalar velMax = s->ReadLEScalar();
hsScalar xSize = s->ReadLEScalar();
hsScalar ySize = s->ReadLEScalar();
hsScalar scaleMin = s->ReadLEScalar();
hsScalar scaleMax = s->ReadLEScalar();
hsScalar massRange = s->ReadLEScalar();
hsScalar radsPerSec = s->ReadLEScalar();
float angleRange = s->ReadLEScalar();
float velMin = s->ReadLEScalar();
float velMax = s->ReadLEScalar();
float xSize = s->ReadLEScalar();
float ySize = s->ReadLEScalar();
float scaleMin = s->ReadLEScalar();
float scaleMax = s->ReadLEScalar();
float massRange = s->ReadLEScalar();
float radsPerSec = s->ReadLEScalar();
Init(genLife, partLifeMin, partLifeMax, pps, numSources, pos, pitch, yaw, angleRange, velMin, velMax,
xSize, ySize, scaleMin, scaleMax, massRange, radsPerSec);
@ -347,7 +347,7 @@ void plSimpleParticleGenerator::Write(hsStream* s, hsResMgr *mgr)
s->WriteLEScalar(fScaleMin);
s->WriteLEScalar(fScaleMax);
hsScalar massRange = 1.f / fPartInvMassMin - DEFAULT_INVERSE_MASS;
float massRange = 1.f / fPartInvMassMin - DEFAULT_INVERSE_MASS;
s->WriteLEScalar(massRange);
s->WriteLEScalar(fPartRadsPerSecRange);
}
@ -364,8 +364,8 @@ plOneTimeParticleGenerator::~plOneTimeParticleGenerator()
delete [] fDirection;
}
void plOneTimeParticleGenerator::Init(hsScalar count, hsPoint3 *pointArray, hsVector3 *dirArray,
hsScalar xSize, hsScalar ySize, hsScalar scaleMin, hsScalar scaleMax, hsScalar radsPerSecRange)
void plOneTimeParticleGenerator::Init(float count, hsPoint3 *pointArray, hsVector3 *dirArray,
float xSize, float ySize, float scaleMin, float scaleMax, float radsPerSecRange)
{
fCount = count;
fPosition = pointArray;
@ -380,16 +380,16 @@ void plOneTimeParticleGenerator::Init(hsScalar count, hsPoint3 *pointArray, hsVe
// The numForced param is required by the parent class, but ignored by this particular generator
hsBool plOneTimeParticleGenerator::AddAutoParticles(plParticleEmitter *emitter, float dt, uint32_t numForced /* = 0 */)
{
hsScalar currSizeVar;
hsScalar scale = (fScaleMax + fScaleMin) / 2;
hsScalar scaleRange = scale - fScaleMin;
float currSizeVar;
float scale = (fScaleMax + fScaleMin) / 2;
float scaleRange = scale - fScaleMin;
hsScalar tile;
float tile;
hsPoint3 currStart;
hsPoint3 orientation;
hsVector3 initDirection;
hsVector3 zeroVel(0.f, 0.f, 0.f);
hsScalar radsPerSec = 0;
float radsPerSec = 0;
int i;
for (i = 0; i < fCount; i++)
@ -402,7 +402,7 @@ hsBool plOneTimeParticleGenerator::AddAutoParticles(plParticleEmitter *emitter,
else
orientation.Set(&initDirection);
tile = (hsScalar)(sRandom.Rand() % emitter->GetNumTiles());
tile = (float)(sRandom.Rand() % emitter->GetNumTiles());
currSizeVar = scale + scaleRange * sRandom.RandMinusOneToOne();
if( fPartRadsPerSecRange > 0 )
@ -418,11 +418,11 @@ hsBool plOneTimeParticleGenerator::AddAutoParticles(plParticleEmitter *emitter,
void plOneTimeParticleGenerator::Read(hsStream* s, hsResMgr *mgr)
{
uint32_t count = s->ReadLE32();
hsScalar xSize = s->ReadLEScalar();
hsScalar ySize = s->ReadLEScalar();
hsScalar scaleMin = s->ReadLEScalar();
hsScalar scaleMax = s->ReadLEScalar();
hsScalar radsPerSecRange = s->ReadLEScalar();
float xSize = s->ReadLEScalar();
float ySize = s->ReadLEScalar();
float scaleMin = s->ReadLEScalar();
float scaleMax = s->ReadLEScalar();
float radsPerSecRange = s->ReadLEScalar();
hsPoint3 *pos = TRACKED_NEW hsPoint3[count];
hsVector3 *dir = TRACKED_NEW hsVector3[count];
@ -434,7 +434,7 @@ void plOneTimeParticleGenerator::Read(hsStream* s, hsResMgr *mgr)
dir[i].Read(s);
}
Init((hsScalar)count, pos, dir, xSize, ySize, scaleMin, scaleMax, radsPerSecRange);
Init((float)count, pos, dir, xSize, ySize, scaleMin, scaleMax, radsPerSecRange);
}
void plOneTimeParticleGenerator::Write(hsStream* s, hsResMgr *mgr)