From c285f59ce2a05703e3a1232fcaf3ee3aea714b3f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 18 Feb 2024 12:52:19 +0100 Subject: Replace BOOL with bool in llwindow and dependent classes --- indra/newview/lltoolface.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/lltoolface.cpp') diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp index a00ac10698..79e4e25165 100644 --- a/indra/newview/lltoolface.cpp +++ b/indra/newview/lltoolface.cpp @@ -53,28 +53,28 @@ LLToolFace::~LLToolFace() { } -BOOL LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask) +bool LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask) { if (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) { // You should already have an object selected from the mousedown. // If so, show its properties LLFloaterReg::showInstance("build", "Texture"); - return TRUE; + return true; } else { // Nothing selected means the first mouse click was probably // bad, so try again. - return FALSE; + return false; } } -BOOL LLToolFace::handleMouseDown(S32 x, S32 y, MASK mask) +bool LLToolFace::handleMouseDown(S32 x, S32 y, MASK mask) { gViewerWindow->pickAsync(x, y, mask, pickCallback); - return TRUE; + return true; } void LLToolFace::pickCallback(const LLPickInfo& pick_info) -- cgit v1.2.3 From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/lltoolface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/lltoolface.cpp') diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp index 79e4e25165..3d1dbed650 100644 --- a/indra/newview/lltoolface.cpp +++ b/indra/newview/lltoolface.cpp @@ -134,14 +134,14 @@ void LLToolFace::pickCallback(const LLPickInfo& pick_info) void LLToolFace::handleSelect() { // From now on, draw faces - LLSelectMgr::getInstance()->setTEMode(TRUE); + LLSelectMgr::getInstance()->setTEMode(true); } void LLToolFace::handleDeselect() { // Stop drawing faces - LLSelectMgr::getInstance()->setTEMode(FALSE); + LLSelectMgr::getInstance()->setTEMode(false); } -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/lltoolface.cpp | 302 +++++++++++++++++++++---------------------- 1 file changed, 151 insertions(+), 151 deletions(-) (limited to 'indra/newview/lltoolface.cpp') diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp index e93c3006a5..426f340be1 100644 --- a/indra/newview/lltoolface.cpp +++ b/indra/newview/lltoolface.cpp @@ -1,151 +1,151 @@ -/** - * @file lltoolface.cpp - * @brief A tool to manipulate faces - * - * $LicenseInfo:firstyear=2001&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" - -// File includes -#include "lltoolface.h" - -// Library includes -#include "llfloaterreg.h" -#include "v3math.h" - -// Viewer includes -#include "llviewercontrol.h" -#include "llselectmgr.h" -#include "llviewerobject.h" -#include "llviewerwindow.h" -#include "llfloatertools.h" - -// -// Member functions -// - -LLToolFace::LLToolFace() -: LLTool(std::string("Texture")) -{ } - - -LLToolFace::~LLToolFace() -{ } - - -bool LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask) -{ - if (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) - { - // You should already have an object selected from the mousedown. - // If so, show its properties - LLFloaterReg::showInstance("build", "Texture"); - return true; - } - else - { - // Nothing selected means the first mouse click was probably - // bad, so try again. - return false; - } -} - - -bool LLToolFace::handleMouseDown(S32 x, S32 y, MASK mask) -{ - gViewerWindow->pickAsync(x, y, mask, pickCallback); - return true; -} - -void LLToolFace::pickCallback(const LLPickInfo& pick_info) -{ - LLViewerObject* hit_obj = pick_info.getObject(); - if (hit_obj) - { - S32 hit_face = pick_info.mObjectFace; - - if (hit_obj->isAvatar()) - { - // ...clicked on an avatar, so don't do anything - return; - } - - // ...clicked on a world object, try to pick the appropriate face - - if (pick_info.mKeyMask & MASK_SHIFT) - { - // If object not selected, need to inform sim - if ( !hit_obj->isSelected() ) - { - // object wasn't selected so add the object and face - LLSelectMgr::getInstance()->selectObjectOnly(hit_obj, hit_face); - } - else if (!LLSelectMgr::getInstance()->getSelection()->contains(hit_obj, hit_face) ) - { - // object is selected, but not this face, so add it. - LLSelectMgr::getInstance()->addAsIndividual(hit_obj, hit_face); - } - else - { - // object is selected, as is this face, so remove the face. - LLSelectMgr::getInstance()->remove(hit_obj, hit_face); - - // BUG: If you remove the last face, the simulator won't know about it. - } - } - else - { - // clicked without modifiers, select only - // this face - LLSelectMgr::getInstance()->deselectAll(); - LLSelectMgr::getInstance()->selectObjectOnly(hit_obj, hit_face); - } - } - else - { - if (!(pick_info.mKeyMask == MASK_SHIFT)) - { - LLSelectMgr::getInstance()->deselectAll(); - } - } -} - - -void LLToolFace::handleSelect() -{ - // From now on, draw faces - LLSelectMgr::getInstance()->setTEMode(true); -} - - -void LLToolFace::handleDeselect() -{ - // Stop drawing faces - LLSelectMgr::getInstance()->setTEMode(false); -} - - -void LLToolFace::render() -{ - // for now, do nothing -} +/** + * @file lltoolface.cpp + * @brief A tool to manipulate faces + * + * $LicenseInfo:firstyear=2001&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" + +// File includes +#include "lltoolface.h" + +// Library includes +#include "llfloaterreg.h" +#include "v3math.h" + +// Viewer includes +#include "llviewercontrol.h" +#include "llselectmgr.h" +#include "llviewerobject.h" +#include "llviewerwindow.h" +#include "llfloatertools.h" + +// +// Member functions +// + +LLToolFace::LLToolFace() +: LLTool(std::string("Texture")) +{ } + + +LLToolFace::~LLToolFace() +{ } + + +bool LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask) +{ + if (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) + { + // You should already have an object selected from the mousedown. + // If so, show its properties + LLFloaterReg::showInstance("build", "Texture"); + return true; + } + else + { + // Nothing selected means the first mouse click was probably + // bad, so try again. + return false; + } +} + + +bool LLToolFace::handleMouseDown(S32 x, S32 y, MASK mask) +{ + gViewerWindow->pickAsync(x, y, mask, pickCallback); + return true; +} + +void LLToolFace::pickCallback(const LLPickInfo& pick_info) +{ + LLViewerObject* hit_obj = pick_info.getObject(); + if (hit_obj) + { + S32 hit_face = pick_info.mObjectFace; + + if (hit_obj->isAvatar()) + { + // ...clicked on an avatar, so don't do anything + return; + } + + // ...clicked on a world object, try to pick the appropriate face + + if (pick_info.mKeyMask & MASK_SHIFT) + { + // If object not selected, need to inform sim + if ( !hit_obj->isSelected() ) + { + // object wasn't selected so add the object and face + LLSelectMgr::getInstance()->selectObjectOnly(hit_obj, hit_face); + } + else if (!LLSelectMgr::getInstance()->getSelection()->contains(hit_obj, hit_face) ) + { + // object is selected, but not this face, so add it. + LLSelectMgr::getInstance()->addAsIndividual(hit_obj, hit_face); + } + else + { + // object is selected, as is this face, so remove the face. + LLSelectMgr::getInstance()->remove(hit_obj, hit_face); + + // BUG: If you remove the last face, the simulator won't know about it. + } + } + else + { + // clicked without modifiers, select only + // this face + LLSelectMgr::getInstance()->deselectAll(); + LLSelectMgr::getInstance()->selectObjectOnly(hit_obj, hit_face); + } + } + else + { + if (!(pick_info.mKeyMask == MASK_SHIFT)) + { + LLSelectMgr::getInstance()->deselectAll(); + } + } +} + + +void LLToolFace::handleSelect() +{ + // From now on, draw faces + LLSelectMgr::getInstance()->setTEMode(true); +} + + +void LLToolFace::handleDeselect() +{ + // Stop drawing faces + LLSelectMgr::getInstance()->setTEMode(false); +} + + +void LLToolFace::render() +{ + // for now, do nothing +} -- cgit v1.2.3