Commit 134014b0 authored by Pierre Kraemer's avatar Pierre Kraemer

correctif pb merge ParticleBase

parent f8f141b3
......@@ -194,7 +194,7 @@ void Viewer::importMesh(std::string& filename)
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS) ;
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES) ;
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES, false) ;
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES) ;
bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position) ;
normalBaseSize = bb.diagSize() / 100.0f ;
......
......@@ -18,47 +18,40 @@ typedef Geom::Vec3f VEC3;
class ParticleBase
{
public :
VEC3 m_position;
ParticleBase()
{
m_position.zero();
}
ParticleBase(VEC3 position)
{
m_position = position;
}
virtual unsigned int getState()
{
return 0;
}
/**
* @param newPosition new position to reach
*/
virtual bool move(VEC3 position)
{
m_position = position;
return true;
}
virtual unsigned int getState()
{
return 0;
}
VEC3 getPosition() { return m_position; }
public :
VEC3 m_position;
ParticleBase()
{
m_position.zero();
}
ParticleBase(VEC3 position)
{
m_position = position;
}
virtual unsigned int getState()
{
return 0;
}
/**
* @param newPosition new position to reach
*/
virtual bool move(VEC3 position)
{
m_position = position;
return true;
}
VEC3 getPosition() { return m_position; }
};
//namespace
}
} // namespace MovingObjects
}
}
} // namespace Algo
} // namespace CGoGN
#endif
Markdown is supported
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