From 9e854b697a06abed2a0917fb6120445f176764f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20N=C3=A6sbye=20Christensen?= Date: Fri, 16 Feb 2024 19:29:51 +0100 Subject: misc: BOOL to bool --- indra/newview/llemote.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llemote.cpp') diff --git a/indra/newview/llemote.cpp b/indra/newview/llemote.cpp index b9ef297c00..a051825dae 100644 --- a/indra/newview/llemote.cpp +++ b/indra/newview/llemote.cpp @@ -74,7 +74,7 @@ LLMotion::LLMotionInitStatus LLEmote::onInitialize(LLCharacter *character) //----------------------------------------------------------------------------- // LLEmote::onActivate() //----------------------------------------------------------------------------- -BOOL LLEmote::onActivate() +bool LLEmote::onActivate() { LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" ); if( default_param ) @@ -89,14 +89,14 @@ BOOL LLEmote::onActivate() mCharacter->updateVisualParams(); } - return TRUE; + return true; } //----------------------------------------------------------------------------- // LLEmote::onUpdate() //----------------------------------------------------------------------------- -BOOL LLEmote::onUpdate(F32 time, U8* joint_mask) +bool LLEmote::onUpdate(F32 time, U8* joint_mask) { if( mParam ) { @@ -116,7 +116,7 @@ BOOL LLEmote::onUpdate(F32 time, U8* joint_mask) mCharacter->updateVisualParams(); } - return TRUE; + return true; } -- 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/llemote.cpp | 286 +++++++++++++++++++++++----------------------- 1 file changed, 143 insertions(+), 143 deletions(-) (limited to 'indra/newview/llemote.cpp') diff --git a/indra/newview/llemote.cpp b/indra/newview/llemote.cpp index 777ee43e46..e952a29c54 100644 --- a/indra/newview/llemote.cpp +++ b/indra/newview/llemote.cpp @@ -1,143 +1,143 @@ -/** - * @file llemote.cpp - * @brief Implementation of LLEmote class - * - * $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$ - */ - -//----------------------------------------------------------------------------- -// Header Files -//----------------------------------------------------------------------------- -#include "llviewerprecompiledheaders.h" - -#include "llemote.h" -#include "llcharacter.h" -#include "m3math.h" -#include "llvoavatar.h" - -//----------------------------------------------------------------------------- -// Constants -//----------------------------------------------------------------------------- - -//----------------------------------------------------------------------------- -// LLEmote() -// Class Constructor -//----------------------------------------------------------------------------- -LLEmote::LLEmote(const LLUUID &id) : LLMotion(id) -{ - mCharacter = NULL; - - //RN: flag face joint as highest priority for now, until we implement a proper animation track - mJointSignature[0][LL_FACE_JOINT_NUM] = 0xff; - mJointSignature[1][LL_FACE_JOINT_NUM] = 0xff; - mJointSignature[2][LL_FACE_JOINT_NUM] = 0xff; -} - - -//----------------------------------------------------------------------------- -// ~LLEmote() -// Class Destructor -//----------------------------------------------------------------------------- -LLEmote::~LLEmote() -{ -} - -//----------------------------------------------------------------------------- -// LLEmote::onInitialize(LLCharacter *character) -//----------------------------------------------------------------------------- -LLMotion::LLMotionInitStatus LLEmote::onInitialize(LLCharacter *character) -{ - mCharacter = character; - return STATUS_SUCCESS; -} - - -//----------------------------------------------------------------------------- -// LLEmote::onActivate() -//----------------------------------------------------------------------------- -bool LLEmote::onActivate() -{ - LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" ); - if( default_param ) - { - default_param->setWeight( default_param->getMaxWeight()); - } - - mParam = mCharacter->getVisualParam(mName.c_str()); - if (mParam) - { - mParam->setWeight(0.f); - mCharacter->updateVisualParams(); - } - - return true; -} - - -//----------------------------------------------------------------------------- -// LLEmote::onUpdate() -//----------------------------------------------------------------------------- -bool LLEmote::onUpdate(F32 time, U8* joint_mask) -{ - if( mParam ) - { - F32 weight = mParam->getMinWeight() + mPose.getWeight() * (mParam->getMaxWeight() - mParam->getMinWeight()); - mParam->setWeight(weight); - - // Cross fade against the default parameter - LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" ); - if( default_param ) - { - F32 default_param_weight = default_param->getMinWeight() + - (1.f - mPose.getWeight()) * ( default_param->getMaxWeight() - default_param->getMinWeight() ); - - default_param->setWeight( default_param_weight); - } - - mCharacter->updateVisualParams(); - } - - return true; -} - - -//----------------------------------------------------------------------------- -// LLEmote::onDeactivate() -//----------------------------------------------------------------------------- -void LLEmote::onDeactivate() -{ - if( mParam ) - { - mParam->setWeight( mParam->getDefaultWeight()); - } - - LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" ); - if( default_param ) - { - default_param->setWeight( default_param->getMaxWeight()); - } - - mCharacter->updateVisualParams(); -} - - -// End +/** + * @file llemote.cpp + * @brief Implementation of LLEmote class + * + * $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$ + */ + +//----------------------------------------------------------------------------- +// Header Files +//----------------------------------------------------------------------------- +#include "llviewerprecompiledheaders.h" + +#include "llemote.h" +#include "llcharacter.h" +#include "m3math.h" +#include "llvoavatar.h" + +//----------------------------------------------------------------------------- +// Constants +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- +// LLEmote() +// Class Constructor +//----------------------------------------------------------------------------- +LLEmote::LLEmote(const LLUUID &id) : LLMotion(id) +{ + mCharacter = NULL; + + //RN: flag face joint as highest priority for now, until we implement a proper animation track + mJointSignature[0][LL_FACE_JOINT_NUM] = 0xff; + mJointSignature[1][LL_FACE_JOINT_NUM] = 0xff; + mJointSignature[2][LL_FACE_JOINT_NUM] = 0xff; +} + + +//----------------------------------------------------------------------------- +// ~LLEmote() +// Class Destructor +//----------------------------------------------------------------------------- +LLEmote::~LLEmote() +{ +} + +//----------------------------------------------------------------------------- +// LLEmote::onInitialize(LLCharacter *character) +//----------------------------------------------------------------------------- +LLMotion::LLMotionInitStatus LLEmote::onInitialize(LLCharacter *character) +{ + mCharacter = character; + return STATUS_SUCCESS; +} + + +//----------------------------------------------------------------------------- +// LLEmote::onActivate() +//----------------------------------------------------------------------------- +bool LLEmote::onActivate() +{ + LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" ); + if( default_param ) + { + default_param->setWeight( default_param->getMaxWeight()); + } + + mParam = mCharacter->getVisualParam(mName.c_str()); + if (mParam) + { + mParam->setWeight(0.f); + mCharacter->updateVisualParams(); + } + + return true; +} + + +//----------------------------------------------------------------------------- +// LLEmote::onUpdate() +//----------------------------------------------------------------------------- +bool LLEmote::onUpdate(F32 time, U8* joint_mask) +{ + if( mParam ) + { + F32 weight = mParam->getMinWeight() + mPose.getWeight() * (mParam->getMaxWeight() - mParam->getMinWeight()); + mParam->setWeight(weight); + + // Cross fade against the default parameter + LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" ); + if( default_param ) + { + F32 default_param_weight = default_param->getMinWeight() + + (1.f - mPose.getWeight()) * ( default_param->getMaxWeight() - default_param->getMinWeight() ); + + default_param->setWeight( default_param_weight); + } + + mCharacter->updateVisualParams(); + } + + return true; +} + + +//----------------------------------------------------------------------------- +// LLEmote::onDeactivate() +//----------------------------------------------------------------------------- +void LLEmote::onDeactivate() +{ + if( mParam ) + { + mParam->setWeight( mParam->getDefaultWeight()); + } + + LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" ); + if( default_param ) + { + default_param->setWeight( default_param->getMaxWeight()); + } + + mCharacter->updateVisualParams(); +} + + +// End -- cgit v1.2.3