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 crazy camera stack issues (cherry picked from commit 6ece5e6341)

Browse Source 
Author: Adam Johnson <AdamJohnso@gmail.com>
Date:   Fri Feb 8 00:15:56 2013 -0500

    Fix crazy camera stack issues

    Turns out, it was an artifact of us suspending the simulation during links
    and partly because of Cyan's late adding of the avatar controller to the
    sim. Now, we add the avatar as soon as the age data is loaded. This causes
    the camera stack to be populated with whatever garbage PhysX decides on,
    then xJourneyClothsGen2 is free to set the real stack after we get all the
    SDL from the server.

    Verified to fix Teledahn oddness and not display a regression in Kemo.
This commit is contained in:
Adam Johnson
2020-04-15 10:53:31 -06:00
committed by rarified
parent ab400f11a7
commit f1ed7f4b7d
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.cpp
View File

@ -1683,7 +1683,7 @@ void plVirtualCam1::PushCamera(plCameraModifier1* pCam, hsBool bDefault)
void plVirtualCam1::PopCamera(plCameraModifier1* pCam) void plVirtualCam1::PopCamera(plCameraModifier1* pCam)
{ {
// sanity / new default camera check // sanity / new default camera check
if (fCameraStack.Count() <= 1) if (fCameraStack.Count() <= 1)
return; return;

16
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp
View File

@ -1387,12 +1387,20 @@ hsBool plArmatureMod::MsgReceive(plMessage* msg)
{ {
// only the local player gets these // only the local player gets these
NetworkSynch(hsTimer::GetSysSeconds(), true); NetworkSynch(hsTimer::GetSysSeconds(), true);
EnablePhysics(true);
} else } else
fIsLinkedIn = false; fIsLinkedIn = false;
return true; return true;
} }
plAgeLoaded2Msg *agePreLoadMsg = plAgeLoaded2Msg::ConvertNoRef(msg);
if (agePreLoadMsg)
{
// all the age data is loaded -- add our physical controller to the age
ValidatePhysics();
EnablePhysics(true);
return true;
}
plAnimCmdMsg *cmdMsg = plAnimCmdMsg::ConvertNoRef(msg); plAnimCmdMsg *cmdMsg = plAnimCmdMsg::ConvertNoRef(msg);
if (cmdMsg) if (cmdMsg)
{ {
@ -1668,7 +1676,9 @@ void plArmatureMod::AddTarget(plSceneObject* so)
// non-players will unregister when they learn the truth. // non-players will unregister when they learn the truth.
if (IsLocallyOwned()) if (IsLocallyOwned())
plgDispatch::Dispatch()->RegisterForExactType(plAgeLoadedMsg::Index(), GetKey()); plgDispatch::Dispatch()->RegisterForExactType(plAgeLoadedMsg::Index(), GetKey());
plgDispatch::Dispatch()->RegisterForType(plAgeLoaded2Msg::Index(), GetKey());
// attach a clothingSDLModifier to handle clothing saveState // attach a clothingSDLModifier to handle clothing saveState
delete fClothingSDLMod; delete fClothingSDLMod;
fClothingSDLMod = TRACKED_NEW plClothingSDLModifier; fClothingSDLMod = TRACKED_NEW plClothingSDLModifier;

7
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp
View File

@ -317,9 +317,7 @@ void plSimulationMgr::Init()
hsAssert(!gTheInstance, "Initializing the sim when it's already been done"); hsAssert(!gTheInstance, "Initializing the sim when it's already been done");
gTheInstance = TRACKED_NEW plSimulationMgr(); gTheInstance = TRACKED_NEW plSimulationMgr();
if (gTheInstance->InitSimulation()) if (gTheInstance->InitSimulation())
{
gTheInstance->RegisterAs(kSimulationMgr_KEY); gTheInstance->RegisterAs(kSimulationMgr_KEY);
}
else else
{ {
// There was an error when creating the PhysX simulation // There was an error when creating the PhysX simulation
@ -769,11 +767,6 @@ void plSimulationMgr::ISendUpdates()
} }
} }
hsBool plSimulationMgr::MsgReceive(plMessage *msg)
{
return hsKeyedObject::MsgReceive(msg);
}
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// //
// RESOLUTION & TIMEOUT PARAMETERS // RESOLUTION & TIMEOUT PARAMETERS

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.h
View File

@ -75,8 +75,6 @@ public:
// Advance the simulation by the given number of seconds // Advance the simulation by the given number of seconds
void Advance(float delSecs); void Advance(float delSecs);
hsBool MsgReceive(plMessage* msg);
// The simulation won't run at all if it is suspended // The simulation won't run at all if it is suspended
void Suspend() { fSuspended = true; } void Suspend() { fSuspended = true; }
void Resume() { fSuspended = false; } void Resume() { fSuspended = false; }
@ -211,4 +209,4 @@ inline void SimLog(const char *str, ...)
#endif #endif
#endif #endif