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

Fixed silly compiler warning that was being produced in error.

Browse Source
This commit is contained in:
Robert Osfield 2012-02-06 12:05:36 +00:00
parent ae27f1e210
commit 3b4333ec9a
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
examples/osgsharedarray/osgsharedarray.cpp
View File

@ -132,40 +132,6 @@ private:
* per-face colors and normals. * per-face colors and normals.
*/ */
namespace { namespace {
static const osg::Vec3 myVertices[] = { osg::Vec3(-1.,-1.,-1.),
osg::Vec3( 1.,-1.,-1.),
osg::Vec3(-1., 1.,-1.),
osg::Vec3( 1., 1.,-1.),
osg::Vec3(-1.,-1., 1.),
osg::Vec3( 1.,-1., 1.),
osg::Vec3(-1., 1., 1.),
osg::Vec3( 1., 1., 1.)
};
static const osg::Vec3 myNormals[] = { osg::Vec3( 0., 0., 1.),
osg::Vec3( 1., 0., 0.),
osg::Vec3( 0., 0.,-1.),
osg::Vec3(-1., 0., 0.),
osg::Vec3( 0., 1., 0.),
osg::Vec3( 0.,-1., 0.)
};
static const osg::Vec4 myColors[] = { osg::Vec4( 1., 0., 0., 1.),
osg::Vec4( 0., 1., 0., 1.),
osg::Vec4( 1., 1., 0., 1.),
osg::Vec4( 0., 0., 1., 1.),
osg::Vec4( 1., 0., 1., 1.),
osg::Vec4( 0., 1., 1., 1.)
};
static const unsigned short myIndices[] = { 4, 5, 7, 6,
5, 1, 3, 7,
1, 0, 2, 3,
0, 4, 6, 2,
6, 7, 3, 2,
0, 1, 5, 4
};
} }
/** Create a Geode that describes a cube using our own /** Create a Geode that describes a cube using our own
@ -194,6 +160,40 @@ namespace {
*/ */
osg::Geode* createGeometry() osg::Geode* createGeometry()
{ {
const osg::Vec3 myVertices[] = { osg::Vec3(-1.,-1.,-1.),
osg::Vec3( 1.,-1.,-1.),
osg::Vec3(-1., 1.,-1.),
osg::Vec3( 1., 1.,-1.),
osg::Vec3(-1.,-1., 1.),
osg::Vec3( 1.,-1., 1.),
osg::Vec3(-1., 1., 1.),
osg::Vec3( 1., 1., 1.)
};
const osg::Vec3 myNormals[] = { osg::Vec3( 0., 0., 1.),
osg::Vec3( 1., 0., 0.),
osg::Vec3( 0., 0.,-1.),
osg::Vec3(-1., 0., 0.),
osg::Vec3( 0., 1., 0.),
osg::Vec3( 0.,-1., 0.)
};
const osg::Vec4 myColors[] = { osg::Vec4( 1., 0., 0., 1.),
osg::Vec4( 0., 1., 0., 1.),
osg::Vec4( 1., 1., 0., 1.),
osg::Vec4( 0., 0., 1., 1.),
osg::Vec4( 1., 0., 1., 1.),
osg::Vec4( 0., 1., 1., 1.)
};
const unsigned short myIndices[] = { 4, 5, 7, 6,
5, 1, 3, 7,
1, 0, 2, 3,
0, 4, 6, 2,
6, 7, 3, 2,
0, 1, 5, 4
};
osg::Geode* geode = new osg::Geode(); osg::Geode* geode = new osg::Geode();
// create Geometry // create Geometry