summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatercamera.h
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-03-11 08:11:09 -0700
committerGraham Linden <graham@lindenlab.com>2019-03-11 08:11:09 -0700
commit3e560022459bf3534b873a7f6499dfb5eb75a7d9 (patch)
tree26f134322e5d12add8960a8ecd563b0f9b2918d0 /indra/newview/llfloatercamera.h
parent52566e4b333a6f91c04034a6bdcb1e9099371d12 (diff)
Tabs -> spaces.
Diffstat (limited to 'indra/newview/llfloatercamera.h')
-rw-r--r--indra/newview/llfloatercamera.h166
1 files changed, 83 insertions, 83 deletions
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h
index 481e9aec1b..1b24b143bf 100644
--- a/indra/newview/llfloatercamera.h
+++ b/indra/newview/llfloatercamera.h
@@ -39,95 +39,95 @@ class LLPanelCameraZoom;
enum ECameraControlMode
{
- CAMERA_CTRL_MODE_MODES,
- CAMERA_CTRL_MODE_PAN,
- CAMERA_CTRL_MODE_FREE_CAMERA,
- CAMERA_CTRL_MODE_PRESETS
+ CAMERA_CTRL_MODE_MODES,
+ CAMERA_CTRL_MODE_PAN,
+ CAMERA_CTRL_MODE_FREE_CAMERA,
+ CAMERA_CTRL_MODE_PRESETS
};
class LLFloaterCamera : public LLFloater
{
- friend class LLFloaterReg;
-
+ friend class LLFloaterReg;
+
public:
- /* whether in free camera mode */
- static bool inFreeCameraMode();
- /* callback for camera items selection changing */
- static void onClickCameraItem(const LLSD& param);
+ /* whether in free camera mode */
+ static bool inFreeCameraMode();
+ /* callback for camera items selection changing */
+ static void onClickCameraItem(const LLSD& param);
- static void onLeavingMouseLook();
+ static void onLeavingMouseLook();
- /** resets current camera mode to orbit mode */
- static void resetCameraMode();
+ /** 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 Avatar is entered/exited editing appearance mode */
+ static void onAvatarEditingAppearance(bool editing);
- /* determines actual mode and updates ui */
- void update();
+ /* 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);
+ /*switch to one of the camera presets (front, rear, side)*/
+ static void switchToPreset(const std::string& name);
- /* move to CAMERA_CTRL_MODE_PRESETS from CAMERA_CTRL_MODE_FREE_CAMERA if we are on presets panel and
- are not in free camera mode*/
- void fromFreeToPresets();
+ /* move to CAMERA_CTRL_MODE_PRESETS from CAMERA_CTRL_MODE_FREE_CAMERA if we are on presets panel and
+ are not in free camera mode*/
+ void fromFreeToPresets();
- virtual void onOpen(const LLSD& key);
- virtual void onClose(bool app_quitting);
+ virtual void onOpen(const LLSD& key);
+ virtual void onClose(bool app_quitting);
- LLJoystickCameraRotate* mRotate;
- LLPanelCameraZoom* mZoom;
- LLJoystickCameraTrack* mTrack;
+ LLJoystickCameraRotate* mRotate;
+ LLPanelCameraZoom* mZoom;
+ LLJoystickCameraTrack* mTrack;
private:
- LLFloaterCamera(const LLSD& val);
- ~LLFloaterCamera() {};
+ LLFloaterCamera(const LLSD& val);
+ ~LLFloaterCamera() {};
- /* return instance if it exists - created by LLFloaterReg */
- static LLFloaterCamera* findInstance();
+ /* return instance if it exists - created by LLFloaterReg */
+ static LLFloaterCamera* findInstance();
- /*virtual*/ BOOL postBuild();
+ /*virtual*/ BOOL postBuild();
- F32 getCurrentTransparency();
+ F32 getCurrentTransparency();
- void onViewButtonClick(const LLSD& user_data);
+ void onViewButtonClick(const LLSD& user_data);
- ECameraControlMode determineMode();
+ ECameraControlMode determineMode();
- /* resets to the previous mode */
- void toPrevMode();
+ /* resets to the previous mode */
+ void toPrevMode();
- /* sets a new mode and performs related actions */
- void switchMode(ECameraControlMode mode);
+ /* 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);
+ /* 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();
+ /* 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();
+ /* update camera modes items selection and camera preset items selection according to the currently selected preset */
+ void updateItemsSelection();
- void onClickBtn(ECameraControlMode mode);
- void assignButton2Mode(ECameraControlMode mode, const std::string& button_name);
-
- // fills flatlist with items from given panel
- void fillFlatlistFromPanel (LLFlatListView* list, LLPanel* panel);
+ void onClickBtn(ECameraControlMode mode);
+ void assignButton2Mode(ECameraControlMode mode, const std::string& button_name);
+
+ // fills flatlist with items from given panel
+ void fillFlatlistFromPanel (LLFlatListView* list, LLPanel* panel);
- void handleAvatarEditingAppearance(bool editing);
+ void handleAvatarEditingAppearance(bool editing);
- // 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<ECameraControlMode, LLButton*> mMode2Button;
+ // 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<ECameraControlMode, LLButton*> mMode2Button;
};
/**
@@ -138,33 +138,33 @@ private:
* it's items are used inside of flatlist.
*/
class LLPanelCameraItem
- : public LLPanel
+ : public LLPanel
{
public:
- struct Params : public LLInitParam::Block<Params, LLPanel::Params>
- {
- Optional<LLIconCtrl::Params> icon_over;
- Optional<LLIconCtrl::Params> icon_selected;
- Optional<LLIconCtrl::Params> picture;
- Optional<LLIconCtrl::Params> selected_picture;
-
- Optional<LLTextBox::Params> text;
- Optional<CommitCallbackParam> 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();
+ struct Params : public LLInitParam::Block<Params, LLPanel::Params>
+ {
+ Optional<LLIconCtrl::Params> icon_over;
+ Optional<LLIconCtrl::Params> icon_selected;
+ Optional<LLIconCtrl::Params> picture;
+ Optional<LLIconCtrl::Params> selected_picture;
+
+ Optional<LLTextBox::Params> text;
+ Optional<CommitCallbackParam> 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;
+ friend class LLUICtrlFactory;
+ LLPanelCameraItem(const Params&);
+ LLIconCtrl* mIconOver;
+ LLIconCtrl* mIconSelected;
+ LLIconCtrl* mPicture;
+ LLIconCtrl* mPictureSelected;
+ LLTextBox* mText;
};
#endif