From 3ad2b9986e09296077bd505f454007bbad56afe2 Mon Sep 17 00:00:00 2001 From: gugus Date: Wed, 23 Mar 2011 19:16:51 +0100 Subject: [PATCH 1/5] fix actors not beeing deleted. Need the latest OEngine. --- apps/openmw/mwrender/mwscene.cpp | 1 + apps/openmw/mwworld/world.cpp | 3 +++ components/nifbullet/bullet_nif_loader.cpp | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwrender/mwscene.cpp b/apps/openmw/mwrender/mwscene.cpp index 93197f690c..f4cf6f2b2b 100644 --- a/apps/openmw/mwrender/mwscene.cpp +++ b/apps/openmw/mwrender/mwscene.cpp @@ -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); } diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index b30ee29a5f..e6833d0c6a 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -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); @@ -330,6 +331,7 @@ namespace MWWorld void World::changeCell (int X, int Y, const ESM::Position& position, bool adjustPlayerPos) { + std::cout << "change CEll " << X << Y; SuppressDoingPhysics scopeGuard; // remove active @@ -716,6 +718,7 @@ namespace MWWorld void World::changeToExteriorCell (const ESM::Position& position) { + std::cout << "to exterior cell"; int x = 0; int y = 0; diff --git a/components/nifbullet/bullet_nif_loader.cpp b/components/nifbullet/bullet_nif_loader.cpp index 301060cd6f..b3fd9019c7 100644 --- a/components/nifbullet/bullet_nif_loader.cpp +++ b/components/nifbullet/bullet_nif_loader.cpp @@ -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 "<addChildShape(tr,NodeShape); - std::cout << "tri"; } void ManualBulletShapeLoader::load(const std::string &name,const std::string &group) From 57c3414fcd72b088f3ebc77901961b78466401aa Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Wed, 23 Mar 2011 22:56:11 +0100 Subject: [PATCH 2/5] OpenEngine update (bug-fix) --- libs/openengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openengine b/libs/openengine index 1ce6405e2b..32b475432f 160000 --- a/libs/openengine +++ b/libs/openengine @@ -1 +1 @@ -Subproject commit 1ce6405e2bf5388a05a5cc0a60d1c5fe3dcadbfb +Subproject commit 32b475432f3e1c8d7275d17da0d692c173f30478 From 5661dc27c28e40122178cf4cbf284458de83e548 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Wed, 23 Mar 2011 22:56:58 +0100 Subject: [PATCH 3/5] removed a leftover from physics debugging --- apps/openmw/mwworld/world.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index e6833d0c6a..b59b59f517 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -331,7 +331,6 @@ namespace MWWorld void World::changeCell (int X, int Y, const ESM::Position& position, bool adjustPlayerPos) { - std::cout << "change CEll " << X << Y; SuppressDoingPhysics scopeGuard; // remove active From a70e582ae2347a4c7a92b229095c39f85ac3b781 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Wed, 23 Mar 2011 23:03:41 +0100 Subject: [PATCH 4/5] removed debugging leftovers from the tab_complition branch --- apps/openmw/mwgui/console.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp index 07905bcb98..836a0f0db9 100644 --- a/apps/openmw/mwgui/console.cpp +++ b/apps/openmw/mwgui/console.cpp @@ -28,12 +28,6 @@ namespace MWGui bool Console::compile (const std::string& cmd, Compiler::Output& output) { - - listNames(); - for (std::vector::iterator iter (mNames.begin()); iter!=mNames.end(); ++iter) - std::cout << *iter << ", "; - std::cout << std::endl; - try { ErrorHandler::reset(); From 53e1d0e7e7a3f42bd4a1991c1447629bacb8ccc9 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Wed, 23 Mar 2011 23:05:15 +0100 Subject: [PATCH 5/5] more cleanup --- apps/openmw/mwworld/world.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index 08e1cb63d9..10117d8538 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -308,7 +308,6 @@ 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); @@ -454,8 +453,6 @@ namespace MWWorld delete mPlayer; delete mSkyManager; delete mGlobalVariables; - - //delete mPhysEngine; } MWWorld::Player& World::getPlayer() @@ -717,7 +714,6 @@ namespace MWWorld void World::changeToExteriorCell (const ESM::Position& position) { - std::cout << "to exterior cell"; int x = 0; int y = 0;