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

Fixed placement of { and spacing to make the code more readable and consistent with the rest of the OSG

Browse Source
This commit is contained in:
Robert Osfield 2017-10-19 11:06:23 +01:00
parent 6496c304f9
commit 3c6f569360
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
examples/osgsimpleMDI/osgsimpleMDI.cpp
View File

@ -86,6 +86,7 @@ int main( int argc, char**argv )
osg::ref_ptr<osg::Geometry> geom=new osg::Geometry(); osg::ref_ptr<osg::Geometry> geom=new osg::Geometry();
geom->setUseVertexBufferObjects(true); geom->setUseVertexBufferObjects(true);
osg::BoundingBox bb; osg::BoundingBox bb;
bb.set(0,0,0,MAXX,0,MAXY); bb.set(0,0,0,MAXX,0,MAXY);
//set bounds by hand cause of the lack of support of basevertex in PrimitiveFunctors //set bounds by hand cause of the lack of support of basevertex in PrimitiveFunctors
@ -104,10 +105,10 @@ int main( int argc, char**argv )
osg::Vec3Array * verts=new osg::Vec3Array(); osg::Vec3Array * verts=new osg::Vec3Array();
for(int j =0 ; j<MAXY; ++j)
for(int j =0 ; j<MAXY; ++j) { {
for(int i =0 ; i<MAXX; ++i) { for(int i =0 ; i<MAXX; ++i)
{
///create indirect command ///create indirect command
osg::DrawElementsIndirectCommand cmd; osg::DrawElementsIndirectCommand cmd;
cmd.count=4; cmd.count=4;
@ -116,24 +117,33 @@ int main( int argc, char**argv )
cmd.baseVertex=verts->size(); cmd.baseVertex=verts->size();
mdicommands->push_back(cmd); mdicommands->push_back(cmd);
for(int z=0; z<4; z++) { for(int z=0; z<4; z++)
{
verts->push_back(osg::Vec3(i,0,j)+myCoords[z]); verts->push_back(osg::Vec3(i,0,j)+myCoords[z]);
mdi->addElement(myIndices[z]); mdi->addElement(myIndices[z]);
} }
} }
} }
geom->setVertexArray(verts); geom->setVertexArray(verts);
if(MDIenable) {
if(MDIenable)
{
geom->addPrimitiveSet(mdi); geom->addPrimitiveSet(mdi);
} else } else
for(int i=0; i<MAXY*MAXX; ++i) { {
for(int i=0; i<MAXY*MAXX; ++i)
{
osg::DrawElementsUInt *dre=new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLE_STRIP,4,myIndicesUI) ; osg::DrawElementsUInt *dre=new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLE_STRIP,4,myIndicesUI) ;
dre->setElementBufferObject(ebo); dre->setElementBufferObject(ebo);
geom->addPrimitiveSet(dre); geom->addPrimitiveSet(dre);
for(int z=0; z<4; z++)myIndicesUI[z]+=4; for(int z=0; z<4; z++)myIndicesUI[z]+=4;
} }
}
root->addChild(geom); root->addChild(geom);
osgViewer::Viewer viewer; osgViewer::Viewer viewer;
viewer.addEventHandler(new osgViewer::StatsHandler); viewer.addEventHandler(new osgViewer::StatsHandler);
viewer.setSceneData( root ); viewer.setSceneData( root );