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

Tweaked adjustPosition. Now uses a very thin box for tracing the feet only.

Browse Source
This commit is contained in:
scrawl 2013-04-30 20:43:38 +02:00
parent 91c89e5db4
commit 1420a2cb33
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,18 +105,19 @@ namespace MWWorld
physicActor->enableCollisions(false); physicActor->enableCollisions(false);
Ogre::Vector3 halfExtents = physicActor->getHalfExtents();// + Vector3(1,1,1); Ogre::Vector3 halfExtents = physicActor->getHalfExtents();// + Vector3(1,1,1);
halfExtents.z = 1; // we trace the feet only, so we use a very thin box
Ogre::Vector3 newPosition = position; Ogre::Vector3 newPosition = position;
traceResults trace; //no initialization needed traceResults trace; //no initialization needed
int maxHeight = 400.f; int maxHeight = 200.f;
newtrace(&trace, Ogre::Quaternion::IDENTITY, newPosition, newPosition-Ogre::Vector3(0,0,maxHeight), halfExtents, isInterior, engine); newtrace(&trace, Ogre::Quaternion::IDENTITY, newPosition, newPosition-Ogre::Vector3(0,0,maxHeight), halfExtents, isInterior, engine);
if(trace.fraction < 1.0f) if(trace.fraction < 1.0f)
hit = true; hit = true;
newPosition = trace.endpos; newPosition = trace.endpos;
physicActor->setOnGround(hit); physicActor->setOnGround(hit && getSlope(trace.planenormal) <= sMaxSlope);
physicActor->enableCollisions(wasCollisionMode); physicActor->enableCollisions(wasCollisionMode);
if (hit) if (hit)

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

@ -911,7 +911,7 @@ namespace MWWorld
float terrainHeight = mRendering->getTerrainHeightAt(pos); float terrainHeight = mRendering->getTerrainHeightAt(pos);
if (pos.z < terrainHeight) if (pos.z < terrainHeight)
pos.z = terrainHeight+400; // place slightly above. will snap down to ground with code below pos.z = terrainHeight+5; // place slightly above. will snap down to ground with code below
ptr.getRefData().getPosition().pos[2] = pos.z; ptr.getRefData().getPosition().pos[2] = pos.z;