mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 07:53:53 +00:00
Code Issues Releases Wiki Activity

silenced some warnings

Browse source
This commit is contained in:
Marc Zinnschlag 2013-08-03 15:26:53 +02:00
parent 9123afa863
commit 41b2fa985b
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -313,8 +313,6 @@ namespace MWWorld
std::pair<std::string,float> PhysicsSystem::getFacedHandle(const Ogre::Vector3 &origin_, const Ogre::Quaternion &orient_, float queryDistance)
{
Ogre::Vector3 dest_ = origin_ + orient_.yAxis()*queryDistance;
btVector3 origin(origin_.x, origin_.y, origin_.z);
std::pair<std::string,btVector3> result = mEngine->sphereTest(queryDistance,origin);

10
libs/openengine/bullet/physic.cpp
View file

@ -147,7 +147,7 @@ namespace Physic
{
mEngine->dynamicsWorld->removeRigidBody(mBody);
}
void PhysicActor::enableCollisionBody()
{
mEngine->dynamicsWorld->addRigidBody(mBody,CollisionType_Actor,CollisionType_World|CollisionType_HeightMap);
@ -484,7 +484,7 @@ namespace Physic
if (it != mCollisionObjectMap.end() )
{
RigidBody* body = it->second;
if(body != NULL)
{
delete body;
@ -583,7 +583,7 @@ namespace Physic
btVector3 aabbMax = pos + radius*btVector3(1.0f, 1.0f, 1.0f);
broadphase->aabbTest(aabbMin,aabbMax,callback);
for(int i=0;i<callback.hits.size();i++)
for(int i=0;i<static_cast<int> (callback.hits.size()); ++i)
{
float d = (callback.hits[i]->getWorldTransform().getOrigin()-pos).length();
if(d<radius)
@ -634,7 +634,7 @@ namespace Physic
removeCharacter(name);
PhysicActor* newActor = new PhysicActor(name, mesh, this, position, rotation, scale);
//dynamicsWorld->addAction( newActor->mCharacter );
mActorMap[name] = newActor;
@ -648,7 +648,7 @@ namespace Physic
PhysicActor* act = it->second;
if(act != NULL)
{
delete act;
}
mActorMap.erase(it);