Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Seriously? I swear I hit save.

Browse Source
This commit is contained in:
Lirusaito
2016-05-27 12:52:29 -04:00
parent 330e30607a
commit a8cf4a51b3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llagentcamera.h
View File

@@ -90,9 +90,7 @@ public:
void changeCameraToThirdPerson(BOOL animate = TRUE); void changeCameraToThirdPerson(BOOL animate = TRUE);
void changeCameraToCustomizeAvatar(); // Trigger transition animation void changeCameraToCustomizeAvatar(); // Trigger transition animation
F32 calcCustomizeAvatarUIOffset( const LLVector3d& camera_pos_global ); F32 calcCustomizeAvatarUIOffset( const LLVector3d& camera_pos_global );
// Ventrella
void changeCameraToFollow(BOOL animate = TRUE); // Ventrella void changeCameraToFollow(BOOL animate = TRUE); // Ventrella
//end Ventrella
BOOL cameraThirdPerson() const { return (mCameraMode == CAMERA_MODE_THIRD_PERSON && mLastCameraMode == CAMERA_MODE_THIRD_PERSON); } 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 cameraMouselook() const { return (mCameraMode == CAMERA_MODE_MOUSELOOK && mLastCameraMode == CAMERA_MODE_MOUSELOOK); }
BOOL cameraCustomizeAvatar() const { return (mCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR /*&& !mCameraAnimating*/); } BOOL cameraCustomizeAvatar() const { return (mCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR /*&& !mCameraAnimating*/); }
@@ -162,6 +160,7 @@ private:
//-------------------------------------------------------------------- //--------------------------------------------------------------------
public: public:
void setUsingFollowCam(bool using_follow_cam); void setUsingFollowCam(bool using_follow_cam);
bool isfollowCamLocked();
private: private:
LLFollowCam mFollowCam; // Ventrella LLFollowCam mFollowCam; // Ventrella
@@ -214,18 +213,22 @@ public:
void setCameraPosAndFocusGlobal(const LLVector3d& pos, const LLVector3d& focus, const LLUUID &object_id); void setCameraPosAndFocusGlobal(const LLVector3d& pos, const LLVector3d& focus, const LLUUID &object_id);
void clearFocusObject(); void clearFocusObject();
void setFocusObject(LLViewerObject* object); void setFocusObject(LLViewerObject* object);
void setAllowChangeToFollow(BOOL focus) { mAllowChangeToFollow = focus; }
void setObjectTracking(BOOL track) { mTrackFocusObject = track; }
const LLVector3d &getFocusGlobal() const { return mFocusGlobal; } const LLVector3d &getFocusGlobal() const { return mFocusGlobal; }
const LLVector3d &getFocusTargetGlobal() const { return mFocusTargetGlobal; } const LLVector3d &getFocusTargetGlobal() const { return mFocusTargetGlobal; }
private: private:
LLVector3d mCameraFocusOffset; // Offset from focus point in build mode LLVector3d mCameraFocusOffset; // Offset from focus point in build mode
LLVector3d mCameraFocusOffsetTarget; // Target towards which we are lerping the camera's focus offset LLVector3d mCameraFocusOffsetTarget; // Target towards which we are lerping the camera's focus offset
BOOL mFocusOnAvatar; BOOL mFocusOnAvatar;
BOOL mAllowChangeToFollow;
LLVector3d mFocusGlobal; LLVector3d mFocusGlobal;
LLVector3d mFocusTargetGlobal; LLVector3d mFocusTargetGlobal;
LLPointer<LLViewerObject> mFocusObject; LLPointer<LLViewerObject> mFocusObject;
F32 mFocusObjectDist; F32 mFocusObjectDist;
LLVector3 mFocusObjectOffset; LLVector3 mFocusObjectOffset;
F32 mFocusDotRadius; // Meters F32 mFocusDotRadius; // Meters
BOOL mTrackFocusObject;
//-------------------------------------------------------------------- //--------------------------------------------------------------------
// Lookat / Pointat // Lookat / Pointat