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

Christopher: Corrected colors for translationmanipulatornode. closes #289

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13465 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 3c32a948
......@@ -611,11 +611,17 @@ void TranslationManipulatorNode::drawManipulator (GLState& _state, bool _active)
if ( activeRotations_ & X_AXIS) {
if (_active)
{
_state.set_diffuse_color(element_[XRing].active_current_color_);
_state.set_ambient_color(element_[XRing].active_current_color_);
glColor4f(element_[XRing].active_current_color_[0],
element_[XRing].active_current_color_[1],
element_[XRing].active_current_color_[2],
element_[XRing].active_current_color_[3]);
} else {
_state.set_diffuse_color(element_[XRing].inactive_current_color_);
_state.set_ambient_color(element_[XRing].inactive_current_color_);
glColor4f(element_[XRing].inactive_current_color_[0],
element_[XRing].inactive_current_color_[1],
element_[XRing].inactive_current_color_[2],
......@@ -630,11 +636,17 @@ void TranslationManipulatorNode::drawManipulator (GLState& _state, bool _active)
if ( activeRotations_ & Y_AXIS) {
if (_active)
{
_state.set_diffuse_color(element_[YRing].active_current_color_);
_state.set_ambient_color(element_[YRing].active_current_color_);
glColor4f(element_[YRing].active_current_color_[0],
element_[YRing].active_current_color_[1],
element_[YRing].active_current_color_[2],
element_[YRing].active_current_color_[3]);
} else {
_state.set_diffuse_color(element_[YRing].inactive_current_color_);
_state.set_ambient_color(element_[YRing].inactive_current_color_);
glColor4f(element_[YRing].inactive_current_color_[0],
element_[YRing].inactive_current_color_[1],
element_[YRing].inactive_current_color_[2],
......@@ -648,11 +660,17 @@ void TranslationManipulatorNode::drawManipulator (GLState& _state, bool _active)
if ( activeRotations_ & Z_AXIS) {
if (_active)
{
_state.set_diffuse_color(element_[ZRing].active_current_color_);
_state.set_ambient_color(element_[ZRing].active_current_color_);
glColor4f(element_[ZRing].active_current_color_[0],
element_[ZRing].active_current_color_[1],
element_[ZRing].active_current_color_[2],
element_[ZRing].active_current_color_[3]);
} else {
_state.set_diffuse_color(element_[ZRing].inactive_current_color_);
_state.set_ambient_color(element_[ZRing].inactive_current_color_);
glColor4f(element_[ZRing].inactive_current_color_[0],
element_[ZRing].inactive_current_color_[1],
element_[ZRing].inactive_current_color_[2],
......
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