From 1b68f71348ecf3983b76b40d7940da8377f049b7 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 29 Apr 2024 07:43:28 +0300 Subject: #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed --- indra/newview/llmodelpreview.h | 82 +++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'indra/newview/llmodelpreview.h') diff --git a/indra/newview/llmodelpreview.h b/indra/newview/llmodelpreview.h index d4d5d087bd..064623ac6a 100644 --- a/indra/newview/llmodelpreview.h +++ b/indra/newview/llmodelpreview.h @@ -6,21 +6,21 @@ * $LicenseInfo:firstyear=2020&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2020, 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$ */ @@ -190,7 +190,7 @@ public: U32 getLegacyRigFlags() const { return mLegacyRigFlags; } void setLegacyRigFlags(U32 rigFlags) { mLegacyRigFlags = rigFlags; } - static void textureLoadedCallback(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata); + static void textureLoadedCallback(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata); static bool lodQueryCallback(); boost::signals2::connection setDetailsCallback(const details_signal_t::slot_type& cb){ return mDetailsSignal.connect(cb); } @@ -200,18 +200,18 @@ public: void setLoadState(U32 state) { mLoadState = state; } U32 getLoadState() { return mLoadState; } - static bool sIgnoreLoadedCallback; + static bool sIgnoreLoadedCallback; std::vector mLodsQuery; std::vector mLodsWithParsingError; bool mHasDegenerate; protected: - static void loadedCallback(LLModelLoader::scene& scene, LLModelLoader::model_list& model_list, S32 lod, void* opaque); - static void stateChangedCallback(U32 state, void* opaque); + static void loadedCallback(LLModelLoader::scene& scene, LLModelLoader::model_list& model_list, S32 lod, void* opaque); + static void stateChangedCallback(U32 state, void* opaque); - static LLJoint* lookupJointByName(const std::string&, void* opaque); - static U32 loadTextures(LLImportMaterial& material, void* opaque); + static LLJoint* lookupJointByName(const std::string&, void* opaque); + static U32 loadTextures(LLImportMaterial& material, void* opaque); void lookupLODModelFiles(S32 lod); @@ -219,13 +219,13 @@ private: //Utility function for controller vertex compare bool verifyCount(int expected, int result); //Creates the dummy avatar for the preview window - void createPreviewAvatar(void); + void createPreviewAvatar(void); //Accessor for the dummy avatar LLVOAvatar* getPreviewAvatar(void) { return mPreviewAvatar; } // Count amount of original models, excluding sub-models static U32 countRootModels(LLModelLoader::model_list models); LLVector3 mGroundPlane[4]; - void renderGroundPlane(float z_offset = 0.0f); + void renderGroundPlane(float z_offset = 0.0f); /// Indicates whether we should warn of high-lod meshes that do not have a corresponding physics mesh. /// Reset when resetting the modelpreview (i.e., when the uploader dialog is created or reset), and when /// about to process a physics file. Set to true immediately after the file is loaded (before rebuildUploadData()). @@ -267,24 +267,24 @@ protected: LLFloater* mFMP; BOOL mNeedsUpdate; - bool mDirty; - bool mGenLOD; + bool mDirty; + bool mGenLOD; U32 mTextureName; - F32 mCameraDistance; - F32 mCameraYaw; - F32 mCameraPitch; - F32 mCameraZoom; - LLVector3 mCameraOffset; - LLVector3 mPreviewTarget; - LLVector3 mPreviewScale; - S32 mPreviewLOD; - S32 mPhysicsSearchLOD; + F32 mCameraDistance; + F32 mCameraYaw; + F32 mCameraPitch; + F32 mCameraZoom; + LLVector3 mCameraOffset; + LLVector3 mPreviewTarget; + LLVector3 mPreviewScale; + S32 mPreviewLOD; + S32 mPhysicsSearchLOD; std::string mLODFile[LLModel::NUM_LODS]; - bool mLoading; - U32 mLoadState; - bool mResetJoints; - bool mModelNoErrors; - bool mLookUpLodFiles; + bool mLoading; + U32 mLoadState; + bool mResetJoints; + bool mModelNoErrors; + bool mLookUpLodFiles; std::map mViewOption; @@ -303,8 +303,8 @@ protected: LLModelLoader::model_list mModel[LLModel::NUM_LODS]; LLModelLoader::model_list mBaseModel; - typedef std::vector v_LLVolumeFace_t; - typedef std::vector vv_LLVolumeFace_t; + typedef std::vector v_LLVolumeFace_t; + typedef std::vector vv_LLVolumeFace_t; vv_LLVolumeFace_t mModelFacesCopy[LLModel::NUM_LODS]; vv_LLVolumeFace_t mBaseModelFacesCopy; @@ -324,22 +324,22 @@ protected: model_loaded_signal_t mModelLoadedSignal; model_updated_signal_t mModelUpdatedSignal; - LLVector3 mModelPivot; - bool mHasPivot; + LLVector3 mModelPivot; + bool mHasPivot; - float mPelvisZOffset; + float mPelvisZOffset; - bool mRigValidJointUpload; - U32 mLegacyRigFlags; + bool mRigValidJointUpload; + U32 mLegacyRigFlags; - bool mLastJointUpdate; - bool mFirstSkinUpdate; + bool mLastJointUpdate; + bool mFirstSkinUpdate; - JointNameSet mJointsFromNode; - JointTransformMap mJointTransformMap; + JointNameSet mJointsFromNode; + JointTransformMap mJointTransformMap; - LLPointer mPreviewAvatar; - LLCachedControl mImporterDebug; + LLPointer mPreviewAvatar; + LLCachedControl mImporterDebug; }; #endif // LL_LLMODELPREVIEW_H -- cgit v1.2.3