From de1e1db9600a03ab5b0dc3f04a5bdcee30632f05 Mon Sep 17 00:00:00 2001 From: prep Date: Wed, 13 Jun 2012 10:50:46 -0400 Subject: WIP for path-702. --- indra/newview/llpanelnavmeshrebake.cpp | 179 +++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 indra/newview/llpanelnavmeshrebake.cpp (limited to 'indra/newview/llpanelnavmeshrebake.cpp') diff --git a/indra/newview/llpanelnavmeshrebake.cpp b/indra/newview/llpanelnavmeshrebake.cpp new file mode 100644 index 0000000000..99b2bf288c --- /dev/null +++ b/indra/newview/llpanelnavmeshrebake.cpp @@ -0,0 +1,179 @@ +/** + * @file LLPanelNavMeshRebake.cpp + * @author + * @brief + * + * $LicenseInfo:firstyear=2002&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "llpathfindingmanager.h" + +#include +#include + +#include +#include + +#include "llpanelnavmeshrebake.h" +#include "llagent.h" +#include "llfloaterreg.h" +#include "llhints.h" +#include "lltooltip.h" +#include "llbutton.h" +#include "llpanel.h" + +LLPanelNavMeshRebake::LLPanelNavMeshRebake() +: mNavMeshRebakeButton(NULL) +, mAttached(false) +{ + // make sure we have the only instance of this class + static bool b = true; + llassert_always(b); + b=false; +} + +// static +LLPanelNavMeshRebake* LLPanelNavMeshRebake::getInstance() +{ + static LLPanelNavMeshRebake* panel = getPanel(); + return panel; +} + +//static +void LLPanelNavMeshRebake::setMode( ESNavMeshRebakeMode mode ) +{ + LLPanelNavMeshRebake* panel = getInstance(); + + panel->mNavMeshRebakeButton->setVisible( true ); + + //visibility of it should be updated after updating visibility of the buttons + panel->setVisible(TRUE); +} + +void LLPanelNavMeshRebake::clearMode( ESNavMeshRebakeMode mode ) +{ + LLPanelNavMeshRebake* panel = getInstance(); + switch(mode) + { + case NMRM_Visible: + panel->mNavMeshRebakeButton->setVisible(FALSE); + break; + + default: + llerrs << "Unexpected mode is passed: " << mode << llendl; + } +} + +BOOL LLPanelNavMeshRebake::postBuild() +{ + mNavMeshRebakeButton = getChild("navmesh_btn"); + mNavMeshRebakeButton->setCommitCallback(boost::bind(&LLPanelNavMeshRebake::onNavMeshRebakeClick, this)); + mNavMeshRebakeButton->setVisible( TRUE ); + LLHints::registerHintTarget("navmesh_btn", mNavMeshRebakeButton->getHandle()); + + return TRUE; +} + +void LLPanelNavMeshRebake::setVisible( BOOL visible ) +{ + + LLPanel::setVisible(visible); +} + +BOOL LLPanelNavMeshRebake::handleToolTip(S32 x, S32 y, MASK mask) +{ + LLToolTipMgr::instance().unblockToolTips(); + + if (mNavMeshRebakeButton->getVisible()) + { + LLToolTipMgr::instance().show(mNavMeshRebakeButton->getToolTip()); + } + return LLPanel::handleToolTip(x, y, mask); +} + +void LLPanelNavMeshRebake::reparent(LLView* rootp) +{ + LLPanel* parent = dynamic_cast(getParent()); + if (!parent) + { + return; + } + + rootp->addChild(this); + mAttached = true; +} + +//static +LLPanelNavMeshRebake* LLPanelNavMeshRebake::getPanel() +{ + LLPanelNavMeshRebake* panel = new LLPanelNavMeshRebake(); + panel->buildFromFile("panel_navmesh_rebake.xml"); + + panel->setVisible(FALSE); + + llinfos << "Build LLPanelNavMeshRebake panel" << llendl; + + //prep#panel->updatePosition(); + return panel; +} + +void LLPanelNavMeshRebake::onNavMeshRebakeClick() +{ + setFocus(FALSE); + mNavMeshRebakeButton->setVisible(FALSE); +} + +/** + * Updates position to be center aligned with Move button. + */ +/* +void LLPanelNavMeshRebake::updatePosition() +{ + if (mAttached) return; + + S32 y_pos = 0; + S32 bottom_tb_center = 0; + if (LLToolBar* toolbar_bottom = gToolBarView->getChild("toolbar_bottom")) + { + y_pos = toolbar_bottom->getRect().getHeight(); + bottom_tb_center = toolbar_bottom->getRect().getCenterX(); + } + + S32 left_tb_width = 0; + if (LLToolBar* toolbar_left = gToolBarView->getChild("toolbar_left")) + { + left_tb_width = toolbar_left->getRect().getWidth(); + } + + if(LLPanel* panel_ssf_container = getRootView()->getChild("navmesh_rebake_container")) + { + panel_ssf_container->setOrigin(0, y_pos); + } + + S32 x_pos = bottom_tb_center-getRect().getWidth()/2 - left_tb_width; + + setOrigin( x_pos, 0); + + + */ -- cgit v1.2.3 From 9215c682d23d4b977f289c9700b24f3bf2d20b03 Mon Sep 17 00:00:00 2001 From: prep Date: Wed, 13 Jun 2012 11:31:38 -0400 Subject: Added a baking button --- indra/newview/llpanelnavmeshrebake.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'indra/newview/llpanelnavmeshrebake.cpp') diff --git a/indra/newview/llpanelnavmeshrebake.cpp b/indra/newview/llpanelnavmeshrebake.cpp index 99b2bf288c..9281c08059 100644 --- a/indra/newview/llpanelnavmeshrebake.cpp +++ b/indra/newview/llpanelnavmeshrebake.cpp @@ -44,7 +44,8 @@ #include "llpanel.h" LLPanelNavMeshRebake::LLPanelNavMeshRebake() -: mNavMeshRebakeButton(NULL) +: mNavMeshRebakeButton( NULL ) +, mNavMeshBakingButton( NULL ) , mAttached(false) { // make sure we have the only instance of this class @@ -87,11 +88,17 @@ void LLPanelNavMeshRebake::clearMode( ESNavMeshRebakeMode mode ) BOOL LLPanelNavMeshRebake::postBuild() { + //Rebake mNavMeshRebakeButton = getChild("navmesh_btn"); mNavMeshRebakeButton->setCommitCallback(boost::bind(&LLPanelNavMeshRebake::onNavMeshRebakeClick, this)); mNavMeshRebakeButton->setVisible( TRUE ); LLHints::registerHintTarget("navmesh_btn", mNavMeshRebakeButton->getHandle()); - + + //Baking + mNavMeshBakingButton = getChild("navmesh_btn_baking"); + mNavMeshBakingButton->setCommitCallback(boost::bind(&LLPanelNavMeshRebake::onNavMeshRebakeClick, this)); + mNavMeshBakingButton->setVisible( FALSE ); + LLHints::registerHintTarget("navmesh_btn_baking", mNavMeshBakingButton->getHandle()); return TRUE; } @@ -129,11 +136,7 @@ LLPanelNavMeshRebake* LLPanelNavMeshRebake::getPanel() { LLPanelNavMeshRebake* panel = new LLPanelNavMeshRebake(); panel->buildFromFile("panel_navmesh_rebake.xml"); - panel->setVisible(FALSE); - - llinfos << "Build LLPanelNavMeshRebake panel" << llendl; - //prep#panel->updatePosition(); return panel; } @@ -141,7 +144,8 @@ LLPanelNavMeshRebake* LLPanelNavMeshRebake::getPanel() void LLPanelNavMeshRebake::onNavMeshRebakeClick() { setFocus(FALSE); - mNavMeshRebakeButton->setVisible(FALSE); + mNavMeshRebakeButton->setVisible( FALSE ); + mNavMeshBakingButton->setVisible( TRUE ); } /** -- cgit v1.2.3 From 7d5c4d20b9f99b3e7d5781433ed6046678292627 Mon Sep 17 00:00:00 2001 From: prep Date: Wed, 13 Jun 2012 13:30:26 -0400 Subject: WIP: path-722. Posting and responders for navmesh rebaking --- indra/newview/llpanelnavmeshrebake.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelnavmeshrebake.cpp') diff --git a/indra/newview/llpanelnavmeshrebake.cpp b/indra/newview/llpanelnavmeshrebake.cpp index 9281c08059..92a082467f 100644 --- a/indra/newview/llpanelnavmeshrebake.cpp +++ b/indra/newview/llpanelnavmeshrebake.cpp @@ -96,7 +96,6 @@ BOOL LLPanelNavMeshRebake::postBuild() //Baking mNavMeshBakingButton = getChild("navmesh_btn_baking"); - mNavMeshBakingButton->setCommitCallback(boost::bind(&LLPanelNavMeshRebake::onNavMeshRebakeClick, this)); mNavMeshBakingButton->setVisible( FALSE ); LLHints::registerHintTarget("navmesh_btn_baking", mNavMeshBakingButton->getHandle()); return TRUE; @@ -146,6 +145,8 @@ void LLPanelNavMeshRebake::onNavMeshRebakeClick() setFocus(FALSE); mNavMeshRebakeButton->setVisible( FALSE ); mNavMeshBakingButton->setVisible( TRUE ); + mNavMeshBakingButton->setForcePressedState( TRUE ); + //post } /** -- cgit v1.2.3 From 9767b5a026ba1b442ad1aa438f5957375a997c14 Mon Sep 17 00:00:00 2001 From: prep Date: Wed, 13 Jun 2012 15:31:44 -0400 Subject: Path-722: Reset buttons to default state. --- indra/newview/llpanelnavmeshrebake.cpp | 90 +++++----------------------------- 1 file changed, 13 insertions(+), 77 deletions(-) (limited to 'indra/newview/llpanelnavmeshrebake.cpp') diff --git a/indra/newview/llpanelnavmeshrebake.cpp b/indra/newview/llpanelnavmeshrebake.cpp index 92a082467f..0f88c6f1d3 100644 --- a/indra/newview/llpanelnavmeshrebake.cpp +++ b/indra/newview/llpanelnavmeshrebake.cpp @@ -1,7 +1,7 @@ /** * @file LLPanelNavMeshRebake.cpp - * @author - * @brief + * @author prep + * @brief handles the buttons for navmesh rebaking * * $LicenseInfo:firstyear=2002&license=viewerlgpl$ * Second Life Viewer Source Code @@ -26,18 +26,13 @@ */ #include "llviewerprecompiledheaders.h" - #include "llpathfindingmanager.h" - #include #include - #include #include - #include "llpanelnavmeshrebake.h" #include "llagent.h" -#include "llfloaterreg.h" #include "llhints.h" #include "lltooltip.h" #include "llbutton.h" @@ -46,7 +41,6 @@ LLPanelNavMeshRebake::LLPanelNavMeshRebake() : mNavMeshRebakeButton( NULL ) , mNavMeshBakingButton( NULL ) -, mAttached(false) { // make sure we have the only instance of this class static bool b = true; @@ -54,47 +48,21 @@ LLPanelNavMeshRebake::LLPanelNavMeshRebake() b=false; } -// static LLPanelNavMeshRebake* LLPanelNavMeshRebake::getInstance() { static LLPanelNavMeshRebake* panel = getPanel(); return panel; } -//static -void LLPanelNavMeshRebake::setMode( ESNavMeshRebakeMode mode ) -{ - LLPanelNavMeshRebake* panel = getInstance(); - - panel->mNavMeshRebakeButton->setVisible( true ); - - //visibility of it should be updated after updating visibility of the buttons - panel->setVisible(TRUE); -} - -void LLPanelNavMeshRebake::clearMode( ESNavMeshRebakeMode mode ) -{ - LLPanelNavMeshRebake* panel = getInstance(); - switch(mode) - { - case NMRM_Visible: - panel->mNavMeshRebakeButton->setVisible(FALSE); - break; - - default: - llerrs << "Unexpected mode is passed: " << mode << llendl; - } -} - BOOL LLPanelNavMeshRebake::postBuild() { - //Rebake + //Rebake initiated mNavMeshRebakeButton = getChild("navmesh_btn"); mNavMeshRebakeButton->setCommitCallback(boost::bind(&LLPanelNavMeshRebake::onNavMeshRebakeClick, this)); mNavMeshRebakeButton->setVisible( TRUE ); LLHints::registerHintTarget("navmesh_btn", mNavMeshRebakeButton->getHandle()); - //Baking + //Baking... mNavMeshBakingButton = getChild("navmesh_btn_baking"); mNavMeshBakingButton->setVisible( FALSE ); LLHints::registerHintTarget("navmesh_btn_baking", mNavMeshBakingButton->getHandle()); @@ -103,11 +71,10 @@ BOOL LLPanelNavMeshRebake::postBuild() void LLPanelNavMeshRebake::setVisible( BOOL visible ) { - LLPanel::setVisible(visible); } -BOOL LLPanelNavMeshRebake::handleToolTip(S32 x, S32 y, MASK mask) +BOOL LLPanelNavMeshRebake::handleToolTip( S32 x, S32 y, MASK mask ) { LLToolTipMgr::instance().unblockToolTips(); @@ -118,67 +85,36 @@ BOOL LLPanelNavMeshRebake::handleToolTip(S32 x, S32 y, MASK mask) return LLPanel::handleToolTip(x, y, mask); } -void LLPanelNavMeshRebake::reparent(LLView* rootp) +void LLPanelNavMeshRebake::reparent( LLView* rootp ) { - LLPanel* parent = dynamic_cast(getParent()); + LLPanel* parent = dynamic_cast( getParent() ); if (!parent) { return; } - rootp->addChild(this); - mAttached = true; } -//static LLPanelNavMeshRebake* LLPanelNavMeshRebake::getPanel() { LLPanelNavMeshRebake* panel = new LLPanelNavMeshRebake(); panel->buildFromFile("panel_navmesh_rebake.xml"); panel->setVisible(FALSE); - //prep#panel->updatePosition(); + //panel->updatePosition(); return panel; } void LLPanelNavMeshRebake::onNavMeshRebakeClick() { - setFocus(FALSE); mNavMeshRebakeButton->setVisible( FALSE ); mNavMeshBakingButton->setVisible( TRUE ); mNavMeshBakingButton->setForcePressedState( TRUE ); - //post + LLPathfindingManager::getInstance()->triggerNavMeshRebuild(); } -/** - * Updates position to be center aligned with Move button. - */ -/* -void LLPanelNavMeshRebake::updatePosition() +void LLPanelNavMeshRebake::resetButtonStates() { - if (mAttached) return; - - S32 y_pos = 0; - S32 bottom_tb_center = 0; - if (LLToolBar* toolbar_bottom = gToolBarView->getChild("toolbar_bottom")) - { - y_pos = toolbar_bottom->getRect().getHeight(); - bottom_tb_center = toolbar_bottom->getRect().getCenterX(); - } - - S32 left_tb_width = 0; - if (LLToolBar* toolbar_left = gToolBarView->getChild("toolbar_left")) - { - left_tb_width = toolbar_left->getRect().getWidth(); - } - - if(LLPanel* panel_ssf_container = getRootView()->getChild("navmesh_rebake_container")) - { - panel_ssf_container->setOrigin(0, y_pos); - } - - S32 x_pos = bottom_tb_center-getRect().getWidth()/2 - left_tb_width; - - setOrigin( x_pos, 0); - + mNavMeshRebakeButton->setVisible( TRUE ); + mNavMeshBakingButton->setVisible( FALSE ); +} - */ -- cgit v1.2.3