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

Fully implemented Breast Physics, but the boobies still don't bounce. Put in some other stuff for OTR (I think?) Finally added the client_definitions XML file to the versioning system.

Browse Source
This commit is contained in:
CharleyLevenque
2010-08-29 07:01:20 -04:00
parent ae4dcc283c
commit 137dc30c14
15 changed files with 2212 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
indra/newview/llvoavatar.h
View File

@@ -49,7 +49,7 @@
#include "llrendertarget.h"
#include "llwearable.h"
#include "llvoavatardefines.h"
#include "emeraldboobutils.h"
extern const LLUUID ANIM_AGENT_BODY_NOISE;
@@ -118,7 +118,7 @@ public:
void idleUpdateLipSync(bool voice_enabled);
void idleUpdateLoadingEffect();
void idleUpdateWindEffect();
void idleUpdateBoobEffect();
void idleUpdateNameTag(const LLVector3& root_pos_last);
void idleUpdateRenderCost();
void idleUpdateTractorBeam();
@@ -525,58 +525,57 @@ private:
BOOL mAppearanceAnimSetByUser;
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
@@ -870,6 +869,7 @@ public:
static F32 sUnbakedUpdateTime; // Last time stats were updated (to prevent multiple updates per frame)
static F32 sGreyTime; // Total seconds with >=1 grey avatars
static F32 sGreyUpdateTime; // Last time stats were updated (to prevent multiple updates per frame)
static bool sDoProperArc;
const std::string getBakedStatusForPrintout() const;
};