From d0936606412ccaf05a2e17894d2bc9a3c18506ab Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Mon, 22 Feb 2010 17:57:35 +0100 Subject: Ported breast physics from Emerald. --- linden/indra/newview/llvoavatar.h | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'linden/indra/newview/llvoavatar.h') 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 @@ #include "llwearable.h" #include "llvoavatardefines.h" +#include "emeraldboobutils.h" + extern const LLUUID ANIM_AGENT_BODY_NOISE; extern const LLUUID ANIM_AGENT_BREATHE_ROT; extern const LLUUID ANIM_AGENT_EDITING; @@ -106,6 +108,7 @@ public: void idleUpdateLipSync(bool voice_enabled); void idleUpdateLoadingEffect(); void idleUpdateWindEffect(); + void idleUpdateBoobEffect(); void idleUpdateNameTag(const LLVector3& root_pos_last); void idleUpdateRenderCost(); void idleUpdateTractorBeam(); @@ -494,6 +497,59 @@ private: F32 mLastAppearanceBlendTime; //-------------------------------------------------------------------- + // boob bounce stuff + //-------------------------------------------------------------------- + +private: + bool mFirstSetActualBoobGravRan; + bool mFirstSetActualButtGravRan; + bool mFirstSetActualFatGravRan; + LLFrameTimer mBoobBounceTimer; + EmeraldAvatarLocalBoobConfig mLocalBoobConfig; + EmeraldBoobState mBoobState; + EmeraldBoobState mButtState; + EmeraldBoobState mFatState; + +public: + //boob + F32 getActualBoobGrav() { return mLocalBoobConfig.actualBoobGrav; } + void setActualBoobGrav(F32 grav) + { + mLocalBoobConfig.actualBoobGrav = grav; + if(!mFirstSetActualBoobGravRan) + { + mBoobState.boobGrav = grav; + mFirstSetActualBoobGravRan = true; + } + } + + //butt + F32 getActualButtGrav() { return mLocalBoobConfig.actualButtGrav; } + void setActualButtGrav(F32 grav) + { + mLocalBoobConfig.actualButtGrav = grav; + if(!mFirstSetActualButtGravRan) + { + mButtState.boobGrav = grav; + mFirstSetActualButtGravRan = true; + } + } + + //fat + F32 getActualFatGrav() { return mLocalBoobConfig.actualFatGrav; } + void setActualFatGrav(F32 grav) + { + mLocalBoobConfig.actualFatGrav = grav; + if(!mFirstSetActualFatGravRan) + { + mFatState.boobGrav = grav; + mFirstSetActualFatGravRan = true; + } + } + + static EmeraldGlobalBoobConfig sBoobConfig; + + //-------------------------------------------------------------------- // Attachments //-------------------------------------------------------------------- public: -- cgit v1.1