Commit adb7f7d5 authored by Matthias Möller's avatar Matthias Möller
Browse files

- changed the way to set the color (glColor to state.base_color)

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13483 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 31d9ec9a
......@@ -613,19 +613,13 @@ void TranslationManipulatorNode::drawManipulator (GLState& _state, bool _active)
{
_state.set_diffuse_color(element_[XRing].active_current_color_);
_state.set_ambient_color(element_[XRing].active_current_color_);
_state.set_base_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_);
_state.set_base_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],
element_[XRing].inactive_current_color_[3]);
}
circle_->draw(_state);
......@@ -638,19 +632,13 @@ void TranslationManipulatorNode::drawManipulator (GLState& _state, bool _active)
{
_state.set_diffuse_color(element_[YRing].active_current_color_);
_state.set_ambient_color(element_[YRing].active_current_color_);
_state.set_base_color(element_[XRing].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_);
_state.set_base_color(element_[XRing].inactive_current_color_);
glColor4f(element_[YRing].inactive_current_color_[0],
element_[YRing].inactive_current_color_[1],
element_[YRing].inactive_current_color_[2],
element_[YRing].inactive_current_color_[3]);
}
circle_->draw(_state);
......@@ -662,19 +650,13 @@ void TranslationManipulatorNode::drawManipulator (GLState& _state, bool _active)
{
_state.set_diffuse_color(element_[ZRing].active_current_color_);
_state.set_ambient_color(element_[ZRing].active_current_color_);
_state.set_base_color(element_[XRing].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_);
_state.set_base_color(element_[XRing].inactive_current_color_);
glColor4f(element_[ZRing].inactive_current_color_[0],
element_[ZRing].inactive_current_color_[1],
element_[ZRing].inactive_current_color_[2],
element_[ZRing].inactive_current_color_[3]);
}
circle_->draw(_state);
......
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