FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some renaming and harmonisations with osg metamodel convention

Browse Source
This commit is contained in:
mp3butcher
2017-07-26 23:36:55 +02:00
parent 5be14bc2ba
commit f27c379b1e
3 changed files with 76 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/osggpucull/osggpucull.cpp
View File

@@ -206,7 +206,7 @@ struct IndirectTarget
for(unsigned int j=0;j<indirectCommands->size(); ++j){
osg::DrawArraysIndirect *ipr=new osg::DrawArraysIndirect( GL_TRIANGLES, j );
ipr->setIndirectCommandDrawArrays( indirectCommands);
ipr->setIndirectCommandArray( indirectCommands);
newPrimitiveSets.push_back(ipr);
}
@@ -220,7 +220,7 @@ struct IndirectTarget
else // use glMultiDrawArraysIndirect()
{
osg::MultiDrawArraysIndirect *ipr=new osg::MultiDrawArraysIndirect( GL_TRIANGLES );
ipr->setIndirectCommandDrawArrays( indirectCommands );
ipr->setIndirectCommandArray( indirectCommands );
geometryAggregator->getAggregatedGeometry()->removePrimitiveSet(0,geometryAggregator->getAggregatedGeometry()->getNumPrimitiveSets() );
geometryAggregator->getAggregatedGeometry()->addPrimitiveSet( ipr );
}

74
include/osg/PrimitiveSetIndirect
View File

