mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 21:42:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'collision'

Browse Source
This commit is contained in:
Marc Zinnschlag 2011-03-23 22:57:56 +01:00
commit c571148bef
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwrender/mwscene.cpp
View File

@ -155,6 +155,7 @@ void MWScene::addActor (const std::string& handle, const std::string& mesh,
void MWScene::removeObject (const std::string& handle)
{
//TODO:check if actor???
eng->removeCharacter(handle);
eng->removeRigidBody(handle);
eng->deleteRigidBody(handle);
}

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

@ -308,6 +308,7 @@ namespace MWWorld
void World::playerCellChange (Ptr::CellStore *cell, const ESM::Position& position,
bool adjustPlayerPos)
{
std::cout << "PlayerCellChange";
if (adjustPlayerPos)
mPlayer->setPos (position.pos[0], position.pos[1], position.pos[2], false);
@ -716,6 +717,7 @@ namespace MWWorld
void World::changeToExteriorCell (const ESM::Position& position)
{
std::cout << "to exterior cell";
int x = 0;
int y = 0;

2
components/nifbullet/bullet_nif_loader.cpp
View File

@ -133,7 +133,6 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource)
//if collide = false, then it does a second pass which create a shape for raycasting.
if(cShape->collide == false)
{
std::cout << "collide = false "<<resourceName << std::endl;
handleNode(node,0,Ogre::Matrix3::IDENTITY,Ogre::Vector3::ZERO,1,hasCollisionNode,false,true);
}
}
@ -306,7 +305,6 @@ void ManualBulletShapeLoader::handleNiTriShape(Nif::NiTriShape *shape, int flags
}
NodeShape = new btBvhTriangleMeshShape(mTriMesh,true);
currentShape->addChildShape(tr,NodeShape);
std::cout << "tri";
}
void ManualBulletShapeLoader::load(const std::string &name,const std::string &group)

2
libs/openengine

@ -1 +1 @@
Subproject commit 1ce6405e2bf5388a05a5cc0a60d1c5fe3dcadbfb
Subproject commit 32b475432f3e1c8d7275d17da0d692c173f30478