OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix plAvatar.

Browse Source
This commit is contained in:
Darryl Pogue
2012-01-29 01:46:06 -08:00
parent b1fb2e6dd0
commit 745378f9be
14 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp
View File

@ -438,9 +438,9 @@ void plArmatureModBase::AdjustLOD()
hsPoint3 delta = ourPos - camPos;
float distanceSquared = delta.MagnitudeSquared();
if (distanceSquared < fLODDistance * fLODDistance)
SetLOD(__max(0, fMinLOD));
SetLOD(max(0, fMinLOD));
else if (distanceSquared < fLODDistance * fLODDistance * 4.0)
SetLOD(__max(1, fMinLOD));
SetLOD(max(1, fMinLOD));
else
SetLOD(2);
}
@ -1102,7 +1102,7 @@ hsBool plArmatureMod::MsgReceive(plMessage* msg)
plCorrectionMsg *corMsg = plCorrectionMsg::ConvertNoRef(msg);
if (corMsg)
{
hsMatrix44 &correction = corMsg->fWorldToLocal * GetTarget(0)->GetLocalToWorld();
hsMatrix44 correction = corMsg->fWorldToLocal * GetTarget(0)->GetLocalToWorld();
if (fBoneRootAnimator)
fBoneRootAnimator->SetCorrection(correction);
}
@ -2678,14 +2678,14 @@ void plArmatureMod::DumpToDebugDisplay(int &x, int &y, int lineHeight, char *str
hsMatrix44 l2w = SO->GetLocalToWorld();
hsPoint3 worldPos = l2w.GetTranslate();
char *opaque = IsOpaque() ? "yes" : "no";
const char *opaque = IsOpaque() ? "yes" : "no";
sprintf(strBuf, "position(world): %.2f, %.2f, %.2f Opaque: %3s",
worldPos.fX, worldPos.fY, worldPos.fZ, opaque);
debugTxt.DrawString(x, y, strBuf);
y += lineHeight;
hsPoint3 kPos;
char *kinematic = "n.a.";
const char *kinematic = "n.a.";
const char* frozen = "n.a.";
if (fController)
{

2
Sources/Plasma/PubUtilLib/plAvatar/plAvBehaviors.cpp
View File

@ -104,7 +104,7 @@ void plArmatureBehavior::DumpDebug(int &x, int &y, int lineHeight, char *strBuf,
float strength = GetStrength();
const char *onOff = strength > 0 ? "on" : "off";
char blendBar[11] = "||||||||||";
int bars = (int)__min(10 * strength, 10);
int bars = (int)min(10 * strength, 10);
blendBar[bars] = '\0';
if (fAnim)

4
Sources/Plasma/PubUtilLib/plAvatar/plAvBrainCritter.cpp
View File

@ -330,8 +330,8 @@ void plAvBrainCritter::SightCone(float coneRad)
fSightConeAngle = coneRad;
// calculate the minimum dot product for the cone of sight (angle/2 vector dotted with straight ahead)
hsVector3 straightVector(1, 0, 0), viewVector(1, 0, 0);
hsQuat rotation(fSightConeAngle/2, &hsVector3(0, 1, 0));
hsVector3 straightVector(1, 0, 0), viewVector(1, 0, 0), up(0, 1, 0);
hsQuat rotation(fSightConeAngle/2, &up);
viewVector = hsVector3(rotation.Rotate(&viewVector));
viewVector.Normalize();
fSightConeDotMin = straightVector * viewVector;

2
Sources/Plasma/PubUtilLib/plAvatar/plAvBrainSwim.cpp
View File

@ -183,7 +183,7 @@ public:
// hsAssert(0, "fixme physx");
float oldSpeed = fabs(fSwimBrain->fCallbackAction->GetTurnStrength());
float thisInc = elapsed * incPerSec;
float newSpeed = __min(oldSpeed + thisInc, maxTurnSpeed);
float newSpeed = min(oldSpeed + thisInc, maxTurnSpeed);
fSwimBrain->fCallbackAction->SetTurnStrength(newSpeed * fAvMod->GetKeyTurnStrength() + fAvMod->GetAnalogTurnStrength());
// the turn is actually applied during PhysicsUpdate
}

8
Sources/Plasma/PubUtilLib/plAvatar/plAvCallbackAction.cpp
View File

@ -48,9 +48,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plPhysicalControllerCore.h"
// Generic geom utils.
hsBool LinearVelocity(hsVector3 &outputV, float elapsed, hsMatrix44 &prevMat, hsMatrix44 &curMat);
void AngularVelocity(float &outputV, float elapsed, hsMatrix44 &prevMat, hsMatrix44 &curMat);
float AngleRad2d (float x1, float y1, float x3, float y3);
static hsBool LinearVelocity(hsVector3 &outputV, float elapsed, hsMatrix44 &prevMat, hsMatrix44 &curMat);
static void AngularVelocity(float &outputV, float elapsed, hsMatrix44 &prevMat, hsMatrix44 &curMat);
static float AngleRad2d (float x1, float y1, float x3, float y3);
inline hsVector3 GetYAxis(hsMatrix44 &mat)
{
return hsVector3(mat.fMap[1][0], mat.fMap[1][1], mat.fMap[1][2]);
@ -195,7 +195,7 @@ bool plWalkingController::EnableControlledFlight(bool status)
fWaitingForGround = true;
}
else
fControlledFlight = __max(--fControlledFlight, 0);
fControlledFlight = max(--fControlledFlight, 0);
return status;
}

2
Sources/Plasma/PubUtilLib/plAvatar/plAvLadderModifier.h
View File

@ -100,4 +100,4 @@ protected:
// Don't try to trigger during this time.
};
#endif plAvLadderMod_INC
#endif //plAvLadderMod_INC

