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

From Lukasz Izdebski , "I added write and read numInstances in PrimitiveSet."

Browse Source
This commit is contained in:
Robert Osfield
2013-02-07 11:10:24 +00:00
parent 2700c9d5e5
commit b7ccf3f377
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgDB/InputStream.cpp
View File

@@ -403,7 +403,12 @@ osg::PrimitiveSet* InputStream::readPrimitiveSet()
DEF_MAPPEE(PrimitiveType, type);
DEF_MAPPEE(PrimitiveType, mode);
unsigned int numInstances = 0u;
*this >> type >> mode;
if ( _fileVersion>96 )
{
*this >> numInstances;
}
switch ( type.get() )
{
@@ -413,6 +418,7 @@ osg::PrimitiveSet* InputStream::readPrimitiveSet()
*this >> first >> count;
osg::DrawArrays* da = new osg::DrawArrays( mode.get(), first, count );
primitive = da;
primitive->setNumInstances( numInstances );
}
break;
case ID_DRAWARRAY_LENGTH:
@@ -427,6 +433,7 @@ osg::PrimitiveSet* InputStream::readPrimitiveSet()
}
*this >> END_BRACKET;
primitive = dl;
primitive->setNumInstances( numInstances );
}
break;
case ID_DRAWELEMENTS_UBYTE:
@@ -441,6 +448,7 @@ osg::PrimitiveSet* InputStream::readPrimitiveSet()
}
*this >> END_BRACKET;
primitive = de;
primitive->setNumInstances( numInstances );
}
break;
case ID_DRAWELEMENTS_USHORT:
@@ -455,6 +463,7 @@ osg::PrimitiveSet* InputStream::readPrimitiveSet()
}
*this >> END_BRACKET;
primitive = de;
primitive->setNumInstances( numInstances );
}
break;
case ID_DRAWELEMENTS_UINT:
@@ -469,6 +478,7 @@ osg::PrimitiveSet* InputStream::readPrimitiveSet()
}
*this >> END_BRACKET;
primitive = de;
primitive->setNumInstances( numInstances );
}
break;
default: