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

Updated filter_img_patch_param to float/double independence

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2014-08-23 01:45:50 +00:00
parent 5aff2c1f82
commit 2d979781fc
4 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/meshlabplugins/filter_img_patch_param/VisibilityCheck.cpp
View File

@ -97,14 +97,14 @@ void VisibilityCheck_VMV2002::init( std::vector<unsigned char> &visBuffer )
// Initialize the OpenGL transform so as to place the camera on the current raster.
float zNear, zFar;
GlShot< vcg::Shot<float> >::GetNearFarPlanes( m_Raster->shot, m_Mesh->bbox, zNear, zFar );
CMeshO::ScalarType zNear, zFar;
GlShot< Shotm >::GetNearFarPlanes( m_Raster->shot, m_Mesh->bbox, zNear, zFar );
if( zNear < 0.0001f )
zNear = 0.1f;
if( zFar < zNear )
zFar = zNear + 1000.0f;
GlShot< vcg::Shot<float> >::SetView( m_Raster->shot, zNear, zFar );
GlShot< Shotm >::SetView( m_Raster->shot, zNear, zFar );
// Perform the first rendering pass that initializes the depth buffer.
@ -120,9 +120,9 @@ void VisibilityCheck_VMV2002::init( std::vector<unsigned char> &visBuffer )
glBegin( GL_TRIANGLES );
for( CMeshO::FaceIterator fi=m_Mesh->face.begin(); fi!=m_Mesh->face.end(); ++fi )
{
glVertex3fv( fi->V(0)->P().V() );
glVertex3fv( fi->V(1)->P().V() );
glVertex3fv( fi->V(2)->P().V() );
glVertex( fi->V(0)->P());
glVertex( fi->V(1)->P() );
glVertex( fi->V(2)->P() );
}
glEnd();
@ -152,7 +152,7 @@ bool VisibilityCheck_VMV2002::iteration( std::vector<unsigned char> &visBuffer )
(vertId>> 8) & 0xFF,
(vertId>>16) & 0xFF,
(vertId>>24) & 0xFF );
glVertex3fv( m_Mesh->vert[v].P().V() );
glVertex( m_Mesh->vert[v].P() );
}
glEnd();
@ -242,8 +242,8 @@ void VisibilityCheck_ShadowMap::shadowProjMatrices()
{
// Recover the near and far clipping planes by considering the bounding box of the current mesh
// in the camera space of the current raster.
float zNear, zFar;
GlShot< vcg::Shot<float> >::GetNearFarPlanes( m_Raster->shot, m_Mesh->bbox, zNear, zFar );
CMeshO::ScalarType zNear, zFar;
GlShot< Shotm >::GetNearFarPlanes( m_Raster->shot, m_Mesh->bbox, zNear, zFar );
if( zNear < 0.0001f )
zNear = 0.1f;
if( zFar < zNear )
@ -251,7 +251,7 @@ void VisibilityCheck_ShadowMap::shadowProjMatrices()
// Recover the view frustum of the current raster.
float l, r, b, t, focal;
CMeshO::ScalarType l, r, b, t, focal;
m_Raster->shot.Intrinsics.GetFrustum( l, r, b, t, focal );
@ -267,7 +267,7 @@ void VisibilityCheck_ShadowMap::shadowProjMatrices()
// Extract the pose matrix from the current raster.
m_Pose = m_Raster->shot.GetWorldToExtrinsicsMatrix().transpose();
m_Pose.Import(m_Raster->shot.GetWorldToExtrinsicsMatrix().transpose());
// Define the bias matrix that will enable to go from clipping space to texture space.
@ -276,7 +276,9 @@ void VisibilityCheck_ShadowMap::shadowProjMatrices()
0.0f, 0.0f, 0.5f, 0.0f,
0.5f, 0.5f, 0.5f, 1.0f };
m_ShadowProj = m_Pose * m_Proj * vcg::Matrix44f(biasMatData);
m_ShadowProj.Import(m_Pose * m_Proj * vcg::Matrix44f(biasMatData));
m_Viewpoint.Import(m_Raster->shot.GetViewPoint());
m_ZAxis.Import(m_Raster->shot.Axis(2));
}
@ -314,11 +316,11 @@ void VisibilityCheck_ShadowMap::updateShadowTexture()
// Set up the OpenGL transformation matrices so as to place the viewpoint on the raster's camera.
glMatrixMode( GL_PROJECTION );
glPushMatrix();
glLoadMatrixf( m_Proj.V() );
vcg::glLoadMatrix( m_Proj.V() );
glMatrixMode( GL_MODELVIEW );
glPushMatrix();
glLoadMatrixf( m_Pose.V() );
vcg::glLoadMatrix( m_Pose.V() );
// Perform an off-screen rendering pass so as to generate the a depth map of the model
@ -338,13 +340,13 @@ void VisibilityCheck_ShadowMap::updateShadowTexture()
glPushClientAttrib( GL_CLIENT_VERTEX_ARRAY_BIT );
glEnableClientState( GL_VERTEX_ARRAY );
m_Context.bindVertexBuffer( m_ShadowVBOVertices );
glVertexPointer( 3, GL_FLOAT, 0, 0 );
m_Context.unbindVertexBuffer();
m_Context.bindVertexBuffer( m_ShadowVBOVertices );
glVertexPointer( 3, vcg::GL_TYPE<Scalarm>::SCALAR(), 0, 0 );
m_Context.unbindVertexBuffer();
m_Context.bindIndexBuffer( m_ShadowVBOIndices );
glDrawElements( GL_TRIANGLES, 3*m_Mesh->fn, GL_UNSIGNED_INT, 0 );
m_Context.unbindIndexBuffer();
m_Context.bindIndexBuffer( m_ShadowVBOIndices );
glDrawElements( GL_TRIANGLES, 3*m_Mesh->fn, GL_UNSIGNED_INT, 0 );
m_Context.unbindIndexBuffer();
glPopClientAttrib();
}
@ -353,9 +355,9 @@ void VisibilityCheck_ShadowMap::updateShadowTexture()
glBegin( GL_TRIANGLES );
for( CMeshO::FaceIterator fi=m_Mesh->face.begin(); fi!=m_Mesh->face.end(); ++fi )
{
glVertex3fv( fi->V(0)->P().V() );
glVertex3fv( fi->V(1)->P().V() );
glVertex3fv( fi->V(2)->P().V() );
glVertex( fi->V(0)->P());
glVertex( fi->V(1)->P());
glVertex( fi->V(2)->P());
}
glEnd();
}
@ -438,7 +440,7 @@ void VisibilityCheck_ShadowMap::initMeshTextures()
{
// Creates a first OpenGL texture into which normal vectors at each mesh vertex are stored.
int mapH = (int) std::ceil( m_Mesh->vn / 2048.0f );
vcg::Point3f *mapData = new vcg::Point3f [ 2048*mapH ];
Point3m *mapData = new Point3m [ 2048*mapH ];
for( int i=0; i<m_Mesh->vn; ++i )
mapData[i] = m_Mesh->vert[i].N();
@ -476,7 +478,7 @@ void VisibilityCheck_ShadowMap::initMeshTextures()
// Creates the VBO that will be used for the generation of the shadow map.
if( s_AreVBOSupported )
{
m_ShadowVBOVertices = glw::createBuffer( m_Context, m_Mesh->vn*sizeof(vcg::Point3f), mapData );
m_ShadowVBOVertices = glw::createBuffer( m_Context, m_Mesh->vn*sizeof(Point3m), mapData );
delete [] mapData;
unsigned int *indices = new unsigned int [ 3*m_Mesh->fn ];
@ -510,9 +512,9 @@ void VisibilityCheck_ShadowMap::setMesh( CMeshO *mesh )
m_FBuffer = glw::createFramebuffer ( m_Context, glw::RenderTarget(), glw::renderbufferTarget(m_ColorBuffer) );
glw::BoundReadDrawFramebufferHandle hfb = m_Context.bindReadDrawFramebuffer(m_FBuffer);
}
m_Context.unbindReadDrawFramebuffer();
}
}
m_Context.unbindReadDrawFramebuffer();
}
}
@ -545,8 +547,8 @@ void VisibilityCheck_ShadowMap::checkVisibility()
boundShader->setUniform( "u_NormalMap", 1 );
boundShader->setUniform( "u_SadowMap" , 2 );
boundShader->setUniform4x4( "u_ShadowProj", m_ShadowProj.V(), false );
boundShader->setUniform3( "u_Viewpoint", m_Raster->shot.GetViewPoint().V() );
boundShader->setUniform3( "u_ZAxis", m_Raster->shot.Axis(2).V() );
boundShader->setUniform3( "u_Viewpoint", m_Viewpoint.V() );
boundShader->setUniform3( "u_ZAxis", m_ZAxis.V());
boundShader->setUniform( "u_PixelSize", 1.0f/m_VertexMap->width(), 1.0f/m_VertexMap->height() );

