From 60b7e02d28f7cb03cbe4b4f9b7ef98af988dc209 Mon Sep 17 00:00:00 2001
From: Joseph Davies <deledrius@gmail.com>
Date: Sun, 20 Jan 2013 13:41:41 -0800
Subject: [PATCH] Fix for multi-controller debug display.

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.
---
 .../plPhysX/plPXPhysicalControllerCore.cpp    | 23 +++++++++++--------
 .../plPhysX/plPXPhysicalControllerCore.h      |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.cpp b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.cpp
index 00c69ec6..f49b4939 100644
--- a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.cpp
+++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.cpp
@@ -561,7 +561,7 @@ void plPXPhysicalControllerCore::Update(int numSubSteps, float alpha)
 
 #ifndef PLASMA_EXTERNAL_RELEASE
         if (fDebugDisplay)
-            controller->IDrawDebugDisplay();
+            controller->IDrawDebugDisplay(i);
 #endif
     }
 }
@@ -847,23 +847,28 @@ void plPXPhysicalControllerCore::IProcessDynamicHits()
 #ifndef PLASMA_EXTERNAL_RELEASE
 #include "../plPipeline/plDebugText.h"
 
-void plPXPhysicalControllerCore::IDrawDebugDisplay()
+void plPXPhysicalControllerCore::IDrawDebugDisplay(int controllerIdx)
 {
     plDebugText &debugTxt = plDebugText::Instance();
     plString debugString;
-    int y = 10;     // Initial draw position
-    int x = 10;
     int lineHeight = debugTxt.GetFontSize() + 4;
-
-    debugString = plString::Format("Controller Count: %d", gControllers.size());
-    debugTxt.DrawString(x, y, debugString.c_str());
-    y += lineHeight;
+    int x = 10;     // Initial draw position
+    static int y = 10;
+    if (controllerIdx == 0)
+    {
+        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...
     int collisionCount = fDbgCollisionInfo.GetCount();
     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;
 
         for (int i = 0; i < collisionCount; i++)
diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.h b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.h
index 70ff44d1..21efb411 100644
--- a/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.h
+++ b/Sources/Plasma/PubUtilLib/plPhysX/plPXPhysicalControllerCore.h
@@ -157,7 +157,7 @@ protected:
     void IProcessDynamicHits();
 
 #ifndef PLASMA_EXTERNAL_RELEASE
-    void IDrawDebugDisplay();
+    void IDrawDebugDisplay(int controllerIdx);
     hsTArray<plDbgCollisionInfo> fDbgCollisionInfo;
 #endif