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

- fixed some small bugs

This commit is contained in:
granzuglia 2016-05-06 10:41:00 +00:00
parent a5f3b19d9d
commit 4e71a57fff
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h
View File

@ -402,7 +402,7 @@ namespace vcg
if (tobeupdated[INT_ATT_NAMES::ATT_EDGEINDICES]) if (tobeupdated[INT_ATT_NAMES::ATT_EDGEINDICES])
updateEdgeVertIndVector(); updateEdgeVertIndVector();
bool immediatemode = !(buffersMemoryManagementFunction(tobeallocated,tobedeallocated)); bool immediatemode = !(buffersMemoryManagementFunction(tobeallocated,tobedeallocated,tobeupdated));
bool replicated = isThereAReplicatedPipelineView(); bool replicated = isThereAReplicatedPipelineView();
if (immediatemode) if (immediatemode)
@ -439,7 +439,7 @@ namespace vcg
_meshtriangleswhenedgeindiceswerecomputed = _mesh.FN(); _meshtriangleswhenedgeindiceswerecomputed = _mesh.FN();
} }
bool buffersMemoryManagementFunction(const InternalRendAtts& tobeallocated,const InternalRendAtts& tobedeallocated) bool buffersMemoryManagementFunction(const InternalRendAtts& tobeallocated,const InternalRendAtts& tobedeallocated,const InternalRendAtts& tobeupdated)
{ {
//GLenum err = glGetError(); //GLenum err = glGetError();
bool replicated = isThereAReplicatedPipelineView(); bool replicated = isThereAReplicatedPipelineView();
@ -510,6 +510,12 @@ namespace vcg
glBindBuffer(cbo->_target, 0); glBindBuffer(cbo->_target, 0);
_currallocatedboatt[boname] = !failedallocation; _currallocatedboatt[boname] = !failedallocation;
} }
else
{
//the arity of the attribute contained in the bo didn't change so i can use the old space without reallocating it
if (cbo != NULL)
cbo->_isvalid = tobeupdated[boname];
}
++it; ++it;
++ii; ++ii;
} }
@ -573,7 +579,9 @@ namespace vcg
} }
if (attributestobeupdated[INT_ATT_NAMES::ATT_VERTCOLOR]) if (attributestobeupdated[INT_ATT_NAMES::ATT_VERTCOLOR])
{
cv[chunkindex] = _mesh.vert[i].cC(); cv[chunkindex] = _mesh.vert[i].cC();
}
if (attributestobeupdated[INT_ATT_NAMES::ATT_VERTTEXTURE]) if (attributestobeupdated[INT_ATT_NAMES::ATT_VERTTEXTURE])
{ {
tv[chunkindex*2+0] = _mesh.vert[i].cT().U(); tv[chunkindex*2+0] = _mesh.vert[i].cT().U();
@ -1218,14 +1226,14 @@ namespace vcg
} }
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,0);
glBindBuffer(GL_ARRAY_BUFFER,0); glBindBuffer(GL_ARRAY_BUFFER,0);
int ii = 0; //int ii = 0;
for(typename std::vector<GLBufferObject*>::const_iterator it = _bo.begin();it != _bo.end();++it) //for(typename std::vector<GLBufferObject*>::const_iterator it = _bo.begin();it != _bo.end();++it)
{ //{
INT_ATT_NAMES boname(ii); // INT_ATT_NAMES boname(ii);
if ((boname != INT_ATT_NAMES::ATT_VERTINDICES) && (boname != INT_ATT_NAMES::ATT_EDGEINDICES) && (boname != INT_ATT_NAMES::ATT_MESHCOLOR)) // if ((boname != INT_ATT_NAMES::ATT_VERTINDICES) && (boname != INT_ATT_NAMES::ATT_EDGEINDICES) && (boname != INT_ATT_NAMES::ATT_MESHCOLOR))
disableClientState(boname,req); // disableClientState(boname,req);
++ii; // ++ii;
} //}
/*disable all client state buffers*/ /*disable all client state buffers*/
InternalRendAtts tmp; InternalRendAtts tmp;
updateClientState(tmp); updateClientState(tmp);