OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

Fix for multi-controller debug display.

Browse Source 
Previously, multiple controllers in a single age
would overlap.  This adds a static positional
counter which is reset at the start of a new list.

This commit also attempts to make the list more
useful by showing the controller objects'
owner's name.
This commit is contained in:
Joseph Davies
2013-01-20 13:41:41 -08:00
parent cac9d347d6
commit 60b7e02d28
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,7 +561,7 @@ void plPXPhysicalControllerCore::Update(int numSubSteps, float alpha)
#ifndef PLASMA_EXTERNAL_RELEASE #ifndef PLASMA_EXTERNAL_RELEASE
if (fDebugDisplay) if (fDebugDisplay)
controller->IDrawDebugDisplay(); controller->IDrawDebugDisplay(i);
#endif #endif
} }
} }
@ -847,23 +847,28 @@ void plPXPhysicalControllerCore::IProcessDynamicHits()
#ifndef PLASMA_EXTERNAL_RELEASE #ifndef PLASMA_EXTERNAL_RELEASE
#include "../plPipeline/plDebugText.h" #include "../plPipeline/plDebugText.h"
void plPXPhysicalControllerCore::IDrawDebugDisplay() void plPXPhysicalControllerCore::IDrawDebugDisplay(int controllerIdx)
{ {
plDebugText &debugTxt = plDebugText::Instance(); plDebugText &debugTxt = plDebugText::Instance();
plString debugString; plString debugString;
int y = 10; // Initial draw position
int x = 10;
int lineHeight = debugTxt.GetFontSize() + 4; int lineHeight = debugTxt.GetFontSize() + 4;
int x = 10; // Initial draw position
debugString = plString::Format("Controller Count: %d", gControllers.size()); static int y = 10;
debugTxt.DrawString(x, y, debugString.c_str()); if (controllerIdx == 0)
y += lineHeight; {
y = 10;
debugString = plString::Format("Controller Count: %d", gControllers.size());
debugTxt.DrawString(x, y, debugString.c_str());
y += lineHeight;
}
// Only display avatar collisions if any exist... // Only display avatar collisions if any exist...
int collisionCount = fDbgCollisionInfo.GetCount(); int collisionCount = fDbgCollisionInfo.GetCount();
if (collisionCount > 0) if (collisionCount > 0)
{ {
debugTxt.DrawString(x, y, "Avatar Collisions:"); debugString = plString::Format("Controller #%d (%s) Collisions:",
controllerIdx + 1, gControllers[controllerIdx]->fOwner->GetName().c_str());
debugTxt.DrawString(x, y, debugString.c_str());
y += lineHeight; y += lineHeight;
for (int i = 0; i < collisionCount; i++) for (int i = 0; i < collisionCount; i++)

2
Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.h
View File

@ -157,7 +157,7 @@ protected:
void IProcessDynamicHits(); void IProcessDynamicHits();
#ifndef PLASMA_EXTERNAL_RELEASE #ifndef PLASMA_EXTERNAL_RELEASE
void IDrawDebugDisplay(); void IDrawDebugDisplay(int controllerIdx);
hsTArray<plDbgCollisionInfo> fDbgCollisionInfo; hsTArray<plDbgCollisionInfo> fDbgCollisionInfo;
#endif #endif