lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-16 09:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

deleted old savemaskobj & old MaskObj

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2006-01-19 11:21:14 +00:00
parent d92dddc09f
commit 7b97eb75fa
8 changed files with 71 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/meshlab/mainwindow.h
View File

@ -23,6 +23,9 @@
/****************************************************************************
History
$Log$
Revision 1.58 2006/01/19 11:21:12 fmazzant
deleted old savemaskobj & old MaskObj
Revision 1.57 2006/01/17 13:47:45 fmazzant
update interface meshio : formats -> importFormats() & exportFormts
@ -107,7 +110,7 @@ Added copyright info
#include <QColorDialog>
#include "meshmodel.h"
#include "glarea.h"
#include "../meshlabplugins/meshio/savemaskdialog.h"
//#include "../meshlabplugins/meshio/savemaskdialog.h"
#define MAXRECENTFILES 4
@ -126,7 +129,7 @@ public:
MainWindow();
static bool QCallBack(const int pos, const char * str);
const QString appName() const {return tr("MeshLab v0.6"); }
MaskObj maskobj;
// MaskObj maskobj;
private slots:

5
src/meshlab/mainwindow_Init.cpp
View File

@ -24,6 +24,9 @@
History
$Log$
Revision 1.40 2006/01/19 11:21:12 fmazzant
deleted old savemaskobj & old MaskObj
Revision 1.39 2006/01/17 09:20:02 fmazzant
deleted Ob&j saving options... menu
@ -325,7 +328,7 @@ QProgressDialog *MainWindow::qb;
MainWindow::MainWindow()
{
maskobj = MaskObj();
//maskobj = MaskObj();
workspace = new QWorkspace(this);
setCentralWidget(workspace);

7
src/meshlab/mainwindow_RunTime.cpp
View File

@ -24,6 +24,9 @@
History
$Log$
Revision 1.72 2006/01/19 11:21:12 fmazzant
deleted old savemaskobj & old MaskObj
Revision 1.71 2006/01/17 23:46:36 cignoni
Moved some include from meshmodel.h to here
@ -926,9 +929,9 @@ void MainWindow::setCustomize()
void MainWindow::setSaveMaskObj()
{
SaveMaskDialog objdialog(&maskobj,new QWidget());
/*SaveMaskDialog objdialog(&maskobj,new QWidget());
objdialog.ReadMask();
objdialog.exec();
objdialog.exec();*/
}
void MainWindow::renderBbox() { GLA()->setDrawMode(GLW::DMBox ); }

4
src/meshlab/meshlab.pro
View File

@ -6,8 +6,6 @@ HEADERS = interfaces.h \
plugindialog.h \
customDialog.h \
saveSnapshotDialog.h \
../meshlabplugins/meshio/savemaskdialog.h\
../meshlabplugins/meshio/maskobj.h\
../../../sf/wrap/gui/trackball.h\
../../../sf/wrap/gui/trackmode.h\
../../../sf/wrap/gl/trimesh.h
@ -20,8 +18,6 @@ SOURCES = main.cpp \
plugindialog.cpp \
customDialog.cpp \
saveSnapshotDialog.cpp \
../meshlabplugins/meshio/savemaskdialog.cpp\
../meshlabplugins/meshio/maskobj.cpp\
../../../sf/wrap/ply/plylib.cpp\
../../../sf/wrap/gui/trackball.cpp\
../../../sf/wrap/gui/trackmode.cpp

59
src/meshlabplugins/meshio/maskobj.cpp
View File

