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

This commit is contained in:
Paolo Cignoni cignoni 2009-12-05 00:43:23 +00:00
parent 17f26e536c
commit 90be6ee042
45 changed files with 69 additions and 174 deletions

View File

@ -23,15 +23,11 @@ SOURCES += edit_phototex_factory.cpp \
../../external/TSAI30B3//cal_util.c \
../../external/TSAI30B3//cal_main.c \
../../external/TSAI30B3//cal_eval.c \
#src/Poly/PolyCameraCalibration.cpp \
#src/Poly/Polynom3_444.cpp \
src/SmartBlendTextureMerger.cpp \
src/WinnerTakesAllTextureMerger.cpp \
src/QuadTree/QuadTreeNode.cpp \
$$VCGDIR/wrap/gui/trackball.cpp\
$$VCGDIR/wrap/gui/trackmode.cpp \
$$GLEWDIR/src/glew.c \
../../common/filterparameter.cpp \
../../meshlab/stdpardialog.cpp

View File

@ -12,9 +12,7 @@ SOURCES += edit_pickpoints_factory.cpp \
pickpointsDialog.cpp \
pickedPoints.cpp \
pickPointsTemplate.cpp \
../../meshlab/stdpardialog.cpp \
../../common/filterparameter.cpp \
$$GLEWCODE
../../meshlab/stdpardialog.cpp
RESOURCES += editpickpoints.qrc

View File

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

View File

@ -30,13 +30,7 @@
#ifndef EDIT_PickPoints_PLUGIN_H
#define EDIT_PickPoints_PLUGIN_H
#include <QObject>
#include <QString>
#include <QList>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
#include "pickpointsDialog.h"
class EditPickPointsPlugin : public QObject, public MeshEditInterface

View File

@ -32,10 +32,7 @@
#ifndef PICKED_POINTS_H
#define PICKED_POINTS_H
#include <QString>
#include <QMap>
#include <meshlab/meshmodel.h>
#include <common/meshmodel.h>
//our points
class PickedPoint

View File

@ -30,12 +30,10 @@
#include <math.h>
#include <common/meshmodel.h>
#include <meshlab/stdpardialog.h>
#include <meshlab/meshmodel.h>
#include <meshlab/glarea.h>
#include <vcg/complex/trimesh/allocate.h>
#include "editpickpoints.h"
#include "pickpointsDialog.h"

View File

