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

Emerald physics cleanup. Removed unused cruft. Disabling by default since it never worked (although it does now if set to enabled).

Browse Source
This commit is contained in:
Shyotl
2012-06-18 14:50:39 -05:00
parent b5535c9cc4
commit a3e6e96869
11 changed files with 42 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llcharacter/llcharacter.cpp
View File

@@ -56,8 +56,7 @@ LLCharacter::LLCharacter()
mPreferredPelvisHeight( 0.f ),
mSex( SEX_FEMALE ),
mAppearanceSerialNum( 0 ),
mSkeletonSerialNum( 0 ),
mInAppearance( false )
mSkeletonSerialNum( 0 )
{
llassert_always(sAllowInstancesChange) ;
sInstances.push_back(this);

6
indra/llcharacter/llcharacter.h
View File

@@ -268,10 +268,6 @@ public:
ESex getSex() const { return mSex; }
void setSex( ESex sex ) { mSex = sex; }
// set appearance flag
void setAppearanceFlag( bool flag ) { mInAppearance = flag; }
bool getAppearanceFlag() { return mInAppearance; }
U32 getAppearanceSerialNum() const { return mAppearanceSerialNum; }
void setAppearanceSerialNum( U32 num ) { mAppearanceSerialNum = num; }
@@ -293,8 +289,6 @@ protected:
U32 mSkeletonSerialNum;
LLAnimPauseRequest mPauseRequest;
BOOL mInAppearance;
private:
// visual parameter stuff
typedef std::map<S32, LLVisualParam *> visual_param_index_map_t;

14
indra/llcharacter/llheadrotmotion.cpp
View File

@@ -510,20 +510,6 @@ BOOL LLEyeMotion::onUpdate(F32 time, U8* joint_mask)
vergence_quat.transQuat();
right_eye_rot = vergence_quat * eye_jitter_rot * right_eye_rot;
//if in appearance, set the eyes straight forward
if(mCharacter->getAppearanceFlag()) // no idea why this variable is reversed
{
LLVector3 forward(1.f, 0.0, 0.0);
LLVector3 left;
LLVector3 up;
left.setVec(forward % forward);
up.setVec(forward % left);
target_eye_rot = LLQuaternion(forward, left, up);
mLeftEyeState->setRotation( target_eye_rot );
mRightEyeState->setRotation( target_eye_rot );
return TRUE;
}
mLeftEyeState->setRotation( left_eye_rot );
mRightEyeState->setRotation( right_eye_rot );