OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-20 04:09:16 +00:00
Code Releases Activity

Merge remote-tracking branch 'origin/master' into plString

Browse Source 
Conflicts:
	Sources/Plasma/CoreLib/hsStream.h
	Sources/Plasma/FeatureLib/pfAudio/plListener.cpp
	Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
	Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
	Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
	Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
	Sources/Plasma/FeatureLib/pfPython/cyMisc.h
	Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp
	Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp
	Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h
	Sources/Plasma/FeatureLib/pfPython/pyImage.cpp
	Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp
	Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h
	Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
	Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp
	Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.cpp
	Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.h
	Sources/Plasma/NucleusLib/pnMessage/plMessage.h
	Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h
	Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp
	Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp
	Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp
	Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp
	Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
	Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
	Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h
	Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp
	Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h
	Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h
	Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp
	Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
	Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp
	Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp
	Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h
	Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp
	Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.h
	Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp
	Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h
	Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp
This commit is contained in:
Michael Hansen
2012-01-28 17:20:01 -08:00
parent e34414889f 7c2cb067ad
commit c339f947ba
1722 changed files with 24149 additions and 27599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ plAvatarMgr * plAvatarMgr::GetInstance()
{
if(!fInstance)
{
fInstance = TRACKED_NEW plAvatarMgr;
fInstance = new plAvatarMgr;
fInstance->RegisterAs(kAvatarMgr_KEY);
fInstance->Ref();
}
@ -206,7 +206,7 @@ plKey plAvatarMgr::LoadAvatar(const char *name, const char *accountName, bool is
if (loc.IsValid())
{
plUoid uID(loc, plSceneObject::Index(), theName);
plLoadAvatarMsg *cloneMsg = TRACKED_NEW plLoadAvatarMsg (uID, requestor, 0, isPlayer, spawnPoint, initialTask, userStr);
plLoadAvatarMsg *cloneMsg = new plLoadAvatarMsg (uID, requestor, 0, isPlayer, spawnPoint, initialTask, userStr);
result = cloneMsg->GetCloneKey();
// the clone message is automatically addressed to the net client manager
@ -220,7 +220,7 @@ plKey plAvatarMgr::LoadAvatar(const char *name, const char *accountName, bool is
void plAvatarMgr::UnLoadAvatar(plKey avatarKey, bool isPlayer)
{
hsBool isLoading = false;
plLoadAvatarMsg *msg = TRACKED_NEW plLoadAvatarMsg(avatarKey, GetKey(), 0, isPlayer, isLoading);
plLoadAvatarMsg *msg = new plLoadAvatarMsg(avatarKey, GetKey(), 0, isPlayer, isLoading);
msg->Send();
}
@ -234,7 +234,7 @@ void plAvatarMgr::PropagateLocalPlayer(int spawnPoint)
plKey requestor = GetKey();
bool isPlayer = true;
hsBool isLoading = true;
plLoadAvatarMsg *msg = TRACKED_NEW plLoadAvatarMsg(playerKey, requestor, 0, isPlayer, isLoading);
plLoadAvatarMsg *msg = new plLoadAvatarMsg(playerKey, requestor, 0, isPlayer, isLoading);
if (spawnPoint >= 0)
{
@ -263,7 +263,7 @@ bool plAvatarMgr::UnPropagateLocalPlayer()
plKey requestor = GetKey();
bool isPlayer = true;
hsBool isLoading = false;
plLoadAvatarMsg *msg = TRACKED_NEW plLoadAvatarMsg(playerKey, requestor, 0, isPlayer, isLoading);
plLoadAvatarMsg *msg = new plLoadAvatarMsg(playerKey, requestor, 0, isPlayer, isLoading);
msg->SetBCastFlag(plMessage::kLocalPropagate, false);
msg->Send();
return true;
@ -279,7 +279,7 @@ void plAvatarMgr::UnLoadRemotePlayer(plKey remotePlayer)
plKey requestor = GetKey();
bool isPlayer = true;
hsBool isLoading = false;
plLoadAvatarMsg * msg = TRACKED_NEW plLoadAvatarMsg(remotePlayer, requestor, 0, isPlayer, isLoading);
plLoadAvatarMsg * msg = new plLoadAvatarMsg(remotePlayer, requestor, 0, isPlayer, isLoading);
// don't propagate over the network. this is just for removing our local version
msg->SetBCastFlag(plMessage::kNetPropagate, false);
@ -296,7 +296,7 @@ void plAvatarMgr::UnLoadLocalPlayer()
plKey mgrKey = GetKey();
bool isPlayer = true;
hsBool isLoading = false;
plLoadAvatarMsg *msg = TRACKED_NEW plLoadAvatarMsg(playerKey, mgrKey, 0, isPlayer, isLoading);
plLoadAvatarMsg *msg = new plLoadAvatarMsg(playerKey, mgrKey, 0, isPlayer, isLoading);
msg->Send();
}
}
@ -368,8 +368,8 @@ hsBool plAvatarMgr::HandleCoopMsg(plAvCoopMsg *msg)
{
plAvCoopMsg::Command cmd = msg->fCommand;
UInt32 id = msg->fInitiatorID;
UInt16 serial = msg->fInitiatorSerial;
uint32_t id = msg->fInitiatorID;
uint16_t serial = msg->fInitiatorSerial;
if(cmd == plAvCoopMsg::kStartNew)
{
@ -403,14 +403,14 @@ hsBool plAvatarMgr::HandleNotifyMsg(plNotifyMsg *msg)
proCoopEventData *ed = static_cast<proCoopEventData *>(msg->FindEventRecord(proEventData::kCoop));
if(ed)
{
UInt32 id = ed->fID;
UInt16 serial = ed->fSerial;
uint32_t id = ed->fID;
uint16_t serial = ed->fSerial;
return IPassMessageToActiveCoop(msg, id, serial);
}
return false;
}
hsBool plAvatarMgr::IPassMessageToActiveCoop(plMessage *msg, UInt32 id, UInt16 serial)
hsBool plAvatarMgr::IPassMessageToActiveCoop(plMessage *msg, uint32_t id, uint16_t serial)
{
plCoopMap::iterator i = fActiveCoops.find(id);
while(i != fActiveCoops.end() && (*i).first == id)
@ -467,7 +467,7 @@ void plAvatarMgr::IFinishLoadingAvatar(plLoadAvatarMsg *cloneMsg)
// *** might want to move this to the human brain so we can make sure the
// *** avatar is sufficiently initialized before anyone accesses him
bool isLocal = cloneMsg->GetOriginatingPlayerID() == plNetClientMgr::GetInstance()->GetPlayerID();
plPlayerPageMsg* pageM = TRACKED_NEW plPlayerPageMsg;
plPlayerPageMsg* pageM = new plPlayerPageMsg;
pageM->SetBCastFlag(plMessage::kBCastByExactType);
pageM->fLocallyOriginated = isLocal;
pageM->fPlayer = avatarKey;
@ -478,7 +478,7 @@ void plAvatarMgr::IFinishLoadingAvatar(plLoadAvatarMsg *cloneMsg)
// This can probably be replaced by the plPlayerPageMsg:
// ...keeping for the moment for compatibility
plMemberUpdateMsg* mu = TRACKED_NEW plMemberUpdateMsg;
plMemberUpdateMsg* mu = new plMemberUpdateMsg;
mu->Send();
}
@ -494,7 +494,7 @@ void plAvatarMgr::IFinishUnloadingAvatar(plLoadAvatarMsg *cloneMsg)
plKey avatar = cloneMsg->GetCloneKey();
bool isLocal = cloneMsg->GetOriginatingPlayerID() == plNetClientMgr::GetInstance()->GetPlayerID();
plPlayerPageMsg *pageM = TRACKED_NEW plPlayerPageMsg;
plPlayerPageMsg *pageM = new plPlayerPageMsg;
pageM->SetBCastFlag(plMessage::kBCastByExactType);
pageM->fLocallyOriginated = isLocal;
pageM->fPlayer = avatar;
@ -506,7 +506,7 @@ void plAvatarMgr::IFinishUnloadingAvatar(plLoadAvatarMsg *cloneMsg)
}
// check on this...can it be subsumed by plPlayerPageMsg ?
plMemberUpdateMsg *mu = TRACKED_NEW plMemberUpdateMsg;
plMemberUpdateMsg *mu = new plMemberUpdateMsg;
mu->Send();
}
@ -726,7 +726,7 @@ plArmatureMod* plAvatarMgr::FindAvatar(plKey& avatarKey)
return nil;
}
plArmatureMod* plAvatarMgr::FindAvatarByPlayerID(UInt32 pid)
plArmatureMod* plAvatarMgr::FindAvatarByPlayerID(uint32_t pid)
{
plAvatarVec::iterator it;
for (it = fAvatars.begin(); it != fAvatars.end(); ++it)
@ -803,7 +803,7 @@ int plAvatarMgr::FindSpawnPoint( const char *name ) const
return -1;
}
int plAvatarMgr::WarpPlayerToAnother(hsBool iMove, UInt32 remoteID)
int plAvatarMgr::WarpPlayerToAnother(hsBool iMove, uint32_t remoteID)
{
plNetTransport &mgr = plNetClientMgr::GetInstance()->TransportMgr();
plNetTransportMember *mbr = mgr.GetMember(mgr.FindMember(remoteID));
@ -822,7 +822,7 @@ int plAvatarMgr::WarpPlayerToAnother(hsBool iMove, UInt32 remoteID)
if (!localSO)
return plCCRError::kNilLocalAvatar;
plWarpMsg *warp = TRACKED_NEW plWarpMsg(nil, (iMove ? localSO->GetKey() : remoteSO->GetKey()),
plWarpMsg *warp = new plWarpMsg(nil, (iMove ? localSO->GetKey() : remoteSO->GetKey()),
plWarpMsg::kFlushTransform, (iMove ? remoteSO->GetLocalToWorld() : localSO->GetLocalToWorld()));
warp->SetBCastFlag(plMessage::kNetPropagate);
@ -831,7 +831,7 @@ int plAvatarMgr::WarpPlayerToAnother(hsBool iMove, UInt32 remoteID)
return hsOK;
}
int plAvatarMgr::WarpPlayerToXYZ(hsScalar x, hsScalar y, hsScalar z)
int plAvatarMgr::WarpPlayerToXYZ(float x, float y, float z)
{
plSceneObject *localSO = plSceneObject::ConvertNoRef(plNetClientMgr::GetInstance()->GetLocalPlayer());
if (!localSO)
@ -841,14 +841,14 @@ int plAvatarMgr::WarpPlayerToXYZ(hsScalar x, hsScalar y, hsScalar z)
hsVector3 v(x, y, z);
m.SetTranslate(&v);
plWarpMsg *warp = TRACKED_NEW plWarpMsg(nil, localSO->GetKey(), plWarpMsg::kFlushTransform, m);
plWarpMsg *warp = new plWarpMsg(nil, localSO->GetKey(), plWarpMsg::kFlushTransform, m);
warp->SetBCastFlag(plMessage::kNetPropagate);
plgDispatch::MsgSend(warp);
return hsOK;
}
int plAvatarMgr::WarpPlayerToXYZ(int pid, hsScalar x, hsScalar y, hsScalar z)
int plAvatarMgr::WarpPlayerToXYZ(int pid, float x, float y, float z)
{
plNetClientMgr* nc=plNetClientMgr::GetInstance();
plNetTransportMember* mbr=nc->TransportMgr().GetMember(nc->TransportMgr().FindMember(pid));
@ -861,7 +861,7 @@ int plAvatarMgr::WarpPlayerToXYZ(int pid, hsScalar x, hsScalar y, hsScalar z)
hsVector3 v(x, y, z);
m.SetTranslate(&v);
plWarpMsg *warp = TRACKED_NEW plWarpMsg(nil, player->GetKey(), 0, m);
plWarpMsg *warp = new plWarpMsg(nil, player->GetKey(), 0, m);
warp->SetBCastFlag(plMessage::kNetPropagate);
plgDispatch::MsgSend(warp);
@ -887,7 +887,7 @@ void plAvatarMgr::RemoveMaintainersMarker(plMaintainersMarkerModifier *mm)
void plAvatarMgr::PointToDniCoordinate(hsPoint3 pt, plDniCoordinateInfo* ret)
{
int count = fMaintainersMarkers.Count();
// plDniCoordinateInfo ret = TRACKED_NEW plDniCoordinateInfo;
// plDniCoordinateInfo ret = new plDniCoordinateInfo;
if (count > 0)
{
@ -950,10 +950,10 @@ void plAvatarMgr::PointToDniCoordinate(hsPoint3 pt, plDniCoordinateInfo* ret)
hsVector3 retVec(pt - retPoint);
retVec.Normalize();
hsScalar dotView = retVec * zeroVec;
hsScalar dotRight = retVec * zeroRight;
float dotView = retVec * zeroVec;
float dotRight = retVec * zeroRight;
hsScalar deg = acosf(dotView);
float deg = acosf(dotView);
deg*=(180/3.141592);
// account for being > 180
if (dotRight < 0.0f)
@ -995,37 +995,37 @@ void plAvatarMgr::OfferLinkingBook(plKey hostKey, plKey guestKey, plMessage *lin
{
// make the host brain
plAvBrainCoop * brainH = TRACKED_NEW plAvBrainCoop(plAvBrainGeneric::kExitNormal, 3.0, 3.0, plAvBrainGeneric::kMoveRelative, guestKey);
plAvBrainCoop * brainH = new plAvBrainCoop(plAvBrainGeneric::kExitNormal, 3.0, 3.0, plAvBrainGeneric::kMoveRelative, guestKey);
plAnimStage *hostOffer = TRACKED_NEW plAnimStage("BookOffer", plAnimStage::kNotifyAdvance); // autoforward, autoadvance
plAnimStage *hostOffer = new plAnimStage("BookOffer", plAnimStage::kNotifyAdvance); // autoforward, autoadvance
// repeats until the guest brain tells us that it's done
plAnimStage *hostIdle = TRACKED_NEW plAnimStage("BookOfferIdle", plAnimStage::kNotifyEnter, plAnimStage::kForwardAuto, plAnimStage::kBackNone,
plAnimStage *hostIdle = new plAnimStage("BookOfferIdle", plAnimStage::kNotifyEnter, plAnimStage::kForwardAuto, plAnimStage::kBackNone,
plAnimStage::kAdvanceNone, plAnimStage::kRegressNone, -1);
plAnimStage *hostFinish = TRACKED_NEW plAnimStage("BookOfferFinish", plAnimStage::kNotifyAdvance); // autoforward, autoadvance
plAnimStage *hostFinish = new plAnimStage("BookOfferFinish", plAnimStage::kNotifyAdvance); // autoforward, autoadvance
brainH->AddStage(hostOffer);
brainH->AddStage(hostIdle);
brainH->AddStage(hostFinish);
UInt32 hostID = brainH->GetInitiatorID();
UInt32 hostSerial = brainH->GetInitiatorSerial();
uint32_t hostID = brainH->GetInitiatorID();
uint32_t hostSerial = brainH->GetInitiatorSerial();
// make the guest brain
plAvBrainCoop * brainG = TRACKED_NEW plAvBrainCoop(plAvBrainGeneric::kExitNormal, 3.0, 3.0, plAvBrainGeneric::kMoveRelative,
hostID, (UInt16)hostSerial, hostKey);
plAvBrainCoop * brainG = new plAvBrainCoop(plAvBrainGeneric::kExitNormal, 3.0, 3.0, plAvBrainGeneric::kMoveRelative,
hostID, (uint16_t)hostSerial, hostKey);
plAnimStage *guestAccept = TRACKED_NEW plAnimStage("BookAccept", plAnimStage::kNotifyAdvance);
plAnimStage *guestAcceptIdle = TRACKED_NEW plAnimStage("BookAcceptIdle", plAnimStage::kNotifyEnter, plAnimStage::kForwardAuto, plAnimStage::kBackNone,
plAnimStage *guestAccept = new plAnimStage("BookAccept", plAnimStage::kNotifyAdvance);
plAnimStage *guestAcceptIdle = new plAnimStage("BookAcceptIdle", plAnimStage::kNotifyEnter, plAnimStage::kForwardAuto, plAnimStage::kBackNone,
plAnimStage::kAdvanceNone, plAnimStage::kRegressNone, -1);
brainG->AddStage(guestAccept);
brainG->AddStage(guestAcceptIdle);
plCoopCoordinator *coord = TRACKED_NEW plCoopCoordinator(hostKey, guestKey, brainH, brainG, "Convergence", 1, 1, linkMsg, true);
plCoopCoordinator *coord = new plCoopCoordinator(hostKey, guestKey, brainH, brainG, "Convergence", 1, 1, linkMsg, true);
plAvCoopMsg *coMg = TRACKED_NEW plAvCoopMsg(hostKey, coord);
plAvCoopMsg *coMg = new plAvCoopMsg(hostKey, coord);
coMg->SetBCastFlag(plMessage::kNetPropagate);
coMg->SetBCastFlag(plMessage::kNetForce);