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/llcharacter/llkeyframefallmotion.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llcharacter/llkeyframefallmotion.cpp') diff --git a/indra/llcharacter/llkeyframefallmotion.cpp b/indra/llcharacter/llkeyframefallmotion.cpp index e8bb2bf95d..ed6dd69362 100644 --- a/indra/llcharacter/llkeyframefallmotion.cpp +++ b/indra/llcharacter/llkeyframefallmotion.cpp @@ -91,7 +91,7 @@ LLMotion::LLMotionInitStatus LLKeyframeFallMotion::onInitialize(LLCharacter *cha //----------------------------------------------------------------------------- // LLKeyframeFallMotion::onActivate() //----------------------------------------------------------------------------- -BOOL LLKeyframeFallMotion::onActivate() +bool LLKeyframeFallMotion::onActivate() { LLVector3 ground_pos; LLVector3 ground_normal; @@ -119,10 +119,10 @@ BOOL LLKeyframeFallMotion::onActivate() //----------------------------------------------------------------------------- // LLKeyframeFallMotion::onUpdate() //----------------------------------------------------------------------------- -BOOL LLKeyframeFallMotion::onUpdate(F32 activeTime, U8* joint_mask) +bool LLKeyframeFallMotion::onUpdate(F32 activeTime, U8* joint_mask) { LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR; - BOOL result = LLKeyframeMotion::onUpdate(activeTime, joint_mask); + bool result = LLKeyframeMotion::onUpdate(activeTime, joint_mask); F32 slerp_amt = clamp_rescale(activeTime / getDuration(), 0.5f, 0.75f, 0.f, 1.f); if (mPelvisState.notNull()) -- 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/llcharacter/llkeyframefallmotion.cpp | 300 ++++++++++++++--------------- 1 file changed, 150 insertions(+), 150 deletions(-) (limited to 'indra/llcharacter/llkeyframefallmotion.cpp') diff --git a/indra/llcharacter/llkeyframefallmotion.cpp b/indra/llcharacter/llkeyframefallmotion.cpp index 58fd99bc5c..82ffc87843 100644 --- a/indra/llcharacter/llkeyframefallmotion.cpp +++ b/indra/llcharacter/llkeyframefallmotion.cpp @@ -1,150 +1,150 @@ -/** - * @file llkeyframefallmotion.cpp - * @brief Implementation of LLKeyframeFallMotion class. - * - * $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$ - */ - -//----------------------------------------------------------------------------- -// Header Files -//----------------------------------------------------------------------------- -#include "linden_common.h" - -#include "llkeyframefallmotion.h" -#include "llcharacter.h" -#include "m3math.h" - -//----------------------------------------------------------------------------- -// Macros -//----------------------------------------------------------------------------- -#define GO_TO_KEY_POSE 1 -#define MIN_TRACK_SPEED 0.01f - -//----------------------------------------------------------------------------- -// LLKeyframeFallMotion() -// Class Constructor -//----------------------------------------------------------------------------- -LLKeyframeFallMotion::LLKeyframeFallMotion(const LLUUID &id) : LLKeyframeMotion(id) -{ - mVelocityZ = 0.f; - mCharacter = NULL; -} - - -//----------------------------------------------------------------------------- -// ~LLKeyframeFallMotion() -// Class Destructor -//----------------------------------------------------------------------------- -LLKeyframeFallMotion::~LLKeyframeFallMotion() -{ -} - - -//----------------------------------------------------------------------------- -// LLKeyframeFallMotion::onInitialize() -//----------------------------------------------------------------------------- -LLMotion::LLMotionInitStatus LLKeyframeFallMotion::onInitialize(LLCharacter *character) -{ - // save character pointer for later use - mCharacter = character; - - // load keyframe data, setup pose and joint states - LLMotion::LLMotionInitStatus result = LLKeyframeMotion::onInitialize(character); - - if (result != LLMotion::STATUS_SUCCESS) - { - return result; - } - - for (U32 jm=0; jmgetNumJointMotions(); jm++) - { - if (!mJointStates[jm]->getJoint()) - continue; - if (mJointStates[jm]->getJoint()->getName() == std::string("mPelvis")) - { - mPelvisState = mJointStates[jm]; - } - } - - return result; -} - -//----------------------------------------------------------------------------- -// LLKeyframeFallMotion::onActivate() -//----------------------------------------------------------------------------- -bool LLKeyframeFallMotion::onActivate() -{ - LLVector3 ground_pos; - LLVector3 ground_normal; - LLQuaternion inverse_pelvis_rot; - LLVector3 fwd_axis(1.f, 0.f, 0.f); - - mVelocityZ = -mCharacter->getCharacterVelocity().mV[VZ]; - mCharacter->getGround( mCharacter->getCharacterPosition(), ground_pos, ground_normal); - ground_normal.normVec(); - - inverse_pelvis_rot = mCharacter->getCharacterRotation(); - inverse_pelvis_rot.transQuat(); - - // find ground normal in pelvis space - ground_normal = ground_normal * inverse_pelvis_rot; - - // calculate new foward axis - fwd_axis = fwd_axis - (ground_normal * (ground_normal * fwd_axis)); - fwd_axis.normVec(); - mRotationToGroundNormal = LLQuaternion(fwd_axis, ground_normal % fwd_axis, ground_normal); - - return LLKeyframeMotion::onActivate(); -} - -//----------------------------------------------------------------------------- -// LLKeyframeFallMotion::onUpdate() -//----------------------------------------------------------------------------- -bool LLKeyframeFallMotion::onUpdate(F32 activeTime, U8* joint_mask) -{ - LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR; - bool result = LLKeyframeMotion::onUpdate(activeTime, joint_mask); - F32 slerp_amt = clamp_rescale(activeTime / getDuration(), 0.5f, 0.75f, 0.f, 1.f); - - if (mPelvisState.notNull()) - { - mPelvisState->setRotation(mPelvisState->getRotation() * slerp(slerp_amt, mRotationToGroundNormal, LLQuaternion())); - } - - return result; -} - -//----------------------------------------------------------------------------- -// LLKeyframeFallMotion::getEaseInDuration() -//----------------------------------------------------------------------------- -F32 LLKeyframeFallMotion::getEaseInDuration() -{ - if (mVelocityZ == 0.f) - { - // we've already hit the ground - return 0.4f; - } - - return mCharacter->getPreferredPelvisHeight() / mVelocityZ; -} - -// End +/** + * @file llkeyframefallmotion.cpp + * @brief Implementation of LLKeyframeFallMotion class. + * + * $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$ + */ + +//----------------------------------------------------------------------------- +// Header Files +//----------------------------------------------------------------------------- +#include "linden_common.h" + +#include "llkeyframefallmotion.h" +#include "llcharacter.h" +#include "m3math.h" + +//----------------------------------------------------------------------------- +// Macros +//----------------------------------------------------------------------------- +#define GO_TO_KEY_POSE 1 +#define MIN_TRACK_SPEED 0.01f + +//----------------------------------------------------------------------------- +// LLKeyframeFallMotion() +// Class Constructor +//----------------------------------------------------------------------------- +LLKeyframeFallMotion::LLKeyframeFallMotion(const LLUUID &id) : LLKeyframeMotion(id) +{ + mVelocityZ = 0.f; + mCharacter = NULL; +} + + +//----------------------------------------------------------------------------- +// ~LLKeyframeFallMotion() +// Class Destructor +//----------------------------------------------------------------------------- +LLKeyframeFallMotion::~LLKeyframeFallMotion() +{ +} + + +//----------------------------------------------------------------------------- +// LLKeyframeFallMotion::onInitialize() +//----------------------------------------------------------------------------- +LLMotion::LLMotionInitStatus LLKeyframeFallMotion::onInitialize(LLCharacter *character) +{ + // save character pointer for later use + mCharacter = character; + + // load keyframe data, setup pose and joint states + LLMotion::LLMotionInitStatus result = LLKeyframeMotion::onInitialize(character); + + if (result != LLMotion::STATUS_SUCCESS) + { + return result; + } + + for (U32 jm=0; jmgetNumJointMotions(); jm++) + { + if (!mJointStates[jm]->getJoint()) + continue; + if (mJointStates[jm]->getJoint()->getName() == std::string("mPelvis")) + { + mPelvisState = mJointStates[jm]; + } + } + + return result; +} + +//----------------------------------------------------------------------------- +// LLKeyframeFallMotion::onActivate() +//----------------------------------------------------------------------------- +bool LLKeyframeFallMotion::onActivate() +{ + LLVector3 ground_pos; + LLVector3 ground_normal; + LLQuaternion inverse_pelvis_rot; + LLVector3 fwd_axis(1.f, 0.f, 0.f); + + mVelocityZ = -mCharacter->getCharacterVelocity().mV[VZ]; + mCharacter->getGround( mCharacter->getCharacterPosition(), ground_pos, ground_normal); + ground_normal.normVec(); + + inverse_pelvis_rot = mCharacter->getCharacterRotation(); + inverse_pelvis_rot.transQuat(); + + // find ground normal in pelvis space + ground_normal = ground_normal * inverse_pelvis_rot; + + // calculate new foward axis + fwd_axis = fwd_axis - (ground_normal * (ground_normal * fwd_axis)); + fwd_axis.normVec(); + mRotationToGroundNormal = LLQuaternion(fwd_axis, ground_normal % fwd_axis, ground_normal); + + return LLKeyframeMotion::onActivate(); +} + +//----------------------------------------------------------------------------- +// LLKeyframeFallMotion::onUpdate() +//----------------------------------------------------------------------------- +bool LLKeyframeFallMotion::onUpdate(F32 activeTime, U8* joint_mask) +{ + LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR; + bool result = LLKeyframeMotion::onUpdate(activeTime, joint_mask); + F32 slerp_amt = clamp_rescale(activeTime / getDuration(), 0.5f, 0.75f, 0.f, 1.f); + + if (mPelvisState.notNull()) + { + mPelvisState->setRotation(mPelvisState->getRotation() * slerp(slerp_amt, mRotationToGroundNormal, LLQuaternion())); + } + + return result; +} + +//----------------------------------------------------------------------------- +// LLKeyframeFallMotion::getEaseInDuration() +//----------------------------------------------------------------------------- +F32 LLKeyframeFallMotion::getEaseInDuration() +{ + if (mVelocityZ == 0.f) + { + // we've already hit the ground + return 0.4f; + } + + return mCharacter->getPreferredPelvisHeight() / mVelocityZ; +} + +// End -- cgit v1.2.3