3
Sources/Plasma/PubUtilLib/plAvatar/plAvTaskSeek.cpp
View File

@ -314,7 +314,8 @@ void plAvTaskSeek::LeaveAge(plArmatureMod *avatar)
hsBool plAvTaskSeek::IAnalyze(plArmatureMod *avatar)
{
avatar->GetPositionAndRotationSim(&fPosition, &fRotation);
fGoalVec.Set(&(hsScalarTriple)(fSeekPos - fPosition));
hsScalarTriple tmp(fSeekPos - fPosition);
fGoalVec.Set(&tmp);
hsVector3 normalizedGoalVec(fGoalVec);
normalizedGoalVec.Normalize();

2
Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp
View File

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsTemplates.h"
#include "hsStream.h"
#include "hsResMgr.h"
#include "plGDispatch.h"
#include "plgDispatch.h"
#include "pnKeyedObject/plKey.h"
#include "pnKeyedObject/plFixedKey.h"
#include "pnSceneObject/plSceneObject.h"

2
Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp
View File

@ -636,7 +636,7 @@ void plAvatarMgr::RemoveOneShot(plOneShotMod *oneshot)
if(oneshot == thisOneshot)
{
i = fOneShots.erase(i);
fOneShots.erase(i);
// destroy our copy of the target name
delete[] name;
} else {

2
Sources/Plasma/PubUtilLib/plAvatar/plClothingSDLModifier.h
View File

@ -99,7 +99,7 @@ public:
static void HandleSingleSDR(const plStateDataRecord *sdr, plClothingOutfit *clothing = nil, plClosetItem *closetItem = nil);
static void PutSingleItemIntoSDR(plClosetItem *item, plStateDataRecord *sdr);
static const plClothingSDLModifier *plClothingSDLModifier::FindClothingSDLModifier(const plSceneObject *obj);
static const plClothingSDLModifier *FindClothingSDLModifier(const plSceneObject *obj);
};
#endif // plClothingSDLModifier_inc

4
Sources/Plasma/PubUtilLib/plAvatar/plPhysicalControllerCore.cpp
View File

@ -48,8 +48,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plArmatureMod.h" // for LOS enum type
#include "plMatrixChannel.h"
#include "hsTimer.h"
#include "plPhysx/plSimulationMgr.h"
#include "plPhysx/plPXPhysical.h"
#include "plPhysX/plSimulationMgr.h"
#include "plPhysX/plPXPhysical.h"
#include "pnMessage/plSetNetGroupIDMsg.h"
#define kSWIMRADIUS 1.1f
#define kSWIMHEIGHT 2.8f

2
Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.h
View File

@ -158,7 +158,7 @@ public:
plPointBlend(plPointChannel *channelA, plPointChannel *channelB, plScalarChannel *channelBias);
virtual ~plPointBlend();
plAGChannel * plPointBlend::Remove(plAGChannel *srceToRemove);
plAGChannel * Remove(plAGChannel *srceToRemove);
const plPointChannel * GetPointChannelA() const { return fPointA; }
void SetPointChannelA(plPointChannel *the_PointA) { fPointA = the_PointA; }

4
Sources/Plasma/PubUtilLib/plAvatar/plSittingModifier.h
View File

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
/////////////////////////////////////////////////////////////////////////////////////////
#include "pnModifier/plSingleModifier.h" // base class
#include "pnKeyedobject/plKey.h" // for the notification keys
#include "pnKeyedObject/plKey.h" // for the notification keys
#include "hsTemplates.h" // for the array they're kept in
/////////////////////////////////////////////////////////////////////////////////////////
@ -125,4 +125,4 @@ protected:
#endif plSittingModifier_inc
#endif //plSittingModifier_inc

6
Sources/Plasma/PubUtilLib/plAvatar/plSwimRegion.cpp
View File

@ -136,7 +136,8 @@ void plSwimCircularCurrentRegion::GetCurrent(plPhysicalControllerCore *physical,
}
hsPoint3 center, pos;
center.Set(&fCurrentSO->GetLocalToWorld().GetTranslate());
hsScalarTriple xlate = fCurrentSO->GetLocalToWorld().GetTranslate();
center.Set(&xlate);
plKey worldKey = physical->GetSubworld();
if (worldKey)
@ -254,7 +255,8 @@ void plSwimStraightCurrentRegion::GetCurrent(plPhysicalControllerCore *physical,
hsPoint3 center, pos;
hsVector3 current = fCurrentSO->GetLocalToWorld() * hsVector3(0.f, 1.f, 0.f);
center.Set(&fCurrentSO->GetLocalToWorld().GetTranslate());
hsScalarTriple xlate = fCurrentSO->GetLocalToWorld().GetTranslate();
center.Set(&xlate);
physical->GetPositionSim(pos);
plKey worldKey = physical->GetSubworld();