OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-19 03:39:08 +00:00
Code Releases Activity

Convert plUoid's object name to a plString

Browse Source
This commit is contained in:
Michael Hansen
2012-01-28 16:24:20 -08:00
parent 442a733fbb
commit e34414889f
122 changed files with 810 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleEmitter.cpp
View File

@ -324,7 +324,7 @@ void plParticleEmitter::IUpdateParticles(hsScalar delta)
if ((fGenerator != nil) && (fTimeToLive >= 0))
{
plProfile_BeginLap(ParticleGenerate, fSystem->GetKeyName());
plProfile_BeginLap(ParticleGenerate, fSystem->GetKeyName().c_str());
if (!fGenerator->AddAutoParticles(this, delta))
{
delete fGenerator;
@ -332,7 +332,7 @@ void plParticleEmitter::IUpdateParticles(hsScalar delta)
}
if( (fTimeToLive > 0) && ((fTimeToLive -= delta) <= 0) )
fTimeToLive = -1.f;
plProfile_EndLap(ParticleGenerate, fSystem->GetKeyName());
plProfile_EndLap(ParticleGenerate, fSystem->GetKeyName().c_str());
}
fTargetInfo.fContext = fSystem->fContext;

4
Sources/Plasma/PubUtilLib/plParticleSystem/plParticleSystem.cpp
View File

@ -486,9 +486,9 @@ hsBool plParticleSystem::MsgReceive(plMessage* msg)
if ((rend = plRenderMsg::ConvertNoRef(msg)))
{
plProfile_BeginLap(ParticleSys, this->GetKey()->GetUoid().GetObjectName());
plProfile_BeginLap(ParticleSys, this->GetKey()->GetUoid().GetObjectName().c_str());
IHandleRenderMsg(rend->Pipeline());
plProfile_EndLap(ParticleSys, this->GetKey()->GetUoid().GetObjectName());
plProfile_EndLap(ParticleSys, this->GetKey()->GetUoid().GetObjectName().c_str());
return true;
}
else if ((refMsg = plGenRefMsg::ConvertNoRef(msg)))