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

Merge remote branch 'gus/collision' into collision

Browse source
This commit is contained in:
Marc Zinnschlag 2011-03-23 19:26:31 +01:00
commit c99bdcd33b
3 changed files with 4 additions and 2 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) void MWScene::removeObject (const std::string& handle)
{ {
//TODO:check if actor??? //TODO:check if actor???
eng->removeCharacter(handle);
eng->removeRigidBody(handle); eng->removeRigidBody(handle);
eng->deleteRigidBody(handle); eng->deleteRigidBody(handle);
} }

3
apps/openmw/mwworld/world.cpp
View file

@ -308,6 +308,7 @@ namespace MWWorld
void World::playerCellChange (Ptr::CellStore *cell, const ESM::Position& position, void World::playerCellChange (Ptr::CellStore *cell, const ESM::Position& position,
bool adjustPlayerPos) bool adjustPlayerPos)
{ {
std::cout << "PlayerCellChange";
if (adjustPlayerPos) if (adjustPlayerPos)
mPlayer->setPos (position.pos[0], position.pos[1], position.pos[2], false); mPlayer->setPos (position.pos[0], position.pos[1], position.pos[2], false);
@ -330,6 +331,7 @@ namespace MWWorld
void World::changeCell (int X, int Y, const ESM::Position& position, bool adjustPlayerPos) void World::changeCell (int X, int Y, const ESM::Position& position, bool adjustPlayerPos)
{ {
std::cout << "change CEll " << X << Y;
SuppressDoingPhysics scopeGuard; SuppressDoingPhysics scopeGuard;
// remove active // remove active
@ -716,6 +718,7 @@ namespace MWWorld
void World::changeToExteriorCell (const ESM::Position& position) void World::changeToExteriorCell (const ESM::Position& position)
{ {
std::cout << "to exterior cell";
int x = 0; int x = 0;
int y = 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 collide = false, then it does a second pass which create a shape for raycasting.
if(cShape->collide == false) if(cShape->collide == false)
{ {
std::cout << "collide = false "<<resourceName << std::endl;
handleNode(node,0,Ogre::Matrix3::IDENTITY,Ogre::Vector3::ZERO,1,hasCollisionNode,false,true); 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); NodeShape = new btBvhTriangleMeshShape(mTriMesh,true);
currentShape->addChildShape(tr,NodeShape); currentShape->addChildShape(tr,NodeShape);
std::cout << "tri";
} }
void ManualBulletShapeLoader::load(const std::string &name,const std::string &group) void ManualBulletShapeLoader::load(const std::string &name,const std::string &group)