13
src/meshlabplugins/filter_img_patch_param/VisibilityCheck.h
View File

@ -8,7 +8,7 @@
* \ *
* All rights reserved. *
* *
* This program is free software; you can redistribute it and/or modify *
* 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. *
@ -78,9 +78,9 @@ class VisibilityCheck_VMV2002 : public VisibilityCheck
friend class VisibilityCheck;
private:
glw::RenderbufferHandle m_ColorRB;
glw::RenderbufferHandle m_DepthRB;
glw::FramebufferHandle m_FrameBuffer;
glw::RenderbufferHandle m_ColorRB;
glw::RenderbufferHandle m_DepthRB;
glw::FramebufferHandle m_FrameBuffer;
vcg::Point2i m_ViewportMin;
vcg::Point2i m_ViewportMax;
@ -109,7 +109,10 @@ private:
vcg::Matrix44f m_Pose;
vcg::Matrix44f m_Proj;
vcg::Matrix44f m_ShadowProj;
glw::Texture2DHandle m_ShadowMap;
vcg::Point3f m_Viewpoint;
vcg::Point3f m_ZAxis;
glw::Texture2DHandle m_ShadowMap;
glw::Texture2DHandle m_VertexMap;
glw::Texture2DHandle m_NormalMap;

10
src/meshlabplugins/filter_img_patch_param/VisibleSet.cpp
View File

