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

Remove PhysX Dependency from plExcludeRegionMod

Browse Source
This commit is contained in:
Adam Johnson
2013-05-20 20:33:22 -04:00
parent 99019becb0
commit 061f129e70
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Plasma/PubUtilLib/plModifier/CMakeLists.txt
View File

@ -4,7 +4,6 @@ include_directories("../../NucleusLib/inc")
include_directories("../../NucleusLib")
include_directories("../../PubUtilLib")
include_directories(${PHYSX_INCLUDE_DIRS})
include_directories(${OPENAL_INCLUDE_DIR})
set(plModifier_SOURCES

8
Sources/Plasma/PubUtilLib/plModifier/plExcludeRegionModifier.cpp
View File

@ -62,7 +62,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//for hack
#include "plPhysX/plPXPhysical.h"
#include "plPhysX/plPXPhysicalControllerCore.h"
#include <NxCapsule.h>
static plPhysical* GetPhysical(plSceneObject* obj)
{
if (obj)
@ -309,10 +309,8 @@ void plExcludeRegionModifier::IMoveAvatars()
int actualCount = plPXPhysicalControllerCore::GetControllersInThisSubWorld(phys->GetWorldKey(), numControllers, controllers);
for (int i=0;i<actualCount;i++)
{
NxCapsule cap;
controllers[i]->GetWorldSpaceCapsule(cap);
if(phys->OverlapWithCapsule(cap))
{
if (phys->OverlapWithController(controllers[i]))
{
plSceneObject* so = plSceneObject::ConvertNoRef(controllers[i]->GetOwner()->ObjectIsLoaded());
const plArmatureMod* constAvMod = (plArmatureMod*)so->GetModifierByType(plArmatureMod::Index());