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

Futher changes to remove unitialized variables/reordering of initialization to

Browse Source 
prevent unitialized warnings.
This commit is contained in:
Robert Osfield
2002-07-21 01:29:11 +00:00
parent 48b3be40e9
commit 389dd8adbb
13 changed files with 71 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Demos/osgcube/osgcube.cpp
View File

@@ -73,25 +73,25 @@ class MyTransformCallback : public osg::NodeCallback{
osg::Geode* createGeometryCube()
{
osg::Geode* geode = new osg::Geode();
osg::Geode* geode = osgNew osg::Geode();
// -------------------------------------------
// Set up a new Geometry which will be our cube
// -------------------------------------------
osg::Geometry* cube = new osg::Geometry();
osg::Geometry* cube = osgNew osg::Geometry();
// set up the primitives
cube->addPrimitive(new osg::DrawArrays(osg::Primitive::POLYGON,0,4));
cube->addPrimitive(new osg::DrawArrays(osg::Primitive::POLYGON,4,4));
cube->addPrimitive(new osg::DrawArrays(osg::Primitive::POLYGON,8,4));
cube->addPrimitive(new osg::DrawArrays(osg::Primitive::POLYGON,12,4));
cube->addPrimitive(new osg::DrawArrays(osg::Primitive::POLYGON,16,4));
cube->addPrimitive(new osg::DrawArrays(osg::Primitive::POLYGON,20,4));
cube->addPrimitive(osgNew osg::DrawArrays(osg::Primitive::POLYGON,0,4));
cube->addPrimitive(osgNew osg::DrawArrays(osg::Primitive::POLYGON,4,4));
cube->addPrimitive(osgNew osg::DrawArrays(osg::Primitive::POLYGON,8,4));
cube->addPrimitive(osgNew osg::DrawArrays(osg::Primitive::POLYGON,12,4));
cube->addPrimitive(osgNew osg::DrawArrays(osg::Primitive::POLYGON,16,4));
cube->addPrimitive(osgNew osg::DrawArrays(osg::Primitive::POLYGON,20,4));
// set up coords.
osg::Vec3Array* coords = new osg::Vec3Array;
osg::Vec3Array* coords = osgNew osg::Vec3Array;
coords->resize(24);
(*coords)[0].set( -1.0000f, 1.0000f, -1.000f );
@@ -129,7 +129,7 @@ osg::Geode* createGeometryCube()
// set up the normals.
osg::Vec3Array* cubeNormals = new osg::Vec3Array;
osg::Vec3Array* cubeNormals = osgNew osg::Vec3Array;
cubeNormals->resize(6);
(*cubeNormals)[0].set(0.0f,0.0f,-1.0f);
@@ -145,8 +145,8 @@ osg::Geode* createGeometryCube()
// ---------------------------------------
// Set up a StateSet to make the cube red
// ---------------------------------------
osg::StateSet* cubeState = new osg::StateSet();
osg::Material* redMaterial = new osg::Material();
osg::StateSet* cubeState = osgNew osg::StateSet();
osg::Material* redMaterial = osgNew osg::Material();
osg::Vec4 red( 1.0f, 0.0f, 0.0f, 1.0f );
redMaterial->setDiffuse( osg::Material::FRONT_AND_BACK, red );
cubeState->setAttribute( redMaterial );
@@ -168,7 +168,7 @@ int main( int argc, char **argv )
for(int i=1;i<argc;++i) commandLine.push_back(argv[i]);
// create the viewer and the model to it.
osgGLUT::Viewer& viewer = *(osgNew osgGLUT::Viewer);
osgGLUT::Viewer viewer;
viewer.setWindowTitle(argv[0]);
@@ -177,17 +177,17 @@ int main( int argc, char **argv )
// parameters that have been matched.
viewer.readCommandLine(commandLine);
osg::MatrixTransform* myTransform = new osg::MatrixTransform();
osg::MatrixTransform* myTransform = osgNew osg::MatrixTransform();
myTransform->addChild( createGeometryCube() );
// move node in a circle at 90 degrees a sec.
myTransform->setAppCallback(new MyTransformCallback(myTransform,osg::inDegrees(90.0f)));
myTransform->setAppCallback(osgNew MyTransformCallback(myTransform,osg::inDegrees(90.0f)));
// add model to viewer.
viewer.addViewport( myTransform );
// register trackball maniupulators.
viewer.registerCameraManipulator(new osgGA::TrackballManipulator);
viewer.registerCameraManipulator(osgNew osgGA::TrackballManipulator);
viewer.open();