Skip to content

Commit

Permalink
FIX sofa-framework#288 Rename data member variables
Browse files Browse the repository at this point in the history
  • Loading branch information
@garciaguevara
garciaguevara committed Oct 12, 2017
1 parent 3c5b7ae commit d867495
Showing 1 changed file with 32 additions and 32 deletions.
64 changes: 32 additions & 32 deletions applications/plugins/Flexible/types/ComponentSpecializations.cpp.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,14 @@ void FixedConstraint< TYPEABSTRACTNAME3dTypes >::draw(const core::visual::Visual
{
if (!vparams->displayFlags().getShowBehaviorModels()) return;

const SetIndexArray & indices = f_indices.getValue();
const SetIndexArray & indices = d_indices.getValue();
const VecCoord& x = mstate->read(core::ConstVecCoordId::position())->getValue();

if( f_drawSize.getValue() == 0) // old classical drawing by points
if( d_drawSize.getValue() == 0) // old classical drawing by points
{
std::vector< Vector3 > points;

if( f_fixAll.getValue()==true )
if( d_fixAll.getValue()==true )
for (unsigned i=0; i<x.size(); i++ )
points.push_back(x[i].getCenter());
else
Expand All @@ -136,16 +136,16 @@ void FixedConstraint< TYPEABSTRACTNAME3dTypes >::draw(const core::visual::Visual
vparams->drawTool()->drawPoints(points, 10, Vec<4,float>(1,0.5,0.5,1));
}
else
// vparams->drawTool()->drawSpheres(points, (float)f_drawSize.getValue(), Vec<4,float>(0.2f,0.1f,0.9f,1.0f));
// vparams->drawTool()->drawSpheres(points, (float)d_drawSize.getValue(), Vec<4,float>(0.2f,0.1f,0.9f,1.0f));
{
if( f_fixAll.getValue()==true )
if( d_fixAll.getValue()==true )
for (unsigned i=0; i<x.size(); i++ )
{
vparams->drawTool()->pushMatrix();
float glTransform[16];
x[i].writeOpenGlMatrix ( glTransform );
vparams->drawTool()->multMatrix( glTransform );
vparams->drawTool()->scale ( f_drawSize.getValue() );
vparams->drawTool()->scale ( d_drawSize.getValue() );
vparams->drawTool()->drawFrame ( Vector3(), Quat(), Vector3 ( 1,1,1 ), Vec4f(0,0,1,1) );
vparams->drawTool()->popMatrix();
}
Expand All @@ -158,7 +158,7 @@ void FixedConstraint< TYPEABSTRACTNAME3dTypes >::draw(const core::visual::Visual
float glTransform[16];
x[indices[i]].writeOpenGlMatrix ( glTransform );
vparams->drawTool()->multMatrix( glTransform );
vparams->drawTool()->scale ( f_drawSize.getValue() );
vparams->drawTool()->scale ( d_drawSize.getValue() );
vparams->drawTool()->drawFrame ( Vector3(), Quat(), Vector3 ( 1,1,1 ), Vec4f(0,0,1,1) );
vparams->drawTool()->popMatrix();
}
Expand All @@ -168,7 +168,7 @@ void FixedConstraint< TYPEABSTRACTNAME3dTypes >::draw(const core::visual::Visual
float glTransform[16];
x[*it].writeOpenGlMatrix ( glTransform );
vparams->drawTool()->multMatrix( glTransform );
vparams->drawTool()->scale ( f_drawSize.getValue() );
vparams->drawTool()->scale ( d_drawSize.getValue() );
vparams->drawTool()->drawFrame ( Vector3(), Quat(), Vector3 ( 1,1,1 ), Vec4f(0,0,1,1) );
vparams->drawTool()->popMatrix();
}
Expand All @@ -182,14 +182,14 @@ void FixedConstraint< TYPEABSTRACTNAME3fTypes >::draw(const core::visual::Visual
{
if (!vparams->displayFlags().getShowBehaviorModels()) return;

const SetIndexArray & indices = f_indices.getValue();
const SetIndexArray & indices = d_indices.getValue();
const VecCoord& x = mstate->read(core::ConstVecCoordId::position())->getValue();

if( f_drawSize.getValue() == 0) // old classical drawing by points
if( d_drawSize.getValue() == 0) // old classical drawing by points
{
std::vector< Vector3 > points;

if( f_fixAll.getValue()==true )
if( d_fixAll.getValue()==true )
for (unsigned i=0; i<x.size(); i++ )
points.push_back(x[i].getCenter());
else
Expand All @@ -201,16 +201,16 @@ void FixedConstraint< TYPEABSTRACTNAME3fTypes >::draw(const core::visual::Visual
vparams->drawTool()->drawPoints(points, 10, Vec<4,float>(1,0.5,0.5,1));
}
else
// vparams->drawTool()->drawSpheres(points, (float)f_drawSize.getValue(), Vec<4,float>(0.2f,0.1f,0.9f,1.0f));
// vparams->drawTool()->drawSpheres(points, (float)d_drawSize.getValue(), Vec<4,float>(0.2f,0.1f,0.9f,1.0f));
{
if( f_fixAll.getValue()==true )
if( d_fixAll.getValue()==true )
for (unsigned i=0; i<x.size(); i++ )
{
vparams->drawTool()->pushMatrix();
float glTransform[16];
x[i].writeOpenGlMatrix ( glTransform );
vparams->drawTool()->multMatrix( glTransform );
vparams->drawTool()->scale ( f_drawSize.getValue() );
vparams->drawTool()->scale ( d_drawSize.getValue() );
vparams->drawTool()->drawFrame ( Vector3(), Quat(), Vector3 ( 1,1,1 ), Vec4f(0,0,1,1) );
vparams->drawTool()->popMatrix();
}
Expand All @@ -223,7 +223,7 @@ void FixedConstraint< TYPEABSTRACTNAME3fTypes >::draw(const core::visual::Visual
float glTransform[16];
x[indices[i]].writeOpenGlMatrix ( glTransform );
vparams->drawTool()->multMatrix( glTransform );
vparams->drawTool()->scale ( f_drawSize.getValue() );
vparams->drawTool()->scale ( d_drawSize.getValue() );
vparams->drawTool()->drawFrame ( Vector3(), Quat(), Vector3 ( 1,1,1 ), Vec4f(0,0,1,1) );
vparams->drawTool()->popMatrix();
}
Expand All @@ -233,7 +233,7 @@ void FixedConstraint< TYPEABSTRACTNAME3fTypes >::draw(const core::visual::Visual
float glTransform[16];
x[*it].writeOpenGlMatrix ( glTransform );
vparams->drawTool()->multMatrix( glTransform );
vparams->drawTool()->scale ( f_drawSize.getValue() );
vparams->drawTool()->scale ( d_drawSize.getValue() );
vparams->drawTool()->drawFrame ( Vector3(), Quat(), Vector3 ( 1,1,1 ), Vec4f(0,0,1,1) );
vparams->drawTool()->popMatrix();
}
Expand Down Expand Up @@ -275,14 +275,14 @@ void PartialFixedConstraint<TYPEABSTRACTNAME3dTypes>::draw(const core::visual::V
{
if (!vparams->displayFlags().getShowBehaviorModels()) return;

const SetIndexArray & indices = f_indices.getValue();
const SetIndexArray & indices = d_indices.getValue();
const VecCoord& x = mstate->read(core::ConstVecCoordId::position())->getValue();

if( _drawSize.getValue() == 0) // old classical drawing by points
if( d_drawSize.getValue() == 0) // old classical drawing by points
{
std::vector< Vector3 > points;

if( f_fixAll.getValue()==true )
if( d_fixAll.getValue()==true )
for (unsigned i=0; i<x.size(); i++ )
points.push_back(x[i].getCenter());
else
Expand All @@ -294,16 +294,16 @@ void PartialFixedConstraint<TYPEABSTRACTNAME3dTypes>::draw(const core::visual::V
vparams->drawTool()->drawPoints(points, 10, Vec<4,float>(1,0.5,0.5,1));
}
else
// vparams->drawTool()->drawSpheres(points, (float)f_drawSize.getValue(), Vec<4,float>(0.2f,0.1f,0.9f,1.0f));
// vparams->drawTool()->drawSpheres(points, (float)d_drawSize.getValue(), Vec<4,float>(0.2f,0.1f,0.9f,1.0f));
{
if( f_fixAll.getValue()==true )
if( d_fixAll.getValue()==true )
for (unsigned i=0; i<x.size(); i++ )
{
vparams->drawTool()->pushMatrix();
float glTransform[16];
x[i].writeOpenGlMatrix ( glTransform );
vparams->drawTool()->multMatrix( glTransform );
vparams->drawTool()->scale ( _drawSize.getValue() );
vparams->drawTool()->scale ( d_drawSize.getValue() );
vparams->drawTool()->drawFrame ( Vector3(), Quat(), Vector3 ( 1,1,1 ), Vec4f(0,0,1,1) );
vparams->drawTool()->popMatrix();
}
Expand All @@ -316,7 +316,7 @@ void PartialFixedConstraint<TYPEABSTRACTNAME3dTypes>::draw(const core::visual::V
float glTransform[16];
x[indices[i]].writeOpenGlMatrix ( glTransform );
vparams->drawTool()->multMatrix( glTransform );
vparams->drawTool()->scale ( _drawSize.getValue() );
vparams->drawTool()->scale ( d_drawSize.getValue() );
vparams->drawTool()->drawFrame ( Vector3(), Quat(), Vector3 ( 1,1,1 ), Vec4f(0,0,1,1) );
vparams->drawTool()->popMatrix();
}
Expand All @@ -326,7 +326,7 @@ void PartialFixedConstraint<TYPEABSTRACTNAME3dTypes>::draw(const core::visual::V
float glTransform[16];
x[*it].writeOpenGlMatrix ( glTransform );
vparams->drawTool()->multMatrix( glTransform );
vparams->drawTool()->scale ( _drawSize.getValue() );
vparams->drawTool()->scale ( d_drawSize.getValue() );
vparams->drawTool()->drawFrame ( Vector3(), Quat(), Vector3 ( 1,1,1 ), Vec4f(0,0,1,1) );
vparams->drawTool()->popMatrix();
}
Expand All @@ -340,14 +340,14 @@ void PartialFixedConstraint<TYPEABSTRACTNAME3fTypes>::draw(const core::visual::V
{
if (!vparams->displayFlags().getShowBehaviorModels()) return;

const SetIndexArray & indices = f_indices.getValue();
const SetIndexArray & indices = d_indices.getValue();
const VecCoord& x = mstate->read(core::ConstVecCoordId::position())->getValue();

if( _drawSize.getValue() == 0) // old classical drawing by points
if( d_drawSize.getValue() == 0) // old classical drawing by points
{
std::vector< Vector3 > points;

if( f_fixAll.getValue()==true )
if( d_fixAll.getValue()==true )
for (unsigned i=0; i<x.size(); i++ )
points.push_back(x[i].getCenter());
else
Expand All @@ -359,16 +359,16 @@ void PartialFixedConstraint<TYPEABSTRACTNAME3fTypes>::draw(const core::visual::V
vparams->drawTool()->drawPoints(points, 10, Vec<4,float>(1,0.5,0.5,1));
}
else
// vparams->drawTool()->drawSpheres(points, (float)f_drawSize.getValue(), Vec<4,float>(0.2f,0.1f,0.9f,1.0f));
// vparams->drawTool()->drawSpheres(points, (float)d_drawSize.getValue(), Vec<4,float>(0.2f,0.1f,0.9f,1.0f));
{
if( f_fixAll.getValue()==true )
if( d_fixAll.getValue()==true )
for (unsigned i=0; i<x.size(); i++ )
{
vparams->drawTool()->pushMatrix();
float glTransform[16];
x[i].writeOpenGlMatrix ( glTransform );
vparams->drawTool()->multMatrix( glTransform );
vparams->drawTool()->scale ( _drawSize.getValue() );
vparams->drawTool()->scale ( d_drawSize.getValue() );
vparams->drawTool()->drawFrame ( Vector3(), Quat(), Vector3 ( 1,1,1 ), Vec4f(0,0,1,1) );
vparams->drawTool()->popMatrix();
}
Expand All @@ -381,7 +381,7 @@ void PartialFixedConstraint<TYPEABSTRACTNAME3fTypes>::draw(const core::visual::V
float glTransform[16];
x[indices[i]].writeOpenGlMatrix ( glTransform );
vparams->drawTool()->multMatrix( glTransform );
vparams->drawTool()->scale ( _drawSize.getValue() );
vparams->drawTool()->scale ( d_drawSize.getValue() );
vparams->drawTool()->drawFrame ( Vector3(), Quat(), Vector3 ( 1,1,1 ), Vec4f(0,0,1,1) );
vparams->drawTool()->popMatrix();
}
Expand All @@ -391,7 +391,7 @@ void PartialFixedConstraint<TYPEABSTRACTNAME3fTypes>::draw(const core::visual::V
float glTransform[16];
x[*it].writeOpenGlMatrix ( glTransform );
vparams->drawTool()->multMatrix( glTransform );
vparams->drawTool()->scale ( _drawSize.getValue() );
vparams->drawTool()->scale ( d_drawSize.getValue() );
vparams->drawTool()->drawFrame ( Vector3(), Quat(), Vector3 ( 1,1,1 ), Vec4f(0,0,1,1) );
vparams->drawTool()->popMatrix();
}
Expand Down

0 comments on commit d867495

Please sign in to comment.