OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 03:09:13 +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/plScene/plPageTreeMgr.cpp
View File

@ -211,7 +211,7 @@ int plPageTreeMgr::IRenderVisList(plPipeline* pipe, hsTArray<plDrawVisList>& lev
plDrawable* p = sortedDrawList[i].fDrawable;
plProfile_BeginLap(DrawableTime, p->GetKey()->GetUoid().GetObjectName());
plProfile_BeginLap(DrawableTime, p->GetKey()->GetUoid().GetObjectName().c_str());
if( sortedDrawList[i].fDrawable->GetNativeProperty(plDrawable::kPropSortSpans) )
{
@ -229,7 +229,7 @@ int plPageTreeMgr::IRenderVisList(plPipeline* pipe, hsTArray<plDrawVisList>& lev
}
plProfile_EndLap(DrawableTime, p->GetKey()->GetUoid().GetObjectName());
plProfile_EndLap(DrawableTime, p->GetKey()->GetUoid().GetObjectName().c_str());
}
return numDrawn;

4
Sources/Plasma/PubUtilLib/plScene/plPostEffectMod.cpp
View File

@ -245,9 +245,9 @@ hsBool plPostEffectMod::MsgReceive(plMessage* msg)
plRenderMsg* rend = plRenderMsg::ConvertNoRef(msg);
if( rend && IIsEnabled() )
{
plProfile_BeginLap(PostEffect, this->GetKey()->GetUoid().GetObjectName());
plProfile_BeginLap(PostEffect, this->GetKey()->GetUoid().GetObjectName().c_str());
ISubmitRequest();
plProfile_EndLap(PostEffect, this->GetKey()->GetUoid().GetObjectName());
plProfile_EndLap(PostEffect, this->GetKey()->GetUoid().GetObjectName().c_str());
return true;
}

24
Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp
View File

@ -149,12 +149,12 @@ hsBool plRelevanceMgr::MsgReceive(plMessage* msg)
return hsKeyedObject::MsgReceive(msg);
}
UInt32 plRelevanceMgr::GetIndex(char *regionName)
UInt32 plRelevanceMgr::GetIndex(const plString &regionName)
{
int i;
for (i = 0; i < fRegions.GetCount(); i++)
{
if (fRegions[i] && !stricmp(regionName, fRegions[i]->GetKeyName()))
if (fRegions[i] && !regionName.Compare(fRegions[i]->GetKeyName(), plString::kCaseInsensitive))
return i + 1;
}
@ -222,7 +222,7 @@ void plRelevanceMgr::ParseCsvInput(hsStream *s)
plRegionInfo *info = TRACKED_NEW plRegionInfo;
regions.Append(info);
info->fName = hsStrcpy(buff);
info->fIndex = GetIndex(buff);
info->fIndex = GetIndex(_TEMP_CONVERT_FROM_LITERAL(buff));
}
}
else // parsing actual settings.
@ -231,7 +231,7 @@ void plRelevanceMgr::ParseCsvInput(hsStream *s)
if (!toke.Next(buff, kBufSize))
continue;
int rowIndex = GetIndex(buff);
int rowIndex = GetIndex(_TEMP_CONVERT_FROM_LITERAL(buff));
int column = 0;
while (toke.Next(buff, kBufSize) && column < regions.GetCount())
{
@ -248,24 +248,24 @@ void plRelevanceMgr::ParseCsvInput(hsStream *s)
delete regions[i];
}
std::string plRelevanceMgr::GetRegionNames(hsBitVector regions)
plString plRelevanceMgr::GetRegionNames(hsBitVector regions)
{
std::string retVal = "";
plString retVal;
if (regions.IsBitSet(0))
retVal = "-Nowhere (0)-";
retVal = _TEMP_CONVERT_FROM_LITERAL("-Nowhere (0)-");
for (int i = 0; i < fRegions.GetCount(); ++i)
{
if (regions.IsBitSet(i + 1))
{
if (retVal.length() != 0)
retVal += ", ";
if (!retVal.IsEmpty())
retVal += _TEMP_CONVERT_FROM_LITERAL(", ");
if (fRegions[i])
retVal += fRegions[i]->GetKeyName();
}
}
if (retVal.length() == 0)
retVal = "<NONE>";
if (retVal.IsEmpty())
retVal = _TEMP_CONVERT_FROM_LITERAL("<NONE>");
return retVal;
}
}

4
Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h
View File

@ -80,13 +80,13 @@ public:
hsBool GetEnabled() { return fEnabled; }
void SetEnabled(hsBool val) { fEnabled = val; }
UInt32 GetIndex(char *regionName);
UInt32 GetIndex(const plString &regionName);
void MarkRegion(UInt32 localIdx, UInt32 remoteIdx, hsBool doICare);
void SetRegionVectors(const hsPoint3 &pos, hsBitVector &regionsImIn, hsBitVector &regionsICareAbout);
UInt32 GetNumRegions() const; // includes the secret 0 region in its count
void ParseCsvInput(hsStream *s);
std::string GetRegionNames(hsBitVector regions);
plString GetRegionNames(hsBitVector regions);
};
#endif // plRelevanceMgr_inc