aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llagent.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llagent.h
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llagent.h')
-rw-r--r--linden/indra/newview/llagent.h35
1 files changed, 22 insertions, 13 deletions
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index 01462f1..97f9aed 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -95,6 +95,7 @@ class LLMessageSystem;
95class LLPermissions; 95class LLPermissions;
96class LLHost; 96class LLHost;
97class LLFriendObserver; 97class LLFriendObserver;
98class LLPickInfo;
98 99
99struct LLGroupData 100struct LLGroupData
100{ 101{
@@ -150,7 +151,9 @@ public:
150 void sendReliableMessage(); 151 void sendReliableMessage();
151 152
152 LLVector3d calcCameraPositionTargetGlobal(BOOL *hit_limit = NULL); // Calculate the camera position target 153 LLVector3d calcCameraPositionTargetGlobal(BOOL *hit_limit = NULL); // Calculate the camera position target
153 LLVector3d calcFocusPositionTargetGlobal(); // target for this mode 154 LLVector3d calcFocusPositionTargetGlobal();
155 LLVector3d calcThirdPersonFocusOffset();
156 // target for this mode
154 LLVector3d getCameraPositionGlobal() const; 157 LLVector3d getCameraPositionGlobal() const;
155 const LLVector3 &getCameraPositionAgent() const; 158 const LLVector3 &getCameraPositionAgent() const;
156 F32 calcCameraFOVZoomFactor(); 159 F32 calcCameraFOVZoomFactor();
@@ -191,6 +194,7 @@ public:
191 void changeCameraToFollow(BOOL animate = TRUE); 194 void changeCameraToFollow(BOOL animate = TRUE);
192 //end Ventrella 195 //end Ventrella
193 196
197 void setFocusGlobal(const LLPickInfo& pick);
194 void setFocusGlobal(const LLVector3d &focus, const LLUUID &object_id = LLUUID::null); 198 void setFocusGlobal(const LLVector3d &focus, const LLUUID &object_id = LLUUID::null);
195 void setFocusOnAvatar(BOOL focus, BOOL animate); 199 void setFocusOnAvatar(BOOL focus, BOOL animate);
196 void setCameraPosAndFocusGlobal(const LLVector3d& pos, const LLVector3d& focus, const LLUUID &object_id); 200 void setCameraPosAndFocusGlobal(const LLVector3d& pos, const LLVector3d& focus, const LLUUID &object_id);
@@ -331,7 +335,7 @@ public:
331 // of the agent in the absolute frame 335 // of the agent in the absolute frame
332// BOOL getLookingAtAvatar() const; 336// BOOL getLookingAtAvatar() const;
333 337
334 void getName(LLString& name); 338 void getName(std::string& name);
335 339
336 const LLColor4 &getEffectColor(); 340 const LLColor4 &getEffectColor();
337 void setEffectColor(const LLColor4 &color); 341 void setEffectColor(const LLColor4 &color);
@@ -374,7 +378,7 @@ public:
374 void sendAnimationRequests(LLDynamicArray<LLUUID> &anim_ids, EAnimRequest request); 378 void sendAnimationRequests(LLDynamicArray<LLUUID> &anim_ids, EAnimRequest request);
375 void sendAnimationRequest(const LLUUID &anim_id, EAnimRequest request); 379 void sendAnimationRequest(const LLUUID &anim_id, EAnimRequest request);
376 380
377 LLVector3d calcFocusOffset(LLViewerObject *object, S32 x, S32 y); 381 LLVector3 calcFocusOffset(LLViewerObject *object, S32 x, S32 y);
378 BOOL calcCameraMinDistance(F32 &obj_min_distance); 382 BOOL calcCameraMinDistance(F32 &obj_min_distance);
379 383
380 void startCameraAnimation(); 384 void startCameraAnimation();
@@ -525,7 +529,7 @@ public:
525 529
526 BOOL sitCameraEnabled() { return mSitCameraEnabled; } 530 BOOL sitCameraEnabled() { return mSitCameraEnabled; }
527 531
528 F32 getCurrentCameraBuildOffset() { return (F32)mCameraFocusOffset.magVec(); } 532 F32 getCurrentCameraBuildOffset() { return (F32)mCameraFocusOffset.length(); }
529 533
530 // look at behavior 534 // look at behavior
531 BOOL setLookAt(ELookAtType target_type, LLViewerObject *object = NULL, LLVector3 position = LLVector3::zero); 535 BOOL setLookAt(ELookAtType target_type, LLViewerObject *object = NULL, LLVector3 position = LLVector3::zero);
@@ -563,8 +567,8 @@ public:
563 567
564 ETeleportState getTeleportState() const { return mTeleportState; } 568 ETeleportState getTeleportState() const { return mTeleportState; }
565 void setTeleportState( ETeleportState state ); 569 void setTeleportState( ETeleportState state );
566 const LLString& getTeleportMessage() const { return mTeleportMessage; } 570 const std::string& getTeleportMessage() const { return mTeleportMessage; }
567 void setTeleportMessage(const LLString& message) 571 void setTeleportMessage(const std::string& message)
568 { 572 {
569 mTeleportMessage = message; 573 mTeleportMessage = message;
570 } 574 }
@@ -694,8 +698,8 @@ public:
694 698
695 U64 mGroupPowers; 699 U64 mGroupPowers;
696 BOOL mHideGroupTitle; 700 BOOL mHideGroupTitle;
697 char mGroupTitle[DB_GROUP_TITLE_BUF_SIZE]; /*Flawfinder: ignore*/ // honorific, like "Sir" 701 std::string mGroupTitle; // honorific, like "Sir"
698 char mGroupName[DB_GROUP_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ 702 std::string mGroupName;
699 LLUUID mGroupID; 703 LLUUID mGroupID;
700 //LLUUID mGroupInsigniaID; 704 //LLUUID mGroupInsigniaID;
701 LLUUID mInventoryRootID; 705 LLUUID mInventoryRootID;
@@ -711,6 +715,9 @@ public:
711 715
712 LLDynamicArray<LLGroupData> mGroups; 716 LLDynamicArray<LLGroupData> mGroups;
713 717
718 F32 mHUDTargetZoom; // target zoom level for HUD objects (used when editing)
719 F32 mHUDCurZoom; // current animated zoom level for HUD objects
720
714 BOOL mInitialized; 721 BOOL mInitialized;
715 722
716 static BOOL sDebugDisplayTarget; 723 static BOOL sDebugDisplayTarget;
@@ -719,12 +726,12 @@ public:
719 726
720 BOOL mForceMouselook; 727 BOOL mForceMouselook;
721 728
722 static void parseTeleportMessages(const LLString& xml_filename); 729 static void parseTeleportMessages(const std::string& xml_filename);
723 //we should really define ERROR and PROGRESS enums here 730 //we should really define ERROR and PROGRESS enums here
724 //but I don't really feel like doing that, so I am just going 731 //but I don't really feel like doing that, so I am just going
725 //to expose the mappings....yup 732 //to expose the mappings....yup
726 static std::map<LLString, LLString> sTeleportErrorMessages; 733 static std::map<std::string, std::string> sTeleportErrorMessages;
727 static std::map<LLString, LLString> sTeleportProgressMessages; 734 static std::map<std::string, std::string> sTeleportProgressMessages;
728 735
729 LLFrameTimer mDoubleTapRunTimer; 736 LLFrameTimer mDoubleTapRunTimer;
730 EDoubleTapRunMode mDoubleTapRunMode; 737 EDoubleTapRunMode mDoubleTapRunMode;
@@ -736,7 +743,7 @@ private:
736 // Access or "maturity" level 743 // Access or "maturity" level
737 U8 mAccess; // SIM_ACCESS_MATURE or SIM_ACCESS_PG 744 U8 mAccess; // SIM_ACCESS_MATURE or SIM_ACCESS_PG
738 ETeleportState mTeleportState; 745 ETeleportState mTeleportState;
739 LLString mTeleportMessage; 746 std::string mTeleportMessage;
740 747
741 S32 mControlsTakenCount[TOTAL_CONTROLS]; 748 S32 mControlsTakenCount[TOTAL_CONTROLS];
742 S32 mControlsTakenPassedOnCount[TOTAL_CONTROLS]; 749 S32 mControlsTakenPassedOnCount[TOTAL_CONTROLS];
@@ -785,7 +792,9 @@ private:
785 LLVector3 mSitCameraPos; // root relative camera pos when sitting 792 LLVector3 mSitCameraPos; // root relative camera pos when sitting
786 LLVector3 mSitCameraFocus; // root relative camera target when sitting 793 LLVector3 mSitCameraFocus; // root relative camera target when sitting
787 LLVector3d mCameraSmoothingLastPositionGlobal; 794 LLVector3d mCameraSmoothingLastPositionGlobal;
788 LLVector3d mCameraSmoothingLastPositionAgent; 795 LLVector3d mCameraSmoothingLastPositionAgent;
796 BOOL mCameraSmoothingStop;
797
789 798
790 //Ventrella 799 //Ventrella
791 LLVector3 mCameraUpVector; // camera's up direction in world coordinates (determines the 'roll' of the view) 800 LLVector3 mCameraUpVector; // camera's up direction in world coordinates (determines the 'roll' of the view)