Updated the filters to do not refer anymore the old applyFilter function

This commit is contained in:
Paolo Cignoni cignoni 2010-02-05 16:19:15 +00:00
parent 3ee5124fe4
commit ec2c8b7608
8 changed files with 10 additions and 10 deletions

View File

@ -43,8 +43,7 @@ public:
virtual bool autoDialog(QAction *);
virtual FilterClass getClass(QAction *);
virtual void initParameterSet(QAction *,MeshDocument &/*m*/, RichParameterSet & /*parent*/);
virtual bool applyFilter(QAction *filter, MeshDocument &m, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual bool applyFilter(QAction *, MeshModel &, RichParameterSet &, vcg::CallBackPos * ) { assert(0); return false;} ;
virtual bool applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
};
#endif

View File

@ -315,8 +315,9 @@ T log_2(const T num)
}
// The Real Core Function doing the actual mesh processing.
bool FilterTexturePlugin::applyFilter(QAction *filter, MeshModel &m, RichParameterSet &par, vcg::CallBackPos *cb)
bool FilterTexturePlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSet &par, vcg::CallBackPos *cb)
{
MeshModel &m=*(md.mm());
switch(ID(filter)) {
case FP_UV_TO_COLOR : {
int vcount = m.cm.vert.size();

View File

@ -54,7 +54,7 @@ public:
virtual QString filterInfo(FilterIDType filter) const;
virtual bool autoDialog(QAction *) {return true;}
virtual void initParameterSet(QAction *,MeshDocument &/*m*/, RichParameterSet & /*parent*/);
virtual bool applyFilter(QAction *filter, MeshModel &m, RichParameterSet & /*parent*/, vcg::CallBackPos * cb);
virtual bool applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & /*parent*/, vcg::CallBackPos * cb);
virtual int getRequirements(QAction *);
virtual int getPreConditions(QAction *) const;
virtual int postCondition( QAction* ) const;

View File

@ -97,9 +97,9 @@ void ExtraSamplePlugin::initParameterSet(QAction *action,MeshModel &m, RichParam
// The Real Core Function doing the actual mesh processing.
// Move Vertex of a random quantity
bool ExtraSamplePlugin::applyFilter(QAction *filter, MeshModel &m, RichParameterSet & par, vcg::CallBackPos *cb)
bool ExtraSamplePlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & par, vcg::CallBackPos *cb)
{
//MeshModel &m=*md->mm();
MeshModel &m=*md.mm();
srand(time(NULL));
const float max_displacement =par.getAbsPerc("Displacement");

View File

@ -52,7 +52,7 @@ public:
virtual QString filterInfo(FilterIDType filter) const;
virtual bool autoDialog(QAction *) {return true;}
virtual void initParameterSet(QAction *,MeshModel &/*m*/, RichParameterSet & /*parent*/);
virtual bool applyFilter(QAction *filter, MeshModel &m, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual bool applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual int postCondition( QAction* ) const {return MeshModel::MM_VERTCOORD | MeshModel::MM_FACENORMAL | MeshModel::MM_VERTNORMAL;};
FilterClass getClass(QAction *a);

View File

@ -54,7 +54,6 @@ public:
virtual FilterClass getClass(QAction *);
virtual void initParameterSet(QAction *,MeshDocument &/*m*/, RichParameterSet & /*parent*/);
virtual bool applyFilter(QAction *filter, MeshDocument &m, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual bool applyFilter(QAction */*filter*/, MeshModel &, RichParameterSet & /*parent*/, vcg::CallBackPos *) { assert(0); return false;} ;
};
#endif

View File

@ -114,8 +114,9 @@ void ExtraSampleDynPlugin::initParameterSet(QAction *action,MeshModel &/*m*/, Ri
// The Real Core Function doing the actual mesh processing.
// It changes the color of the mesh according to a perlin noise function
bool ExtraSampleDynPlugin::applyFilter(QAction *, MeshModel &m, RichParameterSet & par, vcg::CallBackPos *)
bool ExtraSampleDynPlugin::applyFilter(QAction *, MeshDocument &md, RichParameterSet & par, vcg::CallBackPos *)
{
MeshModel &m=*(md.mm());
const Color4b baseColor = par.getColor4b("baseColor");
const float percentage = par.getDynamicFloat("percentage");
const float frequency = math::Clamp(par.getDynamicFloat("frequency"),1.f,1000.f);

View File

@ -43,7 +43,7 @@ public:
virtual bool autoDialog(QAction *) {return true;}
virtual void initParameterSet(QAction *,MeshModel &/*m*/, RichParameterSet & /*parent*/);
virtual int postCondition( QAction* ) const {return MeshModel::MM_VERTCOLOR;};
virtual bool applyFilter(QAction *filter, MeshModel &m, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual bool applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual FilterClass getClass(QAction *);
};