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

Fixed some warnings in nodes

parent 355021e6
Pipeline #3272 canceled with stage
in 15 minutes and 47 seconds
...@@ -438,7 +438,7 @@ getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawM ...@@ -438,7 +438,7 @@ getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawM
//localMaterial.color(primitives_[i].color); //localMaterial.color(primitives_[i].color);
//localMaterial.ambientColor(primitives_[i].color); //localMaterial.ambientColor(primitives_[i].color);
localMaterial.diffuseColor(primitives_[i].color); localMaterial.diffuseColor(primitives_[i].color);
localMaterial.baseColor(primitives_[i].color * .5); localMaterial.baseColor(primitives_[i].color * .5f);
} }
ro.setMaterial(&localMaterial); ro.setMaterial(&localMaterial);
......
...@@ -299,8 +299,8 @@ void TranslationManipulatorNode::updateTargetColors () ...@@ -299,8 +299,8 @@ void TranslationManipulatorNode::updateTargetColors ()
element_[Origin].inactive_target_color_ = colors[0][5]; element_[Origin].inactive_target_color_ = colors[0][5];
for (unsigned int i = 1; i < NumElements - 3; i++) for (unsigned int i = 1; i < NumElements - 3; i++)
{ {
element_[i].active_target_color_ = (colors[0][2] * 0.5) + (colors[((i-1)%3) + 1][2] * 0.5); element_[i].active_target_color_ = (colors[0][2] * static_cast<float>(0.5) ) + (colors[((i-1)%3) + 1][2] * static_cast<float>(0.5));
element_[i].inactive_target_color_ = (colors[0][5] * 0.5) + (colors[((i-1)%3) + 1][5] * 0.5); element_[i].inactive_target_color_ = (colors[0][5] * static_cast<float>(0.5)) + (colors[((i-1)%3) + 1][5] * static_cast<float>(0.5) );
} }
return; return;
} else if(element_[Origin].over_){ } else if(element_[Origin].over_){
...@@ -308,8 +308,8 @@ void TranslationManipulatorNode::updateTargetColors () ...@@ -308,8 +308,8 @@ void TranslationManipulatorNode::updateTargetColors ()
element_[Origin].inactive_target_color_ = colors[0][4]; element_[Origin].inactive_target_color_ = colors[0][4];
for (unsigned int i = 1; i < NumElements - 3; i++) for (unsigned int i = 1; i < NumElements - 3; i++)
{ {
element_[i].active_target_color_ = (colors[0][1] * 0.5) + (colors[((i-1)%3) + 1][1] * 0.5); element_[i].active_target_color_ = (colors[0][1] * static_cast<float>(0.5)) + (colors[((i-1)%3) + 1][1] * static_cast<float>(0.5));
element_[i].inactive_target_color_ = (colors[0][4] * 0.5) + (colors[((i-1)%3) + 1][4] * 0.5); element_[i].inactive_target_color_ = (colors[0][4] * static_cast<float>(0.5)) + (colors[((i-1)%3) + 1][4] * static_cast<float>(0.5));
} }
return; return;
} }
......
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