@ -1,24 +1,24 @@
/****************************************************************************
* MeshLab o o *
* An extendible mesh processor o o *
* _ O _ *
* Copyright(C) 2005, 2009 \/)\/ *
* Visual Computing Lab /\/| *
* ISTI - Italian National Research Council | *
* \ *
* All rights reserved. *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
* for more details. *
* *
/****************************************************************************
* MeshLab o o *
* An extendible mesh processor o o *
* _ O _ *
* Copyright(C) 2005, 2009 \/)\/ *
* Visual Computing Lab /\/| *
* ISTI - Italian National Research Council | *
* \ *
* All rights reserved. *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
* for more details. *
* *
****************************************************************************/
/* A class to represent the ui for the pickpoints plugin
@ -31,7 +31,7 @@
#include <QtGui>
#include <meshlab/meshmodel.h>
#include <common/meshmodel.h>
#include <meshlab/glarea.h>
#include "pickedPoints.h"

View File

@ -4,8 +4,7 @@ HEADERS = edit_select_factory.h \
edit_select.h
SOURCES = edit_select_factory.cpp \
edit_select.cpp \
$$GLEWCODE
edit_select.cpp
TARGET = edit_select

View File

@ -8,8 +8,7 @@ SOURCES += $$VCGDIR/wrap/gui/trackball.cpp \
$$VCGDIR/wrap/gui/trackmode.cpp \
$$VCGDIR/wrap/gui/coordinateframe.cpp \
$$VCGDIR/wrap/gui/activecoordinateframe.cpp \
$$VCGDIR/wrap/gui/rubberband.cpp \
$$GLEWCODE
$$VCGDIR/wrap/gui/rubberband.cpp
# Input
HEADERS += edit_straightener_factory.h \

View File

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

View File

@ -45,14 +45,12 @@ first version
#define EDITSTRAIGHTENER_H
#include <GL/glew.h>
#include <QList>
#include <QDockWidget>
#include <QTGui>
#include <common/interfaces.h>
#include <wrap/gui/activecoordinateframe.h>
#include <wrap/gui/rubberband.h>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include "editstraightenerdialog.h"

View File

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

View File

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

View File

@ -32,8 +32,7 @@ $Log: editmeasure.h,v $
#include <QStringList>
#include <QList>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
#include <wrap/gui/rubberband.h>
class EditMeasurePlugin : public QObject, public MeshEditInterface

View File

@ -5,7 +5,6 @@ HEADERS = edit_measure_factory.h \
SOURCES = edit_measure_factory.cpp \
editmeasure.cpp \
$$GLEWCODE \
$$VCGDIR/wrap/gui/rubberband.cpp
TARGET = editmeasure

View File

@ -26,7 +26,7 @@
#include <vcg/space/point3.h>
#include "rgbInfo.h"
#include <meshlab/meshmodel.h>
#include <common/meshmodel.h>
#include "rgbPrimitives.h"
#include "topologicalOp.h"

View File

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

View File

@ -26,7 +26,7 @@
#include <vcg/space/point3.h>
#include "rgbInfo.h"
#include <meshlab/meshmodel.h>
#include <common/meshmodel.h>
#include "rgbPrimitives.h"
#include "topologicalOp.h"

View File

@ -23,14 +23,8 @@
* for more details. *
****************************************************************************/
#include <vector>
#include <list>
#include <assert.h>
#include <vcg/space/color4.h>
#include <vcg/space/point3.h>
#include <common/meshmodel.h>
#include <iostream>
#include "vcg/simplex/face/component.h"
#include <meshlab/meshmodel.h>
namespace rgbt
{

View File

@ -24,9 +24,8 @@
****************************************************************************/
#include "rgbInfo.h"
#include <meshlab/meshmodel.h>
#include <common/meshmodel.h>
#include "topologicalOp.h"
#include <vcg/space/point3.h>
#include "controlPoint.h"
#include "modButterfly.h"

View File

@ -24,17 +24,7 @@
#define RGBT_H
#include <QObject>
#include <QStringList>
#include <QList>
#include <QDockWidget>
#include <QHash>
#include <QDialog>
#include <vector>
#include <list>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <vcg/math/matrix44.h>
#include <common/interfaces.h>
#include "widgetRgbT.h"
#include "rgbInfo.h"

View File

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

View File

@ -9,7 +9,6 @@ HEADERS = edit_segment_factory.h \
SOURCES = edit_segment_factory.cpp \
editsegment.cpp \
$$GLEWCODE \
meshcutdialog.cpp \
colorpiker.cpp

View File

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

View File

@ -24,19 +24,12 @@
#ifndef SLIDEPLUGIN_H
#define SLIDEPLUGIN_H
#include <QObject>
#include <QStringList>
#include <QList>
#include "svgpro.h"
#include "slicedialog.h"
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
#include <wrap/gui/trackball.h>
#include <vcg/space/index/grid_static_ptr.h>
#include <vcg/simplex/vertex/base.h>
#include <vcg/simplex/vertex/component.h>
#include <vcg/complex/edgemesh/base.h>
#include <vcg/simplex/edge/base.h>
#include <vcg/simplex/edge/component.h>

View File

@ -8,7 +8,6 @@ HEADERS = edit_slice_factory.h \
SOURCES = edit_slice_factory.cpp \
editslice.cpp \
slicedialog.cpp\
$$GLEWCODE \
$$VCGDIR/wrap/gui/trackball.cpp \
$$VCGDIR/wrap/gui/trackmode.cpp \
svgpro.cpp

View File

@ -25,7 +25,7 @@
#define __VCG_AOGLWIDGET
#include <GL/glew.h>
#include <QObject>
#include <QGLWidget>
#include <common/interfaces.h>

View File

@ -26,10 +26,7 @@
#include <QObject>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <vcg/space/box3.h>
#include <wrap/gl/shot.h>
#include <common/interfaces.h>
#include <wrap/gl/gl_surface.h>
class AOGLWidget;
class AmbientOcclusionPlugin : public QObject, public MeshFilterInterface

View File

@ -1,10 +1,9 @@
include (../../sharedfilter.pri)
include (../../shared.pri)
TARGET = filter_ao
QT += opengl
HEADERS += ./filter_ao.h AOGLWidget.h
SOURCES += ./filter_ao.cpp AOGLWidget.cpp
SOURCES += ./filter_ao.cpp AOGLWidget.cpp \
$$GLEWCODE

View File

@ -26,14 +26,7 @@
#include <math.h>
#include <stdlib.h>
#include <time.h>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <vcg/complex/trimesh/clean.h>
#include <vcg/complex/trimesh/update/position.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/append.h>
#include <vcg/complex/trimesh/autoalign_4pcs.h>

View File

@ -26,8 +26,7 @@
#include <QObject>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
class FilterAutoalign : public QObject, public MeshFilterInterface
{

View File

@ -1,4 +1,4 @@
include (../../sharedfilter.pri)
include (../../shared.pri)
HEADERS += ../../meshlabplugins/editalign/align/AlignPair.h \
../../meshlabplugins/editalign/align/OccupancyGrid.h \

View File

@ -33,7 +33,7 @@
#include <QObject>
#include <meshlab/meshmodel.h>
#include <common/meshmodel.h>
#include <meshlab/glarea.h>
#include <meshlabplugins/edit_pickpoints/pickedPoints.h>

View File

@ -62,12 +62,7 @@
#define EXTRAIOPLUGINV3D_H
#include <QObject>
#include <QStringList>
#include <QString>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
class CleanFilter : public QObject, public MeshFilterInterface
{

View File

@ -1,4 +1,4 @@
include (../../sharedfilter.pri)
include (../../shared.pri)
HEADERS += cleanfilter.h \
../../common/filterparameter.h

View File

@ -23,11 +23,7 @@
#include <QtGui>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <vcg/complex/trimesh/create/platonic.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include "filter_create.h"
// Constructor usually performs only two simple tasks of filling the two lists

View File

@ -25,9 +25,7 @@
#define FILTER_CREATE_H
#include <QObject>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
class FilterCreate : public QObject, public MeshFilterInterface
{

View File

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

View File

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

View File

@ -1,13 +1,12 @@
include (../../sharedfilter.pri)
include (../../shared.pri)
ANNDIR = ../../external/ann_1.1.1
INCLUDEPATH += $$ANNDIR/include
LIBS += -L$$ANNDIR/lib \
-lANN
QT += opengl
QT += xml
HEADERS = ../../meshlab/interfaces.h \
../../meshlab/meshmodel.h \
../filter_mls/apss.h \
HEADERS =
../filter_mls/apss.h \
../filter_mls/priorityqueue.h \
../filter_mls/balltree.h \
../filter_mls/implicits.h \
@ -24,8 +23,7 @@ SOURCES = filter_feature_alignment.cpp \
../filter_mls/apss.tpp \
../filter_mls/kdtree.cpp \
../filter_mls/mlssurface.tpp \
../../meshlab/meshmodel.cpp \
../edit_pickpoints/pickedPoints.cpp \
$$GLEWCODE
TARGET = filter_feature_alignment
../edit_pickpoints/pickedPoints.cpp
TARGET = filter_feature_alignment
CONFIG += opengl

View File

@ -25,17 +25,12 @@
#define FILTERISOPARAMPLUGIN_H
#include <QObject>
#include <QStringList>
#include <QString>
#include <assert.h>
#include <parametrizator.h>
#include <iso_parametrization.h>
#include <diamond_sampler.h>
#include <diam_parametrization.h>
#include <stat_remeshing.h>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <vcg/complex/trimesh/allocate.h>
#include <common/interfaces.h>
//#include <math.h>
//#include <vcg/complex/trimesh/update/color.h>

View File

@ -1,4 +1,4 @@
include (../../sharedfilter.pri)
include (../../shared.pri)
HEADERS += ./diamond_sampler.h \
./diam_parametrization.h \
@ -18,13 +18,9 @@ HEADERS += ./diamond_sampler.h \
./uv_grid.h \
./defines.h \
./filter_isoparametrization.h\
./stat_remeshing.h\
../../meshlab/meshmodel.h
./stat_remeshing.h
SOURCES += ./filter_isoparametrization.cpp \
../../meshlab/meshmodel.cpp \
$$GLEWCODE
SOURCES += ./filter_isoparametrization.cpp
TARGET = filter_isoparametrization
INCLUDEPATH += ./ \

View File

@ -26,17 +26,9 @@
#include <math.h>
#include <stdlib.h>
#include <time.h>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <vcg/complex/trimesh/clean.h>
#include <vcg/complex/trimesh/inertia.h>
#include <vcg/complex/trimesh/stat.h>
#include <vcg/complex/trimesh/update/position.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/update/quality.h>
#include <vcg/complex/trimesh/update/selection.h>
#include<vcg/complex/trimesh/append.h>

View File

@ -26,8 +26,7 @@
#include <QObject>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
class FilterMeasurePlugin : public QObject, public MeshFilterInterface
{

View File

@ -1,10 +1,7 @@
include (../../sharedfilter.pri)
include (../../shared.pri)
HEADERS += filter_measure.h
SOURCES += filter_measure.cpp \
$$GLEWCODE
SOURCES += filter_measure.cpp
TARGET = filter_measure
CONFIG += opengl