From 1a4c020e56e11e717150b65db0e93697003dc38f Mon Sep 17 00:00:00 2001 From: "ulukyn@gmail.com" Date: Sat, 10 Dec 2016 22:05:38 +0100 Subject: [PATCH] Added: ARKPACSBorders to enable/disable the display of collisions by user --HG-- branch : compatibility-develop --- .../client/src/interface_v3/action_handler_debug.cpp | 11 +++++++++++ code/ryzom/client/src/main_loop.cpp | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/code/ryzom/client/src/interface_v3/action_handler_debug.cpp b/code/ryzom/client/src/interface_v3/action_handler_debug.cpp index 616d66a1c..51b029815 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_debug.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_debug.cpp @@ -42,6 +42,7 @@ extern bool Render; extern bool WantProfiling; // Do we want a CPU profile? extern bool WantProfilingVBLock; // Do we want a VBLock profile? extern bool PACSBorders; +extern bool ARKPACSBorders; extern bool DebugClusters; extern bool SoundBox; extern uint8 ShowInfos; @@ -92,6 +93,16 @@ REGISTER_ACTION_HANDLER (CAHDisplayInfos, "display_infos"); * * ***********************************************************************************************************/ +// ------------------------------------------------------------------------------------------------ +class CAHToggleARKPACSBorders : public IActionHandler +{ + virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */) + { + ARKPACSBorders = !ARKPACSBorders; + } +}; +REGISTER_ACTION_HANDLER (CAHToggleARKPACSBorders, "ark_pacs_borders"); + #if !FINAL_VERSION // ------------------------------------------------------------------------------------------------ class CAHProfile : public IActionHandler diff --git a/code/ryzom/client/src/main_loop.cpp b/code/ryzom/client/src/main_loop.cpp index 04489ce77..02c26f991 100644 --- a/code/ryzom/client/src/main_loop.cpp +++ b/code/ryzom/client/src/main_loop.cpp @@ -271,6 +271,7 @@ CTimedFXManager::TDebugDisplayMode ShowTimedFXMode = CTimedFXManager::NoText; // DEBUG bool PACSBorders = false; +bool ARKPACSBorders = false; bool DebugClusters = false; CVector LastDebugClusterCameraThirdPersonStart= CVector::Null; CVector LastDebugClusterCameraThirdPersonEnd= CVector::Null; @@ -1793,6 +1794,12 @@ bool mainLoop() displayPACSPrimitive(); } + // Display PACS borders only (for ARK). + if (ARKPACSBorders) + { + displayPACSPrimitive(); + } + // display Sound box if (SoundBox) {