@@ -137,39 +137,34 @@ class OSG_EXPORT DrawElementsIndirect : public DrawElements
public:
DrawElementsIndirect(Type primType=PrimitiveType, GLenum mode = 0,unsigned int firstCommand = 0, GLsizei stride = 0):
DrawElements(primType,mode, 0),_firstCommand(firstCommand),_stride(stride){setIndirectCommandDrawArrays(new DefaultIndirectCommandDrawElements());}
DrawElements(primType,mode, 0),_firstCommand(firstCommand),_stride(stride){setIndirectCommandArray(new DefaultIndirectCommandDrawElements());}
DrawElementsIndirect(const DrawElementsIndirect& rhs,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
DrawElements(rhs,copyop),_firstCommand(rhs._firstCommand), _stride(rhs._stride) {
_IndirectCommandDrawArrays=(DefaultIndirectCommandDrawElements*)copyop(rhs._IndirectCommandDrawArrays.get());
}
/// set command array of this indirect primitive set
inline void setIndirectCommandDrawArrays(IndirectCommandDrawElements*idc) {
inline void setIndirectCommandArray(IndirectCommandDrawElements*idc) {
_IndirectCommandDrawArrays = idc;
if(!_IndirectCommandDrawArrays->getBufferObject())
_IndirectCommandDrawArrays->setBufferObject(new osg::VertexBufferObject());
}
/// get command array of this indirect primitive set
inline IndirectCommandDrawElements* getIndirectCommandDrawArrays()const {
return _IndirectCommandDrawArrays;
}
inline IndirectCommandDrawElements* getIndirectCommandArray() { return _IndirectCommandDrawArrays; }
inline const IndirectCommandDrawElements* getIndirectCommandArray() const { return _IndirectCommandDrawArrays; }
///Further methods are for advanced DI when you plan to use your own IndirectCommandElement (stride)
///or if you want to draw a particular command index of the IndirectCommandElement(FirstCommandToDraw)
/// set offset of the first command to draw in the IndirectCommandDrawArrays
inline void setFirstCommandToDraw( unsigned int i) {
_firstCommand=i;
}
inline void setFirstCommandToDraw( unsigned int i) { _firstCommand = i; }
/// get offset of the first command in the IndirectCommandDrawArrays
inline unsigned int getFirstCommandToDraw()const {
return _firstCommand;
}
inline unsigned int getFirstCommandToDraw() const { return _firstCommand; }
/// stride (to set if you use custom CommandArray)
inline void setStride( GLsizei i) {
_stride=i;
}
/// stride (to set if you use custom CommandArray)
inline GLsizei getStride()const {
inline GLsizei getStride() const {
return _stride;
}
virtual unsigned int getNumPrimitives() const=0;
@@ -491,7 +486,18 @@ public:
DrawElementsIndirectUShort(mode,firstCommand,stride),_count(commandcount){_primitiveType=(Type(MultiDrawElementsUShortIndirectPrimitiveType));}
MultiDrawElementsIndirectUShort(const MultiDrawElementsIndirectUShort& mdi,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
DrawElementsIndirectUShort(mdi,copyop),_count(mdi._count) {}
virtual osg::Object* cloneType() const {
return new MultiDrawElementsIndirectUShort();
}
virtual osg::Object* clone(const osg::CopyOp& copyop) const {
return new MultiDrawElementsIndirectUShort(*this,copyop);
}
virtual bool isSameKindAs(const osg::Object* obj) const {
return dynamic_cast<const MultiDrawElementsIndirectUShort*>(obj)!=NULL;
}
virtual const char* className() const {
return "MultiDrawElementsIndirectUShort";
}
virtual void draw(State& state, bool useVertexBufferObjects) const;
virtual void accept(PrimitiveFunctor& functor) const;
virtual void accept(PrimitiveIndexFunctor& functor) const;
@@ -519,6 +525,18 @@ public:
DrawElementsIndirectUByte(mode,firstCommand,stride),_count(commandcount){_primitiveType=(Type(MultiDrawElementsUByteIndirectPrimitiveType));}
MultiDrawElementsIndirectUByte(const MultiDrawElementsIndirectUByte& mdi,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
DrawElementsIndirectUByte(mdi,copyop),_count(mdi._count) {}
virtual osg::Object* cloneType() const {
return new MultiDrawElementsIndirectUByte();
}
virtual osg::Object* clone(const osg::CopyOp& copyop) const {
return new MultiDrawElementsIndirectUByte(*this,copyop);
}
virtual bool isSameKindAs(const osg::Object* obj) const {
return dynamic_cast<const MultiDrawElementsIndirectUByte*>(obj)!=NULL;
}
virtual const char* className() const {
return "MultiDrawElementsIndirectUByte";
}
virtual void draw(State& state, bool useVertexBufferObjects) const;
virtual void accept(PrimitiveFunctor& functor) const;
virtual void accept(PrimitiveIndexFunctor& functor) const;
@@ -542,7 +560,18 @@ public:
DrawElementsIndirectUInt(mode,firstCommand,stride),_count(commandcount){_primitiveType=(Type(MultiDrawElementsUIntIndirectPrimitiveType));}
MultiDrawElementsIndirectUInt(const MultiDrawElementsIndirectUInt& mdi,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
DrawElementsIndirectUInt(mdi,copyop),_count(mdi._count) {}
virtual osg::Object* cloneType() const {
return new MultiDrawElementsIndirectUInt();
}
virtual osg::Object* clone(const osg::CopyOp& copyop) const {
return new MultiDrawElementsIndirectUInt(*this,copyop);
}
virtual bool isSameKindAs(const osg::Object* obj) const {
return dynamic_cast<const MultiDrawElementsIndirectUInt*>(obj)!=NULL;
}
virtual const char* className() const {
return "MultiDrawElementsIndirectUInt";
}
virtual void draw(State& state, bool useVertexBufferObjects) const;
virtual void accept(PrimitiveFunctor& functor) const;
virtual void accept(PrimitiveIndexFunctor& functor) const;
@@ -568,7 +597,7 @@ public:
DrawArraysIndirect(GLenum mode=0, unsigned int firstcommand = 0, GLsizei stride = 0):
osg::PrimitiveSet(Type(DrawArraysIndirectPrimitiveType), mode),
_firstCommand(firstcommand), _stride(stride) {setIndirectCommandDrawArrays(new DefaultIndirectCommandDrawArrays);}
_firstCommand(firstcommand), _stride(stride) {setIndirectCommandArray(new DefaultIndirectCommandDrawArrays);}
DrawArraysIndirect(const DrawArraysIndirect& dal,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
osg::PrimitiveSet(dal,copyop),
@@ -604,8 +633,8 @@ public:
virtual unsigned int getNumPrimitives() const;
/// stride (to set if you use custom CommandArray)
inline void setStride( GLsizei i) {
/// stride (to set if you use custom CommandArray)
inline void setStride( GLsizei i) {
_stride=i;
}
/// stride (to set if you use custom CommandArray)
@@ -613,20 +642,23 @@ public:
return _stride;
}
/// set offset of the first command in the IndirectCommandDrawArrays
inline void setFirstCommand( unsigned int i) {
inline void setFirstCommandToDraw( unsigned int i) {
_firstCommand=i;
}
/// get offset of the first command in the IndirectCommandDrawArrays
inline unsigned int getFirstCommand()const {
inline unsigned int getFirstCommandToDraw() const {
return _firstCommand;
}
inline void setIndirectCommandDrawArrays(IndirectCommandDrawArrays*idc) {
inline void setIndirectCommandArray(IndirectCommandDrawArrays*idc) {
_IndirectCommandDrawArrays = idc;
if(!_IndirectCommandDrawArrays->getBufferObject())
_IndirectCommandDrawArrays->setBufferObject(new osg::VertexBufferObject());
}
inline IndirectCommandDrawArrays* getIndirectCommandDrawArrays()const {
inline const IndirectCommandDrawArrays* getIndirectCommandArray() const {
return _IndirectCommandDrawArrays;
}
inline IndirectCommandDrawArrays* getIndirectCommandArray(){
return _IndirectCommandDrawArrays;
}

42
src/osg/PrimitiveSetIndirect.cpp
View File

@@ -29,7 +29,7 @@ template<class T> inline
unsigned int getNumPrimitivesDI( const T&_this)
{
unsigned int offset= _this.getFirstCommandToDraw();
IndirectCommandDrawElements *cmd=_this.getIndirectCommandDrawArrays();
IndirectCommandDrawElements *cmd=const_cast<IndirectCommandDrawElements *>(_this.getIndirectCommandArray());
unsigned int total=0;
switch(_this.getMode())
{
@@ -221,21 +221,21 @@ void DrawElementsIndirectUShort::accept(PrimitiveIndexFunctor& functor) const
//
template<class T> inline
unsigned int getNumPrimitivesMDI( const T&_this)
{ IndirectCommandDrawElements *_IndirectCommandDrawArrays=_this.getIndirectCommandDrawArrays();
{ IndirectCommandDrawElements *_IndirectCommandDrawArrays=const_cast<IndirectCommandDrawElements *>(_this.getIndirectCommandArray());
unsigned int total=0;
switch(_this.getMode())
{
case(PrimitiveSet::POINTS):
for(unsigned int i=0;i<_IndirectCommandDrawArrays->getNumElements();i++)
for(unsigned int i=0;i<_IndirectCommandDrawArrays->getNumElements();++i)
total+=_IndirectCommandDrawArrays->count(i);
case(PrimitiveSet::LINES):
for(unsigned int i=0;i<_IndirectCommandDrawArrays->getNumElements();i++)
for(unsigned int i=0;i<_IndirectCommandDrawArrays->getNumElements();++i)
total+=_IndirectCommandDrawArrays->count(i)/2;
case(PrimitiveSet::TRIANGLES):
for(unsigned int i=0;i<_IndirectCommandDrawArrays->getNumElements();i++)
for(unsigned int i=0;i<_IndirectCommandDrawArrays->getNumElements();++i)
total+=_IndirectCommandDrawArrays->count(i)/3;
case(PrimitiveSet::QUADS):
for(unsigned int i=0;i<_IndirectCommandDrawArrays->getNumElements();i++)
for(unsigned int i=0;i<_IndirectCommandDrawArrays->getNumElements();++i)
total+=_IndirectCommandDrawArrays->count(i)/4;
case(PrimitiveSet::LINE_STRIP):
case(PrimitiveSet::LINE_LOOP):
@@ -290,7 +290,7 @@ void MultiDrawElementsIndirectUByte::accept(PrimitiveFunctor& functor) const
{
/* if (!empty() )
unsigned int maxindex=_count>0?_firstCommand + _count : _IndirectCommandDrawArrays->getNumElements() - _firstCommand;
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
functor.drawElements(_mode,_IndirectCommandDrawArrays->count(i),
&(*this)[_IndirectCommandDrawArrays->firstIndex(i)],
_IndirectCommandDrawArrays->baseVertex(i));
@@ -301,7 +301,7 @@ void MultiDrawElementsIndirectUByte::accept(PrimitiveIndexFunctor& functor) cons
{
/* if (!empty() )
unsigned int maxindex=_count>0?_firstCommand + _count : _IndirectCommandDrawArrays->getNumElements() - _firstCommand;
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
functor.drawElements(_mode,_IndirectCommandDrawArrays->count(i),
&(*this)[_IndirectCommandDrawArrays->firstIndex(i)],
_IndirectCommandDrawArrays->baseVertex(i));
@@ -345,7 +345,7 @@ void MultiDrawElementsIndirectUShort::accept(PrimitiveFunctor& functor) const
{
/* if (!empty() )
unsigned int maxindex=_count>0?_firstCommand + _count : _IndirectCommandDrawArrays->getNumElements() - _firstCommand;
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
functor.drawElements(_mode,_IndirectCommandDrawArrays->count(i),
&(*this)[_IndirectCommandDrawArrays->firstIndex(i)],
_IndirectCommandDrawArrays->baseVertex(i));
@@ -356,7 +356,7 @@ void MultiDrawElementsIndirectUShort::accept(PrimitiveIndexFunctor& functor) con
{
/* if (!empty() )
unsigned int maxindex=_count>0?_firstCommand + _count : _IndirectCommandDrawArrays->getNumElements() - _firstCommand;
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
functor.drawElements(_mode,_IndirectCommandDrawArrays->count(i),
&(*this)[_IndirectCommandDrawArrays->firstIndex(i)],
_IndirectCommandDrawArrays->baseVertex(i));
@@ -398,7 +398,7 @@ void MultiDrawElementsIndirectUInt::accept(PrimitiveFunctor& functor) const
{
/* if (!empty() )
unsigned int maxindex=_count>0?_firstCommand + _count : _IndirectCommandDrawArrays->getNumElements() - _firstCommand;
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
functor.drawElements(_mode,_IndirectCommandDrawArrays->count(i),
&(*this)[_IndirectCommandDrawArrays->firstIndex(i)],
_IndirectCommandDrawArrays->baseVertex(i));
@@ -409,7 +409,7 @@ void MultiDrawElementsIndirectUInt::accept(PrimitiveIndexFunctor& functor) const
{
/* if (!empty() )
unsigned int maxindex=_count>0?_firstCommand + _count : _IndirectCommandDrawArrays->getNumElements() - _firstCommand;
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
functor.drawElements(_mode,_IndirectCommandDrawArrays->count(i),
&(*this)[_IndirectCommandDrawArrays->firstIndex(i)],
_IndirectCommandDrawArrays->baseVertex(i));
@@ -504,7 +504,7 @@ void MultiDrawArraysIndirect::draw(osg::State& state, bool) const
void MultiDrawArraysIndirect::accept(PrimitiveFunctor& functor) const
{
unsigned int maxindex=_count>0?_firstCommand + _count : _IndirectCommandDrawArrays->getNumElements() - _firstCommand;
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
{
functor.drawArrays(_mode, _IndirectCommandDrawArrays->first(i), _IndirectCommandDrawArrays->count(i));
}
@@ -513,7 +513,7 @@ void MultiDrawArraysIndirect::accept(PrimitiveFunctor& functor) const
void MultiDrawArraysIndirect::accept(PrimitiveIndexFunctor& functor) const
{
unsigned int maxindex=_count>0?_firstCommand + _count : _IndirectCommandDrawArrays->getNumElements() - _firstCommand;
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
{
functor.drawArrays(_mode, _IndirectCommandDrawArrays->first(i), _IndirectCommandDrawArrays->count(i));
}
@@ -524,7 +524,7 @@ unsigned int MultiDrawArraysIndirect::getNumIndices() const
unsigned int total=0;
unsigned int maxindex=_count>0?_firstCommand + _count : _IndirectCommandDrawArrays->getNumElements() - _firstCommand;
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
total+= _IndirectCommandDrawArrays->count(i);
return total;
}
@@ -532,7 +532,7 @@ unsigned int MultiDrawArraysIndirect::getNumIndices() const
unsigned int MultiDrawArraysIndirect::index(unsigned int pos) const
{
/* unsigned int maxindex=_count>0?_firstCommand + _count : _IndirectCommandDrawArrays->getNumElements() - _firstCommand;
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
{
unsigned int count = _IndirectCommandDrawArrays->count(i);
if (pos<count) break;
@@ -546,7 +546,7 @@ unsigned int MultiDrawArraysIndirect::index(unsigned int pos) const
void MultiDrawArraysIndirect::offsetIndices(int offset)
{
unsigned int maxindex=_count>0?_firstCommand + _count : _IndirectCommandDrawArrays->getNumElements() - _firstCommand;
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
_IndirectCommandDrawArrays->first(i) += offset;
}
@@ -557,16 +557,16 @@ unsigned int MultiDrawArraysIndirect::getNumPrimitives() const
switch(_mode)
{
case(POINTS):
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
total+=_IndirectCommandDrawArrays->count(i);
case(LINES):
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
total+=_IndirectCommandDrawArrays->count(i)/2;
case(TRIANGLES):
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
total+=_IndirectCommandDrawArrays->count(i)/3;
case(QUADS):
for(unsigned int i=_firstCommand; i<maxindex;i++)
for(unsigned int i=_firstCommand; i<maxindex;++i)
total+=_IndirectCommandDrawArrays->count(i)/4;
case(LINE_STRIP):
case(LINE_LOOP):