@ -24,6 +24,9 @@
History
$Log$
Revision 1.6 2006/01/19 11:21:14 fmazzant
deleted old savemaskobj & old MaskObj
Revision 1.5 2006/01/10 16:52:19 fmazzant
update ply::PlyMask -> io::Mask
@ -43,31 +46,31 @@
*****************************************************************************/
#include "maskobj.h"
#include <wrap/io_trimesh/io_mask.h>
MaskObj::MaskObj()
{
this->isfirst=true;
this->faces = true;
this->vertexs = true;
this->binary = false;
this->colorV = false;
this->colorF = false;
this->normal = false;
this->texture = false;
}
int MaskObj::MaskObjToInt()
{
int mask=0;
if(faces) {mask |= vcg::tri::io::Mask::IOM_FACEQUALITY;}
if(vertexs) {mask |= vcg::tri::io::Mask::IOM_VERTQUALITY;}
if(colorV) {mask |= vcg::tri::io::Mask::IOM_VERTCOLOR;}
if(colorF) {mask |= vcg::tri::io::Mask::IOM_FACECOLOR;}
if(normal) {mask |= vcg::tri::io::Mask::IOM_VERTNORMAL;}
if(texture) {mask |= vcg::tri::io::Mask::IOM_WEDGTEXCOORD;}
return mask;
}
//#include "maskobj.h"
//#include <wrap/io_trimesh/io_mask.h>
//
//MaskObj::MaskObj()
//{
// this->isfirst=true;
//
// this->faces = true;
// this->vertexs = true;
//
// this->binary = false;
// this->colorV = false;
// this->colorF = false;
// this->normal = false;
// this->texture = false;
//}
//
//int MaskObj::MaskObjToInt()
//{
// int mask=0;
// if(faces) {mask |= vcg::tri::io::Mask::IOM_FACEQUALITY;}
// if(vertexs) {mask |= vcg::tri::io::Mask::IOM_VERTQUALITY;}
// if(colorV) {mask |= vcg::tri::io::Mask::IOM_VERTCOLOR;}
// if(colorF) {mask |= vcg::tri::io::Mask::IOM_FACECOLOR;}
// if(normal) {mask |= vcg::tri::io::Mask::IOM_VERTNORMAL;}
// if(texture) {mask |= vcg::tri::io::Mask::IOM_WEDGTEXCOORD;}
// return mask;
//}

35
src/meshlabplugins/meshio/maskobj.h
View File

@ -24,6 +24,9 @@
History
$Log$
Revision 1.3 2006/01/19 11:21:14 fmazzant
deleted old savemaskobj & old MaskObj
Revision 1.2 2005/12/13 14:02:50 fmazzant
added the rescue of the materials of the obj
@ -33,19 +36,19 @@
*****************************************************************************/
class MaskObj
{
public:
MaskObj();
int MaskObjToInt();
bool isfirst;
bool vertexs;
bool faces;
bool texture;
bool normal;
bool binary;
bool colorV;
bool colorF;
};
//class MaskObj
//{
//public:
// MaskObj();
//
// int MaskObjToInt();
//
// bool isfirst;
// bool vertexs;
// bool faces;
// bool texture;
// bool normal;
// bool binary;
// bool colorV;
// bool colorF;
//};

5
src/meshlabplugins/meshio/meshio.cpp
View File

@ -24,6 +24,9 @@
History
$Log$
Revision 1.54 2006/01/19 11:21:14 fmazzant
deleted old savemaskobj & old MaskObj
Revision 1.53 2006/01/19 09:36:28 fmazzant
cleaned up history log
@ -45,7 +48,7 @@
#include <QtGui>
#include "meshio.h"
#include "savemaskdialog.h"
//#include "savemaskdialog.h"
#include "savemaskexporter.h"
// temporaneamente prendo la versione corrente dalla cartella test

6
src/meshlabplugins/meshio/meshio.pro
View File

@ -1,9 +1,9 @@
TEMPLATE = lib
CONFIG += plugin
INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include ../../../../code/lib/lib3ds-1.2.0
HEADERS = meshio.h savemaskdialog.h maskobj.h savemaskexporter.h changetexturename.h ../../../../sf/wrap/ply/plylib.h
SOURCES = meshio.cpp savemaskdialog.cpp maskobj.cpp savemaskexporter.cpp changetexturename.cpp ../../../../sf/wrap/ply/plylib.cpp
FORMS = ui/savemask.ui ui/savemaskexporter.ui ui/renametexture.ui
HEADERS = meshio.h savemaskexporter.h changetexturename.h ../../../../sf/wrap/ply/plylib.h
SOURCES = meshio.cpp savemaskexporter.cpp changetexturename.cpp ../../../../sf/wrap/ply/plylib.cpp
FORMS = ui/savemaskexporter.ui ui/renametexture.ui
TARGET = meshio
DESTDIR = ../../meshlab/plugins