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

- fixed "it doesn't update the mesh rendering" bug

This commit is contained in:
granzuglia 2015-10-09 11:35:08 +00:00
parent 4403fb04d1
commit f30429c603
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wrap/gl/gl_mesh_attributes_feeder.h
View File

@ -319,6 +319,7 @@ namespace vcg
ReqAtts setupRequestedAttributes(const ReqAtts& rq,bool& allocated) ReqAtts setupRequestedAttributes(const ReqAtts& rq,bool& allocated)
{ {
if (!_rendermodinitialized) if (!_rendermodinitialized)
_rendermodinitialized = true; _rendermodinitialized = true;
@ -327,6 +328,7 @@ namespace vcg
ReqAtts tmp = rq; ReqAtts tmp = rq;
ReqAtts::computeARequestedAttributesSetCompatibleWithMesh(tmp,_mesh); ReqAtts::computeARequestedAttributesSetCompatibleWithMesh(tmp,_mesh);
tmp = ReqAtts::setUnion(_currallocatedboatt,tmp); tmp = ReqAtts::setUnion(_currallocatedboatt,tmp);
allocated = tryToAllocateAndCopyAttributesInBO(tmp); allocated = tryToAllocateAndCopyAttributesInBO(tmp);
return tmp; return tmp;
} }
@ -487,15 +489,11 @@ namespace vcg
GLBufferObject* bobj = _bo[att]; GLBufferObject* bobj = _bo[att];
if (bobj == NULL) if (bobj == NULL)
return; return;
GLenum err = glGetError();
assert(err == GL_NO_ERROR);
if ((att != ATT_VERTINDEX ) && (ATT_MESHCOLOR)) if ((att != ATT_VERTINDEX ) && (ATT_MESHCOLOR))
glDisableClientState(bobj->_clientstatetag); glDisableClientState(bobj->_clientstatetag);
err = glGetError();
assert(err == GL_NO_ERROR);
glDeleteBuffers(1,&(bobj->_bohandle)); glDeleteBuffers(1,&(bobj->_bohandle));
err = glGetError();
assert(err == GL_NO_ERROR);
bobj->_bohandle = 0; bobj->_bohandle = 0;
if (bobj->_size > 0) if (bobj->_size > 0)
//we don't use dim cause dim is the value that is going to be allocated, instead use (*it)->_size * (*it)->getSizeOfGLType() is the value already in the buffer //we don't use dim cause dim is the value that is going to be allocated, instead use (*it)->_size * (*it)->getSizeOfGLType() is the value already in the buffer
@ -513,7 +511,6 @@ namespace vcg
std::ptrdiff_t bomemoryrequiredbymesh = bufferObjectsMemoryRequired(req); std::ptrdiff_t bomemoryrequiredbymesh = bufferObjectsMemoryRequired(req);
bool generateindex = ReqAtts::isVertexIndexingRequired(req); bool generateindex = ReqAtts::isVertexIndexingRequired(req);
unsigned int ii = 0; unsigned int ii = 0;
for(typename std::vector<GLBufferObject*>::iterator it = _bo.begin();it != _bo.end();++it) for(typename std::vector<GLBufferObject*>::iterator it = _bo.begin();it != _bo.end();++it)
{ {
ATT_NAMES boname = static_cast<ATT_NAMES>(ii); ATT_NAMES boname = static_cast<ATT_NAMES>(ii);
@ -610,7 +607,6 @@ namespace vcg
GLenum err = glGetError(); GLenum err = glGetError();
glBufferData(cbo->_target, dim, NULL, GL_STATIC_DRAW); glBufferData(cbo->_target, dim, NULL, GL_STATIC_DRAW);
err = glGetError(); err = glGetError();
//even if there according the MemoryInfo subclass there is enough space we were not able to allocate an attribute buffer object. We have to deallocate all the bos related to this mesh //even if there according the MemoryInfo subclass there is enough space we were not able to allocate an attribute buffer object. We have to deallocate all the bos related to this mesh
failedallocation = (err == GL_OUT_OF_MEMORY); failedallocation = (err == GL_OUT_OF_MEMORY);
if (!failedallocation) if (!failedallocation)
@ -771,7 +767,12 @@ namespace vcg
GLBufferObject* buffobj = _bo[GLFeederInfo::ATT_VERTPOSITION]; GLBufferObject* buffobj = _bo[GLFeederInfo::ATT_VERTPOSITION];
glBindBuffer(GL_ARRAY_BUFFER, buffobj->_bohandle); glBindBuffer(GL_ARRAY_BUFFER, buffobj->_bohandle);
glBufferSubData(GL_ARRAY_BUFFER,chunkingpu * vertexchunk * buffobj->_components * buffobj->getSizeOfGLType(),buffobj->_components * buffobj->getSizeOfGLType() * chunksize,&pv[0]); glBufferSubData(GL_ARRAY_BUFFER,chunkingpu * vertexchunk * buffobj->_components * buffobj->getSizeOfGLType(),buffobj->_components * buffobj->getSizeOfGLType() * chunksize,&pv[0]);
//std::vector<vcg::Point3f> tmppv; //position vector
//if (attributestobeupdated[GLFeederInfo::ATT_VERTPOSITION])
// tmppv.resize(vertexchunk);
//glGetBufferSubData(GL_ARRAY_BUFFER,0,buffobj->_components * buffobj->getSizeOfGLType() * chunksize,&tmppv[0]);
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
} }
if (attributestobeupdated[GLFeederInfo::ATT_VERTNORMAL]) if (attributestobeupdated[GLFeederInfo::ATT_VERTNORMAL])
{ {
@ -794,7 +795,7 @@ namespace vcg
glBufferSubData(GL_ARRAY_BUFFER,chunkingpu * vertexchunk * buffobj->_components * buffobj->getSizeOfGLType(),buffobj->_components * buffobj->getSizeOfGLType() * chunksize,&tv[0]); glBufferSubData(GL_ARRAY_BUFFER,chunkingpu * vertexchunk * buffobj->_components * buffobj->getSizeOfGLType(),buffobj->_components * buffobj->getSizeOfGLType() * chunksize,&tv[0]);
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
} }
glFinish();
++chunkingpu; ++chunkingpu;
} }
} }
@ -1226,7 +1227,6 @@ namespace vcg
disableClientState(boname,req); disableClientState(boname,req);
++ii; ++ii;
} }
/*disable all client state buffers*/ /*disable all client state buffers*/
ReqAtts tmp; ReqAtts tmp;
updateClientState(tmp); updateClientState(tmp);