mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 04:20:29 +00:00
Code Issues Projects Releases Wiki Activity

Test of basic mouse-plane use

Browse Source
This commit is contained in:
unelsson 2021-08-30 00:26:26 +03:00
parent 291195872e
commit 0d511da615
2 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
apps/opencs/view/render/instancemode.cpp
View File

@ -305,6 +305,9 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (const QPoint& pos)
if (mSubModeId == "move")
{
objectTag->mObject->setEdited (Object::Override_Position);
mDragStart.x() = objectTag->mObject->getPosition().pos[0];
mDragStart.y() = objectTag->mObject->getPosition().pos[1];
mDragStart.z() = objectTag->mObject->getPosition().pos[2];
mDragMode = DragMode_Move;
}
else if (mSubModeId == "rotate")
@ -392,29 +395,7 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
std::vector<osg::ref_ptr<TagBase> > selection = getWorldspaceWidget().getEdited (Mask_Reference);
if (mDragMode == DragMode_Move)
{
osg::Vec3f eye, centre, up;
getWorldspaceWidget().getCamera()->getViewMatrix().getLookAt (eye, centre, up);
if (diffY)
{
offset += up * diffY * speedFactor;
}
if (diffX)
{
offset += ((centre-eye) ^ up) * diffX * speedFactor;
}
if (mDragAxis!=-1)
{
for (int i=0; i<3; ++i)
{
if (i!=mDragAxis)
offset[i] = 0;
}
}
}
if (mDragMode == DragMode_Move) {}
else if (mDragMode == DragMode_Rotate)
{
osg::Vec3f eye, centre, up;
@ -522,10 +503,10 @@ void CSVRender::InstanceMode::drag (const QPoint& pos, int diffX, int diffY, dou
if (mDragMode == DragMode_Move)
{
ESM::Position position = objectTag->mObject->getPosition();
for (int i=0; i<3; ++i)
{
position.pos[i] += offset[i];
}
osg::Vec3d mousePos = getMousePlaneCoords(pos, getProjectionSpaceCoords(mDragStart));
position.pos[0] = mousePos.x();
position.pos[1] = mousePos.y();
position.pos[2] = mousePos.z();
objectTag->mObject->setPosition(position.pos);
}

1
apps/opencs/view/render/instancemode.hpp
View File

@ -45,6 +45,7 @@ namespace CSVRender
bool mLocked;
float mUnitScaleDist;
osg::ref_ptr<osg::Group> mParentNode;
osg::Vec3d mDragStart;
int getSubModeFromId (const std::string& id) const;