diff options
Diffstat (limited to 'linden/indra/newview/llvoavatar.h')
-rw-r--r-- | linden/indra/newview/llvoavatar.h | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h index 33cec69..0bf648a 100644 --- a/linden/indra/newview/llvoavatar.h +++ b/linden/indra/newview/llvoavatar.h | |||
@@ -49,6 +49,8 @@ | |||
49 | #include "llwearable.h" | 49 | #include "llwearable.h" |
50 | #include "llvoavatardefines.h" | 50 | #include "llvoavatardefines.h" |
51 | 51 | ||
52 | #include "emeraldboobutils.h" | ||
53 | |||
52 | extern const LLUUID ANIM_AGENT_BODY_NOISE; | 54 | extern const LLUUID ANIM_AGENT_BODY_NOISE; |
53 | extern const LLUUID ANIM_AGENT_BREATHE_ROT; | 55 | extern const LLUUID ANIM_AGENT_BREATHE_ROT; |
54 | extern const LLUUID ANIM_AGENT_EDITING; | 56 | extern const LLUUID ANIM_AGENT_EDITING; |
@@ -106,6 +108,7 @@ public: | |||
106 | void idleUpdateLipSync(bool voice_enabled); | 108 | void idleUpdateLipSync(bool voice_enabled); |
107 | void idleUpdateLoadingEffect(); | 109 | void idleUpdateLoadingEffect(); |
108 | void idleUpdateWindEffect(); | 110 | void idleUpdateWindEffect(); |
111 | void idleUpdateBoobEffect(); | ||
109 | void idleUpdateNameTag(const LLVector3& root_pos_last); | 112 | void idleUpdateNameTag(const LLVector3& root_pos_last); |
110 | void idleUpdateRenderCost(); | 113 | void idleUpdateRenderCost(); |
111 | void idleUpdateTractorBeam(); | 114 | void idleUpdateTractorBeam(); |
@@ -494,6 +497,59 @@ private: | |||
494 | F32 mLastAppearanceBlendTime; | 497 | F32 mLastAppearanceBlendTime; |
495 | 498 | ||
496 | //-------------------------------------------------------------------- | 499 | //-------------------------------------------------------------------- |
500 | // boob bounce stuff | ||
501 | //-------------------------------------------------------------------- | ||
502 | |||
503 | private: | ||
504 | bool mFirstSetActualBoobGravRan; | ||
505 | bool mFirstSetActualButtGravRan; | ||
506 | bool mFirstSetActualFatGravRan; | ||
507 | LLFrameTimer mBoobBounceTimer; | ||
508 | EmeraldAvatarLocalBoobConfig mLocalBoobConfig; | ||
509 | EmeraldBoobState mBoobState; | ||
510 | EmeraldBoobState mButtState; | ||
511 | EmeraldBoobState mFatState; | ||
512 | |||
513 | public: | ||
514 | //boob | ||
515 | F32 getActualBoobGrav() { return mLocalBoobConfig.actualBoobGrav; } | ||
516 | void setActualBoobGrav(F32 grav) | ||
517 | { | ||
518 | mLocalBoobConfig.actualBoobGrav = grav; | ||
519 | if(!mFirstSetActualBoobGravRan) | ||
520 | { | ||
521 | mBoobState.boobGrav = grav; | ||
522 | mFirstSetActualBoobGravRan = true; | ||
523 | } | ||
524 | } | ||
525 | |||
526 | //butt | ||
527 | F32 getActualButtGrav() { return mLocalBoobConfig.actualButtGrav; } | ||
528 | void setActualButtGrav(F32 grav) | ||
529 | { | ||
530 | mLocalBoobConfig.actualButtGrav = grav; | ||
531 | if(!mFirstSetActualButtGravRan) | ||
532 | { | ||
533 | mButtState.boobGrav = grav; | ||
534 | mFirstSetActualButtGravRan = true; | ||
535 | } | ||
536 | } | ||
537 | |||
538 | //fat | ||
539 | F32 getActualFatGrav() { return mLocalBoobConfig.actualFatGrav; } | ||
540 | void setActualFatGrav(F32 grav) | ||
541 | { | ||
542 | mLocalBoobConfig.actualFatGrav = grav; | ||
543 | if(!mFirstSetActualFatGravRan) | ||
544 | { | ||
545 | mFatState.boobGrav = grav; | ||
546 | mFirstSetActualFatGravRan = true; | ||
547 | } | ||
548 | } | ||
549 | |||
550 | static EmeraldGlobalBoobConfig sBoobConfig; | ||
551 | |||
552 | //-------------------------------------------------------------------- | ||
497 | // Attachments | 553 | // Attachments |
498 | //-------------------------------------------------------------------- | 554 | //-------------------------------------------------------------------- |
499 | public: | 555 | public: |