mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 10:37:41 -04:00
Files for Allowing disabling avatar panic links
This commit is contained in:
@ -499,6 +499,22 @@ void plVirtualCam1::SetCutNextTrans()
|
||||
#endif
|
||||
}
|
||||
|
||||
void plVirtualCam1::SetCutNext()
|
||||
{
|
||||
plCameraModifier1* cam = GetCurrentCamera();
|
||||
if (cam && cam->GetBrain()) {
|
||||
cam->GetBrain()->SetFlags(plCameraBrain1::kCutPosOnce);
|
||||
cam->GetBrain()->SetFlags(plCameraBrain1::kCutPOAOnce);
|
||||
}
|
||||
|
||||
SetFlags(kCutNextTrans);
|
||||
SetRender(true);
|
||||
|
||||
#ifdef STATUS_LOG
|
||||
camLog->AddLineF("Set Camera to cut on next frame");
|
||||
#endif
|
||||
}
|
||||
|
||||
void plVirtualCam1::SetRender(hsBool render)
|
||||
{
|
||||
fFlags.SetBit(kRender,render);
|
||||
|
@ -85,6 +85,7 @@ public:
|
||||
enum flags
|
||||
{
|
||||
kSetFOV,
|
||||
/** Forces the next camera transition to be cut. */
|
||||
kCutNextTrans,
|
||||
kRender,
|
||||
kRegionIgnore,
|
||||
@ -145,6 +146,7 @@ public:
|
||||
hsPoint3 GetCameraPOA() { return fOutputPOA; }
|
||||
hsVector3 GetCameraUp() { return fOutputUp; }
|
||||
void SetCutNextTrans(); // used when player warps into a new camera region
|
||||
void SetCutNext();
|
||||
|
||||
const hsMatrix44 GetCurrentMatrix() { return fMatrix; }
|
||||
static plVirtualCam1* Instance() { return fInstance; }
|
||||
|
@ -1978,3 +1978,12 @@ hsBool cyAvatar::IsCurrentBrainHuman()
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void cyAvatar::SetDontPanicLink(bool value)
|
||||
{
|
||||
if (!fRecvr.empty()) {
|
||||
plArmatureMod* mod = plAvatarMgr::FindAvatar(fRecvr[0]);
|
||||
if (mod)
|
||||
mod->SetDontPanicLinkFlag(value);
|
||||
}
|
||||
}
|
||||
|
@ -566,6 +566,14 @@ public:
|
||||
|
||||
static hsBool IsCurrentBrainHuman();
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Function : SetDontPanicLink
|
||||
// PARAMETERS : value
|
||||
//
|
||||
// PURPOSE : Disables panic linking to Personal Age (warps the avatar back to the start instead)
|
||||
//
|
||||
void SetDontPanicLink(bool value);
|
||||
};
|
||||
|
||||
#endif // cyAvatar_h
|
||||
|
@ -597,6 +597,18 @@ PYTHON_METHOD_DEFINITION(ptAvatar, playSimpleAnimation, args)
|
||||
PYTHON_RETURN_NONE;
|
||||
}
|
||||
|
||||
PYTHON_METHOD_DEFINITION(ptAvatar, setDontPanicLink, args)
|
||||
{
|
||||
bool value;
|
||||
if (!PyArg_ParseTuple(args, "b", &value)) {
|
||||
PyErr_SetString(PyExc_TypeError, "setDontPanicLink expects a boolean");
|
||||
PYTHON_RETURN_ERROR;
|
||||
}
|
||||
|
||||
self->fThis->SetDontPanicLink(value);
|
||||
PYTHON_RETURN_NONE;
|
||||
}
|
||||
|
||||
PYTHON_START_METHODS_TABLE(ptAvatar)
|
||||
PYTHON_METHOD(ptAvatar, netForce, "Params: forceFlag\nSpecify whether this object needs to use messages that are forced to the network\n"
|
||||
"- This is to be used if your Python program is running on only one client\n"
|
||||
@ -651,6 +663,8 @@ PYTHON_START_METHODS_TABLE(ptAvatar)
|
||||
PYTHON_METHOD(ptAvatar, unRegisterForBehaviorNotify, "Params: selfKey\nThis will unregister behavior notifications"),
|
||||
|
||||
PYTHON_METHOD(ptAvatar, playSimpleAnimation, "Params: animName\nPlay simple animation on avatar"),
|
||||
|
||||
PYTHON_METHOD(ptAvatar, setDontPanicLink, "Params: value\nDisables panic linking to Personal Age (warps the avatar back to the start instead)"),
|
||||
PYTHON_END_METHODS_TABLE;
|
||||
|
||||
PYTHON_GLOBAL_METHOD_DEFINITION(PtSetBehaviorLoopCount, args, "Params: behaviorKey,stage,loopCount,netForce\nThis will set the loop count for a particular stage in a multistage behavior")
|
||||
|
@ -865,10 +865,10 @@ void plArmatureMod::SpawnAt(int spawnNum, double time)
|
||||
w2l.RemoveScale();
|
||||
ci->SetTransform(l2w, w2l);
|
||||
ci->FlushTransform();
|
||||
|
||||
if (plVirtualCam1::Instance())
|
||||
plVirtualCam1::Instance()->SetCutNextTrans();
|
||||
|
||||
|
||||
if (IsLocalAvatar() && plVirtualCam1::Instance())
|
||||
plVirtualCam1::Instance()->SetCutNext();
|
||||
|
||||
if (GetFollowerParticleSystemSO())
|
||||
{
|
||||
// Since particles are in world space, if we've got some surrounding us, we've got to translate them to compensate for our warp.
|
||||
|
@ -234,7 +234,9 @@ public:
|
||||
virtual void PanicLink(hsBool playLinkOutAnim = true);
|
||||
virtual void PersonalLink();
|
||||
|
||||
virtual bool ToggleDontPanicLinkFlag() { fDontPanicLink = fDontPanicLink ? false : true; return fDontPanicLink; }
|
||||
bool ToggleDontPanicLinkFlag() { fDontPanicLink = fDontPanicLink ? false : true; return fDontPanicLink; }
|
||||
|
||||
void SetDontPanicLinkFlag(bool value) { fDontPanicLink = value; }
|
||||
|
||||
int GetBrainCount();
|
||||
plArmatureBrain *GetNextBrain(plArmatureBrain *brain);
|
||||
|
Reference in New Issue
Block a user