@ -46,8 +46,8 @@ VisibleSet::VisibleSet( glw::Context &ctx,
foreach( RasterModel *rm, rasterList )
{
float zNear, zFar;
GlShot< vcg::Shot<float> >::GetNearFarPlanes( rm->shot, mesh.bbox, zNear, zFar );
CMeshO::ScalarType zNear, zFar;
GlShot< Shotm >::GetNearFarPlanes( rm->shot, mesh.bbox, zNear, zFar );
if( zNear < depthMin )
depthMin = zNear;
@ -83,7 +83,7 @@ VisibleSet::VisibleSet( glw::Context &ctx,
float VisibleSet::getWeight( const RasterModel *rm, CFaceO &f )
{
vcg::Point3f centroid = (f.V(0)->P() +
Point3m centroid = (f.V(0)->P() +
f.V(1)->P() +
f.V(2)->P()) / 3.0f;
@ -99,7 +99,7 @@ float VisibleSet::getWeight( const RasterModel *rm, CFaceO &f )
if( (m_WeightMask & W_IMG_BORDER) && weight>0.0f )
{
vcg::Point2f cam = rm->shot.Project( centroid );
Point2m cam = rm->shot.Project( centroid );
weight *= 1.0f - std::max( std::abs(2.0f*cam.X()/rm->shot.Intrinsics.ViewportPx.X()-1.0f),
std::abs(2.0f*cam.Y()/rm->shot.Intrinsics.ViewportPx.Y()-1.0f) );
}
@ -109,7 +109,7 @@ float VisibleSet::getWeight( const RasterModel *rm, CFaceO &f )
float alpha[3];
for(int i=0;i<3;++i)
{
vcg::Point2f ppoint = rm->shot.Project( f.V(i)->P() );
Point2m ppoint = rm->shot.Project( f.V(i)->P() );
if(ppoint[0] < 0 ||
ppoint[1] < 0 ||
ppoint[0] >= rm->currentPlane->image.width() ||

18
src/meshlabplugins/filter_img_patch_param/filter_img_patch_param.cpp
View File

@ -218,7 +218,7 @@ bool FilterImgPatchParamPlugin::applyFilter( QAction *act,
CMeshO &mesh = md.mm()->cm;
std::list<vcg::Shotf> initialShots;
std::list<Shotm> initialShots;
QList<RasterModel*> activeRasters;
foreach( RasterModel *rm, md.rasterList )
{
@ -685,18 +685,18 @@ void FilterImgPatchParamPlugin::computePatchUV( CMeshO &mesh,
PatchVec &patches )
{
// Recovers the view frustum of the current raster.
float zNear, zFar;
GlShot< vcg::Shot<float> >::GetNearFarPlanes( rm->shot, mesh.bbox, zNear, zFar );
CMeshO::ScalarType zNear, zFar;
GlShot< Shotm >::GetNearFarPlanes( rm->shot, mesh.bbox, zNear, zFar );
if( zNear < 0.0001f )
zNear = 0.1f;
if( zFar < zNear )
zFar = zNear + 1000.0f;
float l, r, b, t, focal;
CMeshO::ScalarType l, r, b, t, focal;
rm->shot.Intrinsics.GetFrustum( l, r, b, t, focal );
// Computes the camera perspective projection matrix from the frustum values.
vcg::Matrix44f camProj;
Matrix44m camProj;
camProj.SetZero();
camProj[0][0] = 2.0f*focal / (r-l);
camProj[0][2] = (r+l) / (r-l);
@ -706,14 +706,14 @@ void FilterImgPatchParamPlugin::computePatchUV( CMeshO &mesh,
camProj[2][3] = 2.0f*zNear*zFar / (zNear-zFar);
camProj[3][2] = -1.0f;
vcg::Matrix44f cam2clip;
Matrix44m cam2clip;
cam2clip.SetZero();
cam2clip[0][0] = cam2clip[0][3] = 0.5f * rm->shot.Intrinsics.ViewportPx.X();
cam2clip[1][1] = cam2clip[1][3] = 0.5f * rm->shot.Intrinsics.ViewportPx.Y();
cam2clip[2][2] = cam2clip[3][3] = 1.0f;
// Computes the full transform that goes from the mesh local space to the camera clipping space.
vcg::Matrix44f mesh2clip = cam2clip * camProj * rm->shot.GetWorldToExtrinsicsMatrix();
Matrix44m mesh2clip = cam2clip * camProj * rm->shot.GetWorldToExtrinsicsMatrix();
for( PatchVec::iterator p=patches.begin(); p!=patches.end(); ++p )
{
@ -727,7 +727,7 @@ void FilterImgPatchParamPlugin::computePatchUV( CMeshO &mesh,
for( std::vector<CFaceO*>::iterator f=p->faces.begin(); f!=p->faces.end(); ++f )
for( int i=0; i<3; ++i )
{
vcg::Point3f &vp = (*f)->V(i)->P();
Point3m &vp = (*f)->V(i)->P();
(*f)->WT(i).U() = mesh2clip.GetRow3(0)*vp + mesh2clip[0][3];
(*f)->WT(i).V() = mesh2clip.GetRow3(1)*vp + mesh2clip[1][3];
@ -742,7 +742,7 @@ void FilterImgPatchParamPlugin::computePatchUV( CMeshO &mesh,
TriangleUV fuv;
for( int i=0; i<3; ++i )
{
vcg::Point3f &vp = (*f)->V(i)->P();
Point3m &vp = (*f)->V(i)->P();
fuv.v[i].U() = mesh2clip.GetRow3(0)*vp + mesh2clip[0][3];
fuv.v[i].V() = mesh2clip.GetRow3(1)*vp + mesh2clip[1][3];