manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- removed clang compiler errors

This commit is contained in:
granzuglia 2015-06-03 13:45:41 +00:00
parent a2efddf456
commit c8004cf4ad
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wrap/gl/trimesh.h
View File

@ -1030,7 +1030,7 @@ namespace vcg {
{ {
public: public:
GLMeshAttributesFeeder(/*const*/ MESHTYPE& mesh,MemoryInfo& meminfo, size_t perbatchtriangles = 100) GLMeshAttributesFeeder(/*const*/ MESHTYPE& mesh,MemoryInfo& meminfo, size_t perbatchtriangles = 100)
:_mesh(mesh),_gpumeminfo(meminfo),_bo(8,0),_vaohandle(0),_lastfeedingusedreplicatedpipeline(false),_perbatchsimplex(perbatchtriangles),_chunkmap(),_borendering(false) :_mesh(mesh),_gpumeminfo(meminfo),_bo(8,NULL),_vaohandle(0),_lastfeedingusedreplicatedpipeline(false),_perbatchsimplex(perbatchtriangles),_chunkmap(),_borendering(false)
{ {
_bo[VERTPOSITIONBO] = new GLBufferObject(3,GL_FLOAT); _bo[VERTPOSITIONBO] = new GLBufferObject(3,GL_FLOAT);
_bo[VERTNORMALBO] = new GLBufferObject(3,GL_FLOAT); _bo[VERTNORMALBO] = new GLBufferObject(3,GL_FLOAT);
@ -2090,21 +2090,21 @@ namespace vcg {
void remove(MESHTYPE* mesh) void remove(MESHTYPE* mesh)
{ {
std::map< MESHTYPE*, MatrixedFeeder >::iterator it = _scene.find(mesh); typename std::map< MESHTYPE*, MatrixedFeeder >::iterator it = _scene.find(mesh);
if (it != _scene.end()) if (it != _scene.end())
_scene.erase(it); _scene.erase(it);
} }
void update(MESHTYPE* mesh,int mask) void update(MESHTYPE* mesh,int mask)
{ {
std::map< MESHTYPE*, MatrixedFeeder >::iterator it = _scene.find(mesh); typename std::map< MESHTYPE*, MatrixedFeeder >::iterator it = _scene.find(mesh);
if (it != _scene.end()) if (it != _scene.end())
it->second._feeder.update(mask); it->second._feeder.update(mask);
} }
void passTrianglesToOpenGL(MESHTYPE* mesh,GLFeedEnum::NORMAL_MODALITY nm,GLFeedEnum::COLOR_MODALITY cm,GLFeedEnum::TEXTURE_MODALITY tm,const std::vector<GLuint>& textureindex = std::vector<GLuint>()) void passTrianglesToOpenGL(MESHTYPE* mesh,GLFeedEnum::NORMAL_MODALITY nm,GLFeedEnum::COLOR_MODALITY cm,GLFeedEnum::TEXTURE_MODALITY tm,const std::vector<GLuint>& textureindex = std::vector<GLuint>())
{ {
std::map<MESHTYPE*,MatrixedFeeder>::iterator it = _scene.find(mesh); typename std::map<MESHTYPE*,MatrixedFeeder>::iterator it = _scene.find(mesh);
if(it == _scene.end()) if(it == _scene.end())
return; return;
glPushAttrib(GL_TRANSFORM_BIT); glPushAttrib(GL_TRANSFORM_BIT);
@ -2117,12 +2117,12 @@ namespace vcg {
} }
it->second._feeder.passTrianglesToOpenGL(nm,cm,tm,textureindex); it->second._feeder.passTrianglesToOpenGL(nm,cm,tm,textureindex);
glPopMatrix(); glPopMatrix();
glPushAttrib(); glPopAttrib();
} }
void passPointsToOpenGL(MESHTYPE* mesh,GLFeedEnum::NORMAL_MODALITY nm,GLFeedEnum::COLOR_MODALITY cm) void passPointsToOpenGL(MESHTYPE* mesh,GLFeedEnum::NORMAL_MODALITY nm,GLFeedEnum::COLOR_MODALITY cm)
{ {
std::map<MESHTYPE*,MatrixedFeeder>::iterator it = _scene.find(mesh); typename std::map<MESHTYPE*,MatrixedFeeder>::iterator it = _scene.find(mesh);
if(it == _scene.end()) if(it == _scene.end())
return; return;
glPushAttrib(GL_TRANSFORM_BIT); glPushAttrib(GL_TRANSFORM_BIT);
@ -2135,7 +2135,7 @@ namespace vcg {
} }
it->second._feeder.passPointsToOpenGL(nm,cm); it->second._feeder.passPointsToOpenGL(nm,cm);
glPopMatrix(); glPopMatrix();
glPushAttrib(); glPopAttrib();
} }
private: private:
@ -2144,7 +2144,7 @@ namespace vcg {
vcg::Matrix44<typename MESHTYPE::ScalarType> _localmeshmatrix; vcg::Matrix44<typename MESHTYPE::ScalarType> _localmeshmatrix;
GLMeshAttributesFeeder<MESHTYPE> _feeder; GLMeshAttributesFeeder<MESHTYPE> _feeder;
MatrixedFeeder(const vcg::Matrix44<typename MESHTYPE::ScalarType>& localmeshmatrix,GLMeshAttributesFeeder& feeder) MatrixedFeeder(const vcg::Matrix44<typename MESHTYPE::ScalarType>& localmeshmatrix,GLMeshAttributesFeeder<MESHTYPE>& feeder)
:_localmeshmatrix(localmeshmatrix),_feeder(feeder) :_localmeshmatrix(localmeshmatrix),_feeder(feeder)
{ {
} }
@ -2153,7 +2153,7 @@ namespace vcg {
void computeSceneGlobalCenter() void computeSceneGlobalCenter()
{ {
vcg::Box3<typename MESHTYPE::ScalarType> scenebbox; vcg::Box3<typename MESHTYPE::ScalarType> scenebbox;
for(std::map<MESHTYPE*,MatrixedFeeder >::const_iterator it = _scene.begin();it != _scene.end();++it) for(typename std::map<MESHTYPE*,MatrixedFeeder >::const_iterator it = _scene.begin();it != _scene.end();++it)
scenebbox.Add(it->first->bbox,it->second._localmeshmatrix); scenebbox.Add(it->first->bbox,it->second._localmeshmatrix);
_globalscenecenter = -scenebbox.Center(); _globalscenecenter = -scenebbox.Center();