Commit e59dce9e authored by Jan Möbius's avatar Jan Möbius
Browse files

cppcheck fixes and removed unnecessary variables

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17411 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 9a75f178
...@@ -953,7 +953,6 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event) ...@@ -953,7 +953,6 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event)
Vec3d oldPoint3D; Vec3d oldPoint3D;
Vec2i newPoint2D(_event->pos().x(), _event->pos().y()); Vec2i newPoint2D(_event->pos().x(), _event->pos().y());
Vec3d newPoint3D; Vec3d newPoint3D;
double old_axis_hit, new_axis_hit, new_axis_over;
bool rot[3], trans[3]; bool rot[3], trans[3];
unsigned int i; unsigned int i;
bool lockOldPoint = false; bool lockOldPoint = false;
...@@ -980,10 +979,10 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event) ...@@ -980,10 +979,10 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event)
element_[Origin].clicked_ = false; element_[Origin].clicked_ = false;
// hit any top ? // hit any top ?
any_top_clicked_ = mapToCylinderTop(_state, newPoint2D, new_axis_hit, Click); any_top_clicked_ = mapToCylinderTop(_state, newPoint2D, Click);
// hit any axis ? // hit any axis ?
any_axis_clicked_ = mapToCylinder(_state, newPoint2D, new_axis_hit, Click); any_axis_clicked_ = mapToCylinder(_state, newPoint2D, Click);
// hit one of the outer rings ? // hit one of the outer rings ?
if (mode_ != Resize) if (mode_ != Resize)
...@@ -1080,14 +1079,15 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event) ...@@ -1080,14 +1079,15 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event)
else else
element_[Origin].over_ = false; element_[Origin].over_ = false;
// over any top ? // over any top ?
if (mode_ != Place) { if (mode_ != Place) {
any_top_over_ = mapToCylinderTop(_state, newPoint2D, new_axis_over, Over); any_top_over_ = mapToCylinderTop(_state, newPoint2D, Over);
} }
// over any axis ? // over any axis ?
if (mode_ != Place) { if (mode_ != Place) {
any_axis_over_ = mapToCylinder(_state, newPoint2D, new_axis_over, Over); any_axis_over_ = mapToCylinder(_state, newPoint2D, Over);
} }
// over one of the outer rings ? // over one of the outer rings ?
...@@ -1197,11 +1197,13 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event) ...@@ -1197,11 +1197,13 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event)
touched_ = true; touched_ = true;
} }
double old_axis_hit;
// x axis clicked apply translation along axis // x axis clicked apply translation along axis
if (trans[0]) { if (trans[0]) {
mapToCylinder(_state, oldPoint2D_, old_axis_hit); mapToCylinder(_state, oldPoint2D_);
mapToCylinder(_state, newPoint2D, new_axis_hit); mapToCylinder(_state, newPoint2D);
// translate // translate
// Get screen coordinates of current mouse position and unproject them // Get screen coordinates of current mouse position and unproject them
...@@ -1272,8 +1274,8 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event) ...@@ -1272,8 +1274,8 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event)
// y axis clicked change translation along axis // y axis clicked change translation along axis
if (trans[1]) { if (trans[1]) {
mapToCylinder(_state, oldPoint2D_, old_axis_hit); mapToCylinder(_state, oldPoint2D_);
mapToCylinder(_state, newPoint2D, new_axis_hit); mapToCylinder(_state, newPoint2D);
// translate // translate
// Get screen coordinates of current mouse position and unproject them // Get screen coordinates of current mouse position and unproject them
...@@ -1345,8 +1347,8 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event) ...@@ -1345,8 +1347,8 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event)
// z axis clicked change translation along axis // z axis clicked change translation along axis
if (trans[2]) { if (trans[2]) {
mapToCylinder(_state, oldPoint2D_, old_axis_hit); mapToCylinder(_state, oldPoint2D_);
mapToCylinder(_state, newPoint2D, new_axis_hit); mapToCylinder(_state, newPoint2D);
// translate // translate
// Get screen coordinates of current mouse position and unproject them // Get screen coordinates of current mouse position and unproject them
...@@ -1418,8 +1420,8 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event) ...@@ -1418,8 +1420,8 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event)
// x top clicked: rotate around x axis // x top clicked: rotate around x axis
if (rot[0] && (activeRotations_ & X_AXIS)) { if (rot[0] && (activeRotations_ & X_AXIS)) {
mapToCylinder(_state, oldPoint2D_, old_axis_hit); mapToCylinder(_state, oldPoint2D_);
mapToCylinder(_state, newPoint2D, new_axis_hit); mapToCylinder(_state, newPoint2D);
Vec2i dist = oldPoint2D_ - newPoint2D; Vec2i dist = oldPoint2D_ - newPoint2D;
int rotation = 0; int rotation = 0;
...@@ -1466,8 +1468,8 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event) ...@@ -1466,8 +1468,8 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event)
// or outer ring on zx axis has been clicked // or outer ring on zx axis has been clicked
if (rot[1] && (activeRotations_ & Y_AXIS)) { if (rot[1] && (activeRotations_ & Y_AXIS)) {
mapToCylinder(_state, oldPoint2D_, old_axis_hit); mapToCylinder(_state, oldPoint2D_);
mapToCylinder(_state, newPoint2D, new_axis_hit); mapToCylinder(_state, newPoint2D);
Vec2i dist = oldPoint2D_ - newPoint2D; Vec2i dist = oldPoint2D_ - newPoint2D;
int rotation = 0; int rotation = 0;
...@@ -1509,8 +1511,8 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event) ...@@ -1509,8 +1511,8 @@ TranslationManipulatorNode::mouseEvent(GLState& _state, QMouseEvent* _event)
// z top clicked: rotate around z axis // z top clicked: rotate around z axis
if (rot[2] && (activeRotations_ & Z_AXIS)) { if (rot[2] && (activeRotations_ & Z_AXIS)) {
mapToCylinder(_state, oldPoint2D_, old_axis_hit); mapToCylinder(_state, oldPoint2D_);
mapToCylinder(_state, newPoint2D, new_axis_hit); mapToCylinder(_state, newPoint2D);
Vec2i dist = oldPoint2D_ - newPoint2D; Vec2i dist = oldPoint2D_ - newPoint2D;
...@@ -1650,7 +1652,6 @@ bool TranslationManipulatorNode::hitOuterSphere( GLState& _state, ...@@ -1650,7 +1652,6 @@ bool TranslationManipulatorNode::hitOuterSphere( GLState& _state,
bool bool
TranslationManipulatorNode::mapToCylinder( GLState& _state, TranslationManipulatorNode::mapToCylinder( GLState& _state,
const Vec2i& _v1, const Vec2i& _v1,
double& _axis_hit,
StateUpdates _updateStates ) StateUpdates _updateStates )
{ {
// Qt -> GL coordinate systems // Qt -> GL coordinate systems
...@@ -1719,7 +1720,6 @@ TranslationManipulatorNode::mapToCylinder( GLState& _state, ...@@ -1719,7 +1720,6 @@ TranslationManipulatorNode::mapToCylinder( GLState& _state,
{ {
// z axis has been hit // z axis has been hit
_axis_hit = axis_hitX;
if ( _updateStates == Click) if ( _updateStates == Click)
element_[XAxis].clicked_ = true; element_[XAxis].clicked_ = true;
else else
...@@ -1731,7 +1731,6 @@ TranslationManipulatorNode::mapToCylinder( GLState& _state, ...@@ -1731,7 +1731,6 @@ TranslationManipulatorNode::mapToCylinder( GLState& _state,
{ {
// y axis has been hit // y axis has been hit
_axis_hit = axis_hitY;
if ( _updateStates == Click) if ( _updateStates == Click)
element_[YAxis].clicked_ = true; element_[YAxis].clicked_ = true;
else else
...@@ -1742,14 +1741,12 @@ TranslationManipulatorNode::mapToCylinder( GLState& _state, ...@@ -1742,14 +1741,12 @@ TranslationManipulatorNode::mapToCylinder( GLState& _state,
( axis_hitZ <= manipulator_height_ ) ) ( axis_hitZ <= manipulator_height_ ) )
{ {
// x axis has been hit // x axis has been hit
_axis_hit = axis_hitZ;
if ( _updateStates == Click) if ( _updateStates == Click)
element_[ZAxis].clicked_ = true; element_[ZAxis].clicked_ = true;
else else
element_[ZAxis].over_ = true; element_[ZAxis].over_ = true;
} else }
_axis_hit = 0.0;
if ( _updateStates == Click) if ( _updateStates == Click)
return (element_[XAxis].clicked_ || element_[YAxis].clicked_ || element_[ZAxis].clicked_); return (element_[XAxis].clicked_ || element_[YAxis].clicked_ || element_[ZAxis].clicked_);
...@@ -1766,7 +1763,6 @@ TranslationManipulatorNode::mapToCylinder( GLState& _state, ...@@ -1766,7 +1763,6 @@ TranslationManipulatorNode::mapToCylinder( GLState& _state,
bool bool
TranslationManipulatorNode::mapToCylinderTop( GLState& _state, TranslationManipulatorNode::mapToCylinderTop( GLState& _state,
const Vec2i& _v1, const Vec2i& _v1,
double& _axis_hit,
StateUpdates _updateStates ) StateUpdates _updateStates )
{ {
// Qt -> GL coordinate systems // Qt -> GL coordinate systems
...@@ -1841,7 +1837,6 @@ TranslationManipulatorNode::mapToCylinderTop( GLState& _state, ...@@ -1841,7 +1837,6 @@ TranslationManipulatorNode::mapToCylinderTop( GLState& _state,
{ {
// z top has been hit // z top has been hit
_axis_hit = axis_hitX;
if ( _updateStates == Click) if ( _updateStates == Click)
element_[XTop].clicked_ = true; element_[XTop].clicked_ = true;
else else
...@@ -1853,7 +1848,6 @@ TranslationManipulatorNode::mapToCylinderTop( GLState& _state, ...@@ -1853,7 +1848,6 @@ TranslationManipulatorNode::mapToCylinderTop( GLState& _state,
{ {
// y top has been hit // y top has been hit
_axis_hit = axis_hitY;
if ( _updateStates == Click) if ( _updateStates == Click)
element_[YTop].clicked_ = true; element_[YTop].clicked_ = true;
else else
...@@ -1865,14 +1859,12 @@ TranslationManipulatorNode::mapToCylinderTop( GLState& _state, ...@@ -1865,14 +1859,12 @@ TranslationManipulatorNode::mapToCylinderTop( GLState& _state,
{ {
// x top has been hit // x top has been hit
_axis_hit = axis_hitZ;
if ( _updateStates == Click) if ( _updateStates == Click)
element_[ZTop].clicked_ = true; element_[ZTop].clicked_ = true;
else else
element_[ZTop].over_ = true; element_[ZTop].over_ = true;
} else }
_axis_hit = 0.0;
if ( _updateStates == Click) if ( _updateStates == Click)
return (element_[XTop].clicked_ || element_[YTop].clicked_ || element_[ZTop].clicked_); return (element_[XTop].clicked_ || element_[YTop].clicked_ || element_[ZTop].clicked_);
......
...@@ -273,8 +273,8 @@ private: ...@@ -273,8 +273,8 @@ private:
void addAxisToRenderer (IRenderer* _renderer, RenderObject* _baseRO, bool _active, int _axis); void addAxisToRenderer (IRenderer* _renderer, RenderObject* _baseRO, bool _active, int _axis);
bool mapToCylinder (GLState& _state, const Vec2i& _v2, double& axis_hit, StateUpdates _updateStates = None); bool mapToCylinder (GLState& _state, const Vec2i& _v2, StateUpdates _updateStates = None);
bool mapToCylinderTop (GLState& _state, const Vec2i& _v2, double& axis_hit, StateUpdates _updateStates = None); bool mapToCylinderTop (GLState& _state, const Vec2i& _v2, StateUpdates _updateStates = None);
bool mapToSphere (GLState& _state, const Vec2i& _v2, Vec3d& _v3, StateUpdates _updateStates = None); bool mapToSphere (GLState& _state, const Vec2i& _v2, Vec3d& _v3, StateUpdates _updateStates = None);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment