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

- adding last changes to the gl_mesh_attributes_feeder.h file

This commit is contained in:
granzuglia 2015-07-30 11:41:57 +00:00
parent 6bb2ed6382
commit 8869ac344b
1 changed files with 102 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
wrap/gl/gl_mesh_attributes_feeder.h
View File

@ -71,9 +71,10 @@ struct GLFeederInfo
enum PRIMITIVE_MODALITY enum PRIMITIVE_MODALITY
{ {
PR_NONE = 0, PR_NONE = 0,
PR_TRIANGLES, PR_POINTS = 1,
PR_POINTS, PR_TRIANGLES = 2,
PR_QUADS PR_QUADS = 3,
PR_NAMES_ARITY = 4
}; };
typedef unsigned int ATT_BIT_MASK; typedef unsigned int ATT_BIT_MASK;
@ -125,9 +126,9 @@ struct GLFeederInfo
return _atts[ii]; return _atts[ii];
} }
void reset() virtual void reset()
{ {
for(size_t ii = 0;ii < _size;++ii) for(size_t ii = 0;ii < _attssize;++ii)
_atts[ii] = false; _atts[ii] = false;
_pm = PR_NONE; _pm = PR_NONE;
} }
@ -144,11 +145,48 @@ struct GLFeederInfo
inline static size_t possibleAttributesNumber() inline static size_t possibleAttributesNumber()
{ {
return _size; return _attssize;
} }
private:
static const size_t _size = ATT_NAMES_ARITY; static ReqAtts setUnion(const ReqAtts& a,const ReqAtts& b)
bool _atts[_size]; {
ReqAtts res;
for(size_t ii = 0; ii < ReqAtts::possibleAttributesNumber();++ii)
{
ATT_NAMES name = static_cast<ATT_NAMES>(ii);
res[name] = a[name] || b[name];
}
res.primitiveModality() = a.primitiveModality();
if ((unsigned int) res.primitiveModality() <= (unsigned int) b.primitiveModality())
res.primitiveModality() = b.primitiveModality();
return res;
}
static ReqAtts setComplement(const ReqAtts& a,const ReqAtts& b)
{
/*TRUTH TABLE*/
//this[ATT_NAMES] | rq[ATT_NAMES] | res
// true | true | false
// true | false | true
// false | true | false
// false | false | false
ReqAtts res = a;
for(size_t ii = 0; ii < ReqAtts::possibleAttributesNumber();++ii)
{
ATT_NAMES name = static_cast<ATT_NAMES>(ii);
if (res[name])
res[name] = !(b[name]);
}
res.primitiveModality() = b.primitiveModality();
return res;
}
protected:
static const size_t _attssize = ATT_NAMES_ARITY;
bool _atts[_attssize];
PRIMITIVE_MODALITY _pm; PRIMITIVE_MODALITY _pm;
}; };
}; };
@ -257,12 +295,9 @@ public:
{ {
ReqAtts tmp = rq; ReqAtts tmp = rq;
computeARequestedAttributesSetCompatibleWithMesh(tmp,_mesh); computeARequestedAttributesSetCompatibleWithMesh(tmp,_mesh);
mergeReqAtts(tmp,_currallocatedboatt); _currallocatedboatt = ReqAtts::setUnion(_currallocatedboatt,tmp);
allocated = tryToAllocateAttributesInBO(); allocated = tryToAllocateAttributesInBO();
if (allocated) return tmp;
return tmp;
else
return ReqAtts();
} }
catch (GLFeederException& e) catch (GLFeederException& e)
{ {
@ -271,6 +306,11 @@ public:
return ReqAtts(); return ReqAtts();
} }
ReqAtts removeRequestedAttributes(const ReqAtts& rq)
{
return _currallocatedboatt = ReqAtts::setComplement(rq,_currallocatedboatt);
}
void buffersDeAllocationRequested() void buffersDeAllocationRequested()
{ {
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)
@ -328,6 +368,19 @@ public:
return (!isReplicatedPipeline(rqatt) && (pm != PR_POINTS) && (pm != PR_NONE)); return (!isReplicatedPipeline(rqatt) && (pm != PR_POINTS) && (pm != PR_NONE));
} }
void invalidateRequestedAttributes(ReqAtts& rq)
{
size_t ii = 0;
for(typename std::vector<GLBufferObject*>::iterator it = _bo.begin();it != _bo.end();++it)
{
ATT_NAMES boname = static_cast<ATT_NAMES>(ii);
if (((*it) != NULL) && (rq[boname]))
(*it)->_isvalid = false;
++ii;
}
_currallocatedboatt = vcg::GLFeederInfo::ReqAtts::setComplement(_currallocatedboatt,rq);
}
protected: protected:
struct GLBufferObject struct GLBufferObject
{ {
@ -376,19 +429,6 @@ protected:
return _bo[boname]; return _bo[boname];
} }
static void mergeReqAtts(const ReqAtts& newone,ReqAtts& tomerge)
{
for(size_t ii = 0; ii < ReqAtts::possibleAttributesNumber();++ii)
{
ATT_NAMES name = static_cast<ATT_NAMES>(ii);
tomerge[name] = tomerge[name] || newone[name];
}
if ((unsigned int) tomerge.primitiveModality() <= (unsigned int) newone.primitiveModality())
tomerge.primitiveModality() = newone.primitiveModality();
}
static void computeARequestedAttributesSetCompatibleWithMesh(ReqAtts& rqatt,const MESHTYPE& mesh) static void computeARequestedAttributesSetCompatibleWithMesh(ReqAtts& rqatt,const MESHTYPE& mesh)
{ {
if (mesh.VN() == 0) if (mesh.VN() == 0)
@ -612,6 +652,7 @@ protected:
} }
else else
updateBuffersIndexedPipeline(attributestobeupdated); updateBuffersIndexedPipeline(attributestobeupdated);
glFinish();
} }
return true; return true;
} }
@ -1003,7 +1044,10 @@ protected:
glBindTexture(GL_TEXTURE_2D,textureindex[curtexname]); glBindTexture(GL_TEXTURE_2D,textureindex[curtexname]);
} }
glBegin(GL_TRIANGLES); GLenum primitive = GL_TRIANGLES;
if (req.primitiveModality() == vcg::GLFeederInfo::PR_POINTS)
primitive = GL_POINTS;
glBegin(primitive);
while(fi!=_mesh.face.end()) while(fi!=_mesh.face.end())
{ {
@ -1030,28 +1074,39 @@ protected:
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
} }
if(req[ATT_FACENORMAL]) glNormal(f.cN()); if(req[ATT_FACENORMAL])
if(req[ATT_VERTNORMAL]) glNormal(f.V(0)->cN()); glNormal(f.cN());
//if(nm == NMPerWedge)glNormal(f.WN(0)); if(req[ATT_VERTNORMAL])
glNormal(f.V(0)->cN());
if(req[ATT_FACECOLOR]) glColor(f.C()); if(req[ATT_FACECOLOR])
if(req[ATT_VERTCOLOR]) glColor(f.V(0)->C()); glColor(f.C());
if(req[ATT_VERTTEXTURE]) glTexCoord(f.V(0)->T().P()); if(req[ATT_VERTCOLOR])
if(req[ATT_WEDGETEXTURE]) glTexCoord(f.WT(0).t(0)); glColor(f.V(0)->C());
if(req[ATT_VERTTEXTURE])
glTexCoord(f.V(0)->T().P());
if(req[ATT_WEDGETEXTURE])
glTexCoord(f.WT(0).t(0));
glVertex(f.V(0)->P()); glVertex(f.V(0)->P());
if(req[ATT_VERTNORMAL]) glNormal(f.V(1)->cN()); if(req[ATT_VERTNORMAL])
//if(nm == NMPerWedge)glNormal(f.WN(1)); glNormal(f.V(1)->cN());
if(req[ATT_VERTCOLOR]) glColor(f.V(1)->C()); if(req[ATT_VERTCOLOR])
if(req[ATT_VERTTEXTURE]) glTexCoord(f.V(1)->T().P()); glColor(f.V(1)->C());
if(req[ATT_WEDGETEXTURE]) glTexCoord(f.WT(1).t(0)); if(req[ATT_VERTTEXTURE])
glTexCoord(f.V(1)->T().P());
if(req[ATT_WEDGETEXTURE])
glTexCoord(f.WT(1).t(0));
glVertex(f.V(1)->P()); glVertex(f.V(1)->P());
if(req[ATT_VERTNORMAL]) glNormal(f.V(2)->cN()); if(req[ATT_VERTNORMAL])
//if(nm == NMPerWedge)glNormal(f.WN(2)); glNormal(f.V(2)->cN());
if(req[ATT_VERTCOLOR]) glColor(f.V(2)->C()); if(req[ATT_VERTCOLOR])
if(req[ATT_VERTTEXTURE]) glTexCoord(f.V(2)->T().P()); glColor(f.V(2)->C());
if(req[ATT_WEDGETEXTURE]) glTexCoord(f.WT(2).t(0)); if(req[ATT_VERTTEXTURE])
glTexCoord(f.V(2)->T().P());
if(req[ATT_WEDGETEXTURE])
glTexCoord(f.WT(2).t(0));
glVertex(f.V(2)->P()); glVertex(f.V(2)->P());
} }
++fi; ++fi;
@ -1072,6 +1127,7 @@ protected:
if (replicated) if (replicated)
{ {
qDebug("Replicated drawing");
int firsttriangleoffset = 0; int firsttriangleoffset = 0;
if(!req[ATT_VERTTEXTURE] && !req[ATT_WEDGETEXTURE]) if(!req[ATT_VERTTEXTURE] && !req[ATT_WEDGETEXTURE])
{ {
@ -1112,6 +1168,7 @@ protected:
if (_bo[ATT_VERTINDEX]->_isvalid) if (_bo[ATT_VERTINDEX]->_isvalid)
{ {
qDebug("Indexed drawing");
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,_bo[ATT_VERTINDEX]->_bohandle); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,_bo[ATT_VERTINDEX]->_bohandle);
glDrawElements( GL_TRIANGLES, _mesh.fn * _bo[ATT_VERTINDEX]->_components,GL_UNSIGNED_INT ,NULL); glDrawElements( GL_TRIANGLES, _mesh.fn * _bo[ATT_VERTINDEX]->_components,GL_UNSIGNED_INT ,NULL);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);