mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Solid trace

Browse Source
This commit is contained in:
Jason Hooks 2012-04-21 16:57:46 -04:00
parent 16855291a7
commit 8ebae0b706
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwworld/physicssystem.cpp
View File

@ -27,7 +27,7 @@ namespace MWWorld
NifBullet::ManualBulletShapeLoader* shapeLoader = new NifBullet::ManualBulletShapeLoader(); NifBullet::ManualBulletShapeLoader* shapeLoader = new NifBullet::ManualBulletShapeLoader();
mEngine = new OEngine::Physic::PhysicEngine(shapeLoader); mEngine = new OEngine::Physic::PhysicEngine(shapeLoader);
playerphysics->mEngine = mEngine; playerphysics->mEngine = mEngine;
//playerphysics->ps.snappingImplemented = true;
} }

4
libs/openengine/bullet/pmove.cpp
View File

@ -1777,10 +1777,6 @@ void PmoveSingle (playerMove* const pmove)
pm->ps.watertype = 0; pm->ps.watertype = 0;
pm->ps.waterlevel = WL_DRYLAND; pm->ps.waterlevel = WL_DRYLAND;
if(pml.walking)
std::cout << "Walking\n";
else
std::cout << "Not Walking\n";
//if ( pm->ps->stats[STAT_HEALTH] <= 0 ) //if ( pm->ps->stats[STAT_HEALTH] <= 0 )
//pm->tracemask &= ~CONTENTS_BODY; // corpses can fly through bodies //pm->tracemask &= ~CONTENTS_BODY; // corpses can fly through bodies

2
libs/openengine/bullet/trace.cpp
View File

@ -172,7 +172,7 @@ const bool NewPhysicsTrace(NewPhysTraceResults* const out, const Ogre::Vector3&
if (!TestPointAgainstAabb2(aabbMin, aabbMax, *(const btVector3* const)&(start) ) ) if (!TestPointAgainstAabb2(aabbMin, aabbMax, *(const btVector3* const)&(start) ) )
{ {
//We're solid //We're solid
out->startSolid = false; out->startSolid = true;
} }
} }
} }