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

Renamed boolean to something non-opposite of what it actually means.

Browse Source
This commit is contained in:
Shyotl
2011-10-10 10:07:30 -05:00
parent c9d480a6bf
commit a3aec92396
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llphysicsmotion.cpp
View File

@@ -44,7 +44,7 @@
#include "llcharacter.h" #include "llcharacter.h"
#include "llviewercontrol.h" #include "llviewercontrol.h"
#include "llviewervisualparam.h" #include "llviewervisualparam.h"
#include "llvoavatar.h" #include "llvoavatarself.h"
#include "lldriverparam.h" #include "lldriverparam.h"
typedef std::map<std::string, std::string> controller_map_t; typedef std::map<std::string, std::string> controller_map_t;
@@ -497,9 +497,9 @@ BOOL LLPhysicsMotionController::onUpdate(F32 time, U8* joint_mask)
{ {
// Skip if disabled globally. // Skip if disabled globally.
static const LLCachedControl<bool> avatar_physics("AvatarPhysics",false); static const LLCachedControl<bool> avatar_physics("AvatarPhysics",false);
bool supports_physics = !avatar_physics || (!((LLVOAvatar*)mCharacter)->isSelf() && !((LLVOAvatar*)mCharacter)->mSupportsPhysics); bool physics_unsupported = !avatar_physics || (!((LLVOAvatar*)mCharacter)->isSelf() && !((LLVOAvatar*)mCharacter)->mSupportsPhysics);
//Treat lod 0 as AvatarPhyiscs:FALSE. AvatarPhyiscs setting is superfluous unless we decide to hook it into param sending. //Treat lod 0 as AvatarPhyiscs:FALSE. AvatarPhyiscs setting is superfluous unless we decide to hook it into param sending.
if (supports_physics || !LLVOAvatar::sPhysicsLODFactor) if (physics_unsupported || !LLVOAvatar::sPhysicsLODFactor)
{ {
if(!mIsDefault) if(!mIsDefault)
{ {
@@ -510,10 +510,12 @@ BOOL LLPhysicsMotionController::onUpdate(F32 time, U8* joint_mask)
} }
mCharacter->updateVisualParams(); mCharacter->updateVisualParams();
} }
if(!supports_physics) //Only use emerald physics if avatarphysiscs is really off, or the client doesn't seem to support new physics. if(physics_unsupported) //Only use emerald physics if avatarphysiscs is really off, or the client doesn't seem to support new physics.
((LLVOAvatar*)mCharacter)->idleUpdateBoobEffect(); //Fall back to emerald physics ((LLVOAvatar*)mCharacter)->idleUpdateBoobEffect(); //Fall back to emerald physics
return TRUE; return TRUE;
} }
if(!avatar_physics)
return TRUE;
mIsDefault = false; mIsDefault = false;
@@ -758,7 +760,7 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
const F32 area_for_this_setting = area_for_max_settings + (area_for_min_settings-area_for_max_settings)*(1.0-lod_factor); const F32 area_for_this_setting = area_for_max_settings + (area_for_min_settings-area_for_max_settings)*(1.0-lod_factor);
const F32 pixel_area = (F32) sqrt(mCharacter->getPixelArea()); const F32 pixel_area = (F32) sqrt(mCharacter->getPixelArea());
const BOOL is_self = (dynamic_cast<LLVOAvatar *>(mCharacter) != NULL && ((LLVOAvatar*)mCharacter)->isSelf()); const BOOL is_self = (dynamic_cast<LLVOAvatarSelf *>(mCharacter) != NULL);
if ((pixel_area > area_for_this_setting) || is_self) if ((pixel_area > area_for_this_setting) || is_self)
{ {
const F32 position_diff_local = llabs(mPositionLastUpdate_local-position_new_local_clamped); const F32 position_diff_local = llabs(mPositionLastUpdate_local-position_new_local_clamped);