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

Merge pull request #271 from Deledrius/DebugControllerDisplay_Crashfix

Browse Source 
Fix crash when enabling Controller Debug display
This commit is contained in:
Adam Johnson
2013-01-20 12:39:44 -08:00
parent 6944439591 e2a0041d31
commit cac9d347d6
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.cpp
View File

@ -850,33 +850,35 @@ void plPXPhysicalControllerCore::IProcessDynamicHits()
void plPXPhysicalControllerCore::IDrawDebugDisplay() void plPXPhysicalControllerCore::IDrawDebugDisplay()
{ {
plDebugText &debugTxt = plDebugText::Instance(); plDebugText &debugTxt = plDebugText::Instance();
char strBuf[ 2048 ]; plString debugString;
int lineHeight = debugTxt.GetFontSize() + 4; int y = 10; // Initial draw position
uint32_t scrnWidth, scrnHeight;
debugTxt.GetScreenSize( &scrnWidth, &scrnHeight );
int y = 10;
int x = 10; int x = 10;
int lineHeight = debugTxt.GetFontSize() + 4;
sprintf(strBuf, "Controller Count: %d", gControllers.size()); debugString = plString::Format("Controller Count: %d", gControllers.size());
debugTxt.DrawString(x, y, strBuf); debugTxt.DrawString(x, y, debugString.c_str());
y += lineHeight; y += lineHeight;
// Only display avatar collisions if any exist...
int collisionCount = fDbgCollisionInfo.GetCount();
if (collisionCount > 0)
{
debugTxt.DrawString(x, y, "Avatar Collisions:"); debugTxt.DrawString(x, y, "Avatar Collisions:");
y += lineHeight; y += lineHeight;
int i; for (int i = 0; i < collisionCount; i++)
for (i = 0; i < fDbgCollisionInfo.GetCount(); i++)
{ {
hsVector3 normal = fDbgCollisionInfo[i].fNormal; hsVector3 normal = fDbgCollisionInfo[i].fNormal;
char *overlapStr = fDbgCollisionInfo[i].fOverlap ? "yes" : "no"; const char* overlapStr = fDbgCollisionInfo[i].fOverlap ? "yes" : "no";
float angle = hsRadiansToDegrees(acos(normal * hsVector3(0, 0, 1))); float angle = hsRadiansToDegrees(acos(normal * hsVector3(0, 0, 1)));
sprintf(strBuf, " Obj: %s, Normal: (%.2f, %.2f, %.2f), Angle(%.1f), Overlap(%3s)", debugString = plString::Format("\tObj: %s, Normal: (%.2f, %.2f, %.2f), Angle(%.1f), Overlap(%s)",
fDbgCollisionInfo[i].fSO->GetKeyName(), fDbgCollisionInfo[i].fSO->GetKeyName().c_str(),
normal.fX, normal.fY, normal.fZ, angle, overlapStr); normal.fX, normal.fY, normal.fZ, angle,
debugTxt.DrawString(x, y, strBuf); overlapStr);
debugTxt.DrawString(x, y, debugString.c_str());
y += lineHeight; y += lineHeight;
} }
} }
}
#endif PLASMA_EXTERNAL_RELEASE #endif PLASMA_EXTERNAL_RELEASE