mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 08:06:41 +00:00
Code Issues Releases Wiki Activity

some code simplification

Browse source
This commit is contained in:
Marc Zinnschlag 2016-03-04 12:02:45 +01:00
parent c2a8be9048
commit d57021b23c
2 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/opencs/view/render/instancemode.cpp
View file

@ -27,7 +27,7 @@ int CSVRender::InstanceMode::getSubModeFromId (const std::string& id) const
CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent) CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
: EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference, "Instance editing", : EditMode (worldspaceWidget, QIcon (":placeholder"), Mask_Reference, "Instance editing",
parent), mSubMode (0), mSelectionMode (0), mDragMode (DragMode_None), mDragAxis (0) parent), mSubMode (0), mSelectionMode (0), mDragMode (DragMode_None), mDragAxis (-1)
{ {
} }
@ -165,10 +165,11 @@ bool CSVRender::InstanceMode::primaryEditStartDrag (osg::ref_ptr<TagBase> tag)
if (CSVRender::ObjectMarkerTag *objectTag = dynamic_cast<CSVRender::ObjectMarkerTag *> (tag.get())) if (CSVRender::ObjectMarkerTag *objectTag = dynamic_cast<CSVRender::ObjectMarkerTag *> (tag.get()))
{ {
mDragAxis = objectTag->mAxis; mDragAxis = objectTag->mAxis;
mDragMode = DragMode_MoveAxis;
} }
else else
mDragMode = DragMode_Move; mDragAxis = -1;
mDragMode = DragMode_Move;
return true; return true;
} }
@ -197,17 +198,12 @@ void CSVRender::InstanceMode::drag (int diffX, int diffY, double speedFactor)
switch (mDragMode) switch (mDragMode)
{ {
case DragMode_MoveAxis:
{
for (int i=0; i<3; ++i)
if (i!=mDragAxis)
offset[i] = 0;
// Fall through
}
case DragMode_Move: case DragMode_Move:
{ {
if (mDragAxis!=-1)
for (int i=0; i<3; ++i)
if (i!=mDragAxis)
offset[i] = 0;
std::vector<osg::ref_ptr<TagBase> > selection = std::vector<osg::ref_ptr<TagBase> > selection =
getWorldspaceWidget().getEdited (Mask_Reference); getWorldspaceWidget().getEdited (Mask_Reference);
@ -242,10 +238,7 @@ void CSVRender::InstanceMode::dragCompleted()
switch (mDragMode) switch (mDragMode)
{ {
case DragMode_Move: case DragMode_Move: description = "Move Instances"; break;
case DragMode_MoveAxis:
description = "Move Instances"; break;
case DragMode_None: break; case DragMode_None: break;
} }

4
apps/opencs/view/render/instancemode.hpp
View file

@ -19,9 +19,7 @@ namespace CSVRender
enum DragMode enum DragMode
{ {
DragMode_None, DragMode_None,
DragMode_Move, DragMode_Move
DragMode_MoveAxis
}; };
CSVWidget::SceneToolMode *mSubMode; CSVWidget::SceneToolMode *mSubMode;