From d57021b23c682598f71a6922ca9bebe0ea6d56a5 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 4 Mar 2016 12:02:45 +0100
Subject: [PATCH] some code simplification

---
 apps/opencs/view/render/instancemode.cpp | 25 +++++++++---------------
 apps/opencs/view/render/instancemode.hpp |  4 +---
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/apps/opencs/view/render/instancemode.cpp b/apps/opencs/view/render/instancemode.cpp
index f4f38dd34..91923e004 100644
--- a/apps/opencs/view/render/instancemode.cpp
+++ b/apps/opencs/view/render/instancemode.cpp
@@ -27,7 +27,7 @@ int CSVRender::InstanceMode::getSubModeFromId (const std::string& id) const
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget, QWidget *parent)
 : 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()))
     {
         mDragAxis = objectTag->mAxis;
-        mDragMode = DragMode_MoveAxis;
     }
     else
-        mDragMode = DragMode_Move;
+        mDragAxis = -1;
+
+    mDragMode = DragMode_Move;
 
     return true;
 }
@@ -197,17 +198,12 @@ void CSVRender::InstanceMode::drag (int diffX, int diffY, double speedFactor)
 
     switch (mDragMode)
     {
-        case DragMode_MoveAxis:
-        {
-            for (int i=0; i<3; ++i)
-                if (i!=mDragAxis)
-                    offset[i] = 0;
-
-            // Fall through
-        }
-
         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 =
                 getWorldspaceWidget().getEdited (Mask_Reference);
@@ -242,10 +238,7 @@ void CSVRender::InstanceMode::dragCompleted()
 
     switch (mDragMode)
     {
-        case DragMode_Move:
-        case DragMode_MoveAxis:
-
-            description = "Move Instances"; break;
+        case DragMode_Move: description = "Move Instances"; break;
 
         case DragMode_None: break;
     }
diff --git a/apps/opencs/view/render/instancemode.hpp b/apps/opencs/view/render/instancemode.hpp
index e65d8146c..5a744ea88 100644
--- a/apps/opencs/view/render/instancemode.hpp
+++ b/apps/opencs/view/render/instancemode.hpp
@@ -19,9 +19,7 @@ namespace CSVRender
             enum DragMode
             {
                 DragMode_None,
-                DragMode_Move,
-                DragMode_MoveAxis
-
+                DragMode_Move
             };
 
             CSVWidget::SceneToolMode *mSubMode;