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/llfloatercamera.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloatercamera.h') diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index a69b87ad16..6f10c4a064 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -89,7 +89,7 @@ private: /* return instance if it exists - created by LLFloaterReg */ static LLFloaterCamera* findInstance(); - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); F32 getCurrentTransparency(); @@ -151,7 +151,7 @@ public: Optional mousedown_callback; Params(); }; - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); /** setting on/off background icon to indicate selected state */ /*virtual*/ void setValue(const LLSD& value); // sends commit signal -- 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/llfloatercamera.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloatercamera.h') diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index 6f10c4a064..7a30485d4f 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -121,7 +121,7 @@ private: // remains true until preset camera mode is chosen, or pan button is clicked, or escape pressed static bool sFreeCamera; static bool sAppearanceEditing; - BOOL mClosed; + bool mClosed; ECameraControlMode mPrevMode; ECameraControlMode mCurrMode; std::map mMode2Button; -- 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/llfloatercamera.h | 356 ++++++++++++++++++++-------------------- 1 file changed, 178 insertions(+), 178 deletions(-) (limited to 'indra/newview/llfloatercamera.h') diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index ba5e54f84e..ece3d8218e 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -1,178 +1,178 @@ -/** - * @file llfloatercamera.h - * @brief Container for camera control buttons (zoom, pan, orbit) - * - * $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$ - */ - -#ifndef LLFLOATERCAMERA_H -#define LLFLOATERCAMERA_H - -#include "llfloater.h" -#include "lliconctrl.h" -#include "lltextbox.h" -#include "llflatlistview.h" - -class LLJoystickCameraRotate; -class LLJoystickCameraTrack; -class LLFloaterReg; -class LLPanelCameraZoom; -class LLComboBox; - -enum ECameraControlMode -{ - CAMERA_CTRL_MODE_PAN, - CAMERA_CTRL_MODE_FREE_CAMERA, - CAMERA_CTRL_MODE_PRESETS -}; - -class LLFloaterCamera : public LLFloater -{ - friend class LLFloaterReg; - -public: - /* whether in free camera mode */ - static bool inFreeCameraMode(); - /* callback for camera items selection changing */ - static void onClickCameraItem(const LLSD& param); - - static void onLeavingMouseLook(); - - /** resets current camera mode to orbit mode */ - static void resetCameraMode(); - - /** Called when Avatar is entered/exited editing appearance mode */ - static void onAvatarEditingAppearance(bool editing); - - /** Called when opening and when "Advanced | Debug Camera" menu item is toggled */ - static void onDebugCameraToggled(); - - /* determines actual mode and updates ui */ - void update(); - - /*switch to one of the camera presets (front, rear, side)*/ - static void switchToPreset(const std::string& name); - - virtual void onOpen(const LLSD& key); - virtual void onClose(bool app_quitting); - - void onSavePreset(); - void onCustomPresetSelected(); - - void populatePresetCombo(); - - LLJoystickCameraRotate* mRotate { nullptr }; - LLPanelCameraZoom* mZoom { nullptr }; - LLJoystickCameraTrack* mTrack { nullptr }; - -private: - - LLFloaterCamera(const LLSD& val); - ~LLFloaterCamera() {}; - - /* return instance if it exists - created by LLFloaterReg */ - static LLFloaterCamera* findInstance(); - - /*virtual*/ bool postBuild(); - - F32 getCurrentTransparency(); - - void onViewButtonClick(const LLSD& user_data); - - ECameraControlMode determineMode(); - - /* resets to the previous mode */ - void toPrevMode(); - - /* sets a new mode and performs related actions */ - void switchMode(ECameraControlMode mode); - - /* sets a new mode preserving previous one and updates ui*/ - void setMode(ECameraControlMode mode); - - /* updates the state (UI) according to the current mode */ - void updateState(); - - /* update camera modes items selection and camera preset items selection according to the currently selected preset */ - void updateItemsSelection(); - - // fills flatlist with items from given panel - void fillFlatlistFromPanel (LLFlatListView* list, LLPanel* panel); - - void handleAvatarEditingAppearance(bool editing); - - void showDebugInfo(bool show); - - // set to true when free camera mode is selected in modes list - // remains true until preset camera mode is chosen, or pan button is clicked, or escape pressed - static bool sFreeCamera; - static bool sAppearanceEditing; - bool mClosed; - ECameraControlMode mPrevMode; - ECameraControlMode mCurrMode; - std::map mMode2Button; - - LLPanel* mControls { nullptr }; - LLPanel* mViewerCameraInfo { nullptr }; - LLPanel* mAgentCameraInfo { nullptr }; - LLComboBox* mPresetCombo { nullptr }; - LLTextBox* mPreciseCtrls { nullptr }; -}; - -/** - * Class used to represent widgets from panel_camera_item.xml- - * panels that contain pictures and text. Pictures are different - * for selected and unselected state (this state is nor stored- icons - * are changed in setValue()). This class doesn't implement selection logic- - * it's items are used inside of flatlist. - */ -class LLPanelCameraItem - : public LLPanel -{ -public: - struct Params : public LLInitParam::Block - { - Optional icon_over; - Optional icon_selected; - Optional picture; - Optional selected_picture; - - Optional text; - Optional mousedown_callback; - Params(); - }; - /*virtual*/ bool postBuild(); - /** setting on/off background icon to indicate selected state */ - /*virtual*/ void setValue(const LLSD& value); - // sends commit signal - void onAnyMouseClick(); -protected: - friend class LLUICtrlFactory; - LLPanelCameraItem(const Params&); - LLIconCtrl* mIconOver; - LLIconCtrl* mIconSelected; - LLIconCtrl* mPicture; - LLIconCtrl* mPictureSelected; - LLTextBox* mText; -}; - -#endif +/** + * @file llfloatercamera.h + * @brief Container for camera control buttons (zoom, pan, orbit) + * + * $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$ + */ + +#ifndef LLFLOATERCAMERA_H +#define LLFLOATERCAMERA_H + +#include "llfloater.h" +#include "lliconctrl.h" +#include "lltextbox.h" +#include "llflatlistview.h" + +class LLJoystickCameraRotate; +class LLJoystickCameraTrack; +class LLFloaterReg; +class LLPanelCameraZoom; +class LLComboBox; + +enum ECameraControlMode +{ + CAMERA_CTRL_MODE_PAN, + CAMERA_CTRL_MODE_FREE_CAMERA, + CAMERA_CTRL_MODE_PRESETS +}; + +class LLFloaterCamera : public LLFloater +{ + friend class LLFloaterReg; + +public: + /* whether in free camera mode */ + static bool inFreeCameraMode(); + /* callback for camera items selection changing */ + static void onClickCameraItem(const LLSD& param); + + static void onLeavingMouseLook(); + + /** resets current camera mode to orbit mode */ + static void resetCameraMode(); + + /** Called when Avatar is entered/exited editing appearance mode */ + static void onAvatarEditingAppearance(bool editing); + + /** Called when opening and when "Advanced | Debug Camera" menu item is toggled */ + static void onDebugCameraToggled(); + + /* determines actual mode and updates ui */ + void update(); + + /*switch to one of the camera presets (front, rear, side)*/ + static void switchToPreset(const std::string& name); + + virtual void onOpen(const LLSD& key); + virtual void onClose(bool app_quitting); + + void onSavePreset(); + void onCustomPresetSelected(); + + void populatePresetCombo(); + + LLJoystickCameraRotate* mRotate { nullptr }; + LLPanelCameraZoom* mZoom { nullptr }; + LLJoystickCameraTrack* mTrack { nullptr }; + +private: + + LLFloaterCamera(const LLSD& val); + ~LLFloaterCamera() {}; + + /* return instance if it exists - created by LLFloaterReg */ + static LLFloaterCamera* findInstance(); + + /*virtual*/ bool postBuild(); + + F32 getCurrentTransparency(); + + void onViewButtonClick(const LLSD& user_data); + + ECameraControlMode determineMode(); + + /* resets to the previous mode */ + void toPrevMode(); + + /* sets a new mode and performs related actions */ + void switchMode(ECameraControlMode mode); + + /* sets a new mode preserving previous one and updates ui*/ + void setMode(ECameraControlMode mode); + + /* updates the state (UI) according to the current mode */ + void updateState(); + + /* update camera modes items selection and camera preset items selection according to the currently selected preset */ + void updateItemsSelection(); + + // fills flatlist with items from given panel + void fillFlatlistFromPanel (LLFlatListView* list, LLPanel* panel); + + void handleAvatarEditingAppearance(bool editing); + + void showDebugInfo(bool show); + + // set to true when free camera mode is selected in modes list + // remains true until preset camera mode is chosen, or pan button is clicked, or escape pressed + static bool sFreeCamera; + static bool sAppearanceEditing; + bool mClosed; + ECameraControlMode mPrevMode; + ECameraControlMode mCurrMode; + std::map mMode2Button; + + LLPanel* mControls { nullptr }; + LLPanel* mViewerCameraInfo { nullptr }; + LLPanel* mAgentCameraInfo { nullptr }; + LLComboBox* mPresetCombo { nullptr }; + LLTextBox* mPreciseCtrls { nullptr }; +}; + +/** + * Class used to represent widgets from panel_camera_item.xml- + * panels that contain pictures and text. Pictures are different + * for selected and unselected state (this state is nor stored- icons + * are changed in setValue()). This class doesn't implement selection logic- + * it's items are used inside of flatlist. + */ +class LLPanelCameraItem + : public LLPanel +{ +public: + struct Params : public LLInitParam::Block + { + Optional icon_over; + Optional icon_selected; + Optional picture; + Optional selected_picture; + + Optional text; + Optional mousedown_callback; + Params(); + }; + /*virtual*/ bool postBuild(); + /** setting on/off background icon to indicate selected state */ + /*virtual*/ void setValue(const LLSD& value); + // sends commit signal + void onAnyMouseClick(); +protected: + friend class LLUICtrlFactory; + LLPanelCameraItem(const Params&); + LLIconCtrl* mIconOver; + LLIconCtrl* mIconSelected; + LLIconCtrl* mPicture; + LLIconCtrl* mPictureSelected; + LLTextBox* mText; +}; + +#endif -- cgit v1.2.3