From 99db9edfefa0ed396978cc7b1e926af8ddfb7721 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Fri, 24 Jan 2014 02:20:25 +0100 Subject: [PATCH] Fitted mesh: hookup debug display to Advanced -> Charachter -> Show Avatar Joins --- indra/newview/llspatialpartition.cpp | 6 ++++++ indra/newview/llviewermenu.cpp | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 0da7f6cbb..c2fb74365 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -3946,6 +3946,11 @@ public: renderAvatarCollisionVolumes(avatar); } + if (avatar && gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_AVATAR_JOINTS)) + { + avatar->renderJoints(); + } + if (avatar && gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_AGENT_TARGET)) { renderAgentTarget(avatar); @@ -4188,6 +4193,7 @@ void LLSpatialPartition::renderDebug() LLPipeline::RENDER_DEBUG_TEXTURE_ANIM | LLPipeline::RENDER_DEBUG_RAYCAST | LLPipeline::RENDER_DEBUG_AVATAR_VOLUME | + LLPipeline::RENDER_DEBUG_AVATAR_JOINTS | LLPipeline::RENDER_DEBUG_AGENT_TARGET | //LLPipeline::RENDER_DEBUG_BUILD_QUEUE | LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA | diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 4e881c87e..ca85a2ac2 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -1439,9 +1439,6 @@ void init_debug_rendering_menu(LLMenuGL* menu) sub_menu->addChild(new LLMenuItemCheckGL("Complexity", &LLPipeline::toggleRenderDebug, NULL, &LLPipeline::toggleRenderDebugControl, (void*)LLPipeline::RENDER_DEBUG_RENDER_COMPLEXITY)); - sub_menu->addChild(new LLMenuItemCheckGL("Joints", &LLPipeline::toggleRenderDebug, NULL, - &LLPipeline::toggleRenderDebugControl, - (void*)LLPipeline::RENDER_DEBUG_AVATAR_JOINTS)); sub_menu = new LLMenuGL("Render Tests"); sub_menu->setCanTearOff(TRUE); @@ -1584,6 +1581,10 @@ void init_debug_avatar_menu(LLMenuGL* menu) &LLPipeline::toggleRenderDebug, NULL, &LLPipeline::toggleRenderDebugControl, (void*)LLPipeline::RENDER_DEBUG_AVATAR_VOLUME)); + menu->addChild(new LLMenuItemCheckGL("Show Avatar Joints", + &LLPipeline::toggleRenderDebug, NULL, + &LLPipeline::toggleRenderDebugControl, + (void*)LLPipeline::RENDER_DEBUG_AVATAR_JOINTS)); menu->addChild(new LLMenuItemCheckGL("Display Agent Target", &LLPipeline::toggleRenderDebug, NULL, &LLPipeline::toggleRenderDebugControl,