From c285f59ce2a05703e3a1232fcaf3ee3aea714b3f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 18 Feb 2024 12:52:19 +0100 Subject: Replace BOOL with bool in llwindow and dependent classes --- indra/newview/lljoystickbutton.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview/lljoystickbutton.h') diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h index b7fdf63e58..2de50deb22 100644 --- a/indra/newview/lljoystickbutton.h +++ b/indra/newview/lljoystickbutton.h @@ -63,9 +63,9 @@ public: }; LLJoystick(const Params&); - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); - virtual BOOL handleHover(S32 x, S32 y, MASK mask); + virtual bool handleMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); + virtual bool handleHover(S32 x, S32 y, MASK mask); virtual void onMouseUp() {} virtual void onHeldDown() = 0; @@ -147,9 +147,9 @@ public: virtual void setToggleState( BOOL left, BOOL top, BOOL right, BOOL bottom ); - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); - virtual BOOL handleHover(S32 x, S32 y, MASK mask); + virtual bool handleMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); + virtual bool handleHover(S32 x, S32 y, MASK mask); virtual void onHeldDown(); virtual void resetJoystickCamera(); virtual void draw(); @@ -201,8 +201,8 @@ public: virtual void setToggleState(BOOL left, BOOL top, BOOL right, BOOL bottom); - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); + virtual bool handleMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); virtual void onHeldDown(); virtual void draw(); -- 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/lljoystickbutton.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'indra/newview/lljoystickbutton.h') diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h index 2de50deb22..c359985fb7 100644 --- a/indra/newview/lljoystickbutton.h +++ b/indra/newview/lljoystickbutton.h @@ -100,7 +100,7 @@ protected: S32 mVertSlopFar; // where the slop regions end S32 mHorizSlopNear; // where the slop regions end S32 mHorizSlopFar; // where the slop regions end - BOOL mHeldDown; + bool mHeldDown; LLFrameTimer mHeldDownTimer; }; @@ -145,7 +145,7 @@ public: LLJoystickCameraRotate(const LLJoystickCameraRotate::Params&); - virtual void setToggleState( BOOL left, BOOL top, BOOL right, BOOL bottom ); + virtual void setToggleState( bool left, bool top, bool right, bool bottom ); virtual bool handleMouseDown(S32 x, S32 y, MASK mask); virtual bool handleMouseUp(S32 x, S32 y, MASK mask); @@ -160,11 +160,11 @@ protected: void drawRotatedImage( LLPointer image, S32 rotations ); protected: - BOOL mInLeft; - BOOL mInTop; - BOOL mInRight; - BOOL mInBottom; - BOOL mInCenter; + bool mInLeft; + bool mInTop; + bool mInRight; + bool mInBottom; + bool mInCenter; std::string mCenterImageName; }; @@ -199,7 +199,7 @@ public: LLJoystickQuaternion(const LLJoystickQuaternion::Params &); - virtual void setToggleState(BOOL left, BOOL top, BOOL right, BOOL bottom); + virtual void setToggleState(bool left, bool top, bool right, bool bottom); virtual bool handleMouseDown(S32 x, S32 y, MASK mask); virtual bool handleMouseUp(S32 x, S32 y, MASK mask); @@ -214,10 +214,10 @@ protected: virtual void updateSlop(); void drawRotatedImage(LLPointer image, S32 rotations); - BOOL mInLeft; - BOOL mInTop; - BOOL mInRight; - BOOL mInBottom; + bool mInLeft; + bool mInTop; + bool mInRight; + bool mInBottom; S32 mXAxisIndex; S32 mYAxisIndex; -- 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/lljoystickbutton.h | 464 +++++++++++++++++++-------------------- 1 file changed, 232 insertions(+), 232 deletions(-) (limited to 'indra/newview/lljoystickbutton.h') diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h index 445aaef478..12394ca63e 100644 --- a/indra/newview/lljoystickbutton.h +++ b/indra/newview/lljoystickbutton.h @@ -1,232 +1,232 @@ -/** - * @file lljoystickbutton.h - * @brief LLJoystick class definition - * - * $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 LL_LLJOYSTICKBUTTON_H -#define LL_LLJOYSTICKBUTTON_H - -#include "llbutton.h" -#include "llcoord.h" -#include "llviewertexture.h" -#include "llquaternion.h" - -typedef enum e_joystick_quadrant -{ - JQ_ORIGIN, - JQ_UP, - JQ_DOWN, - JQ_LEFT, - JQ_RIGHT -} EJoystickQuadrant; - -struct QuadrantNames : public LLInitParam::TypeValuesHelper -{ - static void declareValues(); -}; - -class LLJoystick -: public LLButton -{ -public: - struct Params - : public LLInitParam::Block - { - Optional quadrant; - - Params() - : quadrant("quadrant", JQ_ORIGIN) - { - changeDefault(label, ""); - } - }; - LLJoystick(const Params&); - - virtual bool handleMouseDown(S32 x, S32 y, MASK mask); - virtual bool handleMouseUp(S32 x, S32 y, MASK mask); - virtual bool handleHover(S32 x, S32 y, MASK mask); - - virtual void onMouseUp() {} - virtual void onHeldDown() = 0; - F32 getElapsedHeldDownTime(); - - static void onBtnHeldDown(void *userdata); // called by llbutton callback handler - void setInitialQuadrant(EJoystickQuadrant initial) { mInitialQuadrant = initial; }; - - /** - * Checks if click location is inside joystick circle. - * - * Image containing circle is square and this square has adherent points with joystick - * circle. Make sure to change method according to shape other than square. - */ - bool pointInCircle(S32 x, S32 y) const; - bool pointInCenterDot(S32 x, S32 y, S32 radius) const; - - static std::string nameFromQuadrant(const EJoystickQuadrant quadrant); - static EJoystickQuadrant quadrantFromName(const std::string& name); - static EJoystickQuadrant selectQuadrant(LLXMLNodePtr node); - - -protected: - virtual void updateSlop(); // recompute slop margins - -protected: - EJoystickQuadrant mInitialQuadrant; // mousedown = click in this quadrant - LLCoordGL mInitialOffset; // pretend mouse started here - LLCoordGL mLastMouse; // where was mouse on last hover event - LLCoordGL mFirstMouse; // when mouse clicked, where was it - S32 mVertSlopNear; // where the slop regions end - S32 mVertSlopFar; // where the slop regions end - S32 mHorizSlopNear; // where the slop regions end - S32 mHorizSlopFar; // where the slop regions end - bool mHeldDown; - LLFrameTimer mHeldDownTimer; -}; - - -// Turn agent left and right, move forward and back -class LLJoystickAgentTurn -: public LLJoystick -{ -public: - struct Params : public LLJoystick::Params {}; - LLJoystickAgentTurn(const Params& p) : LLJoystick(p) {} - virtual void onHeldDown(); -}; - - -// Slide left and right, move forward and back -class LLJoystickAgentSlide -: public LLJoystick -{ -public: - struct Params : public LLJoystick::Params {}; - LLJoystickAgentSlide(const Params& p) : LLJoystick(p) {} - - virtual void onHeldDown(); - virtual void onMouseUp(); -}; - - -// Rotate camera around the focus point -class LLJoystickCameraRotate -: public LLJoystick -{ -public: - struct Params - : public LLInitParam::Block - { - Params() - { - changeDefault(held_down_delay.seconds, 0.0); - } - }; - - LLJoystickCameraRotate(const LLJoystickCameraRotate::Params&); - - virtual void setToggleState( bool left, bool top, bool right, bool bottom ); - - virtual bool handleMouseDown(S32 x, S32 y, MASK mask); - virtual bool handleMouseUp(S32 x, S32 y, MASK mask); - virtual bool handleHover(S32 x, S32 y, MASK mask); - virtual void onHeldDown(); - virtual void resetJoystickCamera(); - virtual void draw(); - -protected: - F32 getOrbitRate(); - virtual void updateSlop(); - void drawRotatedImage( LLPointer image, S32 rotations ); - -protected: - bool mInLeft; - bool mInTop; - bool mInRight; - bool mInBottom; - bool mInCenter; - - std::string mCenterImageName; -}; - - -// Track the camera focus point forward/backward and side to side -class LLJoystickCameraTrack -: public LLJoystickCameraRotate -{ -public: - struct Params - : public LLInitParam::Block - { - Params(); - }; - - LLJoystickCameraTrack(const LLJoystickCameraTrack::Params&); - virtual void onHeldDown(); - virtual void resetJoystickCamera(); -}; - -// -class LLJoystickQuaternion : - public LLJoystick -{ -public: - struct Params : - public LLInitParam::Block - { - Params(); - }; - - LLJoystickQuaternion(const LLJoystickQuaternion::Params &); - - virtual void setToggleState(bool left, bool top, bool right, bool bottom); - - virtual bool handleMouseDown(S32 x, S32 y, MASK mask); - virtual bool handleMouseUp(S32 x, S32 y, MASK mask); - virtual void onHeldDown(); - virtual void draw(); - - void setRotation(const LLQuaternion &value); - LLQuaternion getRotation() const; - -protected: - F32 getOrbitRate(); - virtual void updateSlop(); - void drawRotatedImage(LLPointer image, S32 rotations); - - bool mInLeft; - bool mInTop; - bool mInRight; - bool mInBottom; - - S32 mXAxisIndex; - S32 mYAxisIndex; - S32 mZAxisIndex; - - LLVector3 mVectorZero; - LLQuaternion mRotation; - LLVector3 mUpDnAxis; - LLVector3 mLfRtAxis; -}; - -#endif // LL_LLJOYSTICKBUTTON_H +/** + * @file lljoystickbutton.h + * @brief LLJoystick class definition + * + * $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 LL_LLJOYSTICKBUTTON_H +#define LL_LLJOYSTICKBUTTON_H + +#include "llbutton.h" +#include "llcoord.h" +#include "llviewertexture.h" +#include "llquaternion.h" + +typedef enum e_joystick_quadrant +{ + JQ_ORIGIN, + JQ_UP, + JQ_DOWN, + JQ_LEFT, + JQ_RIGHT +} EJoystickQuadrant; + +struct QuadrantNames : public LLInitParam::TypeValuesHelper +{ + static void declareValues(); +}; + +class LLJoystick +: public LLButton +{ +public: + struct Params + : public LLInitParam::Block + { + Optional quadrant; + + Params() + : quadrant("quadrant", JQ_ORIGIN) + { + changeDefault(label, ""); + } + }; + LLJoystick(const Params&); + + virtual bool handleMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); + virtual bool handleHover(S32 x, S32 y, MASK mask); + + virtual void onMouseUp() {} + virtual void onHeldDown() = 0; + F32 getElapsedHeldDownTime(); + + static void onBtnHeldDown(void *userdata); // called by llbutton callback handler + void setInitialQuadrant(EJoystickQuadrant initial) { mInitialQuadrant = initial; }; + + /** + * Checks if click location is inside joystick circle. + * + * Image containing circle is square and this square has adherent points with joystick + * circle. Make sure to change method according to shape other than square. + */ + bool pointInCircle(S32 x, S32 y) const; + bool pointInCenterDot(S32 x, S32 y, S32 radius) const; + + static std::string nameFromQuadrant(const EJoystickQuadrant quadrant); + static EJoystickQuadrant quadrantFromName(const std::string& name); + static EJoystickQuadrant selectQuadrant(LLXMLNodePtr node); + + +protected: + virtual void updateSlop(); // recompute slop margins + +protected: + EJoystickQuadrant mInitialQuadrant; // mousedown = click in this quadrant + LLCoordGL mInitialOffset; // pretend mouse started here + LLCoordGL mLastMouse; // where was mouse on last hover event + LLCoordGL mFirstMouse; // when mouse clicked, where was it + S32 mVertSlopNear; // where the slop regions end + S32 mVertSlopFar; // where the slop regions end + S32 mHorizSlopNear; // where the slop regions end + S32 mHorizSlopFar; // where the slop regions end + bool mHeldDown; + LLFrameTimer mHeldDownTimer; +}; + + +// Turn agent left and right, move forward and back +class LLJoystickAgentTurn +: public LLJoystick +{ +public: + struct Params : public LLJoystick::Params {}; + LLJoystickAgentTurn(const Params& p) : LLJoystick(p) {} + virtual void onHeldDown(); +}; + + +// Slide left and right, move forward and back +class LLJoystickAgentSlide +: public LLJoystick +{ +public: + struct Params : public LLJoystick::Params {}; + LLJoystickAgentSlide(const Params& p) : LLJoystick(p) {} + + virtual void onHeldDown(); + virtual void onMouseUp(); +}; + + +// Rotate camera around the focus point +class LLJoystickCameraRotate +: public LLJoystick +{ +public: + struct Params + : public LLInitParam::Block + { + Params() + { + changeDefault(held_down_delay.seconds, 0.0); + } + }; + + LLJoystickCameraRotate(const LLJoystickCameraRotate::Params&); + + virtual void setToggleState( bool left, bool top, bool right, bool bottom ); + + virtual bool handleMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); + virtual bool handleHover(S32 x, S32 y, MASK mask); + virtual void onHeldDown(); + virtual void resetJoystickCamera(); + virtual void draw(); + +protected: + F32 getOrbitRate(); + virtual void updateSlop(); + void drawRotatedImage( LLPointer image, S32 rotations ); + +protected: + bool mInLeft; + bool mInTop; + bool mInRight; + bool mInBottom; + bool mInCenter; + + std::string mCenterImageName; +}; + + +// Track the camera focus point forward/backward and side to side +class LLJoystickCameraTrack +: public LLJoystickCameraRotate +{ +public: + struct Params + : public LLInitParam::Block + { + Params(); + }; + + LLJoystickCameraTrack(const LLJoystickCameraTrack::Params&); + virtual void onHeldDown(); + virtual void resetJoystickCamera(); +}; + +// +class LLJoystickQuaternion : + public LLJoystick +{ +public: + struct Params : + public LLInitParam::Block + { + Params(); + }; + + LLJoystickQuaternion(const LLJoystickQuaternion::Params &); + + virtual void setToggleState(bool left, bool top, bool right, bool bottom); + + virtual bool handleMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); + virtual void onHeldDown(); + virtual void draw(); + + void setRotation(const LLQuaternion &value); + LLQuaternion getRotation() const; + +protected: + F32 getOrbitRate(); + virtual void updateSlop(); + void drawRotatedImage(LLPointer image, S32 rotations); + + bool mInLeft; + bool mInTop; + bool mInRight; + bool mInBottom; + + S32 mXAxisIndex; + S32 mYAxisIndex; + S32 mZAxisIndex; + + LLVector3 mVectorZero; + LLQuaternion mRotation; + LLVector3 mUpDnAxis; + LLVector3 mLfRtAxis; +}; + +#endif // LL_LLJOYSTICKBUTTON_H -- cgit v1.2.3