Permalink
Browse files

Seriously? I swear I hit save.

  • Loading branch information...
Lirusaito committed May 27, 2016
1 parent 330e306 commit a8cf4a51b3da8c8517273a214301f66f92fde8fc
Showing with 5 additions and 2 deletions.
  1. +5 −2 indra/newview/llagentcamera.h
@@ -90,9 +90,7 @@ class LLAgentCamera
void changeCameraToThirdPerson(BOOL animate = TRUE);
void changeCameraToCustomizeAvatar(); // Trigger transition animation
F32 calcCustomizeAvatarUIOffset( const LLVector3d& camera_pos_global );
- // Ventrella
void changeCameraToFollow(BOOL animate = TRUE); // Ventrella
- //end Ventrella
BOOL cameraThirdPerson() const { return (mCameraMode == CAMERA_MODE_THIRD_PERSON && mLastCameraMode == CAMERA_MODE_THIRD_PERSON); }
BOOL cameraMouselook() const { return (mCameraMode == CAMERA_MODE_MOUSELOOK && mLastCameraMode == CAMERA_MODE_MOUSELOOK); }
BOOL cameraCustomizeAvatar() const { return (mCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR /*&& !mCameraAnimating*/); }
@@ -162,6 +160,7 @@ class LLAgentCamera
//--------------------------------------------------------------------
public:
void setUsingFollowCam(bool using_follow_cam);
+ bool isfollowCamLocked();
private:
LLFollowCam mFollowCam; // Ventrella
@@ -214,18 +213,22 @@ class LLAgentCamera
void setCameraPosAndFocusGlobal(const LLVector3d& pos, const LLVector3d& focus, const LLUUID &object_id);
void clearFocusObject();
void setFocusObject(LLViewerObject* object);
+ void setAllowChangeToFollow(BOOL focus) { mAllowChangeToFollow = focus; }
+ void setObjectTracking(BOOL track) { mTrackFocusObject = track; }
const LLVector3d &getFocusGlobal() const { return mFocusGlobal; }
const LLVector3d &getFocusTargetGlobal() const { return mFocusTargetGlobal; }
private:
LLVector3d mCameraFocusOffset; // Offset from focus point in build mode
LLVector3d mCameraFocusOffsetTarget; // Target towards which we are lerping the camera's focus offset
BOOL mFocusOnAvatar;
+ BOOL mAllowChangeToFollow;
LLVector3d mFocusGlobal;
LLVector3d mFocusTargetGlobal;
LLPointer<LLViewerObject> mFocusObject;
F32 mFocusObjectDist;
LLVector3 mFocusObjectOffset;
F32 mFocusDotRadius; // Meters
+ BOOL mTrackFocusObject;
//--------------------------------------------------------------------
// Lookat / Pointat

0 comments on commit a8cf4a5

Please sign in to comment.