lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-19 19:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated pros and sources to comply to the new common library system

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2009-12-05 00:37:59 +00:00
parent 049564ff9a
commit 493167770f
26 changed files with 40 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/meshmodel.h
View File

@ -36,9 +36,14 @@
#include <vcg/simplex/face/topology.h>
#include <vcg/complex/trimesh/base.h>
#include <vcg/complex/trimesh/update/topology.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/update/color.h>
#include <vcg/complex/trimesh/update/flag.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/position.h>
#include <vcg/complex/trimesh/update/quality.h>
#include <vcg/complex/trimesh/update/selection.h>
#include <vcg/complex/trimesh/update/topology.h>
#include <wrap/gl/trimesh.h>
#include <wrap/callback.h>

4
src/fgt/decorate_shadow/decorate_shadow.pro
View File

@ -8,9 +8,7 @@ HEADERS = decorate_shadow.h \
variance_shadow_mapping_blur.h \
ssao.h
SOURCES = decorate_shadow.cpp \
shadow_mapping.cpp \
../../common/filterparameter.cpp \
$$GLEWCODE \
shadow_mapping.cpp
../../../../vcglib/wrap/gui/trackball.cpp \
../../../../vcglib/wrap/gui/trackmode.cpp \
variance_shadow_mapping.cpp \

2
src/fgt/edit_hole/edit_hole.h
View File

