From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llmorphview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llmorphview.cpp') diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp index ff86400a56..532876a4ea 100644 --- a/indra/newview/llmorphview.cpp +++ b/indra/newview/llmorphview.cpp @@ -47,7 +47,7 @@ LLMorphView *gMorphView = NULL; -const F32 MORPH_NEAR_CLIP = 0.1f; +constexpr F32 MORPH_NEAR_CLIP = 0.1f; //----------------------------------------------------------------------------- // LLMorphView() @@ -103,7 +103,7 @@ void LLMorphView::shutdown() //----------------------------------------------------------------------------- // setVisible() //----------------------------------------------------------------------------- -void LLMorphView::setVisible(BOOL visible) +void LLMorphView::setVisible(bool visible) { if( visible != getVisible() ) { -- 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/llmorphview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llmorphview.cpp') diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp index 532876a4ea..445af8ae5c 100644 --- a/indra/newview/llmorphview.cpp +++ b/indra/newview/llmorphview.cpp @@ -60,7 +60,7 @@ LLMorphView::LLMorphView(const LLMorphView::Params& p) mOldCameraNearClip( 0.f ), mCameraPitch( 0.f ), mCameraYaw( 0.f ), - mCameraDrivenByKeys( FALSE ) + mCameraDrivenByKeys( false ) {} //----------------------------------------------------------------------------- @@ -152,7 +152,7 @@ void LLMorphView::updateCamera() gAgentCamera.setCameraPosAndFocusGlobal( camera_pos, target_pos, gAgent.getID() ); } -void LLMorphView::setCameraDrivenByKeys(BOOL b) +void LLMorphView::setCameraDrivenByKeys(bool b) { if( mCameraDrivenByKeys != b ) { -- 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/llmorphview.cpp | 332 +++++++++++++++++++++--------------------- 1 file changed, 166 insertions(+), 166 deletions(-) (limited to 'indra/newview/llmorphview.cpp') diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp index f00ebeeb86..a5fc813f2f 100644 --- a/indra/newview/llmorphview.cpp +++ b/indra/newview/llmorphview.cpp @@ -1,166 +1,166 @@ -/** - * @file llmorphview.cpp - * @brief Container for Morph functionality - * - * $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" - -#include "llmorphview.h" - -#include "lljoint.h" - -#include "llagent.h" -#include "llagentcamera.h" -#include "lldrawable.h" -#include "lldrawpoolavatar.h" -#include "llface.h" -//#include "llfirstuse.h" -#include "llfloatertools.h" -#include "llresmgr.h" -#include "lltoolmgr.h" -#include "lltoolmorph.h" -#include "llviewercamera.h" -#include "llvoavatarself.h" -#include "llviewerwindow.h" -#include "pipeline.h" - -LLMorphView *gMorphView = NULL; - -constexpr F32 MORPH_NEAR_CLIP = 0.1f; - -//----------------------------------------------------------------------------- -// LLMorphView() -//----------------------------------------------------------------------------- -LLMorphView::LLMorphView(const LLMorphView::Params& p) -: LLView(p), - mCameraTargetJoint( NULL ), - mCameraOffset(-0.5f, 0.05f, 0.07f ), - mCameraTargetOffset(0.f, 0.f, 0.05f ), - mOldCameraNearClip( 0.f ), - mCameraPitch( 0.f ), - mCameraYaw( 0.f ), - mCameraDrivenByKeys( false ) -{} - -//----------------------------------------------------------------------------- -// initialize() -//----------------------------------------------------------------------------- -void LLMorphView::initialize() -{ - mCameraPitch = 0.f; - mCameraYaw = 0.f; - - if (!isAgentAvatarValid() || gAgentAvatarp->isDead()) - { - gAgentCamera.changeCameraToDefault(); - return; - } - - gAgentAvatarp->stopMotion( ANIM_AGENT_BODY_NOISE ); - gAgentAvatarp->mSpecialRenderMode = 3; - - // set up camera for close look at avatar - mOldCameraNearClip = LLViewerCamera::getInstance()->getNear(); - LLViewerCamera::getInstance()->setNear(MORPH_NEAR_CLIP); -} - -//----------------------------------------------------------------------------- -// shutdown() -//----------------------------------------------------------------------------- -void LLMorphView::shutdown() -{ - if (isAgentAvatarValid()) - { - gAgentAvatarp->startMotion( ANIM_AGENT_BODY_NOISE ); - gAgentAvatarp->mSpecialRenderMode = 0; - // reset camera - LLViewerCamera::getInstance()->setNear(mOldCameraNearClip); - } -} - - -//----------------------------------------------------------------------------- -// setVisible() -//----------------------------------------------------------------------------- -void LLMorphView::setVisible(bool visible) -{ - if( visible != getVisible() ) - { - LLView::setVisible(visible); - - if (visible) - { - // TODO: verify some user action has already opened outfit editor? - Nyx - initialize(); - - // First run dialog - //LLFirstUse::useAppearance(); - } - else - { - // TODO: verify some user action has already closed outfit editor ? - Nyx - shutdown(); - } - } -} - -void LLMorphView::updateCamera() -{ - if (!mCameraTargetJoint) - { - setCameraTargetJoint(gAgentAvatarp->getJoint("mHead")); - } - if (!isAgentAvatarValid()) return; - - LLJoint* root_joint = gAgentAvatarp->getRootJoint(); - if( !root_joint ) - { - return; - } - - const LLQuaternion& avatar_rot = root_joint->getWorldRotation(); - - LLVector3d joint_pos = gAgent.getPosGlobalFromAgent(mCameraTargetJoint->getWorldPosition()); - LLVector3d target_pos = joint_pos + mCameraTargetOffset * avatar_rot; - - LLQuaternion camera_rot_yaw(mCameraYaw, LLVector3::z_axis); - LLQuaternion camera_rot_pitch(mCameraPitch, LLVector3::y_axis); - - LLVector3d camera_pos = joint_pos + mCameraOffset * camera_rot_pitch * camera_rot_yaw * avatar_rot; - - gAgentCamera.setCameraPosAndFocusGlobal( camera_pos, target_pos, gAgent.getID() ); -} - -void LLMorphView::setCameraDrivenByKeys(bool b) -{ - if( mCameraDrivenByKeys != b ) - { - if( b ) - { - // Reset to the default camera position specified by mCameraPitch, mCameraYaw, etc. - updateCamera(); - } - mCameraDrivenByKeys = b; - } -} +/** + * @file llmorphview.cpp + * @brief Container for Morph functionality + * + * $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" + +#include "llmorphview.h" + +#include "lljoint.h" + +#include "llagent.h" +#include "llagentcamera.h" +#include "lldrawable.h" +#include "lldrawpoolavatar.h" +#include "llface.h" +//#include "llfirstuse.h" +#include "llfloatertools.h" +#include "llresmgr.h" +#include "lltoolmgr.h" +#include "lltoolmorph.h" +#include "llviewercamera.h" +#include "llvoavatarself.h" +#include "llviewerwindow.h" +#include "pipeline.h" + +LLMorphView *gMorphView = NULL; + +constexpr F32 MORPH_NEAR_CLIP = 0.1f; + +//----------------------------------------------------------------------------- +// LLMorphView() +//----------------------------------------------------------------------------- +LLMorphView::LLMorphView(const LLMorphView::Params& p) +: LLView(p), + mCameraTargetJoint( NULL ), + mCameraOffset(-0.5f, 0.05f, 0.07f ), + mCameraTargetOffset(0.f, 0.f, 0.05f ), + mOldCameraNearClip( 0.f ), + mCameraPitch( 0.f ), + mCameraYaw( 0.f ), + mCameraDrivenByKeys( false ) +{} + +//----------------------------------------------------------------------------- +// initialize() +//----------------------------------------------------------------------------- +void LLMorphView::initialize() +{ + mCameraPitch = 0.f; + mCameraYaw = 0.f; + + if (!isAgentAvatarValid() || gAgentAvatarp->isDead()) + { + gAgentCamera.changeCameraToDefault(); + return; + } + + gAgentAvatarp->stopMotion( ANIM_AGENT_BODY_NOISE ); + gAgentAvatarp->mSpecialRenderMode = 3; + + // set up camera for close look at avatar + mOldCameraNearClip = LLViewerCamera::getInstance()->getNear(); + LLViewerCamera::getInstance()->setNear(MORPH_NEAR_CLIP); +} + +//----------------------------------------------------------------------------- +// shutdown() +//----------------------------------------------------------------------------- +void LLMorphView::shutdown() +{ + if (isAgentAvatarValid()) + { + gAgentAvatarp->startMotion( ANIM_AGENT_BODY_NOISE ); + gAgentAvatarp->mSpecialRenderMode = 0; + // reset camera + LLViewerCamera::getInstance()->setNear(mOldCameraNearClip); + } +} + + +//----------------------------------------------------------------------------- +// setVisible() +//----------------------------------------------------------------------------- +void LLMorphView::setVisible(bool visible) +{ + if( visible != getVisible() ) + { + LLView::setVisible(visible); + + if (visible) + { + // TODO: verify some user action has already opened outfit editor? - Nyx + initialize(); + + // First run dialog + //LLFirstUse::useAppearance(); + } + else + { + // TODO: verify some user action has already closed outfit editor ? - Nyx + shutdown(); + } + } +} + +void LLMorphView::updateCamera() +{ + if (!mCameraTargetJoint) + { + setCameraTargetJoint(gAgentAvatarp->getJoint("mHead")); + } + if (!isAgentAvatarValid()) return; + + LLJoint* root_joint = gAgentAvatarp->getRootJoint(); + if( !root_joint ) + { + return; + } + + const LLQuaternion& avatar_rot = root_joint->getWorldRotation(); + + LLVector3d joint_pos = gAgent.getPosGlobalFromAgent(mCameraTargetJoint->getWorldPosition()); + LLVector3d target_pos = joint_pos + mCameraTargetOffset * avatar_rot; + + LLQuaternion camera_rot_yaw(mCameraYaw, LLVector3::z_axis); + LLQuaternion camera_rot_pitch(mCameraPitch, LLVector3::y_axis); + + LLVector3d camera_pos = joint_pos + mCameraOffset * camera_rot_pitch * camera_rot_yaw * avatar_rot; + + gAgentCamera.setCameraPosAndFocusGlobal( camera_pos, target_pos, gAgent.getID() ); +} + +void LLMorphView::setCameraDrivenByKeys(bool b) +{ + if( mCameraDrivenByKeys != b ) + { + if( b ) + { + // Reset to the default camera position specified by mCameraPitch, mCameraYaw, etc. + updateCamera(); + } + mCameraDrivenByKeys = b; + } +} -- cgit v1.2.3