lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-18 02:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

small changes to update to the recent changes of the vcg library

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2013-03-20 08:56:50 +00:00
parent 7bcab92a14
commit 9adc490b87
6 changed files with 534 additions and 535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/meshlabplugins/decorate_background/cubemap.cpp
View File

@ -63,12 +63,12 @@ static int cube_faces[6][4] = {
static float tex_vert[4][2] =
{
{1,1},{1,0},{0,0},{0,1},
{1,1},{1,0},{0,0},{0,1},
};
void CICubeMap::DrawEnvCube(Matrix44f &tr)
{
if(!GLEW_ARB_texture_cube_map)
if(!GLEW_ARB_texture_cube_map)
DrawEnvCubeOld(tr);
else DrawEnvCubeExt(tr);
}
@ -80,13 +80,13 @@ void CICubeMap::DrawEnvCubeOld(Matrix44f &tr)
{
checkGLError::qDebug("DrawEnvCubeOld: start");
glMatrixMode(GL_MODELVIEW);
glPushAttrib(GL_ENABLE_BIT|GL_CURRENT_BIT | GL_TEXTURE_BIT);
glPushAttrib(GL_ENABLE_BIT|GL_CURRENT_BIT | GL_TEXTURE_BIT);
glDisable(GL_LIGHTING);
glDisable(GL_TEXTURE_1D);
glEnable(GL_TEXTURE_2D);
glDepthMask(false);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@ -96,19 +96,19 @@ void CICubeMap::DrawEnvCubeOld(Matrix44f &tr)
glMultMatrix(tr);
glScalef(radius,radius,radius);
for (int i=0; i<6; ++i)
{
glBindTexture(GL_TEXTURE_2D,oti[i]);
glBegin(GL_QUADS);
for (int i=0; i<6; ++i)
{
glBindTexture(GL_TEXTURE_2D,oti[i]);
glBegin(GL_QUADS);
for (int j=0; j<4; ++j) {
glTexCoord2f(tex_vert[j][0],tex_vert[j][1]);
glVertex(cube_vertices[cube_faces[i][j]]);
}
glEnd();
glVertex(cube_vertices[cube_faces[i][j]]);
}
glEnd();
}
glDepthMask(true);
glPopMatrix();
glPopAttrib();
@ -118,11 +118,10 @@ void CICubeMap::DrawEnvCubeOld(Matrix44f &tr)
void CICubeMap::DrawEnvCubeExt(Matrix44f &tr)
{
Matrix44f ii=tr;
ii=Invert(ii);
Matrix44f ii=Inverse(tr);
glMatrixMode(GL_MODELVIEW);
glPushAttrib(GL_ENABLE_BIT|GL_CURRENT_BIT | GL_TEXTURE_BIT ); // saves the current state of opengl
glPushAttrib(GL_ENABLE_BIT|GL_CURRENT_BIT | GL_TEXTURE_BIT ); // saves the current state of opengl
glPushMatrix();
glLoadIdentity();
glMatrixMode(GL_MODELVIEW);
@ -132,11 +131,11 @@ void CICubeMap::DrawEnvCubeExt(Matrix44f &tr)
glDisable(GL_TEXTURE_1D);
glDisable(GL_TEXTURE_2D);
glEnable(GL_TEXTURE_CUBE_MAP_ARB);
//CIMsg::checkGLError("glEnable(GL_TEXTURE_CUBE_MAP_ARB);");
glBindTexture(GL_TEXTURE_CUBE_MAP_ARB,ti);
//CIMsg::checkGLError("glBindTexture(GL_TEXTURE_CUBE_MAP_ARB,ti);");
glDepthMask(false);
//CIMsg::checkGLError("glEnable(GL_TEXTURE_CUBE_MAP_ARB);");
glBindTexture(GL_TEXTURE_CUBE_MAP_ARB,ti);
//CIMsg::checkGLError("glBindTexture(GL_TEXTURE_CUBE_MAP_ARB,ti);");
glDepthMask(false);
glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_ARB);
glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_ARB);
glTexGeni(GL_R, GL_TEXTURE_GEN_MODE, GL_NORMAL_MAP_ARB);
@ -144,7 +143,7 @@ void CICubeMap::DrawEnvCubeExt(Matrix44f &tr)
glEnable(GL_TEXTURE_GEN_S);
glEnable(GL_TEXTURE_GEN_T);
glEnable(GL_TEXTURE_GEN_R);
glTexParameterf(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameterf(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameterf(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@ -157,22 +156,22 @@ void CICubeMap::DrawEnvCubeExt(Matrix44f &tr)
glPushMatrix();// Texture
glLoadIdentity();
glMultMatrix(ii);
// LQ.track.inverse().applyGL();
for (int i=0; i<6; ++i)
{
for (int i=0; i<6; ++i)
{
glBegin(GL_QUADS);
for (int j=0; j<4; ++j) {
glNormal(-cube_vertices[cube_faces[i][j]]);
for (int j=0; j<4; ++j) {
glNormal(-cube_vertices[cube_faces[i][j]]);
glVertex(cube_vertices[cube_faces[i][j]]);
}
glEnd();
}
glMatrixMode(GL_TEXTURE);
glPopMatrix();// Texture
glMatrixMode(GL_MODELVIEW);
glMatrixMode(GL_TEXTURE);
glPopMatrix();// Texture
glMatrixMode(GL_MODELVIEW);
glDisable(GL_TEXTURE_GEN_S);
glDisable(GL_TEXTURE_GEN_T);
@ -186,7 +185,7 @@ glPopAttrib();
bool CICubeMap::GetName(int i, QString basename, QString &filename)
{
QString exts[6];
exts[0]="_negx";
exts[1]="_posx";
exts[2]="_negy";
@ -195,23 +194,23 @@ bool CICubeMap::GetName(int i, QString basename, QString &filename)
exts[5]="_posz";
// qDebug("filename = %s basename = %s", qPrintable(filename), qPrintable(basename));
filename=basename;
QString ext= basename.right(4);
filename=filename.left(filename.length()-4);
filename.append(exts[i]);
filename.append(ext);
QString ext= basename.right(4);
filename=filename.left(filename.length()-4);
filename.append(exts[i]);
filename.append(ext);
// qDebug("filename = %s basename = %s", qPrintable(filename), qPrintable(basename));
return true;
return true;
}
bool CICubeMap::Load(const char *basename)
{
if(basename==0) return false;
bool ret;
if(!GLEW_ARB_texture_cube_map)
ret= LoadOld(basename);
else ret =LoadExt(basename);
if(!ret) SetInvalid();
return ret;
bool ret;
if(!GLEW_ARB_texture_cube_map)
ret= LoadOld(basename);
else ret =LoadExt(basename);
if(!ret) SetInvalid();
return ret;
}
bool CICubeMap::LoadOld(const char *basename)
@ -219,9 +218,9 @@ bool CICubeMap::LoadOld(const char *basename)
glPushAttrib(GL_ENABLE_BIT);
glDisable(GL_TEXTURE_1D);
glEnable(GL_TEXTURE_2D);
if(oti[0]==0) glGenTextures(6,&(oti[0]));
QString filename;
if(oti[0]==0) glGenTextures(6,&(oti[0]));
QString filename;
for(int i=0;i<6;++i)
{
glBindTexture(GL_TEXTURE_2D,oti[i]);
@ -229,9 +228,9 @@ bool CICubeMap::LoadOld(const char *basename)
//CIMsg::checkGLError("glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER)");
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
//CIMsg::checkGLError("glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER)");
QImage tt;
QImage tt;
if(!GetName(i,basename,filename)) {
glPopAttrib();
return false;
@ -248,10 +247,10 @@ bool CICubeMap::LoadOld(const char *basename)
GL_RGBA, GL_UNSIGNED_BYTE, tx.bits() );
gluBuild2DMipmaps(GL_TEXTURE_2D, 3, tx.width(), tx.height(), GL_RGBA, GL_UNSIGNED_BYTE, tx.bits() );
//CIMsg::checkGLError("glTexImage2D");
//CIMsg::checkGLError("glTexImage2D");
}
glPopAttrib();
glPopAttrib();
return true;
}
bool CICubeMap::LoadExt(const char *basename)
@ -260,7 +259,7 @@ bool CICubeMap::LoadExt(const char *basename)
glEnable(GL_TEXTURE_CUBE_MAP_ARB);
glDisable(GL_TEXTURE_1D);
glDisable(GL_TEXTURE_2D);
if(ti==0) glGenTextures(1,&ti);
if(ti==0) glGenTextures(1,&ti);
glBindTexture(GL_TEXTURE_CUBE_MAP_ARB,ti);
GLenum targets[6];
@ -276,7 +275,7 @@ bool CICubeMap::LoadExt(const char *basename)
glTexParameterf(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
//CIMsg::checkGLError("glTexParameterf(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER)");
for(int i=0;i<6;++i)
{
QString filename;
@ -288,7 +287,7 @@ bool CICubeMap::LoadExt(const char *basename)
if(!tt.load(filename)) {
glPopAttrib();
//QMessageBox::warning(0,"Cubemapped background decoration","Warning unable to load cube map images: " + filename );
//QMessageBox::warning(0,"Cubemapped background decoration","Warning unable to load cube map images: " + filename );
return false;
}
@ -298,11 +297,11 @@ bool CICubeMap::LoadExt(const char *basename)
gluBuild2DMipmaps(targets[i], 4, tx.width(), tx.height(), GL_RGBA, GL_UNSIGNED_BYTE, tx.bits() );
//CIMsg::checkGLError("glTexImage2D");
}
glDisable(GL_TEXTURE_CUBE_MAP_ARB);
glPopAttrib();
return true;
}

12
src/meshlabplugins/edit_measure/edit_measure.cpp
View File

@ -36,9 +36,9 @@ EditMeasurePlugin::EditMeasurePlugin()
:rubberband(Color4b(255,170,85,255)),was_ready(false)
{}
const QString EditMeasurePlugin::Info()
const QString EditMeasurePlugin::Info()
{
return tr("Allow to measure distances between points of a model");
return tr("Allow to measure distances between points of a model");
}
void EditMeasurePlugin::mousePressEvent(QMouseEvent *, MeshModel &, GLArea * gla)
@ -69,12 +69,12 @@ void EditMeasurePlugin::Decorate(MeshModel &, GLArea * gla,QPainter* p)
{
Point3f a,b;
rubberband.GetPoints(a,b);
vcg::glLabel::render(p,b,QString("%1").arg(Distance(a,b)));
vcg::glLabel::render(p,b,QString("%1").arg(Distance(a,b)));
if(!was_ready)
{
suspendEditToggle();
gla->log->Logf(GLLogStream::FILTER, "Distance: %f",Distance(a,b));
this->Log(GLLogStream::FILTER, "Distance: %f",Distance(a,b));
}
was_ready=true;
}
@ -83,11 +83,11 @@ void EditMeasurePlugin::Decorate(MeshModel &, GLArea * gla,QPainter* p)
bool EditMeasurePlugin::StartEdit(MeshModel &, GLArea *gla )
{
gla->setCursor(QCursor(QPixmap(":/images/cur_measure.png"),15,15));
gla->setCursor(QCursor(QPixmap(":/images/cur_measure.png"),15,15));
connect(this, SIGNAL(suspendEditToggle()),gla,SLOT(suspendEditToggle()) );
was_ready = false;
rubberband.Reset();
return true;
return true;
}
void EditMeasurePlugin::EndEdit(MeshModel &, GLArea *)

554
src/meshlabplugins/edit_paint/edit_paint.cpp
View File

File diff suppressed because it is too large Load Diff

204
src/meshlabplugins/edit_texture/edittexture.cpp
View File

@ -32,7 +32,7 @@
using namespace vcg;
EditTexturePlugin::EditTexturePlugin()
EditTexturePlugin::EditTexturePlugin()
{
isDragging = false;
widget = 0;
@ -40,17 +40,17 @@ EditTexturePlugin::EditTexturePlugin()
qFont.setPixelSize(14);
}
EditTexturePlugin::~EditTexturePlugin()
EditTexturePlugin::~EditTexturePlugin()
{
// Delete the tool widget
if (widget != 0)
if (widget != 0)
{
delete widget;
widget = 0;
}
}
const QString EditTexturePlugin::Info()
const QString EditTexturePlugin::Info()
{
return tr("Edit texture coordinates of the selected area");
}
@ -59,87 +59,87 @@ void EditTexturePlugin::mousePressEvent(QMouseEvent * event, MeshModel &m, GLAre
{
isDragging = true;
if(event->modifiers() == Qt::ControlModifier) selMode = SMAdd;
if(event->modifiers() == Qt::ControlModifier) selMode = SMAdd;
else if(event->modifiers() == Qt::ShiftModifier) selMode = SMSub;
else selMode = SMClear;
// Change the appearance of the cursor
switch(selMode)
{
case SMAdd: // CTRL + Mouse
gla->setCursor(QCursor(QPixmap(":/images/sel_rect_plus.png"),1,1));
break;
case SMSub: // SHIFT + Mouse
gla->setCursor(QCursor(QPixmap(":/images/sel_rect_minus.png"),1,1));
break;
case SMClear: // Mouse
gla->setCursor(QCursor(QPixmap(":/images/sel_rect.png"),1,1));
for (unsigned i = 0; i < FaceSel.size(); i++) FaceSel[i]->ClearS();
FaceSel.clear();
break;
}
else selMode = SMClear;
// Change the appearance of the cursor
switch(selMode)
{
case SMAdd: // CTRL + Mouse
gla->setCursor(QCursor(QPixmap(":/images/sel_rect_plus.png"),1,1));
break;
case SMSub: // SHIFT + Mouse
gla->setCursor(QCursor(QPixmap(":/images/sel_rect_minus.png"),1,1));
break;
case SMClear: // Mouse
gla->setCursor(QCursor(QPixmap(":/images/sel_rect.png"),1,1));
for (unsigned i = 0; i < FaceSel.size(); i++) FaceSel[i]->ClearS();
FaceSel.clear();
break;
}
if(event->modifiers() == Qt::ControlModifier || event->modifiers() == Qt::ShiftModifier )
{
CMeshO::FaceIterator fi;
for(fi = m.cm.face.begin(); fi != m.cm.face.end(); ++fi)
if(!(*fi).IsD() && (*fi).IsS()) FaceSel.push_back(&*fi);
}
{
CMeshO::FaceIterator fi;
for(fi = m.cm.face.begin(); fi != m.cm.face.end(); ++fi)
if(!(*fi).IsD() && (*fi).IsS()) FaceSel.push_back(&*fi);
}
start = event->pos();
start = event->pos();
cur = start;
gla->update();
return;
gla->update();
return;
}
void EditTexturePlugin::mouseMoveEvent(QMouseEvent * event, MeshModel &/*m*/, GLArea * gla)
{
prev = cur;
cur = event->pos();
/*int curT;
static int lastRendering;
if (isDragging)
{
// The user is selecting an area: management of the update
lastRendering = clock();
curT = clock();
if(gla->lastRenderingTime() < 50 || (curT - lastRendering) > 1000 )
{
lastRendering = curT;
gla->update();
}
else
{
gla->makeCurrent();
glDrawBuffer(GL_FRONT);
DrawXORRect(gla);
glDrawBuffer(GL_BACK);
glFlush();
}
}*/
if(gla->lastRenderingTime() < 200 )
/*int curT;
static int lastRendering;
if (isDragging)
{
gla->update();
// The user is selecting an area: management of the update
lastRendering = clock();
curT = clock();
if(gla->lastRenderingTime() < 50 || (curT - lastRendering) > 1000 )
{
lastRendering = curT;
gla->update();
}
else
{
gla->makeCurrent();
glDrawBuffer(GL_FRONT);
DrawXORRect(gla);
glDrawBuffer(GL_BACK);
glFlush();
}
}*/
if(gla->lastRenderingTime() < 200 )
{
gla->update();
}
else
{
gla->makeCurrent();
glDrawBuffer(GL_FRONT);
DrawXORRect(gla);
glDrawBuffer(GL_BACK);
glFlush();
{
gla->makeCurrent();
glDrawBuffer(GL_FRONT);
DrawXORRect(gla);
glDrawBuffer(GL_BACK);
glFlush();
}
}
void EditTexturePlugin::mouseReleaseEvent(QMouseEvent * event, MeshModel &/*m*/, GLArea * gla)
{
prev = cur;
cur = event->pos();
gla->setCursor(QCursor(QPixmap(":/images/sel_rect.png"),1,1));
if (isDragging)
{
widget->SelectFromModel();
isDragging = false;
}
gla->update();
gla->setCursor(QCursor(QPixmap(":/images/sel_rect.png"),1,1));
if (isDragging)
{
widget->SelectFromModel();
isDragging = false;
}
gla->update();
}
void EditTexturePlugin::Decorate(MeshModel &m, GLArea *gla)
@ -153,12 +153,12 @@ void EditTexturePlugin::Decorate(MeshModel &m, GLArea *gla)
DrawXORRect(gla);
mid = (start + cur)/2;
mid.setY(gla->height() - mid.y());
mid.setY(gla->height() - mid.y());
wid = (start - cur);
if(wid.x()<0) wid.setX(-wid.x());
if(wid.x()<0) wid.setX(-wid.x());
if(wid.y()<0) wid.setY(-wid.y());
for(fi = m.cm.face.begin(); fi != m.cm.face.end(); ++fi)
for(fi = m.cm.face.begin(); fi != m.cm.face.end(); ++fi)
if(!(*fi).IsD()) (*fi).ClearS();
glPushMatrix();
@ -190,7 +190,7 @@ bool EditTexturePlugin::StartEdit(MeshModel &m, GLArea *gla )
// Set up the model
//m.cm.face.EnableFFAdjacency();
m.updateDataMask(MeshModel::MM_FACEFACETOPO);
if (m.cm.textures.size() == 0)
{
QMessageBox::warning(gla->window(), "Texture Parametrization Tool",
@ -199,13 +199,13 @@ bool EditTexturePlugin::StartEdit(MeshModel &m, GLArea *gla )
return false;
}
if (vcg::tri::HasPerWedgeTexCoord(m.cm))
if (vcg::tri::HasPerWedgeTexCoord(m.cm))
{
vcg::tri::UpdateTopology<CMeshO>::FaceFaceFromTexCoord(m.cm);
if(vcg::tri::Clean<CMeshO>::HasConsistentPerWedgeTexCoord(m.cm) && !HasCollapsedTextCoords(m)) degenerate = false;
else
else
{
gla->log->Logf(GLLogStream::WARNING,"This mesh has a degenerated texture parametrization!");
this->Log(GLLogStream::WARNING,"This mesh has a degenerated texture parametrization!");
degenerate = true;
}
}
@ -219,23 +219,23 @@ bool EditTexturePlugin::StartEdit(MeshModel &m, GLArea *gla )
for(fi = m.cm.face.begin(); fi != m.cm.face.end(); ++fi) (*fi).ClearS();
gla->setCursor(QCursor(QPixmap(":/images/sel_rect.png"),1,1));
connect(this, SIGNAL(setSelectionRendering(bool)),gla,SLOT(setSelectionRendering(bool)));
setSelectionRendering(true);
// Create an istance of the interface
if (widget == 0)
{
if (widget == 0)
{
widget = new TextureEditor(gla->window(), &m, gla, degenerate);
dock = new QDockWidget(gla->window());
dock->setAllowedAreas(Qt::NoDockWidgetArea);
dock->setWidget(widget);
QPoint p = gla->window()->mapToGlobal(QPoint(0,0));
dock->setGeometry(-5+p.x()+gla->window()->width()-widget->width(),p.y(),widget->width(),widget->height());
dock->setFloating(true);
dock->setFloating(true);
}
dock->setVisible(true);
dock->layout()->update();
dock->layout()->update();
// Initialize the texture using the intere model
InitTexture(m);
@ -248,29 +248,29 @@ void EditTexturePlugin::EndEdit(MeshModel &m , GLArea * )
{
// Delete the widget
for (unsigned i = 0; i < m.cm.face.size(); i++) m.cm.face[i].ClearS();
if (widget != 0)
{
delete widget;
delete dock;
if (widget != 0)
{
delete widget;
delete dock;
widget = 0;
dock = 0;
}
}
void EditTexturePlugin::DrawXORRect(GLArea *gla)
{
// Draw the rectangle of the selection area
{
// Draw the rectangle of the selection area
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
glOrtho(0, gla->width(), gla->height(),0,-1,1);
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();
glPushAttrib(GL_ENABLE_BIT);
glDisable(GL_DEPTH_TEST);
glDisable(GL_LIGHTING);
glDisable(GL_TEXTURE_2D);
glPushMatrix();
glLoadIdentity();
glOrtho(0, gla->width(), gla->height(),0,-1,1);
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();
glPushAttrib(GL_ENABLE_BIT);
glDisable(GL_DEPTH_TEST);
glDisable(GL_LIGHTING);
glDisable(GL_TEXTURE_2D);
glEnable(GL_COLOR_LOGIC_OP);
glLogicOp(GL_XOR);
glColor3f(1,1,1);
@ -283,11 +283,11 @@ void EditTexturePlugin::DrawXORRect(GLArea *gla)
glEnd();
glDisable(GL_LOGIC_OP);
glPopAttrib();
glPopMatrix();
glMatrixMode(GL_PROJECTION);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopAttrib();
glPopMatrix();
glMatrixMode(GL_PROJECTION);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
}
void EditTexturePlugin::InitTexture(MeshModel &m)
@ -311,9 +311,9 @@ bool EditTexturePlugin::HasCollapsedTextCoords(MeshModel &m)
if(!HasPerWedgeTexCoord(m.cm)) return true;
for (CMeshO::FaceIterator fi = m.cm.face.begin(); fi != m.cm.face.end(); ++fi)
{
if(!(*fi).IsD())
if(!(*fi).IsD())
{
if( (*fi).WT(0).P() == (*fi).WT(1).P() || (*fi).WT(0).P() == (*fi).WT(2).P() || (*fi).WT(1).P() == (*fi).WT(2).P())
if( (*fi).WT(0).P() == (*fi).WT(1).P() || (*fi).WT(0).P() == (*fi).WT(2).P() || (*fi).WT(1).P() == (*fi).WT(2).P())
return true;
}
}

174
src/meshlabplugins/edit_texture/renderarea.cpp
View File

@ -38,29 +38,29 @@
RenderArea::RenderArea(QWidget *parent, QString textureName, MeshModel *m, unsigned tnum) : QGLWidget(parent)
{
// Parameters
// Parameters
antialiased = true;
setBackgroundRole(QPalette::Base);
setAutoFillBackground(true);
textNum = tnum;
model = m;
image = QImage();
fileName = textureName;
if(textureName != QString())
{
if (QFile(textureName).exists())
{
image = QImage(textureName);
int bestW = pow(2.0,floor(::log(double(image.width()))/::log(2.0)));
int bestH = pow(2.0,floor(::log(double(image.height()))/::log(2.0)));
QImage imgGL = image.scaled(bestW,bestH,Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
QImage tmpGL = QGLWidget::convertToGLFormat(imgGL);
glGenTextures(1, &id);
image = QImage(tmpGL).mirrored(false, true);
}
else textureName = QString();
}
textNum = tnum;
model = m;
image = QImage();
fileName = textureName;
if(textureName != QString())
{
if (QFile(textureName).exists())
{
image = QImage(textureName);
int bestW = pow(2.0,floor(::log(double(image.width()))/::log(2.0)));
int bestH = pow(2.0,floor(::log(double(image.height()))/::log(2.0)));
QImage imgGL = image.scaled(bestW,bestH,Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
QImage tmpGL = QGLWidget::convertToGLFormat(imgGL);
glGenTextures(1, &id);
image = QImage(tmpGL).mirrored(false, true);
}
else textureName = QString();
}
// Initialization
oldX = 0; oldY = 0;
viewport = vcg::Point2f(0,0);
@ -169,19 +169,19 @@ void RenderArea::SetDegenerate(bool deg)
void RenderArea::paintEvent(QPaintEvent *)
{
// Init
// Init
QPainter painter(this);
painter.setPen(QPen(brush,2));
painter.setBrush(brush);
painter.setRenderHint(QPainter::Antialiasing, antialiased);
painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
tb->GetView();
tb->Apply(true);
maxX = 0; maxY = 0; minX = 0; minY = 0;
painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
tb->GetView();
tb->Apply();
maxX = 0; maxY = 0; minX = 0; minY = 0;
if (model != NULL && HasPerWedgeTexCoord(model->cm) && image != QImage())
{
glEnable(GL_COLOR_LOGIC_OP);
glEnable(GL_COLOR_LOGIC_OP);
glEnable(GL_DEPTH_TEST);
glLineWidth(1);
for (unsigned i = 0; i < model->cm.face.size(); i++)
@ -207,7 +207,7 @@ void RenderArea::paintEvent(QPaintEvent *)
}
}
if (mode == UnifyVert) drawUnifyVertexes();
glDisable(GL_LOGIC_OP);
glDisable(GL_COLOR_LOGIC_OP);
if (minX != 0 || minY != 0 || maxX != 0 || maxY != 0) drawBackground(); // Draw the background behind the model
@ -229,16 +229,16 @@ void RenderArea::paintEvent(QPaintEvent *)
if (mode != UnifyVert) drawEditRectangle(&painter);
else drawUnifyRectangles(&painter); // Draw the rectangles for unify
glDisable(GL_LOGIC_OP);
glPopAttrib();
glPopAttrib();
glPopMatrix();
glMatrixMode(GL_PROJECTION);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
// Draw blend object
glDepthMask(GL_FALSE);
glLogicOp(GL_AND);
glEnable(GL_BLEND);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4f(1.0f, 0.0f, 0.0f, 0.7f);
for (unsigned i = 0; i < model->cm.face.size(); i++)
@ -260,7 +260,7 @@ void RenderArea::drawSelectedVertexes(int i)
if (!isInside(&model->cm.face[i]))
{
for (int j = 0; j < 3; j++)
{
{
if(areaUV.contains(QPointF(model->cm.face[i].WT(j).u(), model->cm.face[i].WT(j).v())) && model->cm.face[i].V(j)->IsUserBit(selVertBit))
DrawCircle(QPoint((origin.x() + (cos(degree) * (model->cm.face[i].WT(j).u() - origin.x()) - sin(degree) * (model->cm.face[i].WT(j).v() - origin.y()))) * AREADIM - posVX/zoom,
(AREADIM - ((origin.y() + (sin(degree) * (model->cm.face[i].WT(j).u() - origin.x()) + cos(degree) * (model->cm.face[i].WT(j).v() - origin.y())))) * AREADIM) - posVY/zoom));
@ -276,8 +276,8 @@ void RenderArea::drawSelectedFaces(int i)
for (int j = 0; j < 3; j++)
{
if (editMode == Scale)
glVertex3f((oScale.x() + (model->cm.face[i].WT(j).u() - oScale.x()) * scaleX) * AREADIM - panX/zoom,
AREADIM - ((oScale.y() + (model->cm.face[i].WT(j).v() - oScale.y()) * scaleY) * AREADIM) - panY/zoom, 1);
glVertex3f((oScale.x() + (model->cm.face[i].WT(j).u() - oScale.x()) * scaleX) * AREADIM - panX/zoom,
AREADIM - ((oScale.y() + (model->cm.face[i].WT(j).v() - oScale.y()) * scaleY) * AREADIM) - panY/zoom, 1);
else glVertex3f((origin.x() + (cos(degree) * (model->cm.face[i].WT(j).u() - origin.x()) - sin(degree) * (model->cm.face[i].WT(j).v() - origin.y()))) * AREADIM - panX/zoom,
AREADIM - ((origin.y() + (sin(degree) * (model->cm.face[i].WT(j).u() - origin.x()) + cos(degree) * (model->cm.face[i].WT(j).v() - origin.y()))) * AREADIM) - panY/zoom, 1);
}
@ -292,9 +292,9 @@ void RenderArea::drawEdge(int i)
if (mode != EditVert)
{
if (!model->cm.face[i].IsUserBit(selBit))
glVertex3f(model->cm.face[i].WT(j).u() * AREADIM , AREADIM - (model->cm.face[i].WT(j).v() * AREADIM), 1);
else if (editMode == Scale) glVertex3f((oScale.x() + (model->cm.face[i].WT(j).u() - oScale.x()) * scaleX) * AREADIM - panX/zoom,
AREADIM - ((oScale.y() + (model->cm.face[i].WT(j).v() - oScale.y()) * scaleY) * AREADIM) - panY/zoom, 1);
glVertex3f(model->cm.face[i].WT(j).u() * AREADIM , AREADIM - (model->cm.face[i].WT(j).v() * AREADIM), 1);
else if (editMode == Scale) glVertex3f((oScale.x() + (model->cm.face[i].WT(j).u() - oScale.x()) * scaleX) * AREADIM - panX/zoom,
AREADIM - ((oScale.y() + (model->cm.face[i].WT(j).v() - oScale.y()) * scaleY) * AREADIM) - panY/zoom, 1);
else glVertex3f((origin.x() + (cos(degree) * (model->cm.face[i].WT(j).u() - origin.x()) - sin(degree) * (model->cm.face[i].WT(j).v() - origin.y()))) * AREADIM - panX/zoom,
AREADIM - ((origin.y() + (sin(degree) * (model->cm.face[i].WT(j).u() - origin.x()) + cos(degree) * (model->cm.face[i].WT(j).v() - origin.y()))) * AREADIM) - panY/zoom, 1);
}
@ -332,21 +332,21 @@ void RenderArea::drawBackground()
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width(), image.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, image.bits());
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
gluBuild2DMipmaps(GL_TEXTURE_2D, 3, image.width(), image.height(), GL_RGBA, GL_UNSIGNED_BYTE, image.bits());
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glEnable(GL_TEXTURE_2D);
for (int x = minX; x < maxX; x++)
{
for (int y = minY; y < maxY; y++)
for (int y = minY; y < maxY; y++)
{
glBegin(GL_QUADS);
glTexCoord2f(0.0,0.0);
glBegin(GL_QUADS);
glTexCoord2f(0.0,0.0);
glVertex3f(0.0 + x*AREADIM,0.0 - y*AREADIM,0.0);
glTexCoord2f(1.0,0.0);
glTexCoord2f(1.0,0.0);
glVertex3f(1.0*AREADIM + x*AREADIM,0.0 - y*AREADIM,0.0);
glTexCoord2f(1.0,1.0);
glTexCoord2f(1.0,1.0);
glVertex3f(1.0*AREADIM + x*AREADIM,1.0*AREADIM - y*AREADIM,0.0);
glTexCoord2f(0.0,1.0);
glTexCoord2f(0.0,1.0);
glVertex3f(0.0 + x*AREADIM,1.0*AREADIM - y*AREADIM,0.0);
glEnd();
}
@ -400,7 +400,7 @@ void RenderArea::drawEditRectangle(QPainter *painter)
painter->drawRect(selRect[l]);
if (editMode == Scale && mode == Edit) painter->drawImage(selRect[l],scal,QRect(0,0,scal.width(),scal.height()));
else painter->drawImage(selRect[l],rot,QRect(0,0,rot.width(),rot.height()));
}
}
// and the origin of the rotation
if ((editMode == Rotate && mode == Edit) || mode == EditVert)
{
@ -444,7 +444,7 @@ void RenderArea::drawUnifyRectangles(QPainter *painter)
{
painter->setPen(QPen(QBrush(Qt::red),2));
for (unsigned k = 0; k < drawnPath.size()-1; k++)
painter->drawLine(ToScreenSpace(drawnPath[k].X(), drawnPath[k].Y()), ToScreenSpace(drawnPath[k+1].X(),drawnPath[k+1].Y()));
painter->drawLine(ToScreenSpace(drawnPath[k].X(), drawnPath[k].Y()), ToScreenSpace(drawnPath[k+1].X(),drawnPath[k+1].Y()));
}
if (drawP1)
{
@ -457,7 +457,7 @@ void RenderArea::mousePressEvent(QMouseEvent *e)
{
if((e->buttons() & Qt::LeftButton))
{
if ((mode == Edit || mode == EditVert) && highlighted == NOSEL)
if ((mode == Edit || mode == EditVert) && highlighted == NOSEL)
{
this->ChangeMode(SPECIALMODE);
pressed = NOSEL;
@ -565,7 +565,7 @@ void RenderArea::mouseReleaseEvent(QMouseEvent *e)
void RenderArea::handleReleaseView(QMouseEvent *e)
{
if (selection != QRect())
if (selection != QRect())
{
UpdateSelectionArea((viewport.X() - initVX)*zoom, (viewport.Y() - initVY)*zoom);
originR.moveCenter(QPoint(originR.x() + (viewport.X() - initVX)*zoom, originR.y() + (viewport.Y() - initVY)*zoom));
@ -615,11 +615,11 @@ void RenderArea::handleReleaseEdit(QMouseEvent *e)
RecalculateSelectionArea();
degree = 0;
}
else if (scaleX != 1 && scaleY != 1 && mode == Edit)
else if (scaleX != 1 && scaleY != 1 && mode == Edit)
{
ScaleComponent(scaleX, scaleY);
RecalculateSelectionArea();
scaleX = 1;
scaleX = 1;
scaleY = 1;
oScale = QPointF(0,0);
}
@ -781,7 +781,7 @@ void RenderArea::handleMoveEdit(QMouseEvent *e)
orY = tY;
this->update(originR);
}
else if (pressed > NOSEL && pressed < selRect.size())
else if (pressed > NOSEL && pressed < selRect.size())
{
if (editMode == Scale && mode == Edit) HandleScale(e->pos());
else HandleRotate(e->pos());
@ -838,15 +838,15 @@ void RenderArea::wheelEvent(QWheelEvent*e)
// Handle the zoom for any mode
int cwx = viewport.X() - (this->visibleRegion().boundingRect().width()/zoom)/2;
int cwy = viewport.Y() - (this->visibleRegion().boundingRect().height()/zoom)/2;
if (e->delta() > 0) zoom /= 0.75;
else zoom *= 0.75;
if (e->delta() > 0) zoom /= 0.75;
else zoom *= 0.75;
// Change the viewport, putting the center of the screen on the mouseposition
cwx += (this->visibleRegion().boundingRect().width()/zoom)/2;
cwy += (this->visibleRegion().boundingRect().height()/zoom)/2;
viewport = Point2f(cwx, cwy);
ResetTrack(false);
tb->Scale(zoom);
if (selectedV)
if (selectedV)
{
if (mode == UnifyVert) UpdateUnify();
else UpdateVertexSelection();
@ -903,7 +903,7 @@ void RenderArea::RemapMod()
float v = model->cm.face[i].WT(j).v();
if (u < 0) u = u + (int)u + 1;
else if (u > 1) u = u - (int)u;
if (v < 0) v = v + (int)v + 1;
if (v < 0) v = v + (int)v + 1;
else if (v > 1) v = v - (int)v;
model->cm.face[i].WT(j).u() = u;
model->cm.face[i].WT(j).v() = v;
@ -949,13 +949,13 @@ void RenderArea::ChangeMode(int modenumber)
{
if (selection != QRect())
{
if (selectMode == Vertex)
if (selectMode == Vertex)
{
mode = EditVert; selectedV = true;
UpdateSelectionAreaV(0,0);
for (unsigned i = 0; i < model->cm.face.size(); i++) model->cm.face[i].ClearUserBit(selBit);
}
else
else
{
mode = Edit; selected = true;
for (unsigned i = 0; i < model->cm.vert.size(); i++) model->cm.vert[i].ClearUserBit(selVertBit);
@ -965,7 +965,7 @@ void RenderArea::ChangeMode(int modenumber)
else
{
mode = Select;
for (unsigned i = 0; i < model->cm.face.size(); i++)
for (unsigned i = 0; i < model->cm.face.size(); i++)
{
model->cm.face[i].ClearUserBit(selBit); model->cm.face[i].ClearS();
}
@ -977,7 +977,7 @@ void RenderArea::ChangeMode(int modenumber)
break;
case SPECIALMODE: // For internal use... reset the selection
mode = Select;
for (unsigned i = 0; i < model->cm.face.size(); i++)
for (unsigned i = 0; i < model->cm.face.size(); i++)
{
model->cm.face[i].ClearUserBit(selBit); model->cm.face[i].ClearS();
}
@ -1054,13 +1054,13 @@ void RenderArea::ChangeSelectMode(int selectindex)
selectMode = Area;
break;
}
if (selectedV && selectMode != Vertex)
if (selectedV && selectMode != Vertex)
{
areaUV = QRectF();
selVertBit = CVertexO::NewBitFlag();
selectedV = false;
}
if (selected && selectMode == Vertex)
if (selected && selectMode == Vertex)
{
selected = false;
//selBit = CFaceO::NewBitFlag();
@ -1199,8 +1199,8 @@ void RenderArea::SelectFaces()
{
if ((*fi).WT(0).n() == textNum && !(*fi).IsD())
{
(*fi).ClearUserBit(selBit);
QVector<QPoint> t = QVector<QPoint>();
(*fi).ClearUserBit(selBit);
QVector<QPoint> t = QVector<QPoint>();
t.push_back(ToScreenSpace((*fi).WT(0).u(), (*fi).WT(0).v()));
t.push_back(ToScreenSpace((*fi).WT(1).u(), (*fi).WT(1).v()));
t.push_back(ToScreenSpace((*fi).WT(2).u(), (*fi).WT(2).v()));
@ -1268,7 +1268,7 @@ void RenderArea::CheckVertex()
if (!areaUV.contains(QPointF((*fi).WT(j).u(), (*fi).WT(j).v()))) go = true;
else {go = false; break;}
}
}
}
if (go) banList.push_back(&(*fi));
}
}
@ -1277,7 +1277,7 @@ void RenderArea::CheckVertex()
void RenderArea::handleUnifySelection(CMeshO::FaceIterator fi, int j)
{
if (unifyRA == QRect())
{
{
unifyRA = QRect(QPoint(selStart.x() - VRADIUS, selStart.y() - VRADIUS), QPoint(selEnd.x() + VRADIUS, selEnd.y() + VRADIUS));
unifyA = (*fi).V(j);
firstface = &(*fi);
@ -1286,8 +1286,8 @@ void RenderArea::handleUnifySelection(CMeshO::FaceIterator fi, int j)
drawnPath.clear();
drawnPath.push_back(Point2f(tua,tva));
}
else if (unifyRB == QRect())
{
else if (unifyRB == QRect())
{
unifyRB = QRect(QPoint(selStart.x() - VRADIUS, selStart.y() - VRADIUS), QPoint(selEnd.x() + VRADIUS, selEnd.y() + VRADIUS));
unifyB = (*fi).V(j);
uvertB = ToScreenSpace((*fi).WT(j).u(), (*fi).WT(j).v());
@ -1300,19 +1300,19 @@ void RenderArea::handleUnifySelection(CMeshO::FaceIterator fi, int j)
}
this->update();
}
else if (unifyRA1 == QRect())
{
else if (unifyRA1 == QRect())
{
firstface1 = &(*fi);
unifyRA1 = QRect(QPoint(selStart.x() - VRADIUS, selStart.y() - VRADIUS), QPoint(selEnd.x() + VRADIUS, selEnd.y() + VRADIUS));
unifyRA1 = QRect(QPoint(selStart.x() - VRADIUS, selStart.y() - VRADIUS), QPoint(selEnd.x() + VRADIUS, selEnd.y() + VRADIUS));
unifyA1 = (*fi).V(j);
uvertA1 = ToScreenSpace((*fi).WT(j).u(), (*fi).WT(j).v());
tua1 = (*fi).WT(j).u(); tva1 = (*fi).WT(j).v();
drawnPath1.clear();
drawnPath1.push_back(Point2f(tua1,tva1));
}
else if (unifyRB1 == QRect())
{
unifyRB1 = QRect(QPoint(selStart.x() - VRADIUS, selStart.y() - VRADIUS), QPoint(selEnd.x() + VRADIUS, selEnd.y() + VRADIUS));
else if (unifyRB1 == QRect())
{
unifyRB1 = QRect(QPoint(selStart.x() - VRADIUS, selStart.y() - VRADIUS), QPoint(selEnd.x() + VRADIUS, selEnd.y() + VRADIUS));
unifyB1 = (*fi).V(j);
uvertB1 = ToScreenSpace((*fi).WT(j).u(), (*fi).WT(j).v());
tub1 = (*fi).WT(j).u(); tvb1 = (*fi).WT(j).v();
@ -1328,7 +1328,7 @@ void RenderArea::handleUnifySelection(CMeshO::FaceIterator fi, int j)
void RenderArea::SelectConnectedComponent(QPoint e)
{
// Select a series of faces with the same UV coord on the edge
// Select a series of faces with the same UV coord on the edge
selStart = QPoint(MAX,MAX);
selEnd = QPoint(-MAX,-MAX);
selected = false;
@ -1336,13 +1336,13 @@ void RenderArea::SelectConnectedComponent(QPoint e)
for (unsigned i = 0; i < model->cm.face.size(); i++) model->cm.face[i].ClearUserBit(selBit);
unsigned index = 0;
vector<CFaceO*> Q = vector<CFaceO*>();
// Search the clicked face
for(unsigned i = 0; i < model->cm.face.size(); i++)
{
if (model->cm.face[i].WT(0).n() == textNum)
{
QVector<QPoint> t = QVector<QPoint>();
QVector<QPoint> t = QVector<QPoint>();
t.push_back(ToScreenSpace(model->cm.face[i].WT(0).u(), model->cm.face[i].WT(0).v()));
t.push_back(ToScreenSpace(model->cm.face[i].WT(1).u(), model->cm.face[i].WT(1).v()));
t.push_back(ToScreenSpace(model->cm.face[i].WT(2).u(), model->cm.face[i].WT(2).v()));
@ -1379,8 +1379,8 @@ void RenderArea::SelectConnectedComponent(QPoint e)
void RenderArea::ClearSelection()
{
//selBit = CFaceO::NewBitFlag();
for (unsigned i = 0; i < model->cm.face.size(); i++)
{
for (unsigned i = 0; i < model->cm.face.size(); i++)
{
model->cm.face[i].ClearUserBit(selBit);
model->cm.face[i].ClearS();
}
@ -1438,7 +1438,7 @@ void RenderArea::Flip(bool mode)
if (mode) model->cm.face[i].WT(j).u() = 2.0f * mid.x() - model->cm.face[i].WT(j).u();
else model->cm.face[i].WT(j).v() = 2.0f * mid.y() - model->cm.face[i].WT(j).v();
}
}
}
}
}
RecalculateSelectionArea();
@ -1543,9 +1543,9 @@ vector<CVertexO*> RenderArea::FindPath(CVertexO* begin, CVertexO* end, CFaceO* f
int notcontrol = -1;
int lastadd = 0, lastex = -1;
/* Add all the adjacent faces to the vertex.
For each face in Stack Q
if the edge is a border one and contains the last added vertex and is on the right
enqueue all adjacent faces to the other vertex
For each face in Stack Q
if the edge is a border one and contains the last added vertex and is on the right
enqueue all adjacent faces to the other vertex
add the other vertex to the path
*/
float tu, tv;
@ -1563,7 +1563,7 @@ vector<CVertexO*> RenderArea::FindPath(CVertexO* begin, CVertexO* end, CFaceO* f
if (nextb == 0) break;
}
bool verso;
if (pathN == 0)
if (pathN == 0)
{
if (tua < tub) verso = true;
else verso = false;
@ -1626,7 +1626,7 @@ vector<CVertexO*> RenderArea::FindPath(CVertexO* begin, CVertexO* end, CFaceO* f
tu = p->WT(oldn).u(); tv = p->WT(oldn).v();
while (n != -1)
{
if (tu == next->WT(n).u() && tv == next->WT(n).v() && next != p && !next->IsV())
if (tu == next->WT(n).u() && tv == next->WT(n).v() && next != p && !next->IsV())
Q.push_back(next);
previus = next;
oldn = n;
@ -1650,9 +1650,9 @@ vector<CVertexO*> RenderArea::FindPath(CVertexO* begin, CVertexO* end, CFaceO* f
}
else notcontrol = -1;
index++;
if (index == Q.size() && end != path[path.size()-1])
if (index == Q.size() && end != path[path.size()-1])
{
index = lastadd;
index = lastadd;
notcontrol = lastex;
Q[index]->ClearV();
}
@ -1738,7 +1738,7 @@ void RenderArea::HandleRotate(QPoint e)
if (ny > e.y()) degree = -degree;
break;
case 1:
if (ny < e.y())
if (ny < e.y())
degree = -degree;
break;
case 2:

8
src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.cpp
View File

@ -575,7 +575,7 @@ void SdfGpuPlugin::setupMesh(MeshDocument& md, ONPRIMITIVE onPrimitive )
vcg::tri::Allocator<CMeshO>::CompactVertexVector(m);
vcg::tri::Allocator<CMeshO>::CompactFaceVector(m);
vcg::tri::UpdateNormal<CMeshO>::PerVertexAngleWeighted(m);
tri::UpdateBounding<CMeshO>::Box(m);
tri::UpdateBounding<CMeshO>::Box(m);
//Enable & Reset the necessary attributes
switch(onPrimitive)
@ -705,7 +705,7 @@ void SdfGpuPlugin::calculateSdfHW(FramebufferObject* fboFront, FramebufferObject
vcg::Matrix44f mvprINV(mv_pr_Matrix_f);
mvprINV.transposeInPlace();
vcg::Invert(mvprINV);
mvprINV=vcg::Inverse(mvprINV);
mSDFProgram->setUniformMatrix4fv( "mvprMatrixINV", mvprINV.V(), 1, GL_TRUE );
@ -1010,8 +1010,8 @@ bool SdfGpuPlugin::postRender(unsigned int peelingIteration)
return true;
}
else return false;
}
}
return true;
}