@ -27,7 +27,7 @@
#include <QObject>
#include "fillerDialog.h"
#include "holeListModel.h"
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
class EditHoleAutoBridgingCB : public AutoBridgingCallback
{

7
src/fgt/edit_hole/edit_hole.pro
View File

@ -6,15 +6,12 @@ HEADERS = edit_hole_factory.h \
holeListModel.h \
fgtHole.h \
fgtBridge.h \
holeSetManager.h \
../../meshlab/meshmodel.h
holeSetManager.h
SOURCES = edit_hole_factory.cpp \
edit_hole.cpp \
fillerDialog.cpp\
holeListModel.cpp \
../../meshlab/meshmodel.cpp \
$$GLEWCODE
holeListModel.cpp
TARGET = edit_hole

3
src/fgt/edit_hole/edit_hole_factory.h
View File

@ -25,9 +25,8 @@
#ifndef EditHoleFactoryPLUGIN_H
#define EditHoleFactoryPLUGIN_H
#include <meshlab/interfaces.h>
#include <QObject>
#include <QList>
#include <common/interfaces.h>
class EditHoleFactory : public QObject, public MeshEditInterfaceFactory
{

2
src/fgt/edit_hole/holeListModel.h
View File

@ -26,7 +26,7 @@
#include <QWidget>
#include <QHeaderView>
#include <QtGui>
#include "meshlab/meshmodel.h"
#include <common/meshmodel.h>
#include "fgtHole.h"
#include "fgtBridge.h"
#include "holeSetManager.h"

8
src/fgt/edit_quality/common/meshmethods.h
View File

@ -19,12 +19,6 @@
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
* for more details. *
* *
****************************************************************************/
/****************************************************************************
History
Revision 1.0 2008/02/20 Alessandro Maione, Federico Bellucci
FIRST RELEASE
****************************************************************************/
#ifndef _MESHMETHODS_H_
@ -33,7 +27,7 @@ FIRST RELEASE
#include "const_types.h"
#include "transferfunction.h"
#include <vcg/math/histogram.h>
#include <meshlab/meshmodel.h>
#include <common/meshmodel.h>
#include <cassert>
#include <utility> // for pair<T,T>

3
src/fgt/edit_quality/edit_quality_factory.h
View File

@ -25,9 +25,8 @@
#ifndef QualityMapperFactoryPLUGIN_H
#define QualityMapperFactoryPLUGIN_H
#include <meshlab/interfaces.h>
#include <QObject>
#include <QList>
#include <common/interfaces.h>
class QualityMapperFactory : public QObject, public MeshEditInterfaceFactory
{

4
src/fgt/edit_quality/qualitymapper.h
View File

@ -34,9 +34,7 @@ FIRST RELEASE
#include <QAction>
#include <QList>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
//#include <vcg/complex/trimesh/update/color.h>
#include <common/interfaces.h>
#include "qualitymapperdialog.h"
//This class defines the plugin interface

2
src/fgt/edit_quality/qualitymapperdialog.h
View File

@ -32,7 +32,7 @@ FIRST RELEASE
#include <QDockWidget>
#include <QGraphicsItem>
#include <meshlab/meshmodel.h>
#include <common/meshmodel.h>
#include <vcg/math/histogram.h>
#include <vcg/complex/trimesh/stat.h> // for ComputePerVertexQualityMinMax
#include <meshlab/glarea.h>

5
src/fgt/edit_texture/edit_texture.pro
View File

@ -4,17 +4,14 @@ HEADERS = edit_texture_factory.h \
edittexture.h \
textureeditor.h \
renderarea.h \
../../meshlab/GLLogStream.h \
$$VCGDIR/wrap/gui/trackball.h
SOURCES = edit_texture_factory.cpp \
edittexture.cpp \
textureeditor.cpp \
renderarea.cpp \
../../meshlab/GLLogStream.cpp \
$$VCGDIR/wrap/gui/trackball.cpp \
$$VCGDIR/wrap/gui/trackmode.cpp \
$$GLEWCODE
$$VCGDIR/wrap/gui/trackmode.cpp
TARGET = edit_texture

3
src/fgt/edit_texture/edit_texture_factory.h
View File

@ -25,9 +25,8 @@
#ifndef EditTextureFactoryPLUGIN_H
#define EditTextureFactoryPLUGIN_H
#include <meshlab/interfaces.h>
#include <QObject>
#include <QList>
#include <common/interfaces.h>
class EditTextureFactory : public QObject, public MeshEditInterfaceFactory
{

10
src/fgt/edit_texture/edittexture.cpp
View File

@ -21,21 +21,13 @@
* *
****************************************************************************/
#include <QtGui>
#include <QString>
#include <math.h>
#include <stdlib.h>
#include <common/interfaces.h>
#include <meshlab/glarea.h>
#include "edittexture.h"
#include "renderarea.h"
#include <wrap/gl/pick.h>
#include <wrap/gl/picking.h>
#include<limits>
#include <meshlab/interfaces.h>
#include <vcg/complex/trimesh/update/topology.h>
#include <vcg/complex/trimesh/update/flag.h>
#include <vcg/complex/trimesh/clean.h>
using namespace vcg;

7
src/fgt/edit_texture/edittexture.h
View File

@ -24,12 +24,7 @@
#ifndef EDITTEXTUREPLUGIN_H
#define EDITTEXTUREPLUGIN_H
#include <QObject>
#include <QList>
#include <QDockWidget>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
#include "textureeditor.h"
#include "ui_textureeditor.h"

2
src/fgt/edit_texture/renderarea.h
View File

@ -27,7 +27,7 @@
#include <QBrush>
#include <QPen>
#include <QPixmap>
#include <meshlab/meshmodel.h>
#include <common/meshmodel.h>
#include <wrap/gui/trackball.h>
#include <stdio.h>
#include <QGLWidget>

10
src/fgt/edit_topo/edit_topo.h
View File

@ -28,10 +28,7 @@ $Log: edit_topo.h,v $
#ifndef edit_topo_H
#define edit_topo_H
#include <QList>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
#include <meshlab/glarea.h>
#include <stdlib.h>
@ -39,11 +36,6 @@ $Log: edit_topo.h,v $
#include <wrap/gl/pick.h>
#include <wrap/gl/picking.h>
#include <vcg/complex/trimesh/append.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/update/color.h>
#include "edit_topodialog.h"
#include "edit_topomeshbuilder.h"

9
src/fgt/edit_topo/edit_topo.pro
View File

@ -5,14 +5,11 @@ FORMS += edit_topodialog.ui
HEADERS = edit_topo_factory.h \
edit_topo.h \
edit_topodialog.h \
edit_topomeshbuilder.h \
../../meshlab/meshmodel.h
edit_topomeshbuilder.h
SOURCES = edit_topo_factory.cpp \
edit_topo.cpp \
edit_topodialog.cpp \
../../meshlab/meshmodel.cpp \
$$GLEWCODE
edit_topodialog.cpp
TARGET = edit_topo

3
src/fgt/edit_topo/edit_topo_factory.h
View File

@ -25,9 +25,8 @@
#ifndef EditTopoFactoryPLUGIN_H
#define EditTopoFactoryPLUGIN_H
#include <meshlab/interfaces.h>
#include <QObject>
#include <QList>
#include <common/interfaces.h>
class EditTopoFactory : public QObject, public MeshEditInterfaceFactory
{

2
src/fgt/edit_topo/edit_topodialog.h
View File

@ -29,7 +29,7 @@
#include <QWidget>
#include <QtGui/QApplication>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
#include "ui_edit_topodialog.h"

12
src/fgt/edit_topo/edit_topomeshbuilder.h
View File

@ -25,19 +25,13 @@
#ifndef edit_topomeshbuilder_H
#define edit_topomeshbuilder_H
#include <QList>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
#include <vcg/complex/intersection.h>
#include <vcg/complex/trimesh/clean.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/space/index/grid_static_ptr.h>
#include <vcg/complex/trimesh/closest.h>
#include <vcg/math/base.h>
#include <vcg/space/index/grid_static_ptr.h>
#include <vcg/space/index/aabb_binary_tree/aabb_binary_tree.h>
#include <vcg/space/index/octree.h>
@ -45,11 +39,7 @@
#include <vcg/complex/trimesh/refine.h>
#include <vcg/complex/trimesh/append.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/update/color.h>
#include <vcg/complex/trimesh/smooth.h>
#include <vcg/complex/trimesh/update/selection.h>
#include "edit_topodialog.h"

2
src/fgt/edit_topo/filter_topo/filter_topo.pro
View File

@ -1,4 +1,4 @@
include (../../sharedfilter.pri)
include (../../shared.pri)
HEADERS += filter_topo.h \
../edit_topomeshbuilder.h

13
src/fgt/filter_aging/edgepred.h
View File

@ -24,15 +24,8 @@
#ifndef EDGEPRED_H_
#define EDGEPRED_H_
#include <vector>
#include <meshlab/meshmodel.h>
using namespace vcg;
namespace vcg
{
class QualityEdgePred
{
public:
@ -143,5 +136,5 @@ class AngleEdgePred
float athVal; // edge angle threshold value
};
}
#endif /*EDGEPRED_H_*/

6
src/fgt/filter_aging/filter_aging.cpp
View File

@ -28,13 +28,9 @@
/* Local includes */
#include "filter_aging.h"
using namespace vcg;
/* VCG includes */
#include <vcg/complex/trimesh/update/position.h>
#include <vcg/complex/trimesh/update/selection.h>
#include <vcg/complex/trimesh/update/flag.h>
#include <vcg/complex/trimesh/update/curvature.h>
#include <vcg/complex/trimesh/update/quality.h>
#include <vcg/complex/trimesh/stat.h>
#include <vcg/complex/trimesh/clean.h>
#include <vcg/complex/trimesh/smooth.h>

7
src/fgt/filter_aging/filter_aging.h
View File

@ -28,8 +28,7 @@
#include <QObject>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
#include <vcg/complex/trimesh/refine.h>
#include <vcg/space/index/grid_static_ptr.h>
@ -59,9 +58,9 @@ class GeometryAgingPlugin : public QObject, public MeshFilterInterface
protected:
void refineMesh(CMeshO &m, QualityEdgePred &ep, bool selection, vcg::CallBackPos *cb);
void refineMesh(CMeshO &m, vcg::QualityEdgePred &ep, bool selection, vcg::CallBackPos *cb);
double generateNoiseValue(int Octaves, const CVertexO::CoordType &p);
bool faceIntersections(CMeshO &m, face::Pos<CMeshO::FaceType> p, GridStaticPtr<CFaceO, CMeshO::ScalarType> &gM);
bool faceIntersections(CMeshO &m, vcg::face::Pos<CMeshO::FaceType> p, vcg::GridStaticPtr<CFaceO, CMeshO::ScalarType> &gM);
void smoothPeaks(CMeshO &m, bool selected, bool updateErosionAttr);
void computeMeanCurvature(CMeshO &m);
};

2
src/fgt/filter_aging/filter_aging.pro
View File

@ -1,4 +1,4 @@
include (../../sharedfilter.pri)
include (../../shared.pri)
HEADERS += filter_aging.h \
edgepred.h

5
src/fgt/filter_break/filter_break.pro
View File

@ -1,8 +1,7 @@
include (../../sharedfilter.pri)
include (../../shared.pri)
HEADERS += filter_dirt.h
SOURCES += filter_dirt.cpp \
$$GLEWCODE
SOURCES += filter_dirt.cpp
TARGET = filter_dirt
TEMPLATE = lib
QT += opengl