From 7d6ad6ad9477e0644cc7f1e671f08ccfb79d9df1 Mon Sep 17 00:00:00 2001 From: gugus Date: Fri, 3 Aug 2012 18:14:05 +0200 Subject: [PATCH 01/21] setPos and getPos Script instructions. Cell-crossing is not tested yet. --- .../mwscript/transformationextensions.cpp | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index 2ea80c0d88..42ef16ed9c 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -108,6 +108,67 @@ namespace MWScript } }; + template + class OpGetPos : public Interpreter::Opcode0 + { + public: + + virtual void execute (Interpreter::Runtime& runtime) + { + MWWorld::Ptr ptr = R()(runtime); + + std::string axis = runtime.getStringLiteral (runtime[0].mInteger); + runtime.pop(); + + if(axis == "X") + { + runtime.push(ptr.getRefData().getPosition().pos[0]); + } + if(axis == "Y") + { + runtime.push(ptr.getRefData().getPosition().pos[1]); + } + if(axis == "Z") + { + runtime.push(ptr.getRefData().getPosition().pos[2]); + } + } + }; + + template + class OpSetPos : public Interpreter::Opcode0 + { + public: + + virtual void execute (Interpreter::Runtime& runtime) + { + MWWorld::Ptr ptr = R()(runtime); + + std::string axis = runtime.getStringLiteral (runtime[0].mInteger); + runtime.pop(); + Interpreter::Type_Float pos = runtime[0].mFloat; + runtime.pop(); + + float ax = ptr.getRefData().getPosition().pos[0]; + float ay = ptr.getRefData().getPosition().pos[1]; + float az = ptr.getRefData().getPosition().pos[2]; + std::cout << "setPos"; + + if(axis == "X") + { + MWBase::Environment::get().getWorld()->moveObject(ptr,pos,ay,az); + } + if(axis == "Y") + { + MWBase::Environment::get().getWorld()->moveObject(ptr,ax,pos,az); + } + if(axis == "Z") + { + MWBase::Environment::get().getWorld()->moveObject(ptr,ax,ay,pos); + } + } + }; + const int opcodeSetScale = 0x2000164; const int opcodeSetScaleExplicit = 0x2000165; const int opcodeSetAngle = 0x2000166; @@ -116,6 +177,10 @@ namespace MWScript const int opcodeGetScaleExplicit = 0x2000169; const int opcodeGetAngle = 0x200016a; const int opcodeGetAngleExplicit = 0x200016b; + const int opcodeGetPos = 0x200016c; + const int opcodeGetPosExplicit = 0x200016d; + const int opcodeSetPos = 0x200016e; + const int opcodeSetPosExplicit = 0x200016f; void registerExtensions (Compiler::Extensions& extensions) { @@ -123,6 +188,8 @@ namespace MWScript extensions.registerFunction("getscale",'f',"",opcodeGetScale,opcodeGetScaleExplicit); extensions.registerInstruction("setangle","Sf",opcodeSetAngle,opcodeSetAngleExplicit); extensions.registerFunction("getangle",'f',"S",opcodeGetAngle,opcodeGetAngleExplicit); + extensions.registerInstruction("setpos","Sf",opcodeSetPos,opcodeSetPosExplicit); + extensions.registerFunction("getpos",'f',"S",opcodeGetPos,opcodeGetPosExplicit); } void installOpcodes (Interpreter::Interpreter& interpreter) @@ -135,6 +202,10 @@ namespace MWScript interpreter.installSegment5(opcodeGetScaleExplicit,new OpGetScale); interpreter.installSegment5(opcodeGetAngle,new OpGetAngle); interpreter.installSegment5(opcodeGetAngleExplicit,new OpGetAngle); + interpreter.installSegment5(opcodeGetPos,new OpGetPos); + interpreter.installSegment5(opcodeGetPosExplicit,new OpGetPos); + interpreter.installSegment5(opcodeSetPos,new OpSetPos); + interpreter.installSegment5(opcodeSetPosExplicit,new OpSetPos); } } } From b2ce1dfd1ab10f1a12f42576d9611cca8a570b29 Mon Sep 17 00:00:00 2001 From: gugus Date: Fri, 3 Aug 2012 18:20:51 +0200 Subject: [PATCH 02/21] getStartingPos --- .../mwscript/transformationextensions.cpp | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index 42ef16ed9c..1eb53e8f38 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -169,6 +169,33 @@ namespace MWScript } }; + template + class OpGetStartingPos : public Interpreter::Opcode0 + { + public: + + virtual void execute (Interpreter::Runtime& runtime) + { + MWWorld::Ptr ptr = R()(runtime); + + std::string axis = runtime.getStringLiteral (runtime[0].mInteger); + runtime.pop(); + + if(axis == "X") + { + runtime.push(ptr.getCellRef().pos.pos[0]); + } + if(axis == "Y") + { + runtime.push(ptr.getCellRef().pos.pos[1]); + } + if(axis == "Z") + { + runtime.push(ptr.getCellRef().pos.pos[2]); + } + } + }; + const int opcodeSetScale = 0x2000164; const int opcodeSetScaleExplicit = 0x2000165; const int opcodeSetAngle = 0x2000166; @@ -181,6 +208,8 @@ namespace MWScript const int opcodeGetPosExplicit = 0x200016d; const int opcodeSetPos = 0x200016e; const int opcodeSetPosExplicit = 0x200016f; + const int opcodeGetStartingPos = 0x2000170; + const int opcodeGetStartingPosExplicit = 0x2000171; void registerExtensions (Compiler::Extensions& extensions) { @@ -190,6 +219,7 @@ namespace MWScript extensions.registerFunction("getangle",'f',"S",opcodeGetAngle,opcodeGetAngleExplicit); extensions.registerInstruction("setpos","Sf",opcodeSetPos,opcodeSetPosExplicit); extensions.registerFunction("getpos",'f',"S",opcodeGetPos,opcodeGetPosExplicit); + extensions.registerFunction("getstartingpos",'f',"S",opcodeGetStartingPos,opcodeGetStartingPosExplicit); } void installOpcodes (Interpreter::Interpreter& interpreter) @@ -206,6 +236,8 @@ namespace MWScript interpreter.installSegment5(opcodeGetPosExplicit,new OpGetPos); interpreter.installSegment5(opcodeSetPos,new OpSetPos); interpreter.installSegment5(opcodeSetPosExplicit,new OpSetPos); + interpreter.installSegment5(opcodeGetStartingPos,new OpGetStartingPos); + interpreter.installSegment5(opcodeGetStartingPosExplicit,new OpGetStartingPos); } } } From d850a3ee49bf31b4b301695a6023d56c9bd29566 Mon Sep 17 00:00:00 2001 From: gugus Date: Sun, 5 Aug 2012 16:21:53 +0200 Subject: [PATCH 03/21] some correction --- .../mwscript/transformationextensions.cpp | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index 1eb53e8f38..432482e480 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -66,15 +66,15 @@ namespace MWScript float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); float az = Ogre::Radian(ptr.getRefData().getPosition().rot[2]).valueDegrees(); - if(axis == "X") + if(axis == "x") { MWBase::Environment::get().getWorld()->rotateObject(ptr,angle,ay,az); } - if(axis == "Y") + if(axis == "y") { MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,angle,az); } - if(axis == "Z") + if(axis == "z") { MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,angle); } @@ -93,15 +93,15 @@ namespace MWScript std::string axis = runtime.getStringLiteral (runtime[0].mInteger); runtime.pop(); - if(axis == "X") + if(axis == "x") { runtime.push(Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees()); } - if(axis == "Y") + if(axis == "y") { runtime.push(Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees()); } - if(axis == "Z") + if(axis == "z") { runtime.push(Ogre::Radian(ptr.getRefData().getPosition().rot[2]).valueDegrees()); } @@ -120,15 +120,15 @@ namespace MWScript std::string axis = runtime.getStringLiteral (runtime[0].mInteger); runtime.pop(); - if(axis == "X") + if(axis == "x") { runtime.push(ptr.getRefData().getPosition().pos[0]); } - if(axis == "Y") + if(axis == "y") { runtime.push(ptr.getRefData().getPosition().pos[1]); } - if(axis == "Z") + if(axis == "z") { runtime.push(ptr.getRefData().getPosition().pos[2]); } @@ -154,15 +154,15 @@ namespace MWScript float az = ptr.getRefData().getPosition().pos[2]; std::cout << "setPos"; - if(axis == "X") + if(axis == "x") { MWBase::Environment::get().getWorld()->moveObject(ptr,pos,ay,az); } - if(axis == "Y") + if(axis == "y") { MWBase::Environment::get().getWorld()->moveObject(ptr,ax,pos,az); } - if(axis == "Z") + if(axis == "z") { MWBase::Environment::get().getWorld()->moveObject(ptr,ax,ay,pos); } @@ -181,15 +181,15 @@ namespace MWScript std::string axis = runtime.getStringLiteral (runtime[0].mInteger); runtime.pop(); - if(axis == "X") + if(axis == "x") { runtime.push(ptr.getCellRef().pos.pos[0]); } - if(axis == "Y") + if(axis == "y") { runtime.push(ptr.getCellRef().pos.pos[1]); } - if(axis == "Z") + if(axis == "z") { runtime.push(ptr.getCellRef().pos.pos[2]); } @@ -217,9 +217,9 @@ namespace MWScript extensions.registerFunction("getscale",'f',"",opcodeGetScale,opcodeGetScaleExplicit); extensions.registerInstruction("setangle","Sf",opcodeSetAngle,opcodeSetAngleExplicit); extensions.registerFunction("getangle",'f',"S",opcodeGetAngle,opcodeGetAngleExplicit); - extensions.registerInstruction("setpos","Sf",opcodeSetPos,opcodeSetPosExplicit); - extensions.registerFunction("getpos",'f',"S",opcodeGetPos,opcodeGetPosExplicit); - extensions.registerFunction("getstartingpos",'f',"S",opcodeGetStartingPos,opcodeGetStartingPosExplicit); + extensions.registerInstruction("setpos","cf",opcodeSetPos,opcodeSetPosExplicit); + extensions.registerFunction("getpos",'f',"c",opcodeGetPos,opcodeGetPosExplicit); + extensions.registerFunction("getstartingpos",'f',"c",opcodeGetStartingPos,opcodeGetStartingPosExplicit); } void installOpcodes (Interpreter::Interpreter& interpreter) From 8a485e213b78ef280807d1b91845cf50dee168bb Mon Sep 17 00:00:00 2001 From: gugus Date: Sun, 5 Aug 2012 16:44:56 +0200 Subject: [PATCH 04/21] first try of the Position script instruction. Still missing: check if overlapp with an object. --- .../mwscript/transformationextensions.cpp | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index 432482e480..46cbf781f0 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -196,6 +196,37 @@ namespace MWScript } }; + template + class OpPosition : public Interpreter::Opcode0 + { + public: + + virtual void execute (Interpreter::Runtime& runtime) + { + MWWorld::Ptr ptr = R()(runtime); + + Interpreter::Type_Float x = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Float y = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Float z = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Float zRot = runtime[0].mFloat; + runtime.pop(); + + MWBase::Environment::get().getWorld()->moveObject(ptr,x,y,z); + float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); + float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); + if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity + { + ax = ax/60.; + ay = ay/60.; + zRot = zRot/60.; + } + MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot); + } + }; + const int opcodeSetScale = 0x2000164; const int opcodeSetScaleExplicit = 0x2000165; const int opcodeSetAngle = 0x2000166; @@ -210,6 +241,8 @@ namespace MWScript const int opcodeSetPosExplicit = 0x200016f; const int opcodeGetStartingPos = 0x2000170; const int opcodeGetStartingPosExplicit = 0x2000171; + const int opcodePosition = 0x2000172; + const int opcodePositionExplicit = 0x2000173; void registerExtensions (Compiler::Extensions& extensions) { @@ -220,6 +253,7 @@ namespace MWScript extensions.registerInstruction("setpos","cf",opcodeSetPos,opcodeSetPosExplicit); extensions.registerFunction("getpos",'f',"c",opcodeGetPos,opcodeGetPosExplicit); extensions.registerFunction("getstartingpos",'f',"c",opcodeGetStartingPos,opcodeGetStartingPosExplicit); + extensions.registerInstruction("position","ffff",opcodePosition,opcodePositionExplicit); } void installOpcodes (Interpreter::Interpreter& interpreter) @@ -238,6 +272,8 @@ namespace MWScript interpreter.installSegment5(opcodeSetPosExplicit,new OpSetPos); interpreter.installSegment5(opcodeGetStartingPos,new OpGetStartingPos); interpreter.installSegment5(opcodeGetStartingPosExplicit,new OpGetStartingPos); + interpreter.installSegment5(opcodePosition,new OpPosition); + interpreter.installSegment5(opcodePositionExplicit,new OpPosition); } } } From cb5b69104d18be0383c901a86758b49600fcc354 Mon Sep 17 00:00:00 2001 From: gugus Date: Thu, 9 Aug 2012 23:45:06 +0200 Subject: [PATCH 05/21] PositionCell --- .../mwscript/transformationextensions.cpp | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index 46cbf781f0..f47a1829a8 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -196,6 +196,39 @@ namespace MWScript } }; + template + class OpPositionCell : public Interpreter::Opcode0 + { + public: + + virtual void execute (Interpreter::Runtime& runtime) + { + MWWorld::Ptr ptr = R()(runtime); + + Interpreter::Type_Float x = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Float y = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Float z = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Float zRot = runtime[0].mFloat; + runtime.pop(); + std::string cellID = runtime.getStringLiteral (runtime[0].mInteger); + runtime.pop(); + + MWBase::Environment::get().getWorld()->moveObjectToCell(ptr,cellID,x,y,z); + float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); + float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); + if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity + { + ax = ax/60.; + ay = ay/60.; + zRot = zRot/60.; + } + MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot); + } + }; + template class OpPosition : public Interpreter::Opcode0 { @@ -243,6 +276,8 @@ namespace MWScript const int opcodeGetStartingPosExplicit = 0x2000171; const int opcodePosition = 0x2000172; const int opcodePositionExplicit = 0x2000173; + const int opcodePositionCell = 0x2000174; + const int opcodePositionCellExplicit = 0x2000175; void registerExtensions (Compiler::Extensions& extensions) { @@ -254,6 +289,7 @@ namespace MWScript extensions.registerFunction("getpos",'f',"c",opcodeGetPos,opcodeGetPosExplicit); extensions.registerFunction("getstartingpos",'f',"c",opcodeGetStartingPos,opcodeGetStartingPosExplicit); extensions.registerInstruction("position","ffff",opcodePosition,opcodePositionExplicit); + extensions.registerInstruction("positioncell","ffffS",opcodePositionCell,opcodePositionCellExplicit); } void installOpcodes (Interpreter::Interpreter& interpreter) @@ -274,6 +310,8 @@ namespace MWScript interpreter.installSegment5(opcodeGetStartingPosExplicit,new OpGetStartingPos); interpreter.installSegment5(opcodePosition,new OpPosition); interpreter.installSegment5(opcodePositionExplicit,new OpPosition); + interpreter.installSegment5(opcodePositionCell,new OpPositionCell); + interpreter.installSegment5(opcodePositionCellExplicit,new OpPositionCell); } } } From 56c9c4dbd95270b8b0b98691bd188d961c490815 Mon Sep 17 00:00:00 2001 From: greye Date: Fri, 10 Aug 2012 21:03:46 +0400 Subject: [PATCH 06/21] remove some redundant code --- apps/openmw/mwworld/scene.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index ec557e35c7..40d0a634a4 100644 --- a/apps/openmw/mwworld/scene.cpp +++ b/apps/openmw/mwworld/scene.cpp @@ -140,19 +140,18 @@ namespace MWWorld const ESM::Position& pos, bool adjustPlayerPos) { - MWBase::Environment::get().getWorld()->getPlayer().setCell (cell); - bool hasWater = cell->cell->data.flags & cell->cell->HasWater; mPhysics->setCurrentWater(hasWater, cell->cell->water); MWBase::World *world = MWBase::Environment::get().getWorld(); MWWorld::Ptr player = world->getPlayer().getPlayer(); + world->getPlayer().setCell(cell); + if (adjustPlayerPos) { world->moveObject(player, pos.pos[0], pos.pos[1], pos.pos[2]); world->rotateObject(player, pos.rot[0], pos.rot[1], pos.rot[2]); } - world->getPlayer().setCell(cell); MWMechanics::MechanicsManager *mechMgr = MWBase::Environment::get().getMechanicsManager(); From bed6545e45e9d456eeda474d2a0ac8327e6c0c13 Mon Sep 17 00:00:00 2001 From: greye Date: Fri, 10 Aug 2012 21:06:09 +0400 Subject: [PATCH 07/21] still fix assertion fail --- apps/openmw/mwworld/scene.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index 40d0a634a4..531546a576 100644 --- a/apps/openmw/mwworld/scene.cpp +++ b/apps/openmw/mwworld/scene.cpp @@ -144,10 +144,10 @@ namespace MWWorld mPhysics->setCurrentWater(hasWater, cell->cell->water); MWBase::World *world = MWBase::Environment::get().getWorld(); - MWWorld::Ptr player = world->getPlayer().getPlayer(); - world->getPlayer().setCell(cell); + MWWorld::Ptr player = world->getPlayer().getPlayer(); + if (adjustPlayerPos) { world->moveObject(player, pos.pos[0], pos.pos[1], pos.pos[2]); world->rotateObject(player, pos.rot[0], pos.rot[1], pos.rot[2]); From 0042020385b7303d20490e810e49e9b6f8e97b0c Mon Sep 17 00:00:00 2001 From: greye Date: Fri, 10 Aug 2012 21:24:07 +0400 Subject: [PATCH 08/21] should fix 'north direction' bug not even compiled --- apps/openmw/mwrender/renderingmanager.cpp | 31 ++++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index 8719557ca3..4534fee2c7 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -254,27 +254,28 @@ RenderingManager::rotateObject( Ogre::Vector3 &rot, bool adjust) { - if (ptr.getRefData().getHandle() == "player") { - if (adjust) { - return mPlayer->adjustRotation(rot); - } else { - return mPlayer->setRotation(rot); - } + bool isPlayer = ptr.getRefData().getHandle() == "player"; + bool force = true; + + if (isPlayer) { + force = (adjust) ? mPlayer->adjustRotation(rot) : mPlayer->setRotation(rot); } MWWorld::Class::get(ptr).adjustRotation(ptr, rot.x, rot.y, rot.z); - if (adjust) { float *f = ptr.getRefData().getPosition().rot; - rot.x += f[0], rot.y += f[1], rot.z += f[2]; + rot.x += Ogre::Radian(f[0]).valueDegrees(); + rot.y += Ogre::Radian(f[1]).valueDegrees(); + rot.z += Ogre::Radian(f[2]).valueDegrees(); + } + if (!isPlayer) { + Ogre::Quaternion xr(Ogre::Degree(rot.x), Ogre::Vector3::UNIT_X); + Ogre::Quaternion yr(Ogre::Degree(rot.y), Ogre::Vector3::UNIT_Y); + Ogre::Quaternion zr(Ogre::Degree(rot.z), Ogre::Vector3::UNIT_Z); + + ptr.getRefData().getBaseNode()->setOrientation(xr * yr * zr); } - Ogre::Quaternion xr(Ogre::Degree(rot.x), Ogre::Vector3::UNIT_X); - Ogre::Quaternion yr(Ogre::Degree(rot.y), Ogre::Vector3::UNIT_Y); - Ogre::Quaternion zr(Ogre::Degree(rot.z), Ogre::Vector3::UNIT_Z); - - ptr.getRefData().getBaseNode()->setOrientation(xr * yr * zr); - - return true; + return force; } void From 7fa1dc93d7837b86ecbdc176468475af28df5d4b Mon Sep 17 00:00:00 2001 From: gugus Date: Sat, 11 Aug 2012 09:52:49 +0200 Subject: [PATCH 09/21] 2nd try: position/ PositionCell --- .../mwscript/transformationextensions.cpp | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index 50897278f7..5d9de6baf8 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -249,16 +249,29 @@ namespace MWScript std::string cellID = runtime.getStringLiteral (runtime[0].mInteger); runtime.pop(); - MWBase::Environment::get().getWorld()->moveObjectToCell(ptr,cellID,x,y,z); - float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); - float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); - if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity + + MWWorld::CellStore* store = MWBase::Environment::get().getWorld()->getInterior(cellID); + if(!store) { - ax = ax/60.; - ay = ay/60.; - zRot = zRot/60.; + ESM::Cell cell = MWBase::Environment::get().getWorld()->getExterior(cellID); + if(cell) + { + store = MWBase::Environment::get().getWorld()->getExterior(cell.getGridX(),cell.getGridY()); + } + } + if(store) + { + MWBase::Environment::get().getWorld()->moveObject(ptr,store,x,y,z); + float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); + float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); + if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity + { + ax = ax/60.; + ay = ay/60.; + zRot = zRot/60.; + } + MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot); } - MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot); } }; @@ -280,7 +293,8 @@ namespace MWScript Interpreter::Type_Float zRot = runtime[0].mFloat; runtime.pop(); - MWBase::Environment::get().getWorld()->moveObject(ptr,x,y,z); + MWBase::Environment::get().getWorld()->moveObject(ptr, + MWBase::Environment::get().getWorld()->getExterior(x,y),x,y,z); float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity From eaf6a8df94822a6bb2b58b44b2b2341bba87ace2 Mon Sep 17 00:00:00 2001 From: gugus Date: Sat, 11 Aug 2012 14:06:58 +0200 Subject: [PATCH 10/21] some correction --- apps/openmw/mwscript/transformationextensions.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index 5d9de6baf8..8576ac22e0 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -253,15 +253,15 @@ namespace MWScript MWWorld::CellStore* store = MWBase::Environment::get().getWorld()->getInterior(cellID); if(!store) { - ESM::Cell cell = MWBase::Environment::get().getWorld()->getExterior(cellID); + const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID); if(cell) { - store = MWBase::Environment::get().getWorld()->getExterior(cell.getGridX(),cell.getGridY()); + store = MWBase::Environment::get().getWorld()->getExterior(cell->getGridX(),cell->getGridY()); } } if(store) { - MWBase::Environment::get().getWorld()->moveObject(ptr,store,x,y,z); + MWBase::Environment::get().getWorld()->moveObject(ptr,*store,x,y,z); float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity @@ -294,7 +294,7 @@ namespace MWScript runtime.pop(); MWBase::Environment::get().getWorld()->moveObject(ptr, - MWBase::Environment::get().getWorld()->getExterior(x,y),x,y,z); + *MWBase::Environment::get().getWorld()->getExterior(x,y),x,y,z); float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity From 0bc48cc5eaaa23793fbeb644c20a747e2fb969fd Mon Sep 17 00:00:00 2001 From: gugus Date: Sat, 11 Aug 2012 18:07:20 +0200 Subject: [PATCH 11/21] little fix (thanks greye!) --- apps/openmw/mwscript/transformationextensions.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index 8576ac22e0..cc0444f86a 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -292,9 +292,10 @@ namespace MWScript runtime.pop(); Interpreter::Type_Float zRot = runtime[0].mFloat; runtime.pop(); - + int cx,cy; + MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy); MWBase::Environment::get().getWorld()->moveObject(ptr, - *MWBase::Environment::get().getWorld()->getExterior(x,y),x,y,z); + *MWBase::Environment::get().getWorld()->getExterior(cx,cy),x,y,z); float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity From 0c8045d60661b615a4b7089898c294d1e710453d Mon Sep 17 00:00:00 2001 From: gugus Date: Sat, 11 Aug 2012 19:16:00 +0200 Subject: [PATCH 12/21] allow exterior cell for positioncell. Crash! --- apps/openmw/mwscript/transformationextensions.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index cc0444f86a..f3d22f6702 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -249,13 +249,21 @@ namespace MWScript std::string cellID = runtime.getStringLiteral (runtime[0].mInteger); runtime.pop(); - - MWWorld::CellStore* store = MWBase::Environment::get().getWorld()->getInterior(cellID); - if(!store) + bool interior = true; + MWWorld::CellStore* store; + try { + MWWorld::CellStore* store = MWBase::Environment::get().getWorld()->getInterior(cellID); + } + catch(std::exception &e) + { + std::cout << "trying exterior"; const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID); if(cell) { + std::cout << "exteriorfffffffffffffffffmZEJFB"; + //cell->getGridX(); + //MWBase::Environment::get().getWorld()->getExterior(cell->getGridX(),cell->getGridY()); store = MWBase::Environment::get().getWorld()->getExterior(cell->getGridX(),cell->getGridY()); } } From fb91f76a2b70bf10366d8f8f97b53d4aa3c0acfd Mon Sep 17 00:00:00 2001 From: gugus Date: Sat, 11 Aug 2012 22:08:04 +0200 Subject: [PATCH 13/21] fixed a crash --- apps/openmw/mwscript/transformationextensions.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index f3d22f6702..3f1cff7e7d 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -249,21 +249,16 @@ namespace MWScript std::string cellID = runtime.getStringLiteral (runtime[0].mInteger); runtime.pop(); - bool interior = true; - MWWorld::CellStore* store; + MWWorld::CellStore* store = 0; try { MWWorld::CellStore* store = MWBase::Environment::get().getWorld()->getInterior(cellID); } catch(std::exception &e) { - std::cout << "trying exterior"; const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID); if(cell) { - std::cout << "exteriorfffffffffffffffffmZEJFB"; - //cell->getGridX(); - //MWBase::Environment::get().getWorld()->getExterior(cell->getGridX(),cell->getGridY()); store = MWBase::Environment::get().getWorld()->getExterior(cell->getGridX(),cell->getGridY()); } } From f2d080d0913a2ebcddce5d2740658d908bb9cf5a Mon Sep 17 00:00:00 2001 From: gugus Date: Sat, 18 Aug 2012 10:50:58 +0200 Subject: [PATCH 14/21] bugfix --- .../mwscript/transformationextensions.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index 3f1cff7e7d..18054374c0 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -185,7 +185,7 @@ namespace MWScript float ax = ptr.getRefData().getPosition().pos[0]; float ay = ptr.getRefData().getPosition().pos[1]; float az = ptr.getRefData().getPosition().pos[2]; - std::cout << "setPos"; + if(axis == "x") { @@ -252,28 +252,32 @@ namespace MWScript MWWorld::CellStore* store = 0; try { - MWWorld::CellStore* store = MWBase::Environment::get().getWorld()->getInterior(cellID); + store = MWBase::Environment::get().getWorld()->getInterior(cellID); } catch(std::exception &e) { - const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID); + /*const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID); if(cell) { store = MWBase::Environment::get().getWorld()->getExterior(cell->getGridX(),cell->getGridY()); - } + }*/ } if(store) { MWBase::Environment::get().getWorld()->moveObject(ptr,*store,x,y,z); float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); - if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity + if(ptr.getTypeName() == typeid(ESM::NPC).name())//some morrowind oddity { ax = ax/60.; ay = ay/60.; zRot = zRot/60.; } - MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot); + //MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot); + } + else + { + throw std::runtime_error ("unknown cell"); } } }; @@ -301,7 +305,7 @@ namespace MWScript *MWBase::Environment::get().getWorld()->getExterior(cx,cy),x,y,z); float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); - if(ptr.getTypeName() == "struct ESM::NPC")//some morrowind oddity + if(ptr.getTypeName() == typeid(ESM::NPC).name())//some morrowind oddity { ax = ax/60.; ay = ay/60.; From 165065d37891be204f67f9cc89de3780a0982b92 Mon Sep 17 00:00:00 2001 From: gugus Date: Tue, 21 Aug 2012 19:54:42 +0200 Subject: [PATCH 15/21] fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p --- apps/openmw/mwworld/cells.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp index 822aa78d6e..dd2339eeb5 100644 --- a/apps/openmw/mwworld/cells.cpp +++ b/apps/openmw/mwworld/cells.cpp @@ -8,6 +8,17 @@ #include "class.hpp" #include "containerstore.hpp" +//helper function +std::string toLower (const std::string& name) +{ + std::string lowerCase; + + std::transform (name.begin(), name.end(), std::back_inserter (lowerCase), + (int(*)(int)) std::tolower); + + return lowerCase; +} + MWWorld::Ptr::CellStore *MWWorld::Cells::getCellStore (const ESM::Cell *cell) { if (cell->data.flags & ESM::Cell::Interior) @@ -129,13 +140,14 @@ MWWorld::Ptr::CellStore *MWWorld::Cells::getExterior (int x, int y) MWWorld::Ptr::CellStore *MWWorld::Cells::getInterior (const std::string& name) { - std::map::iterator result = mInteriors.find (name); + std::string nName = toLower(name); + std::map::iterator result = mInteriors.find (nName); if (result==mInteriors.end()) { - const ESM::Cell *cell = mStore.cells.findInt (name); + const ESM::Cell *cell = mStore.cells.findInt (nName); - result = mInteriors.insert (std::make_pair (name, Ptr::CellStore (cell))).first; + result = mInteriors.insert (std::make_pair (nName, Ptr::CellStore (cell))).first; } if (result->second.mState!=Ptr::CellStore::State_Loaded) From fa9f2b268b0869b3203789098a3226ef2de1c9fe Mon Sep 17 00:00:00 2001 From: gugus Date: Sun, 2 Sep 2012 17:57:03 +0200 Subject: [PATCH 16/21] PlaceItem,PlaceItemCell,PlaceAtPC,PlaceAtMe --- apps/openmw/mwbase/world.hpp | 3 + .../mwscript/transformationextensions.cpp | 209 +++++++++++++++++- 2 files changed, 208 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp index 8b809d399a..b0ce261f1e 100644 --- a/apps/openmw/mwbase/world.hpp +++ b/apps/openmw/mwbase/world.hpp @@ -122,6 +122,9 @@ namespace MWBase virtual MWWorld::Ptr getPtrViaHandle (const std::string& handle) = 0; ///< Return a pointer to a liveCellRef with the given Ogre handle. + virtual void + copyObjectToCell(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell, const ESM::Position &pos) = 0; + /// \todo enable reference in the OGRE scene virtual void enable (const MWWorld::Ptr& ptr) = 0; diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index 18054374c0..c82108f8bb 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -16,6 +16,11 @@ #include "ref.hpp" #include "OgreSceneNode.h" + +#include "../mwworld/player.hpp" +#include "components\esm\loadcell.hpp" + +#include "OgreMath.h" namespace MWScript { namespace Transformation @@ -256,11 +261,13 @@ namespace MWScript } catch(std::exception &e) { - /*const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID); + const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID); if(cell) { - store = MWBase::Environment::get().getWorld()->getExterior(cell->getGridX(),cell->getGridY()); - }*/ + int cx,cy; + MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy); + store = MWBase::Environment::get().getWorld()->getExterior(cx,cy); + } } if(store) { @@ -273,7 +280,7 @@ namespace MWScript ay = ay/60.; zRot = zRot/60.; } - //MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot); + MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot); } else { @@ -315,6 +322,185 @@ namespace MWScript } }; + template + class OpPlaceItemCell : public Interpreter::Opcode0 + { + public: + + virtual void execute (Interpreter::Runtime& runtime) + { + //MWWorld::Ptr ptr = R()(runtime); + + std::string itemID = runtime.getStringLiteral (runtime[0].mInteger); + runtime.pop(); + std::string cellID = runtime.getStringLiteral (runtime[0].mInteger); + runtime.pop(); + + Interpreter::Type_Float x = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Float y = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Float z = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Float zRot = runtime[0].mFloat; + runtime.pop(); + + MWWorld::CellStore* store = 0; + try + { + store = MWBase::Environment::get().getWorld()->getInterior(cellID); + } + catch(std::exception &e) + { + const ESM::Cell* cell = MWBase::Environment::get().getWorld()->getExterior(cellID); + if(cell) + { + int cx,cy; + MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy); + store = MWBase::Environment::get().getWorld()->getExterior(cx,cy); + } + } + if(store) + { + ESM::Position pos; + pos.pos[0] = x; + pos.pos[1] = y; + pos.pos[2] = z; + pos.rot[0] = pos.rot[1] = 0; + pos.rot[2] = zRot; + MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtr(itemID,false); + MWBase::Environment::get().getWorld()->copyObjectToCell(ptr,*store,pos); + } + else + { + throw std::runtime_error ("unknown cell"); + } + } + }; + + template + class OpPlaceItem : public Interpreter::Opcode0 + { + public: + + virtual void execute (Interpreter::Runtime& runtime) + { + //MWWorld::Ptr ptr = R()(runtime); + + std::string itemID = runtime.getStringLiteral (runtime[0].mInteger); + runtime.pop(); + + Interpreter::Type_Float x = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Float y = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Float z = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Float zRot = runtime[0].mFloat; + runtime.pop(); + + MWWorld::CellStore* store = 0; + int cx,cy; + MWBase::Environment::get().getWorld()->positionToIndex(x,y,cx,cy); + store = MWBase::Environment::get().getWorld()->getExterior(cx,cy); + if(store) + { + ESM::Position pos; + pos.pos[0] = x; + pos.pos[1] = y; + pos.pos[2] = z; + pos.rot[0] = pos.rot[1] = 0; + pos.rot[2] = zRot; + MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtr(itemID,false); + MWBase::Environment::get().getWorld()->copyObjectToCell(ptr,*store,pos); + } + else + { + throw std::runtime_error ("unknown cell"); + } + } + }; + + template + class OpPlaceAtPc : public Interpreter::Opcode0 + { + public: + + virtual void execute (Interpreter::Runtime& runtime) + { + std::string itemID = runtime.getStringLiteral (runtime[0].mInteger); + runtime.pop(); + + Interpreter::Type_Integer count = runtime[0].mInteger; + runtime.pop(); + Interpreter::Type_Float distance = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Integer direction = runtime[0].mInteger; + runtime.pop(); + + ESM::Position ipos = MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getRefData().getPosition(); + Ogre::Vector3 pos(ipos.pos[0],ipos.pos[1],ipos.pos[2]); + Ogre::Quaternion rot(Ogre::Radian(ipos.rot[2]), Ogre::Vector3::UNIT_Z); + if(direction == 0) pos = pos + distance*rot.yAxis(); + else if(direction == 1) pos = pos - distance*rot.yAxis(); + else if(direction == 2) pos = pos - distance*rot.xAxis(); + else if(direction == 3) pos = pos + distance*rot.xAxis(); + else throw std::runtime_error ("direction must be 0,1,2 or 3"); + + ipos.pos[0] = pos.x; + ipos.pos[1] = pos.y; + ipos.pos[2] = pos.z; + MWWorld::CellStore* store = MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getCell(); + MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtr(itemID,false); + int icount = ptr.getRefData().getCount(); + ptr.getRefData().setCount(count); + MWBase::Environment::get().getWorld()->copyObjectToCell(ptr,*store,ipos); + ptr.getRefData().setCount(icount); + //store->ge + } + }; + + template + class OpPlaceAtMe : public Interpreter::Opcode0 + { + public: + + virtual void execute (Interpreter::Runtime& runtime) + { + MWWorld::Ptr me = R()(runtime); + + std::string itemID = runtime.getStringLiteral (runtime[0].mInteger); + runtime.pop(); + + Interpreter::Type_Integer count = runtime[0].mInteger; + runtime.pop(); + Interpreter::Type_Float distance = runtime[0].mFloat; + runtime.pop(); + Interpreter::Type_Integer direction = runtime[0].mInteger; + runtime.pop(); + + ESM::Position ipos = me.getRefData().getPosition(); + Ogre::Vector3 pos(ipos.pos[0],ipos.pos[1],ipos.pos[2]); + Ogre::Quaternion rot(Ogre::Radian(ipos.rot[2]), Ogre::Vector3::UNIT_Z); + if(direction == 0) pos = pos + distance*rot.yAxis(); + else if(direction == 1) pos = pos - distance*rot.yAxis(); + else if(direction == 2) pos = pos - distance*rot.xAxis(); + else if(direction == 3) pos = pos + distance*rot.xAxis(); + else throw std::runtime_error ("direction must be 0,1,2 or 3"); + + ipos.pos[0] = pos.x; + ipos.pos[1] = pos.y; + ipos.pos[2] = pos.z; + MWWorld::CellStore* store = me.getCell(); + MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtr(itemID,false); + int icount = ptr.getRefData().getCount(); + ptr.getRefData().setCount(count); + MWBase::Environment::get().getWorld()->copyObjectToCell(ptr,*store,ipos); + ptr.getRefData().setCount(icount); + //store->ge + } + }; + const int opcodeSetScale = 0x2000164; const int opcodeSetScaleExplicit = 0x2000165; const int opcodeSetAngle = 0x2000166; @@ -334,6 +520,12 @@ namespace MWScript const int opcodePositionCell = 0x2000174; const int opcodePositionCellExplicit = 0x2000175; + const int opcodePlaceItemCell = 0x2000176; + const int opcodePlaceItem = 0x2000177; + const int opcodePlaceAtPc = 0x2000178; + const int opcodePlaceAtMe = 0x2000179; + const int opcodePlaceAtMeExplicit = 0x200017a; + void registerExtensions (Compiler::Extensions& extensions) { extensions.registerInstruction("setscale","f",opcodeSetScale,opcodeSetScaleExplicit); @@ -345,6 +537,10 @@ namespace MWScript extensions.registerFunction("getstartingpos",'f',"c",opcodeGetStartingPos,opcodeGetStartingPosExplicit); extensions.registerInstruction("position","ffff",opcodePosition,opcodePositionExplicit); extensions.registerInstruction("positioncell","ffffS",opcodePositionCell,opcodePositionCellExplicit); + extensions.registerInstruction("placeitemcell","ccffff",opcodePlaceItemCell); + extensions.registerInstruction("placeitem","cffff",opcodePlaceItem); + extensions.registerInstruction("placeatpc","clfl",opcodePlaceAtPc); + extensions.registerInstruction("placeatme","clfl",opcodePlaceAtMe,opcodePlaceAtMeExplicit); } void installOpcodes (Interpreter::Interpreter& interpreter) @@ -367,6 +563,11 @@ namespace MWScript interpreter.installSegment5(opcodePositionExplicit,new OpPosition); interpreter.installSegment5(opcodePositionCell,new OpPositionCell); interpreter.installSegment5(opcodePositionCellExplicit,new OpPositionCell); + interpreter.installSegment5(opcodePlaceItemCell,new OpPlaceItemCell); + interpreter.installSegment5(opcodePlaceItem,new OpPlaceItem); + interpreter.installSegment5(opcodePlaceAtPc,new OpPlaceAtPc); + interpreter.installSegment5(opcodePlaceAtMe,new OpPlaceAtPc); + interpreter.installSegment5(opcodePlaceAtMeExplicit,new OpPlaceAtPc); } } } From 99885e8ca411ff4e06fd8c77c64fda722301610f Mon Sep 17 00:00:00 2001 From: gugus Date: Sun, 2 Sep 2012 18:04:36 +0200 Subject: [PATCH 17/21] Revert "fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p" This reverts commit 165065d37891be204f67f9cc89de3780a0982b92. --- apps/openmw/mwworld/cells.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp index dd2339eeb5..822aa78d6e 100644 --- a/apps/openmw/mwworld/cells.cpp +++ b/apps/openmw/mwworld/cells.cpp @@ -8,17 +8,6 @@ #include "class.hpp" #include "containerstore.hpp" -//helper function -std::string toLower (const std::string& name) -{ - std::string lowerCase; - - std::transform (name.begin(), name.end(), std::back_inserter (lowerCase), - (int(*)(int)) std::tolower); - - return lowerCase; -} - MWWorld::Ptr::CellStore *MWWorld::Cells::getCellStore (const ESM::Cell *cell) { if (cell->data.flags & ESM::Cell::Interior) @@ -140,14 +129,13 @@ MWWorld::Ptr::CellStore *MWWorld::Cells::getExterior (int x, int y) MWWorld::Ptr::CellStore *MWWorld::Cells::getInterior (const std::string& name) { - std::string nName = toLower(name); - std::map::iterator result = mInteriors.find (nName); + std::map::iterator result = mInteriors.find (name); if (result==mInteriors.end()) { - const ESM::Cell *cell = mStore.cells.findInt (nName); + const ESM::Cell *cell = mStore.cells.findInt (name); - result = mInteriors.insert (std::make_pair (nName, Ptr::CellStore (cell))).first; + result = mInteriors.insert (std::make_pair (name, Ptr::CellStore (cell))).first; } if (result->second.mState!=Ptr::CellStore::State_Loaded) From 95c27723f7733f02a8d753d229d52e829c9c4913 Mon Sep 17 00:00:00 2001 From: gugus Date: Sun, 2 Sep 2012 18:12:13 +0200 Subject: [PATCH 18/21] fixed a bug (see commit reverted) --- apps/openmw/mwworld/worldimp.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index 8ace54378b..d9c4fe3212 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -541,6 +541,16 @@ namespace MWWorld } } + std::string toLower (const std::string& name) + { + std::string lowerCase; + + std::transform (name.begin(), name.end(), std::back_inserter (lowerCase), + (int(*)(int)) std::tolower); + + return lowerCase; + } + void World::moveObject(const Ptr &ptr, CellStore &newCell, float x, float y, float z) { ESM::Position &pos = ptr.getRefData().getPosition(); @@ -550,11 +560,10 @@ namespace MWWorld CellStore *currCell = ptr.getCell(); bool isPlayer = ptr == mPlayer->getPlayer(); bool haveToMove = mWorldScene->isCellActive(*currCell) || isPlayer; - if (*currCell != newCell) { if (isPlayer) { if (!newCell.isExterior()) { - changeToInteriorCell(newCell.cell->name, pos); + changeToInteriorCell(toLower(newCell.cell->name), pos); } else { int cellX = newCell.cell->data.gridX; int cellY = newCell.cell->data.gridY; From d2612638241e86a5a1a007b4e9b3d12626a1cdc0 Mon Sep 17 00:00:00 2001 From: gugus Date: Sun, 2 Sep 2012 21:09:07 +0200 Subject: [PATCH 19/21] oups forgot vmformat --- apps/openmw/mwscript/docs/vmformat.txt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt index 1ea5f8e3ec..ac8e5d01db 100644 --- a/apps/openmw/mwscript/docs/vmformat.txt +++ b/apps/openmw/mwscript/docs/vmformat.txt @@ -31,7 +31,7 @@ op 0x2000e: PCGetRank implicit op 0x2000f: PCGetRank explicit op 0x20010: AiWander op 0x20011: AiWander, explicit reference -opcodes 0x20012-0x3ffff unused +op s 0x20012-0x3ffff unused Segment 4: (not implemented yet) @@ -181,4 +181,19 @@ op 0x2000170: user4, explicit reference (console only, requires --script-console op 0x2000171: user4 (implicit reference, console only, requires --script-console switch) op 0x2000172: GetStartingAngle op 0x2000173: GetStartingAngle, explicit reference -opcodes 0x2000174-0x3ffffff unused +op 0x200016c: GetPos +op 0x200016d: GetPosExplicit +op 0x200016e: SetPos +op 0x200016f: SetPosExplicit +op 0x2000170: GetStartingPos +op 0x2000171: GetStartingPosExplicit +op 0x2000172: Position +op 0x2000173: Position Explicit +op 0x2000174: PositionCell +op 0x2000175: PositionCell Explicit +op 0x2000176: PlaceItemCell +op 0x2000177: PlaceItem +op 0x2000178: PlaceAtPc +op 0x2000179: PlaceAtMe +op 0x200017a: PlaceAtMe Explicit +opcodes 0x200017b-0x3ffffff unused From 032ff7c879e2b80423f21576f508edc8e8753776 Mon Sep 17 00:00:00 2001 From: gugus Date: Mon, 17 Sep 2012 13:36:48 +0200 Subject: [PATCH 20/21] Clean-up. There is still a little bug. --- apps/openmw/mwbase/world.hpp | 3 ++ .../mwscript/transformationextensions.cpp | 36 ++++++++++--------- apps/openmw/mwworld/worldimp.cpp | 5 +++ apps/openmw/mwworld/worldimp.hpp | 3 ++ 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp index b0ce261f1e..ef4e6a5b85 100644 --- a/apps/openmw/mwbase/world.hpp +++ b/apps/openmw/mwbase/world.hpp @@ -187,6 +187,9 @@ namespace MWBase virtual void rotateObject(const MWWorld::Ptr& ptr,float x,float y,float z, bool adjust = false) = 0; + virtual void safePlaceObject(const MWWorld::Ptr& ptr,MWWorld::CellStore &Cell,ESM::Position pos) = 0; + ///< place an object in a "safe" location (ie not in the void, etc). Makes a copy of the Ptr. + virtual void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false) const = 0; ///< Convert cell numbers to position. diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index c82108f8bb..e40390a635 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -19,6 +19,7 @@ #include "../mwworld/player.hpp" #include "components\esm\loadcell.hpp" +#include "../mwworld/manualref.hpp" #include "OgreMath.h" namespace MWScript @@ -369,7 +370,7 @@ namespace MWScript pos.rot[0] = pos.rot[1] = 0; pos.rot[2] = zRot; MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtr(itemID,false); - MWBase::Environment::get().getWorld()->copyObjectToCell(ptr,*store,pos); + MWBase::Environment::get().getWorld()->safePlaceObject(ptr,*store,pos); } else { @@ -412,7 +413,7 @@ namespace MWScript pos.rot[0] = pos.rot[1] = 0; pos.rot[2] = zRot; MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtr(itemID,false); - MWBase::Environment::get().getWorld()->copyObjectToCell(ptr,*store,pos); + MWBase::Environment::get().getWorld()->safePlaceObject(ptr,*store,pos); } else { @@ -450,13 +451,14 @@ namespace MWScript ipos.pos[0] = pos.x; ipos.pos[1] = pos.y; ipos.pos[2] = pos.z; + ipos.rot[0] = 0; + ipos.rot[1] = 0; + ipos.rot[2] = 0; + MWWorld::CellStore* store = MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getCell(); - MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtr(itemID,false); - int icount = ptr.getRefData().getCount(); - ptr.getRefData().setCount(count); - MWBase::Environment::get().getWorld()->copyObjectToCell(ptr,*store,ipos); - ptr.getRefData().setCount(icount); - //store->ge + MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID); + ref.getPtr().getRefData().setCount(count); + MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),*store,ipos); } }; @@ -491,13 +493,15 @@ namespace MWScript ipos.pos[0] = pos.x; ipos.pos[1] = pos.y; ipos.pos[2] = pos.z; + ipos.rot[0] = 0; + ipos.rot[1] = 0; + ipos.rot[2] = 0; + MWWorld::CellStore* store = me.getCell(); - MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtr(itemID,false); - int icount = ptr.getRefData().getCount(); - ptr.getRefData().setCount(count); - MWBase::Environment::get().getWorld()->copyObjectToCell(ptr,*store,ipos); - ptr.getRefData().setCount(icount); - //store->ge + MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID); + ref.getPtr().getRefData().setCount(count); + MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),*store,ipos); + } }; @@ -566,8 +570,8 @@ namespace MWScript interpreter.installSegment5(opcodePlaceItemCell,new OpPlaceItemCell); interpreter.installSegment5(opcodePlaceItem,new OpPlaceItem); interpreter.installSegment5(opcodePlaceAtPc,new OpPlaceAtPc); - interpreter.installSegment5(opcodePlaceAtMe,new OpPlaceAtPc); - interpreter.installSegment5(opcodePlaceAtMeExplicit,new OpPlaceAtPc); + interpreter.installSegment5(opcodePlaceAtMe,new OpPlaceAtMe); + interpreter.installSegment5(opcodePlaceAtMeExplicit,new OpPlaceAtMe); } } } diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index d9c4fe3212..fb475f3615 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -656,6 +656,11 @@ namespace MWWorld } } + void World::safePlaceObject(const MWWorld::Ptr& ptr,MWWorld::CellStore &Cell,ESM::Position pos) + { + copyObjectToCell(ptr,Cell,pos); + } + void World::indexToPosition (int cellX, int cellY, float &x, float &y, bool centre) const { const int cellSize = 8192; diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp index 4031a180a8..acf63b54a0 100644 --- a/apps/openmw/mwworld/worldimp.hpp +++ b/apps/openmw/mwworld/worldimp.hpp @@ -214,6 +214,9 @@ namespace MWWorld /// \param adjust indicates rotation should be set or adjusted virtual void rotateObject (const Ptr& ptr,float x,float y,float z, bool adjust = false); + virtual void safePlaceObject(const MWWorld::Ptr& ptr,MWWorld::CellStore &Cell,ESM::Position pos); + ///< place an object in a "safe" location (ie not in the void, etc). Makes a copy of the Ptr. + virtual void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false) const; ///< Convert cell numbers to position. From 3c1a9061de1641fa03e4a69c25b050ee89ae7f2a Mon Sep 17 00:00:00 2001 From: gugus Date: Mon, 17 Sep 2012 14:12:27 +0200 Subject: [PATCH 21/21] Fixed a bug of Ptr having a wrong orientation. But that's strange, seems CellRef isn't initialized properly --- apps/openmw/mwscript/transformationextensions.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index e40390a635..5b43453ebf 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -369,8 +369,9 @@ namespace MWScript pos.pos[2] = z; pos.rot[0] = pos.rot[1] = 0; pos.rot[2] = zRot; - MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtr(itemID,false); - MWBase::Environment::get().getWorld()->safePlaceObject(ptr,*store,pos); + MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID); + ref.getPtr().getCellRef().pos = pos; + MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),*store,pos); } else { @@ -412,8 +413,9 @@ namespace MWScript pos.pos[2] = z; pos.rot[0] = pos.rot[1] = 0; pos.rot[2] = zRot; - MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtr(itemID,false); - MWBase::Environment::get().getWorld()->safePlaceObject(ptr,*store,pos); + MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID); + ref.getPtr().getCellRef().pos = pos; + MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),*store,pos); } else { @@ -457,6 +459,7 @@ namespace MWScript MWWorld::CellStore* store = MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getCell(); MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID); + ref.getPtr().getCellRef().pos = ipos; ref.getPtr().getRefData().setCount(count); MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),*store,ipos); } @@ -499,6 +502,7 @@ namespace MWScript MWWorld::CellStore* store = me.getCell(); MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(),itemID); + ref.getPtr().getCellRef().pos = ipos; ref.getPtr().getRefData().setCount(count); MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(),*store,ipos);