krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Inventory item picking

Browse source
This commit is contained in:
scrawl 2015-05-20 03:35:52 +02:00
parent 8d033f0558
commit c4452afd89
6 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -487,10 +487,8 @@ namespace MWGui
{
MyGUI::IntPoint mousePos = MyGUI::InputManager::getInstance ().getLastPressedPosition (MyGUI::MouseButton::Left);
MyGUI::IntPoint relPos = mousePos - mAvatarImage->getAbsolutePosition ();
int realX = int(float(relPos.left) / float(mAvatarImage->getSize().width) * 512.f );
int realY = int(float(relPos.top) / float(mAvatarImage->getSize().height) * 1024.f );
MWWorld::Ptr itemSelected = getAvatarSelectedItem (realX, realY);
MWWorld::Ptr itemSelected = getAvatarSelectedItem (relPos.left, relPos.top);
if (itemSelected.isEmpty ())
return;
@ -508,6 +506,8 @@ namespace MWGui
MWWorld::Ptr InventoryWindow::getAvatarSelectedItem(int x, int y)
{
// convert to OpenGL lower-left origin
y = (mAvatarImage->getHeight()-1) - y;
int slot = mPreview->getSlotSelected (x, y);
if (slot == -1)

4
apps/openmw/mwgui/tooltips.cpp
View file

@ -200,9 +200,7 @@ namespace MWGui
{
MyGUI::IntCoord avatarPos = focus->getAbsoluteCoord();
MyGUI::IntPoint relMousePos = MyGUI::InputManager::getInstance ().getMousePosition () - MyGUI::IntPoint(avatarPos.left, avatarPos.top);
int realX = int(float(relMousePos.left) / float(avatarPos.width) * 512.f );
int realY = int(float(relMousePos.top) / float(avatarPos.height) * 1024.f );
MWWorld::Ptr item = MWBase::Environment::get().getWindowManager()->getInventoryWindow ()->getAvatarSelectedItem (realX, realY);
MWWorld::Ptr item = MWBase::Environment::get().getWindowManager()->getInventoryWindow ()->getAvatarSelectedItem (relMousePos.left, relMousePos.top);
mFocusObject = item;
if (!mFocusObject.isEmpty ())

19
apps/openmw/mwrender/characterpreview.cpp
View file

@ -5,6 +5,8 @@
#include <osg/PositionAttitudeTransform>
#include <osgViewer/Viewer>
#include <osg/LightModel>
#include <osgUtil/IntersectionVisitor>
#include <osgUtil/LineSegmentIntersector>
#include <components/sceneutil/lightmanager.hpp>
@ -253,8 +255,21 @@ namespace MWRender
int InventoryPreview::getSlotSelected (int posX, int posY)
{
// TODO: implement
return 0;
osg::ref_ptr<osgUtil::LineSegmentIntersector> intersector (new osgUtil::LineSegmentIntersector(osgUtil::Intersector::WINDOW, posX, posY));
intersector->setIntersectionLimit(osgUtil::LineSegmentIntersector::LIMIT_ONE);
osgUtil::IntersectionVisitor visitor(intersector);
osg::Node::NodeMask nodeMask = mCamera->getNodeMask();
mCamera->setNodeMask(~0);
mCamera->accept(visitor);
mCamera->setNodeMask(nodeMask);
if (intersector->containsIntersections())
{
osgUtil::LineSegmentIntersector::Intersection intersection = intersector->getFirstIntersection();
return mAnimation->getSlot(intersection.nodePath);
}
return -1;
}
void InventoryPreview::updatePtr(const MWWorld::Ptr &ptr)

15
apps/openmw/mwrender/npcanimation.cpp
View file

@ -235,6 +235,21 @@ void NpcAnimation::rebuild()
MWBase::Environment::get().getMechanicsManager()->forceStateUpdate(mPtr);
}
int NpcAnimation::getSlot(const osg::NodePath &path) const
{
for (int i=0; i<ESM::PRT_Count; ++i)
{
PartHolderPtr part = mObjectParts[i];
if (!part.get())
continue;
if (std::find(path.begin(), path.end(), part->getNode().get()) != path.end())
{
return mPartslots[i];
}
}
return -1;
}
void NpcAnimation::updateNpcBase()
{
clearAnimSources();

3
apps/openmw/mwrender/npcanimation.hpp
View file

@ -174,6 +174,9 @@ public:
/// Rebuilds the NPC, updating their root model, animation sources, and equipment.
void rebuild();
/// Get the inventory slot that the given node path leads into, or -1 if not found.
int getSlot(const osg::NodePath& path) const;
/// Make the NPC only partially visible
virtual void setAlpha(float alpha);

2
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -139,6 +139,8 @@ namespace MWRender
mViewer->getCamera()->setComputeNearFarMode(osg::Camera::DO_NOT_COMPUTE_NEAR_FAR);
mViewer->getCamera()->setCullingMode(cullingMode);
mViewer->getCamera()->setCullMask(~(Mask_UpdateVisitor));
mViewDistance = Settings::Manager::getFloat("viewing distance", "Viewing distance");
mFieldOfView = Settings::Manager::getFloat("field of view", "General");
updateProjectionMatrix();