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

needed changes to the new directory organization and common folder

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2010-04-08 09:31:34 +00:00
parent 08969e6e78
commit be7dd8a14f
3 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/meshlabplugins/render_splatpyramid/dialog.h
View File

@ -3,7 +3,7 @@
#include <map>
#include <GL/glew.h>
#include <meshlab/meshmodel.h>
#include <common/interfaces.h>
#include <QtGui>
#include <QGLWidget>
#include "shaderStructs.h"

50
src/meshlabplugins/render_splatpyramid/splat_pyramid.cc
View File

@ -44,35 +44,37 @@ void PyramidPointRendererPlugin::Init(QAction *, MeshDocument &md, RenderMode &,
bool color_per_vertex = false;
foreach(MeshModel * mp, md.meshList) {
// Create a new primitive from given file
objects.push_back( Object( objects.size() ) );
if(mp->hasDataMask(MeshModel::MM_VERTRADIUS))
{
// Create a new primitive from given file
objects.push_back( Object( objects.size() ) );
vector<Surfeld> *surfels = (objects.back()).getSurfels();
vector<Surfeld> *surfels = (objects.back()).getSurfels();
if (mp->hasDataMask( MeshModel::MM_VERTCOLOR ) )
color_per_vertex = true;
Color4b c (180, 180, 180, 255);
float quality = 0.0001;
double radius = 1.0;
if (mp->hasDataMask( MeshModel::MM_VERTCOLOR ) )
color_per_vertex = true;
int pos = 0;
CMeshO::VertexIterator vi;
Color4b c (180, 180, 180, 255);
float quality = 0.0001;
double radius = 1.0;
for(vi=mp->cm.vert.begin(); vi!=mp->cm.vert.end(); ++vi)
if(!(*vi).IsD())
{
Point3f p = (*vi).P();
Point3f n = (*vi).N();
radius = (*vi).R();
if (color_per_vertex)
c = (*vi).C();
int pos = 0;
CMeshO::VertexIterator vi;
surfels->push_back ( Surfeld (p, n, c, quality, radius, pos) );
++pos;
}
}
for(vi=mp->cm.vert.begin(); vi!=mp->cm.vert.end(); ++vi)
if(!(*vi).IsD())
{
Point3f p = (*vi).P();
Point3f n = (*vi).N();
radius = (*vi).R();
if (color_per_vertex)
c = (*vi).C();
surfels->push_back ( Surfeld (p, n, c, quality, radius, pos) );
++pos;
}
}
}
if (color_per_vertex)
render_mode = PYRAMID_POINTS_COLOR;
else

3
src/meshlabplugins/render_splatpyramid/splat_pyramid.h
View File

@ -36,8 +36,7 @@ using namespace std;
#include <QString>
#include <GL/glew.h>
#include <meshlab/meshmodel.h>
#include <meshlab/interfaces.h>
#include <common/interfaces.h>
#include <vcg/math/matrix44.h>
#include <meshlab/glarea.h>