Changeset 7648

Show
Ignore:
Timestamp:
12/10/07 18:30:18 (4 years ago)
Author:
robert
Message:

From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."

Location:
OpenSceneGraph/trunk
Files:
216 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/trunk/applications/osgarchive/osgarchive.cpp

    r5328 r7648  
    9393    arguments.reportRemainingOptionsAsUnrecognized(); 
    9494 
    95     // report any errors if they have occured when parsing the program aguments. 
     95    // report any errors if they have occurred when parsing the program arguments. 
    9696    if (arguments.errors()) 
    9797    { 

  • OpenSceneGraph/trunk/applications/osgconv/osgconv.cpp

    r7646 r7648  
    104104    virtual void apply(osg::StateSet& stateset) 
    105105    { 
    106         // search for the existance of any texture object attributes 
     106        // search for the existence of any texture object attributes 
    107107        for(unsigned int i=0;i<stateset.getTextureAttributeList().size();++i) 
    108108        { 
    … …  
    222222 
    223223 
    224         // search for the existance of any texture object attributes 
     224        // search for the existence of any texture object attributes 
    225225        for(unsigned int i=0;i<stateset.getTextureAttributeList().size();++i) 
    226226        { 
    … …  
    456456    arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is a utility for converting between various input and output databases formats."); 
    457457    arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ..."); 
    458     arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display command line paramters"); 
     458    arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display command line parameters"); 
    459459    arguments.getApplicationUsage()->addCommandLineOption("--help-env","Display environmental variables available"); 
    460460 
    … …  
    590590    arguments.reportRemainingOptionsAsUnrecognized(); 
    591591 
    592     // report any errors if they have occured when parsing the program aguments. 
     592    // report any errors if they have occurred when parsing the program arguments. 
    593593    if (arguments.errors()) 
    594594    { 

  • OpenSceneGraph/trunk/examples/osgcatch/osgcatch.cpp

    r6941 r7648  
    13941394    arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates use node masks to create stereo images."); 
    13951395    arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] image_file_left_eye image_file_right_eye"); 
    1396     arguments.getApplicationUsage()->addCommandLineOption("-d <float>","Time delay in sceonds between the display of successive image pairs when in auto advance mode."); 
     1396    arguments.getApplicationUsage()->addCommandLineOption("-d <float>","Time delay in seconds between the display of successive image pairs when in auto advance mode."); 
    13971397    arguments.getApplicationUsage()->addCommandLineOption("-a","Enter auto advance of image pairs on start up."); 
    13981398    arguments.getApplicationUsage()->addCommandLineOption("-x <float>","Horizontal offset of left and right images."); 
    … …  
    14041404 
    14051405 
    1406     // register the handler to add keyboard and mosue handling. 
     1406    // register the handler to add keyboard and mouse handling. 
    14071407    GameEventHandler* seh = new GameEventHandler(); 
    14081408    viewer.addEventHandler(seh); 
    … …  
    14221422    arguments.reportRemainingOptionsAsUnrecognized(); 
    14231423 
    1424     // report any errors if they have occured when parsing the program aguments. 
     1424    // report any errors if they have occurred when parsing the program arguments. 
    14251425    if (arguments.errors()) 
    14261426    { 

  • OpenSceneGraph/trunk/examples/osgdelaunay/osgdelaunay.cpp

    r6941 r7648  
    12881288    } 
    12891289     
    1290     // optimize the scene graph, remove rendundent nodes and state etc. 
     1290    // optimize the scene graph, remove redundant nodes and state etc. 
    12911291    osgUtil::Optimizer optimizer; 
    12921292    optimizer.optimize(loadedModel.get()); 

  • OpenSceneGraph/trunk/examples/osgdepthpeeling/DePee.cpp

    r7418 r7648  
    6868   
    6969   
    70   //!!!Getting problems if assigning unit to texture in depth peeling subraph and removing depth peeling steps!!! 
     70  //!!!Getting problems if assigning unit to texture in depth peeling subgraph and removing depth peeling steps!!! 
    7171  //That's why it is done here 
    7272  osg::StateSet* stateset = _parent->getOrCreateStateSet(); 
    … …  
    465465  znear *= 0.9f; 
    466466  zfar *= 1.1f; 
    467          
     467     
    468468   
    469469  // set up projection. 
    … …  
    473473  //set view 
    474474  _dePeePasses.back()->Cameras[EDGE_MAP]->setReferenceFrame(osg::Transform::ABSOLUTE_RF); 
    475          
     475     
    476476  _dePeePasses.back()->Cameras[EDGE_MAP]->setViewMatrixAsLookAt(osg::Vec3(0.0f,0.0f,2.0f)*bs.radius(), osg::Vec3(0.0,0.0,0.0),osg::Vec3(0.0f,1.0f,0.0f)); 
    477477   
    … …  
    484484  // tell the camera to use OpenGL frame buffer object 
    485485  _dePeePasses.back()->Cameras[EDGE_MAP]->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER); 
    486          
     486     
    487487  //switch lighting off 
    488488  osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet; 
    … …  
    502502   
    503503  stateset->setMode(GL_LIGHTING,osg::StateAttribute::OVERRIDE |  
    504                           osg::StateAttribute::OFF); 
     504              osg::StateAttribute::OFF); 
    505505  //setup shader 
    506506  stateset->setAttributeAndModes(_edgeMapProgram.get(), osg::StateAttribute::OVERRIDE | osg::StateAttribute::ON); 
    … …  
    552552  float zfar  = 3.0f*bs.radius(); 
    553553     
    554   // 2:1 aspect ratio as per flag geomtry below. 
     554  // 2:1 aspect ratio as per flag geometry below. 
    555555  float projTop   = 0.25f*znear; 
    556556  float projRight = projTop * ((double)_width/(double)_height); 

  • OpenSceneGraph/trunk/examples/osgdepthpeeling/osgdepthpeeling.cpp

    r7411 r7648  
    230230  arguments.reportRemainingOptionsAsUnrecognized(); 
    231231   
    232   // report any errors if they have occured when parsing the program aguments. 
     232  // report any errors if they have occurred when parsing the program arguments. 
    233233  if (arguments.errors()) 
    234234  { 

  • OpenSceneGraph/trunk/examples/osgfxbrowser/osgfxbrowser.cpp

    r6941 r7648  
    324324    arguments.reportRemainingOptionsAsUnrecognized(); 
    325325 
    326     // report any errors if they have occured when parsing the program aguments. 
     326    // report any errors if they have occurred when parsing the program arguments. 
    327327    if (arguments.errors()) { 
    328328        arguments.writeErrorMessages(std::cout); 
    … …  
    342342    } 
    343343 
    344     // optimize the scene graph, remove rendundent nodes and state etc. 
     344    // optimize the scene graph, remove redundant nodes and state etc. 
    345345    osgUtil::Optimizer optimizer; 
    346346    optimizer.optimize(loadedModel.get()); 

  • OpenSceneGraph/trunk/examples/osggeometry/osggeometry.cpp

    r6941 r7648  
    4040// This demos uses the illustrates how to creates the various different types of geometry that 
    4141// the osg::Geometry class can represent.  This demos uses the OpenGL red books diagram of different  
    42 // OpenGL Primitives as a template for all the equivilant OpenSceneGraph Primitives.  The OpenSceneGraph  
     42// OpenGL Primitives as a template for all the equivalent OpenSceneGraph Primitives.  The OpenSceneGraph  
    4343// wraps OpenGL very thinly so uses all the same enum and naming conventions. The coordinate data is also  
    44 // wrapped around OpenGL's vertex arrays and draw arrays/elements calls.  Familarity with 
     44// wrapped around OpenGL's vertex arrays and draw arrays/elements calls.  Familiarity with 
    4545// OpenGL will help understand the the osg::Geometry class which encapsulate all this, or if you 
    46 // havn't learnt OpenGL yet, learning osg::Geometry will help you understand how OpenGL 
     46// havn't learned OpenGL yet, learning osg::Geometry will help you understand how OpenGL 
    4747// works! 
    4848 
    4949// The osg::Geometry class "is a" subclass of osg::Drawable base class, so is an object that provides 
    5050// a draw method for drawing objects in the scene.  osg::Geometry contains all the vertex, normal 
    51 // color and texture coordate arrays required to specify the coordinates of your objects, and the 
    52 // primtives join these coordinates together as the points, lines or surfaces that you will see 
     51// color and texture coordinate arrays required to specify the coordinates of your objects, and the 
     52// primitives join these coordinates together as the points, lines or surfaces that you will see 
    5353// rendered on your screen.  
    5454// 
    … …  
    6868}; 
    6969 
    70 // decompose Drawable primtives into triangles, print out these triangles and computed normals. 
     70// decompose Drawable primitives into triangles, print out these triangles and computed normals. 
    7171void printTriangles(const std::string& name, osg::Drawable& drawable) 
    7272{ 
    … …  
    8686 
    8787    // follows are separate blocks for creating POINTS, LINES, LINE_STRIP, LINE_LOOP, POLYGON, QUADS, 
    88     // QUAD_STRIP, TRIANGLES, TRIANGLE_STRIP and TRIANGLE_FAN primtives.  A image of these primtives 
    89     // are provided in the distribution : OpenSceneGraph-Data/Images/primtives.gif. 
     88    // QUAD_STRIP, TRIANGLES, TRIANGLE_STRIP and TRIANGLE_FAN primitives.  A image of these primitives 
     89    // are provided in the distribution : OpenSceneGraph-Data/Images/primitives.gif. 
    9090 
    9191 
    9292    // create POINTS 
    9393    { 
    94         // create Geometry object to store all the vetices and points primtive. 
     94        // create Geometry object to store all the vertices and points primitive. 
    9595        osg::Geometry* pointsGeom = new osg::Geometry(); 
    9696         
    9797        // create a Vec3Array and add to it all my coordinates. 
    98         // Like all the *Array variants (see include/osg/Array) , Vec3Array is derivied from both osg::Array  
     98        // Like all the *Array variants (see include/osg/Array) , Vec3Array is derived from both osg::Array  
    9999        // and std::vector<>.  osg::Array's are reference counted and hence sharable, 
    100         // which std::vector<> provides all the convinience, flexibility and robustness 
     100        // which std::vector<> provides all the convenience, flexibility and robustness 
    101101        // of the most popular of all STL containers. 
    102102        osg::Vec3Array* vertices = new osg::Vec3Array; 
    … …  
    113113         
    114114        // create the color of the geometry, one single for the whole geometry. 
    115         // for consitency of design even one single color must added as an element 
     115        // for consistency of design even one single color must added as an element 
    116116        // in a color array. 
    117117        osg::Vec4Array* colors = new osg::Vec4Array; 
    … …  
    119119        colors->push_back(osg::Vec4(1.0f,1.0f,0.0f,1.0f)); 
    120120         
    121         // pass the color arry to points geometry, note the binding to tell the geometry 
     121        // pass the color array to points geometry, note the binding to tell the geometry 
    122122        // that only use one color for the whole object. 
    123123        pointsGeom->setColorArray(colors); 
    … …  
    132132 
    133133 
    134         // create and add a DrawArray Primitive (see include/osg/Primtive).  The first 
    135         // paramter passed to the DrawArrays constructor is the Primtive::Mode which 
     134        // create and add a DrawArray Primitive (see include/osg/Primitive).  The first 
     135        // parameter passed to the DrawArrays constructor is the Primitive::Mode which 
    136136        // in this case is POINTS (which has the same value GL_POINTS), the second 
    137137        // parameter is the index position into the vertex array of the first point 
    … …  
    140140         
    141141         
    142         // add the points geomtry to the geode. 
     142        // add the points geometry to the geode. 
    143143        geode->addDrawable(pointsGeom); 
    144144    } 
    … …  
    146146    // create LINES 
    147147    { 
    148         // create Geometry object to store all the vetices and lines primtive. 
     148        // create Geometry object to store all the vertices and lines primitive. 
    149149        osg::Geometry* linesGeom = new osg::Geometry(); 
    150150         
    151         // this time we'll prealloacte the vertex array to the size we 
     151        // this time we'll preallocate the vertex array to the size we 
    152152        // need and then simple set them as array elements, 8 points 
    153153        // makes 4 line segments. 
    … …  
    166166        linesGeom->setVertexArray(vertices); 
    167167         
    168         // set the colors as before, plus using the aobve 
     168        // set the colors as before, plus using the above 
    169169        osg::Vec4Array* colors = new osg::Vec4Array; 
    170170        colors->push_back(osg::Vec4(1.0f,1.0f,0.0f,1.0f)); 
    … …  
    185185         
    186186         
    187         // add the points geomtry to the geode. 
     187        // add the points geometry to the geode. 
    188188        geode->addDrawable(linesGeom); 
    189189    } 
    … …  
    191191    // create LINE_STRIP 
    192192    { 
    193         // create Geometry object to store all the vetices and lines primtive. 
     193        // create Geometry object to store all the vertices and lines primitive. 
    194194        osg::Geometry* linesGeom = new osg::Geometry(); 
    195195         
    196         // this time we'll prealloacte the vertex array to the size  
     196        // this time we'll preallocate the vertex array to the size  
    197197        // and then use an iterator to fill in the values, a bit perverse 
    198198        // but does demonstrate that we have just a standard std::vector underneath. 
    … …  
    208208        linesGeom->setVertexArray(vertices); 
    209209         
    210         // set the colors as before, plus using the aobve 
     210        // set the colors as before, plus using the above 
    211211        osg::Vec4Array* colors = new osg::Vec4Array; 
    212212        colors->push_back(osg::Vec4(1.0f,1.0f,0.0f,1.0f)); 
    … …  
    227227         
    228228         
    229         // add the points geomtry to the geode. 
     229        // add the points geometry to the geode. 
    230230        geode->addDrawable(linesGeom); 
    231231    } 
    … …  
    233233    // create LINE_LOOP 
    234234    { 
    235         // create Geometry object to store all the vetices and lines primtive. 
     235        // create Geometry object to store all the vertices and lines primitive. 
    236236        osg::Geometry* linesGeom = new osg::Geometry(); 
    237237         
    238         // this time we'll a C arrays to initilize the vertices. 
     238        // this time we'll a C arrays to initialize the vertices. 
    239239         
    240240        osg::Vec3 myCoords[] = 
    … …  
    255255        linesGeom->setVertexArray(vertices); 
    256256         
    257         // set the colors as before, plus using the aobve 
     257        // set the colors as before, plus using the above 
    258258        osg::Vec4Array* colors = new osg::Vec4Array; 
    259259        colors->push_back(osg::Vec4(1.0f,1.0f,0.0f,1.0f)); 
    … …  
    274274         
    275275         
    276         // add the points geomtry to the geode. 
     276        // add the points geometry to the geode. 
    277277        geode->addDrawable(linesGeom); 
    278278    } 
    … …  
    306306    // create POLYGON 
    307307    { 
    308         // create Geometry object to store all the vetices and lines primtive. 
     308        // create Geometry object to store all the vertices and lines primitive. 
    309309        osg::Geometry* polyGeom = new osg::Geometry(); 
    310310         
    311         // this time we'll a C arrays to initilize the vertices. 
    312         // note, anticlockwsie ordering. 
     311        // this time we'll a C arrays to initialize the vertices. 
     312        // note, anticlockwise ordering. 
    313313        // note II, OpenGL polygons must be convex plan polygons, otherwise  
    314314        // undefined results will occur.  If you have concave polygons or ones 
    … …  
    347347        printTriangles("Polygon",*polyGeom); 
    348348         
    349         // add the points geomtry to the geode. 
     349        // add the points geometry to the geode. 
    350350        geode->addDrawable(polyGeom); 
    351351    } 
    … …  
    354354    // create QUADS 
    355355    { 
    356         // create Geometry object to store all the vetices and lines primtive. 
     356        // create Geometry object to store all the vertices and lines primitive. 
    357357        osg::Geometry* polyGeom = new osg::Geometry(); 
    358358         
    359         // note, anticlockwsie ordering. 
     359        // note, anticlockwise ordering. 
    360360        osg::Vec3 myCoords[] = 
    361361        { 
    … …  
    395395        printTriangles("Quads",*polyGeom); 
    396396 
    397         // add the points geomtry to the geode. 
     397        // add the points geometry to the geode. 
    398398        geode->addDrawable(polyGeom); 
    399399    } 
    … …  
    401401    // create QUAD_STRIP 
    402402    { 
    403         // create Geometry object to store all the vetices and lines primtive. 
     403        // create Geometry object to store all the vertices and lines primitive. 
    404404        osg::Geometry* polyGeom = new osg::Geometry(); 
    405405         
    … …  
    444444        printTriangles("Quads strip",*polyGeom); 
    445445 
    446         // add the points geomtry to the geode. 
     446        // add the points geometry to the geode. 
    447447        geode->addDrawable(polyGeom); 
    448448    } 
    … …  
    450450    // create TRIANGLES, TRIANGLE_STRIP and TRIANGLE_FAN all in one Geometry/ 
    451451    { 
    452         // create Geometry object to store all the vetices and lines primtive. 
     452        // create Geometry object to store all the vertices and lines primitive. 
    453453        osg::Geometry* polyGeom = new osg::Geometry(); 
    454454         
    … …  
    457457        { 
    458458            // TRIANGLES 6 vertices, v0..v5 
    459             // note in aniclockwise order. 
     459            // note in anticlockwise order. 
    460460            osg::Vec3(-1.12056, -2.15188e-09, -0.840418), 
    461461            osg::Vec3(-0.95165, -2.15188e-09, -0.840418), 
    462462            osg::Vec3(-1.11644, 9.18133e-09, -0.716827), 
    463463 
    464             // note in aniclockwise order. 
     464            // note in anticlockwise order. 
    465465            osg::Vec3(-0.840418, 9.18133e-09, -0.778623), 
    466466            osg::Vec3(-0.622074, 9.18133e-09, -0.613835), 
    … …  
    479479 
    480480            // TRIANGLE FAN 5 vertices, v12..v16 
    481             // note defined in anticlockwsie order. 
     481            // note defined in anticlockwise order. 
    482482            osg::Vec3(0.844538, 9.18133e-09, -0.712708), 
    483483            osg::Vec3(1.0258, 9.18133e-09, -0.799221), 
    … …  
    519519        printTriangles("Triangles/Strip/Fan",*polyGeom); 
    520520 
    521         // add the points geomtry to the geode. 
     521        // add the points geometry to the geode. 
    522522        geode->addDrawable(polyGeom); 
    523523    } 
    … …  
    567567     
    568568  
    569     // create Geometry object to store all the vetices and lines primtive. 
     569    // create Geometry object to store all the vertices and lines primitive. 
    570570    osg::Geometry* polyGeom = new osg::Geometry(); 
    571571 
    572     // note, anticlockwsie ordering. 
     572    // note, anticlockwise ordering. 
    573573    osg::Vec3 myCoords[] = 
    574574    { 
    … …  
    621621    int numIndices = sizeof(myIndices)/sizeof(unsigned short); 
    622622 
    623     // Theere are three variants of the DrawElements osg::Primitive, UByteDrawElements which 
    624     // contains unsigned char indicies, UShortDrawElements which contains unsigned short indices, 
    625     // and UIntDrawElements whcih contains ... unsigned int indices.   
     623    // There are three variants of the DrawElements osg::Primitive, UByteDrawElements which 
     624    // contains unsigned char indices, UShortDrawElements which contains unsigned short indices, 
     625    // and UIntDrawElements which contains ... unsigned int indices.   
    626626    // The first parameter to DrawElements is  
    627627    polyGeom->addPrimitiveSet(new osg::DrawElementsUShort(osg::PrimitiveSet::QUADS,numIndices,myIndices)); 
    … …  
    643643    osg::Geode* geode = new osg::Geode(); 
    644644 
    645     // add the points geomtry to the geode. 
     645    // add the points geometry to the geode. 
    646646    geode->addDrawable(polyGeom); 
    647647 
    648648    //return geode; 
    649649 
    650     // create a tranform to move the background back and forward with. 
     650    // create a transform to move the background back and forward with. 
    651651  
    652652    osg::MatrixTransform* transform = new osg::MatrixTransform(); 

  • OpenSceneGraph/trunk/examples/osgimpostor/osgimpostor.cpp

    r6941 r7648  
    107107    osg::UByteArray* coordIndices = new osg::UByteArray(48,indices); 
    108108 
    109         // share the primtive set. 
     109        // share the primitive set. 
    110110        osg::PrimitiveSet* primitives = new osg::DrawArrays(osg::PrimitiveSet::TRIANGLES,0,48); 
    111111 

  • OpenSceneGraph/trunk/examples/osglogo/osglogo.cpp

    r6941 r7648  
    180180    text->setCharacterSize((bb.zMax()-bb.zMin())*1.0f); 
    181181    text->setPosition(bb.center()-osg::Vec3((bb.xMax()-bb.xMin()),-(bb.yMax()-bb.yMin())*0.5f,(bb.zMax()-bb.zMin())*0.1f)); 
    182     //text->setColor(osg::Vec4(0.37f,0.48f,0.67f,1.0f)); // Neil's orignal OSG colour 
     182    //text->setColor(osg::Vec4(0.37f,0.48f,0.67f,1.0f)); // Neil's original OSG colour 
    183183    text->setColor(osg::Vec4(0.20f,0.45f,0.60f,1.0f)); // OGL logo colour 
    184184    text->setText(label); 

  • OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp

    r7615 r7648  
    5656    virtual void getUsage(osg::ApplicationUsage& usage) const; 
    5757 
    58     typedef std::vector< osg::ref_ptr<osg::ImageStream> > ImageStreamList; 
     58    typedef std::vector< osg::observer_ptr<osg::ImageStream> > ImageStreamList; 
    5959 
    6060protected: 
    … …  
    455455    viewer.addEventHandler(new osgViewer::RecordCameraPathHandler); 
    456456 
    457     // report any errors if they have occured when parsing the program aguments. 
     457    // report any errors if they have occurred when parsing the program arguments. 
    458458    if (arguments.errors()) 
    459459    { 

  • OpenSceneGraph/trunk/examples/osgpagedlod/osgpagedlod.cpp

    r6941 r7648  
    241241    arguments.reportRemainingOptionsAsUnrecognized(); 
    242242 
    243     // report any errors if they have occured when parsing the program aguments. 
     243    // report any errors if they have occurred when parsing the program arguments. 
    244244    if (arguments.errors()) 
    245245    { 

  • OpenSceneGraph/trunk/examples/osgphotoalbum/osgphotoalbum.cpp

    r7565 r7648  
    677677    arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates use node masks to create stereo images."); 
    678678    arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] image_file [image_file]"); 
    679     arguments.getApplicationUsage()->addCommandLineOption("-d <float>","Time delay in sceonds between the display of successive image pairs when in auto advance mode."); 
     679    arguments.getApplicationUsage()->addCommandLineOption("-d <float>","Time delay in seconds between the display of successive image pairs when in auto advance mode."); 
    680680    arguments.getApplicationUsage()->addCommandLineOption("-a","Enter auto advance of image pairs on start up."); 
    681681    arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information"); 
    … …  
    688688    viewer.setThreadingModel(osgViewer::Viewer::SingleThreaded); 
    689689 
    690     // register the handler to add keyboard and mosue handling. 
     690    // register the handler to add keyboard and mouse handling. 
    691691    SlideEventHandler* seh = new SlideEventHandler(); 
    692692    viewer.addEventHandler(seh); 
    … …  
    712712    arguments.reportRemainingOptionsAsUnrecognized(); 
    713713 
    714     // report any errors if they have occured when parsing the program aguments. 
     714    // report any errors if they have occurred when parsing the program arguments. 
    715715    if (arguments.errors()) 
    716716    { 

  • OpenSceneGraph/trunk/examples/osgplanets/osgplanets.cpp

    r6941 r7648  
    728728    arguments.reportRemainingOptionsAsUnrecognized(); 
    729729 
    730     // report any errors if they have occured when parsing the program aguments. 
     730    // report any errors if they have occurred when parsing the program arguments. 
    731731    if (arguments.errors()) 
    732732    { 

  • OpenSceneGraph/trunk/examples/osgpoints/osgpoints.cpp

    r6941 r7648  
    150150    } 
    151151 
    152     // optimize the scene graph, remove rendundent nodes and state etc. 
     152    // optimize the scene graph, remove redundant nodes and state etc. 
    153153    osgUtil::Optimizer optimizer; 
    154154    optimizer.optimize(loadedModel.get()); 

  • OpenSceneGraph/trunk/examples/osgprerender/osgprerender.cpp

    r7006 r7648  
    4444#include <iostream> 
    4545 
    46 // call back which cretes a deformation field to oscilate the model. 
     46// call back which creates a deformation field to oscillate the model. 
    4747class MyGeometryCallback :  
    4848    public osg::Drawable::UpdateCallback,  
    … …  
    324324        float zfar  = 3.0f*bs.radius(); 
    325325 
    326         // 2:1 aspect ratio as per flag geomtry below. 
     326        // 2:1 aspect ratio as per flag geometry below. 
    327327        float proj_top   = 0.25f*znear; 
    328328        float proj_right = 0.5f*znear; 
    … …  
    361361            // Rather than attach the texture directly to illustrate the texture's ability to 
    362362            // detect an image update and to subload the image onto the texture.  You needn't 
    363             // do this when using an Image for copying to, as a seperate camera->attach(..) 
    364             // would suffice as well, but we'll do it the long way round here just for demonstation 
     363            // do this when using an Image for copying to, as a separate camera->attach(..) 
     364            // would suffice as well, but we'll do it the long way round here just for demonstration 
    365365            // purposes (long way round meaning we'll need to copy image to main memory, then 
    366366            // copy it back to the graphics card to the texture in one frame). 
    367             // The long way round allows us to mannually modify the copied image via the callback 
     367            // The long way round allows us to manually modify the copied image via the callback 
    368368            // and then let this modified image by reloaded back. 
    369369            texture->setImage(0, image); 
    … …  
    398398    arguments.getApplicationUsage()->addCommandLineOption("--fb","Use FrameBuffer for render to texture."); 
    399399    arguments.getApplicationUsage()->addCommandLineOption("--pbuffer","Use Pixel Buffer for render to texture, where supported."); 
    400     arguments.getApplicationUsage()->addCommandLineOption("--window","Use a seperate Window for render to texture."); 
     400    arguments.getApplicationUsage()->addCommandLineOption("--window","Use a separate Window for render to texture."); 
    401401    arguments.getApplicationUsage()->addCommandLineOption("--width","Set the width of the render to texture."); 
    402402    arguments.getApplicationUsage()->addCommandLineOption("--height","Set the height of the render to texture."); 
    403403    arguments.getApplicationUsage()->addCommandLineOption("--image","Render to an image, then apply a post draw callback to it, and use this image to update a texture."); 
    404     arguments.getApplicationUsage()->addCommandLineOption("--texture-rectangle","Use osg::TextureRectangle for doing the render to texure to."); 
     404    arguments.getApplicationUsage()->addCommandLineOption("--texture-rectangle","Use osg::TextureRectangle for doing the render to texture to."); 
    405405    
    406406    // construct the viewer. 

  • OpenSceneGraph/trunk/examples/osgprerendercubemap/osgprerendercubemap.cpp

    r6941 r7648  
    143143        virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) 
    144144        { 
    145             // first update subgraph to make sure objects are all moved into postion 
     145            // first update subgraph to make sure objects are all moved into position 
    146146            traverse(node,nv); 
    147147 
    … …  
    196196        virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) 
    197197        { 
    198             // first update subgraph to make sure objects are all moved into postion 
     198            // first update subgraph to make sure objects are all moved into position 
    199199            traverse(node,nv); 
    200200             
    … …  
    304304    arguments.getApplicationUsage()->addCommandLineOption("--fb","Use FrameBuffer for render to texture."); 
    305305    arguments.getApplicationUsage()->addCommandLineOption("--pbuffer","Use Pixel Buffer for render to texture, where supported."); 
    306     arguments.getApplicationUsage()->addCommandLineOption("--window","Use a seperate Window for render to texture."); 
     306    arguments.getApplicationUsage()->addCommandLineOption("--window","Use a separate Window for render to texture."); 
    307307    arguments.getApplicationUsage()->addCommandLineOption("--width","Set the width of the render to texture"); 
    308308    arguments.getApplicationUsage()->addCommandLineOption("--height","Set the height of the render to texture"); 
    … …  
    334334    arguments.reportRemainingOptionsAsUnrecognized(); 
    335335 
    336     // report any errors if they have occured when parsing the program aguments. 
     336    // report any errors if they have occurred when parsing the program arguments. 
    337337    if (arguments.errors()) 
    338338    { 

  • OpenSceneGraph/trunk/examples/osgreflect/osgreflect.cpp

    r6941 r7648  
    351351 
    352352 
    353     // optimize the scene graph, remove rendundent nodes and state etc. 
     353    // optimize the scene graph, remove redundant nodes and state etc. 
    354354    osgUtil::Optimizer optimizer; 
    355355    optimizer.optimize(loadedModel.get()); 

  • OpenSceneGraph/trunk/examples/osgslice/osgslice.cpp

    r6941 r7648  
    119119    arguments.reportRemainingOptionsAsUnrecognized(); 
    120120 
    121     // report any errors if they have occured when parsing the program aguments. 
     121    // report any errors if they have occurred when parsing the program arguments. 
    122122    if (arguments.errors()) 
    123123    { 

  • OpenSceneGraph/trunk/examples/osgspheresegment/osgspheresegment.cpp

    r7019 r7648  
    682682    arguments.reportRemainingOptionsAsUnrecognized(); 
    683683 
    684     // report any errors if they have occured when parsing the program aguments. 
     684    // report any errors if they have occurred when parsing the program arguments. 
    685685    if (arguments.errors()) 
    686686    { 

  • OpenSceneGraph/trunk/examples/osgstereoimage/osgstereoimage.cpp

    r7446 r7648  
    460460    arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates use node masks to create stereo images."); 
    461461    arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] image_file_left_eye image_file_right_eye"); 
    462     arguments.getApplicationUsage()->addCommandLineOption("-d <float>","Time delay in sceonds between the display of successive image pairs when in auto advance mode."); 
     462    arguments.getApplicationUsage()->addCommandLineOption("-d <float>","Time delay in seconds between the display of successive image pairs when in auto advance mode."); 
    463463    arguments.getApplicationUsage()->addCommandLineOption("-a","Enter auto advance of image pairs on start up."); 
    464464    arguments.getApplicationUsage()->addCommandLineOption("-x <float>","Horizontal offset of left and right images."); 
    … …  
    476476    osgViewer::Viewer viewer; 
    477477 
    478     // register the handler to add keyboard and mosue handling. 
     478    // register the handler to add keyboard and mouse handling. 
    479479    SlideEventHandler* seh = new SlideEventHandler(); 
    480480    viewer.addEventHandler(seh); 
    … …  
    527527    arguments.reportRemainingOptionsAsUnrecognized(); 
    528528 
    529     // report any errors if they have occured when parsing the program aguments. 
     529    // report any errors if they have occurred when parsing the program arguments. 
    530530    if (arguments.errors()) 
    531531    { 
    … …  
    560560    float length = osg::PI*radius;  // half a cylinder. 
    561561 
    562     // use a texure matrix to control the placement of the image. 
     562    // use a texture matrix to control the placement of the image. 
    563563    osg::TexMat* texmatLeft = new osg::TexMat; 
    564564    osg::TexMat* texmatRight = new osg::TexMat; 

  • OpenSceneGraph/trunk/examples/osgtexture1D/osgtexture1D.cpp

    r6941 r7648  
    4242    int noPixels = 1024; 
    4343     
    44     // allocate the image data, noPixels x 1 x 1 with 4 rgba floats - equivilant to a Vec4! 
     44    // allocate the image data, noPixels x 1 x 1 with 4 rgba floats - equivalent to a Vec4! 
    4545    image->allocateImage(noPixels,1,1,GL_RGBA,GL_FLOAT); 
    4646    image->setInternalTextureFormat(GL_RGBA); 

  • OpenSceneGraph/trunk/examples/osgunittests/osgunittests.cpp

    r7608 r7648  
    479479    arguments.reportRemainingOptionsAsUnrecognized(); 
    480480 
    481     // report any errors if they have occured when parsing the program aguments. 
     481    // report any errors if they have occurred when parsing the program arguments. 
    482482    if (arguments.errors()) 
    483483    { 

  • OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

    r6941 r7648  
    263263 
    264264    /////////////////////////////////////////////////////////////////////////////// 
    265     // alpha luminiance sources..     
     265    // alpha luminance sources..     
    266266    virtual void LA_to_A(unsigned int num, unsigned char* source, unsigned char* dest) const 
    267267    { 
    … …  
    758758    // note, well set the filtering up so that mip mapping is disabled, 
    759759    // gluBuild3DMipsmaps doesn't do a very good job of handled the 
    760     // inbalanced dimensions of the 256x256x4 texture. 
     760    // imbalanced dimensions of the 256x256x4 texture. 
    761761    osg::Texture3D* texture3D = new osg::Texture3D; 
    762762    texture3D->setFilter(osg::Texture3D::MIN_FILTER,osg::Texture3D::LINEAR); 
    … …  
    11391139        // note, well set the filtering up so that mip mapping is disabled, 
    11401140        // gluBuild3DMipsmaps doesn't do a very good job of handled the 
    1141         // inbalanced dimensions of the 256x256x4 texture. 
     1141        // imbalanced dimensions of the 256x256x4 texture. 
    11421142        osg::Texture3D* texture3D = new osg::Texture3D; 
    11431143        texture3D->setFilter(osg::Texture3D::MIN_FILTER,osg::Texture3D::LINEAR); 
    … …  
    13331333            for(int t=0;t<sizeT;++t) 
    13341334            { 
    1335                 // reset the indices to begining 
     1335                // reset the indices to beginning 
    13361336                readOp._pos = 0; 
    13371337                writeOp._pos = 0; 
    … …  
    15631563    arguments.reportRemainingOptionsAsUnrecognized(); 
    15641564 
    1565     // report any errors if they have occured when parsing the program aguments. 
     1565    // report any errors if they have occurred when parsing the program arguments. 
    15661566    if (arguments.errors()) 
    15671567    { 
    … …  
    15701570    } 
    15711571 
    1572     // assume remaining argments are file names of textures. 
     1572    // assume remaining arguments are file names of textures. 
    15731573    for(int pos=1;pos<arguments.argc() && !image_3d;++pos) 
    15741574    { 

  • OpenSceneGraph/trunk/include/osg/ApplicationUsage

    r6151 r7648  
    106106    public: 
    107107 
    108         /** register an explanation of commandline/evironmentalvaraible/keyboard mouse usage.*/ 
     108        /** register an explanation of commandline/environmentvariable/keyboard mouse usage.*/ 
    109109        ApplicationUsageProxy(ApplicationUsage::Type type,const std::string& option,const std::string& explanation) 
    110110        { 

  • OpenSceneGraph/trunk/include/osg/ArgumentParser

    r7442 r7648  
    114114        std::string getApplicationName() const; 
    115115 
    116         /** Return the position of an occurance of a string in the argument list. 
     116        /** Return the position of an occurrence of a string in the argument list. 
    117117          * Return -1 if no string is found. */ 
    118118        int find(const std::string& str) const; 
    … …  
    138138        bool match(int pos, const std::string& str) const; 
    139139 
    140         /** Search for an occurance of a string in the argument list. If found, 
    141           * remove that occurance and return true. Otherwise, return false. */ 
     140        /** Search for an occurrence of a string in the argument list. If found, 
     141          * remove that occurrence and return true. Otherwise, return false. */ 
    142142        bool read(const std::string& str); 
    143143        bool read(const std::string& str, Parameter value1); 
    … …  
    173173        typedef std::map<std::string,ErrorSeverity> ErrorMessageMap; 
    174174 
    175         /** Return the error flag, true if an error has occured when reading arguments. */ 
     175        /** Return the error flag, true if an error has occurred when reading arguments. */ 
    176176        bool errors(ErrorSeverity severity=BENIGN) const; 
    177177 
    … …  
    182182        void reportRemainingOptionsAsUnrecognized(ErrorSeverity severity=BENIGN); 
    183183         
    184         /** Return the error message, if any has occured. */ 
     184        /** Return the error message, if any has occurred. */ 
    185185        ErrorMessageMap& getErrorMessageMap() { return _errorMessageMap; } 
    186186       
    187         /** Return the error message, if any has occured. */ 
     187        /** Return the error message, if any has occurred. */ 
    188188        const ErrorMessageMap& getErrorMessageMap() const { return _errorMessageMap; } 
    189189 
    190         /** Write error messages to the given ostream, if at or above the given severiity. */ 
     190        /** Write error messages to the given ostream, if at or above the given severity. */ 
    191191        void writeErrorMessages(std::ostream& output,ErrorSeverity sevrity=BENIGN); 
    192192 

  • OpenSceneGraph/trunk/include/osg/Billboard

    r5649 r7648  
    2121 
    2222/** Billboard is a derived form of Geode that orients its osg::Drawable 
    23   * children to face the eye point. Typical uses incllude trees and 
     23  * children to face the eye point. Typical uses include trees and 
    2424  * particle explosions, 
    2525*/ 
    … …  
    4747 
    4848        /** Set the rotation axis for the billboard's child Drawables. 
    49           * Only utlized when mode==AXIAL_ROT. */ 
     49          * Only utilized when mode==AXIAL_ROT. */ 
    5050        void setAxis(const Vec3& axis); 
    5151        /** Get the rotation axis. */ 

  • OpenSceneGraph/trunk/include/osg/BlendColor

    r7379 r7648  
    7171 
    7272        /** Encapsulates queries of extension availability, obtains extension 
    73           * function pointers, and provides convinience wrappers for 
     73          * function pointers, and provides convenience wrappers for 
    7474          * calling extension functions. */         
    7575        class OSG_EXPORT Extensions : public osg::Referenced 
    … …  
    101101         
    102102        /** Returns the Extensions object for the given context. 
    103           * If createIfNotInitalized is true and the Exentsions object doesn't 
     103          * If createIfNotInitalized is true and the Extensions object doesn't 
    104104          * exist, getExtensions() creates it on the given context. 
    105105          * Returns NULL if createIfNotInitalized is false and the Extensions 

  • OpenSceneGraph/trunk/include/osg/BlendEquation

    r7379 r7648  
    9393        virtual void apply(State& state) const; 
    9494        /** Encapsulates queries of extension availability, obtains extension 
    95           * function pointers, and provides convinience wrappers for 
     95          * function pointers, and provides convenience wrappers for 
    9696          * calling extension functions. */         
    9797        class OSG_EXPORT Extensions : public osg::Referenced 
    … …  
    128128         
    129129        /** Returns the Extensions object for the given context. 
    130           * If createIfNotInitalized is true and the Exentsions object doesn't 
     130          * If createIfNotInitalized is true and the Extensions object doesn't 
    131131          * exist, getExtensions() creates it on the given context. 
    132132          * Returns NULL if createIfNotInitalized is false and the Extensions 

  • OpenSceneGraph/trunk/include/osg/BlendFunc

    r7379 r7648  
    168168 
    169169        /** Returns the Extensions object for the given context. 
    170         * If createIfNotInitalized is true and the Exentsions object doesn't 
     170        * If createIfNotInitalized is true and the Extensions object doesn't 
    171171        * exist, getExtensions() creates it on the given context. 
    172172        * Returns NULL if createIfNotInitalized is false and the Extensions 

  • OpenSceneGraph/trunk/include/osg/BoundingBox

    r5328 r7648  
    165165         
    166166 
    167         /** Returns the intesection of this bounding box and the specified bounding box. */ 
     167        /** Returns the intersection of this bounding box and the specified bounding box. */ 
    168168        BoundingBox intersect(const BoundingBox& bb) const 
    169169        {    return osg::BoundingBox(osg::maximum(xMin(),bb.xMin()),osg::maximum(yMin(),bb.yMin()),osg::maximum(zMin(),bb.zMin()), 

  • OpenSceneGraph/trunk/include/osg/BufferObject

    r7101 r7648  
    143143 
    144144        /** If State is non-zero, this function releases OpenGL objects for 
    145           * the specified graphics context. Otherwise, releases OpenGL objexts 
     145          * the specified graphics context. Otherwise, releases OpenGL objects 
    146146          * for all graphics contexts. */ 
    147147        void releaseGLObjects(State* state=0) const; 
    … …  
    217217 
    218218        /** Function to call to get the extension of a specified context. 
    219         * If the Exentsion object for that context has not yet been created   
     219        * If the Extension object for that context has not yet been created   
    220220        * and the 'createIfNotInitalized' flag been set to false then returns NULL. 
    221221        * If 'createIfNotInitalized' is true then the Extensions object is  

  • OpenSceneGraph/trunk/include/osg/Camera

    r7178 r7648  
    141141        }; 
    142142         
    143         /** Set the policy used to determin if and how the projection matrix should be adjusted on window resizes. */ 
     143        /** Set the policy used to determine if and how the projection matrix should be adjusted on window resizes. */ 
    144144        inline void setProjectionResizePolicy(ProjectionResizePolicy policy) { _projectionResizePolicy = policy; } 
    145145 
    146         /** Get the policy used to determin if and how the projection matrix should be adjusted on window resizes. */ 
     146        /** Get the policy used to determine if and how the projection matrix should be adjusted on window resizes. */ 
    147147        inline ProjectionResizePolicy getProjectionResizePolicy() const { return _projectionResizePolicy; } 
    148148 
    … …  
    179179        const osg::Matrixd& getProjectionMatrix() const { return _projectionMatrix; } 
    180180 
    181         /** Get the othographic settings of the orthographic projection matrix.  
     181        /** Get the orthographic settings of the orthographic projection matrix.  
    182182          * Returns false if matrix is not an orthographic matrix, where parameter values are undefined.*/ 
    183183        bool getProjectionMatrixAsOrtho(double& left, double& right, 

  • OpenSceneGraph/trunk/include/osg/CameraView

    r5328 r7648  
    2525/** CameraView - is a Transform that is used to specify camera views from within the scene graph. 
    2626  * The application must attach a camera to a CameraView via the NodePath from the top of the scene graph 
    27   * to the CameraView node itself, and accimulate the view matrix from this NodePath. 
     27  * to the CameraView node itself, and accumulate the view matrix from this NodePath. 
    2828*/ 
    2929class OSG_EXPORT CameraView : public Transform 
    … …  
    4949        inline const Vec3d& getPosition() const { return _position; } 
    5050 
    51         /** Set the attitide of the camera view.*/ 
     51        /** Set the attitude of the camera view.*/ 
    5252        inline void setAttitude(const Quat& quat) { _attitude = quat; dirtyBound(); } 
    5353 
    54         /** Get the attitide of the camera view.*/ 
     54        /** Get the attitude of the camera view.*/ 
    5555        inline const Quat& getAttitude() const { return _attitude; } 
    5656 
    5757        /** Set the field of view. 
    58           * The cameras field of view can be contrained to either the horizontal or vertex axis of the camera, or unconstrained 
     58          * The cameras field of view can be constrained to either the horizontal or vertex axis of the camera, or unconstrained 
    5959          * in which case the camera/application are left to choose an appropriate field of view. 
    60           * The default value if 60 degrres. */ 
     60          * The default value if 60 degrees. */ 
    6161        inline void setFieldOfView(double fieldOfView) { _fieldOfView = fieldOfView; } 
    6262 
    … …  
    7171        }; 
    7272 
    73         /** Set the field of view mode - controlling how the field of view of the camera is contrained by the CameaView settings.*/ 
     73        /** Set the field of view mode - controlling how the field of view of the camera is constrained by the CameaView settings.*/ 
    7474        inline void setFieldOfViewMode(FieldOfViewMode mode) { _fieldOfViewMode = mode; } 
    7575 

  • OpenSceneGraph/trunk/include/osg/ClampColor

    r7379 r7648  
    7979        virtual void apply(State& state) const; 
    8080        /** Encapsulates queries of extension availability, obtains extension 
    81           * function pointers, and provides convinience wrappers for 
     81          * function pointers, and provides convenience wrappers for 
    8282          * calling extension functions. */         
    8383        class OSG_EXPORT Extensions : public osg::Referenced 
    … …  
    108108         
    109109        /** Returns the Extensions object for the given context. 
    110           * If createIfNotInitalized is true and the Exentsions object doesn't 
     110          * If createIfNotInitalized is true and the Extensions object doesn't 
    111111          * exist, getExtensions() creates it on the given context. 
    112112          * Returns NULL if createIfNotInitalized is false and the Extensions 

  • OpenSceneGraph/trunk/include/osg/CollectOccludersVisitor

    r7038 r7648  
    6969        /** Removes occluded occluders for the collected occluders list, then 
    7070          * discards all but MaximumNumberOfActiveOccluders of occluders, 
    71           * discarding the occluders with the lowests shadow occluder volume. */ 
     71          * discarding the occluders with the lowest shadow occluder volume. */ 
    7272        void removeOccludedOccluders(); 
    7373 

  • OpenSceneGraph/trunk/include/osg/CullSettings

    r7212 r7648  
    7979        }; 
    8080 
    81         /** Set the inheritance mask used in inheritCullSettings to control which variables get overritten by the passed in CullSettings object.*/ 
     81        /** Set the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object.*/ 
    8282        void setInheritanceMask(unsigned int mask) { _inheritanceMask = mask; } 
    8383 
    84         /** Get the inheritance mask used in inheritCullSettings to control which variables get overritten by the passed in CullSettings object.*/ 
     84        /** Get the inheritance mask used in inheritCullSettings to control which variables get overwritten by the passed in CullSettings object.*/ 
    8585        unsigned int getInheritanceMask() const { return _inheritanceMask; } 
    8686         

  • OpenSceneGraph/trunk/include/osg/DeleteHandler

    r7091 r7648  
    4242        /** Set the number of frames to retain objects that are have been requested for deletion. 
    4343          * When set to zero objects are deleted immediately, by set to 1 there are kept around for an extra frame etc. 
    44           * The ability to retain obejcts for several frames is useful to prevent premature deletion when objects 
    45           * are stil be used the graphics threads that are using double buffering of rendering data structures with 
     44          * The ability to retain objects for several frames is useful to prevent premature deletion when objects 
     45          * are still be used the graphics threads that are using double buffering of rendering data structures with 
    4646          * non ref_ptr<> pointers to scene graph elements.*/         
    4747        void setNumFramesToRetainObjects(int numberOfFramesToRetainObjects) {  _numFramesToRetainObjects = numberOfFramesToRetainObjects; } 
    … …  
    4949        int getNumFramesToRetainObjects() const { return _numFramesToRetainObjects; } 
    5050 
    51         /** Set the current frame numberso that subsequent deletes get tagged as associated with this frame.*/ 
     51        /** Set the current frame number so that subsequent deletes get tagged as associated with this frame.*/ 
    5252        void setFrameNumber(int frameNumber) { _currentFrameNumber = frameNumber; } 
    5353 

  • OpenSceneGraph/trunk/include/osg/Depth

    r6311 r7648  
    5959            COMPARE_StateAttribute_Types(Depth,sa) 
    6060 
    61             // compare each paramter in turn against the rhs. 
     61            // compare each parameter in turn against the rhs. 
    6262            COMPARE_StateAttribute_Parameter(_func) 
    6363            COMPARE_StateAttribute_Parameter(_depthWriteMask) 

  • OpenSceneGraph/trunk/include/osg/Drawable

    r7601 r7648  
    126126 
    127127 
    128         /** Compute the DataVariance based on an assestment of callback etc.*/ 
     128        /** Compute the DataVariance based on an assessment of callback etc.*/ 
    129129        virtual void computeDataVariance(); 
    130130 
    … …  
    311311 
    312312        /** If State is non-zero, this function releases OpenGL objects for 
    313           * the specified graphics context. Otherwise, releases OpenGL objexts 
     313          * the specified graphics context. Otherwise, releases OpenGL objects 
    314314          * for all graphics contexts. */ 
    315315        virtual void releaseGLObjects(State* state=0) const; 
    … …  
    421421          * must be implemented in concrete subclasses of the Drawable base class, examples include osg::Geometry and osg::ShapeDrawable. 
    422422          * drawImplementation(RenderInfo&) is called from the draw(RenderInfo&) method, with the draw method handling management of OpenGL display lists, 
    423           * and drawImplementation(RenderInfo&) handling the actuall drawing itself.   
    424           * @param renderInfo The osg::RenderInfo object that encapulates the current rendering information including the osg::State OpenGL state for the current graphics context. */ 
     423          * and drawImplementation(RenderInfo&) handling the actual drawing itself.   
     424          * @param renderInfo The osg::RenderInfo object that encapsulates the current rendering information including the osg::State OpenGL state for the current graphics context. */ 
    425425        virtual void drawImplementation(RenderInfo& renderInfo) const = 0; 
    426426 
    … …  
    480480            TEXTURE_COORDS_6    = TEXTURE_COORDS_0+6, 
    481481            TEXTURE_COORDS_7    = TEXTURE_COORDS_0+7 
    482             // only eight texture coord examples provided here, but underlying code can handle any no of texure units, 
     482            // only eight texture coord examples provided here, but underlying code can handle any no of texture units, 
    483483            // simply co them as (TEXTURE_COORDS_0+unit). 
    484484        }; 

  • OpenSceneGraph/trunk/include/osg/Export

    r5371 r7648  
    1717// define USE_DEPRECATED_API is used to include in API which is being fazed out 
    1818// if you can compile your apps with this turned off you are 
    19 // well placed for compatablity with future versions. 
     19// well placed for compatibility with future versions. 
    2020#define USE_DEPRECATED_API 
    2121 

  • OpenSceneGraph/trunk/include/osg/Fog

    r6311 r7648  
    5454            COMPARE_StateAttribute_Types(Fog,sa) 
    5555 
    56             // compare each paramter in turn against the rhs. 
     56            // compare each parameter in turn against the rhs. 
    5757            COMPARE_StateAttribute_Parameter(_mode) 
    5858            COMPARE_StateAttribute_Parameter(_density) 

  • OpenSceneGraph/trunk/include/osg/FragmentProgram

    r7379 r7648  
    131131            COMPARE_StateAttribute_Types(FragmentProgram,sa) 
    132132 
    133             // compare each paramter in turn against the rhs. 
     133            // compare each parameter in turn against the rhs. 
    134134            COMPARE_StateAttribute_Parameter(_fragmentProgram) 
    135135 
    … …  
    225225 
    226226        /** release an OpenGL objects in specified graphics context if State 
    227             object is passed, otherwise release OpenGL objexts for all graphics context if 
     227            object is passed, otherwise release OpenGL objects for all graphics context if 
    228228            State object pointer == NULL.*/ 
    229229        virtual void releaseGLObjects(State* state=0) const; 

  • OpenSceneGraph/trunk/include/osg/FrameStamp

    r6051 r7648  
    2828 
    2929/** Class which encapsulates the frame number, reference time and calendar 
    30   * time of specific frame, used to synchonize operations on the scene graph 
     30  * time of specific frame, used to synchronize operations on the scene graph 
    3131  * and other machines when using a graphics cluster.  Note the calendar 
    3232  * time can be an artificial simulation time or capture the real time 
    … …  
    7070        // member variables of time.h's tm structure, copied here to 
    7171        // ensure that all data is not dynamic. The tm structure itself 
    72         // is not completely consistent betweem implementations, which 
     72        // is not completely consistent between implementations, which 
    7373        // could be a problem when sending the FrameStamp across a network 
    7474        // with different versions of tm (i.e mixing Unix and Windows.) 

  • OpenSceneGraph/trunk/include/osg/FrontFace

    r5328 r7648  
    4747            COMPARE_StateAttribute_Types(FrontFace,sa) 
    4848 
    49             // compare each paramter in turn against the rhs. 
     49            // compare each parameter in turn against the rhs. 
    5050            COMPARE_StateAttribute_Parameter(_mode) 
    5151 

  • OpenSceneGraph/trunk/include/osg/Geode

    r5885 r7648  
    146146 
    147147        /** If State is non-zero, this function releases any associated OpenGL objects for 
    148            * the specified graphics context. Otherwise, releases OpenGL objexts 
     148           * the specified graphics context. Otherwise, releases OpenGL objects 
    149149           * for all graphics contexts. */ 
    150150        virtual void releaseGLObjects(osg::State* = 0) const; 

  • OpenSceneGraph/trunk/include/osg/Geometry

    r6582 r7648  
    295295 
    296296        /** If State is non-zero, this function releases OpenGL objects for 
    297           * the specified graphics context. Otherwise, releases OpenGL objexts 
     297          * the specified graphics context. Otherwise, releases OpenGL objects 
    298298          * for all graphics contexts. */ 
    299299        virtual void releaseGLObjects(State* state=0) const; 
    … …  
    346346 
    347347        /** Return the estimated size of GLObjects (display lists/vertex buffer objects) that are associated with this drawable. 
    348           * This size is used a hint for reuse of deleteed display lists/vertex buffer objects. */ 
     348          * This size is used a hint for reuse of deleted display lists/vertex buffer objects. */ 
    349349        virtual unsigned int getGLObjectSizeHint() const; 
    350350         
    … …  
    358358        virtual bool supports(const Drawable::AttributeFunctor&) const { return true; } 
    359359 
    360         /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ 
     360        /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the internal attributes that this Drawable has. */ 
    361361        virtual void accept(Drawable::AttributeFunctor& af); 
    362362 
    … …  
    364364        virtual bool supports(const Drawable::ConstAttributeFunctor&) const { return true; } 
    365365 
    366         /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ 
     366        /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the internal attributes that this Drawable has. */ 
    367367        virtual void accept(Drawable::ConstAttributeFunctor& af) const; 
    368368 
    … …  
    370370        virtual bool supports(const PrimitiveFunctor&) const { return true; } 
    371371 
    372         /** Accept a PrimitiveFunctor and call its methods to tell it about the interal primitives that this Drawable has. */ 
     372        /** Accept a PrimitiveFunctor and call its methods to tell it about the internal primitives that this Drawable has. */ 
    373373        virtual void accept(PrimitiveFunctor& pf) const; 
    374374 
    … …  
    376376        virtual bool supports(const PrimitiveIndexFunctor&) const { return true; } 
    377377 
    378         /** Accept a PrimitiveFunctor and call its methods to tell it about the interal primitives that this Drawable has. */ 
     378        /** Accept a PrimitiveFunctor and call its methods to tell it about the internal primitives that this Drawable has. */ 
    379379        virtual void accept(PrimitiveIndexFunctor& pf) const; 
    380380 

  • OpenSceneGraph/trunk/include/osg/GraphicsContext

    r7182 r7648  
    8282                setInheritedWindowPixelFormat(false) {} 
    8383                             
    84             // graphics context orginal and size 
     84            // graphics context original and size 
    8585            int x; 
    8686            int y; 
    … …  
    8888            int height; 
    8989             
    90             // window decoration and baviour 
     90            // window decoration and behaviour 
    9191            std::string windowName; 
    9292            bool        windowDecoration; 
    … …  
    154154     
    155155     
    156         /** Set the querry the windowing system for screens and create graphics context - this functor should be supplied by the windows toolkit. */ 
     156        /** Set the query the windowing system for screens and create graphics context - this functor should be supplied by the windows toolkit. */ 
    157157        static void setWindowingSystemInterface(WindowingSystemInterface* wsInterface); 
    158158         
    … …  
    170170        static unsigned int getMaxContextID(); 
    171171 
    172         /** Increment the usage count associate with a contextID. The usage count speficies how many graphics contexts a specific contextID is shared between.*/ 
     172        /** Increment the usage count associate with a contextID. The usage count specifies how many graphics contexts a specific contextID is shared between.*/ 
    173173        static void incrementContextIDUsageCount(unsigned int contextID); 
    174174 
    … …  
    218218        OpenThreads::Mutex* getOperationsMutex() { return &_operationsMutex; } 
    219219 
    220         /** Get the operations queue block used to mark an empty queue, if you end items into the empty queu you must release this block.*/ 
     220        /** Get the operations queue block used to mark an empty queue, if you end items into the empty queue you must release this block.*/ 
    221221        osg::RefBlock* getOperationsBlock() { return _operationsBlock.get(); } 
    222222 
    … …  
    262262         
    263263 
    264         /** Realise the GraphicsContext.*/ 
     264        /** Realize the GraphicsContext.*/ 
    265265        bool realize(); 
    266266 
    … …  
    275275        void swapBuffers(); 
    276276 
    277         /** Return true if the graphics context has been realised and is ready to use.*/ 
     277        /** Return true if the graphics context has been realized and is ready to use.*/ 
    278278        inline bool isRealized() const { return isRealizedImplementation(); } 
    279279 
    280280 
    281281        /** Make this graphics context current. 
    282           * Implementated by calling makeCurrentImplementation().  
     282          * Implemented by calling makeCurrentImplementation().  
    283283          * Returns true on success. */ 
    284284        bool makeCurrent(); 
    285285         
    286286        /** Make this graphics context current with specified read context. 
    287           * Implementated by calling makeContextCurrentImplementation(). 
     287          * Implemented by calling makeContextCurrentImplementation(). 
    288288          * Returns true on success. */ 
    289289        bool makeContextCurrent(GraphicsContext* readContext); 
    … …  
    314314 
    315315 
    316         /** Realise the GraphicsContext implementation,  
    317           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ 
     316        /** Realize the GraphicsContext implementation,  
     317          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    318318        virtual bool realizeImplementation() = 0; 
    319319 
    320         /** Return true if the graphics context has been realised, and is ready to use, implementation. 
    321           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ 
     320        /** Return true if the graphics context has been realized, and is ready to use, implementation. 
     321          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    322322        virtual bool isRealizedImplementation() const = 0; 
    323323 
    324324        /** Close the graphics context implementation. 
    325           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ 
     325          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    326326        virtual void closeImplementation() = 0; 
    327327 
    328328        /** Make this graphics context current implementation. 
    329           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ 
     329          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    330330        virtual bool makeCurrentImplementation() = 0; 
    331331         
    332332        /** Make this graphics context current with specified read context implementation. 
    333           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ 
     333          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    334334        virtual bool makeContextCurrentImplementation(GraphicsContext* readContext) = 0; 
    335335 
    … …  
    338338 
    339339        /** Pure virtual, Bind the graphics context to associated texture implementation. 
    340           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ 
     340          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    341341        virtual void bindPBufferToTextureImplementation(GLenum buffer) = 0; 
    342342 
    343343        /** Swap the front and back buffers implementation. 
    344           * Pure virtual - must be implemented by Concrate implementations of GraphicsContext. */ 
     344          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    345345        virtual void swapBuffersImplementation() = 0; 
    346346 

  • OpenSceneGraph/trunk/include/osg/GraphicsThread

    r7209 r7648  
    3838        Operation(name,keep) {} 
    3939 
    40     /** Override the standard Operation opertator and dynamic cast object to a GraphicsContext, 
     40    /** Override the standard Operation operator and dynamic cast object to a GraphicsContext, 
    4141      * on success call operation()(GraphicsContext*).*/ 
    4242    virtual void operator () (Object* object); 
    … …  
    5555}; 
    5656 
    57 /** BarrierOperation allows one to syncronize multiple GraphicsThreads with each other.*/ 
     57/** BarrierOperation allows one to synchronize multiple GraphicsThreads with each other.*/ 
    5858struct OSG_EXPORT BarrierOperation : public Operation, public OpenThreads::Barrier 
    5959{ 
    … …  
    7777}; 
    7878 
    79 /** ReleaseContext_Block_MakeCurrentOperation releases the context for another thread to aquire,  
    80   * then blocks waiting for context to be released, once the block is release the context is re-aqquired.*/ 
     79/** ReleaseContext_Block_MakeCurrentOperation releases the context for another thread to acquire,  
     80  * then blocks waiting for context to be released, once the block is release the context is re-acquired.*/ 
    8181struct OSG_EXPORT ReleaseContext_Block_MakeCurrentOperation : public GraphicsOperation, public RefBlock 
    8282{ 

  • OpenSceneGraph/trunk/include/osg/Group

    r5885 r7648  
    9393        /** Replace specified Node with another Node. 
    9494          * Equivalent to setChild(getChildIndex(orignChild),node) 
    95           * See docs for setChild for futher details on implementation. 
     95          * See docs for setChild for further details on implementation. 
    9696          */ 
    9797        virtual bool replaceChild( Node *origChild, Node* newChild ); 
    9898 
    99         /** Return the number of chilren nodes. */ 
     99        /** Return the number of children nodes. */ 
    100100        inline unsigned int getNumChildren() const { return _children.size(); } 
    101101 
    … …  
    150150 
    151151        /** If State is non-zero, this function releases any associated OpenGL objects for 
    152            * the specified graphics context. Otherwise, releases OpenGL objexts 
     152           * the specified graphics context. Otherwise, releases OpenGL objects 
    153153           * for all graphics contexts. */ 
    154154        virtual void releaseGLObjects(osg::State* = 0) const; 

  • OpenSceneGraph/trunk/include/osg/Hint

    r7632 r7648  
    5151        COMPARE_StateAttribute_Types(Hint,sa) 
    5252 
    53             // compare each paramter in turn against the rhs. 
     53            // compare each parameter in turn against the rhs. 
    5454            COMPARE_StateAttribute_Parameter(_target) 
    5555            COMPARE_StateAttribute_Parameter(_mode) 

  • OpenSceneGraph/trunk/include/osg/LOD

    r6288 r7648  
    7777 
    7878        /** Set the object-space reference radius of the volume enclosed by the LOD.  
    79           * Used to detmine the bounding sphere of the LOD in the absense of any children.*/ 
     79          * Used to determine the bounding sphere of the LOD in the absence of any children.*/ 
    8080        inline void setRadius(float radius) { _radius = radius; } 
    8181         
    … …  
    8585 
    8686 
    87         /** Modes that control how the range values should be intepreted when computing which child is active.*/ 
     87        /** Modes that control how the range values should be interpreted when computing which child is active.*/ 
    8888        enum RangeMode 
    8989        { 
    … …  
    9292        }; 
    9393         
    94         /** Set how the range values should be intepreted when computing which child is active.*/ 
     94        /** Set how the range values should be interpreted when computing which child is active.*/ 
    9595        void setRangeMode(RangeMode mode) { _rangeMode = mode; } 
    9696 
    97         /** Get how the range values should be intepreted when computing which child is active.*/ 
     97        /** Get how the range values should be interpreted when computing which child is active.*/ 
    9898        RangeMode getRangeMode() const { return _rangeMode; } 
    9999 
    100100 
    101         /** Sets the min and max visible ranges of range of specifiec child. 
     101        /** Sets the min and max visible ranges of range of specific child. 
    102102            Values are floating point distance specified in local objects coordinates.*/ 
    103103        void setRange(unsigned int childNo, float min,float max); 

  • OpenSceneGraph/trunk/include/osg/Light

    r7620 r7648  
    5959            COMPARE_StateAttribute_Types(Light,sa) 
    6060 
    61             // compare each paramter in turn against the rhs. 
     61            // compare each parameter in turn against the rhs. 
    6262            COMPARE_StateAttribute_Parameter(_lightnum) 
    6363            COMPARE_StateAttribute_Parameter(_ambient) 

  • OpenSceneGraph/trunk/include/osg/LightModel

    r5328 r7648  
    4444            COMPARE_StateAttribute_Types(LightModel,sa) 
    4545 
    46             // compare each paramter in turn against the rhs. 
     46            // compare each parameter in turn against the rhs. 
    4747            COMPARE_StateAttribute_Parameter(_ambient) 
    4848            COMPARE_StateAttribute_Parameter(_colorControl) 

  • OpenSceneGraph/trunk/include/osg/Math

    r7521 r7648  
    140140  { double delta = rhs-lhs; return delta<0.0?delta>=-epsilon:delta<=epsilon; } 
    141141 
    142 /** return the minimum of two values, equivilent to std::min. 
     142/** return the minimum of two values, equivalent to std::min. 
    143143  * std::min not used because of STL implementation under IRIX not containing 
    144144  * std::min. 
    … …  
    147147inline T minimum(T lhs,T rhs) { return lhs<rhs?lhs:rhs; } 
    148148 
    149 /** return the maximum of two values, equivilent to std::max. 
     149/** return the maximum of two values, equivalent to std::max. 
    150150  * std::max not used because of STL implementation under IRIX not containing 
    151151  * std::max. 

  • OpenSceneGraph/trunk/include/osg/Matrixd

    r6142 r7648  
    124124 
    125125 
    126         /** decompose the matrix into translation, rotation, scale and scale orietation.*/         
     126        /** decompose the matrix into translation, rotation, scale and scale orientation.*/         
    127127        void decompose( osg::Vec3f& translation, 
    128128                        osg::Quat& rotation,  
    … …  
    130130                        osg::Quat& so ) const; 
    131131 
    132         /** decompose the matrix into translation, rotation, scale and scale orietation.*/         
     132        /** decompose the matrix into translation, rotation, scale and scale orientation.*/         
    133133        void decompose( osg::Vec3d& translation, 
    134134                        osg::Quat& rotation,  
    … …  
    144144                       double zNear,  double zFar); 
    145145 
    146         /** Get the othogrraphic settings of the orthographic projection matrix. 
     146        /** Get the orthographic settings of the orthographic projection matrix. 
    147147          * Note, if matrix is not an orthographic matrix then invalid values  
    148148          * will be returned. 

  • OpenSceneGraph/trunk/include/osg/Matrixf

    r6142 r7648  
    124124 
    125125         
    126         /** decompose the matrix into translation, rotation, scale and scale orietation.*/         
     126        /** decompose the matrix into translation, rotation, scale and scale orientation.*/         
    127127        void decompose( osg::Vec3f& translation, 
    128128                        osg::Quat& rotation,  
    … …  
    130130                        osg::Quat& so ) const; 
    131131 
    132         /** decompose the matrix into translation, rotation, scale and scale orietation.*/         
     132        /** decompose the matrix into translation, rotation, scale and scale orientation.*/         
    133133        void decompose( osg::Vec3d& translation, 
    134134                        osg::Quat& rotation,  
    … …  
    144144                       double zNear,  double zFar); 
    145145 
    146         /** Get the othogrraphic settings of the orthographic projection matrix. 
     146        /** Get the orthographic settings of the orthographic projection matrix. 
    147147          * Note, if matrix is not an orthographic matrix then invalid values  
    148148          * will be returned. 

  • OpenSceneGraph/trunk/include/osg/Multisample

    r7379 r7648  
    6969            COMPARE_StateAttribute_Types(Multisample,sa) 
    7070 
    71             // compare each paramter in turn against the rhs. 
     71            // compare each parameter in turn against the rhs. 
    7272            COMPARE_StateAttribute_Parameter(_coverage) 
    7373            COMPARE_StateAttribute_Parameter(_invert) 
    … …  
    128128         
    129129        /** Function to call to get the extension of a specified context. 
    130           * If the Exentsion object for that context has not yet been created  
     130          * If the Extension object for that context has not yet been created  
    131131          * and the 'createIfNotInitalized' flag been set to false then returns NULL. 
    132132          * If 'createIfNotInitalized' is true then the Extensions object is  

  • OpenSceneGraph/trunk/include/osg/Node

    r5885 r7648  
    246246        inline const osg::StateSet* getStateSet() const { return _stateset.get(); } 
    247247 
    248         /** Set the intial bounding volume to use when computing the overall bounding volume.*/ 
     248        /** Set the initial bounding volume to use when computing the overall bounding volume.*/ 
    249249        void setInitialBound(const osg::BoundingSphere& bsphere) { _initialBound = bsphere; dirtyBound(); } 
    250250 
    251         /** Set the intial bounding volume to use when computing the overall bounding volume.*/ 
     251        /** Set the initial bounding volume to use when computing the overall bounding volume.*/ 
    252252        const BoundingSphere& getInitialBound() const { return _initialBound; } 
    253253 
    … …  
    307307 
    308308        /** If State is non-zero, this function releases any associated OpenGL objects for 
    309            * the specified graphics context. Otherwise, releases OpenGL objexts 
     309           * the specified graphics context. Otherwise, releases OpenGL objects 
    310310           * for all graphics contexts. */ 
    311311        virtual void releaseGLObjects(osg::State* = 0) const; 

  • OpenSceneGraph/trunk/include/osg/NodeVisitor

    r7256 r7648  
    157157 
    158158        /** 
    159          * Set user data, data must be subclased from Referenced to allow 
     159         * Set user data, data must be subclassed from Referenced to allow 
    160160         * automatic memory handling.  If your own data isn't directly  
    161161         * subclassed from Referenced then create an adapter object 

  • OpenSceneGraph/trunk/include/osg/Object

    r6184 r7648  
    9999           * Can be set to either STATIC for values that do not change over the lifetime of the object, 
    100100           * or DYNAMIC for values that vary over the lifetime of the object. The DataVariance value 
    101            * can be used by routines such as optimzation codes that wish to share static data. 
    102            * UNSPECIFIED is used to sepecify that the DataVariance hasn't been set yet. */ 
     101           * can be used by routines such as optimization codes that wish to share static data. 
     102           * UNSPECIFIED is used to specify that the DataVariance hasn't been set yet. */ 
    103103        inline void setDataVariance(DataVariance dv) { _dataVariance = dv; } 
    104104 
    … …  
    106106        inline DataVariance getDataVariance() const { return _dataVariance; } 
    107107         
    108         /** Compute the DataVariance based on an assestment of callback etc.*/ 
     108        /** Compute the DataVariance based on an assessment of callback etc.*/ 
    109109        virtual void computeDataVariance() {} 
    110110 
    … …  
    128128 
    129129        /** If State is non-zero, this function releases any associated OpenGL objects for 
    130            * the specified graphics context. Otherwise, releases OpenGL objexts 
     130           * the specified graphics context. Otherwise, releases OpenGL objects 
    131131           * for all graphics contexts. */ 
    132132        virtual void releaseGLObjects(osg::State* = 0) const {} 

  • OpenSceneGraph/trunk/include/osg/Plane

    r6704 r7648  
    302302    protected: 
    303303 
    304         /** Vec member varaible. */ 
     304        /** Vec member variable. */ 
    305305        value_type _fv[4]; 
    306306 

  • OpenSceneGraph/trunk/include/osg/Point

    r7379 r7648  
    7979 
    8080        /** Encapsulates queries of extension availability, obtains extension 
    81           * function pointers, and provides convinience wrappers for 
     81          * function pointers, and provides convenience wrappers for 
    8282          * calling extension functions. */         
    8383        class OSG_EXPORT Extensions : public osg::Referenced 
    … …  
    120120         
    121121        /** Returns the Extensions object for the given context. 
    122           * If createIfNotInitalized is true and the Exentsions object doesn't 
     122          * If createIfNotInitalized is true and the Extensions object doesn't 
    123123          * exist, getExtensions() creates it on the given context. 
    124124          * Returns NULL if createIfNotInitalized is false and the Extensions 

  • OpenSceneGraph/trunk/include/osg/PolygonMode

    r5328 r7648  
    5757            COMPARE_StateAttribute_Types(PolygonMode,sa) 
    5858 
    59             // compare each paramter in turn against the rhs. 
     59            // compare each parameter in turn against the rhs. 
    6060            COMPARE_StateAttribute_Parameter(_modeFront) 
    6161            COMPARE_StateAttribute_Parameter(_modeBack) 

  • OpenSceneGraph/trunk/include/osg/PolygonOffset

    r6311 r7648  
    4343            COMPARE_StateAttribute_Types(PolygonOffset,sa) 
    4444 
    45             // compare each paramter in turn against the rhs. 
     45            // compare each parameter in turn against the rhs. 
    4646            COMPARE_StateAttribute_Parameter(_factor) 
    4747            COMPARE_StateAttribute_Parameter(_units) 
    … …  
    7575        static bool areFactorAndUnitsMultipliersSet(); 
    7676         
    77         /** Checks with the OpenGL driver to try and pick multiplier approrpriate for the hardware. 
     77        /** Checks with the OpenGL driver to try and pick multiplier appropriate for the hardware. 
    7878            note, requires a valid graphics context to be current. */ 
    7979        static void setFactorAndUnitsMultipliersUsingBestGuessForDriver(); 

  • OpenSceneGraph/trunk/include/osg/Polytope

    r7596 r7648  
    7070        } 
    7171 
    72         /** Create a Polytope which is a equivilant to BoundingBox.*/ 
     72        /** Create a Polytope which is a equivalent to BoundingBox.*/ 
    7373        void setToBoundingBox(const BoundingBox& bb) 
    7474        { 

  • OpenSceneGraph/trunk/include/osg/PrimitiveSet

    r7601 r7648  
    276276 
    277277        /** If State is non-zero, this function releases OpenGL objects for 
    278           * the specified graphics context. Otherwise, releases OpenGL objexts 
     278          * the specified graphics context. Otherwise, releases OpenGL objects 
    279279          * for all graphics contexts. */ 
    280280        virtual void releaseGLObjects(State* /*state*/=0) const {} 
    … …  
    486486 
    487487        /** If State is non-zero, this function releases OpenGL objects for 
    488           * the specified graphics context. Otherwise, releases OpenGL objexts 
     488          * the specified graphics context. Otherwise, releases OpenGL objects 
    489489          * for all graphics contexts. */ 
    490490        virtual void releaseGLObjects(State* state=0) const 

  • OpenSceneGraph/trunk/include/osg/ProxyNode

    r5328 r7648  
    7272 
    7373        /** Set the object-space reference radius of the volume enclosed by the ProxyNode.  
    74           * Used to detmine the bounding sphere of the ProxyNode in the absense of any children.*/ 
     74          * Used to determine the bounding sphere of the ProxyNode in the absence of any children.*/ 
    7575        inline void setRadius(float radius) { _radius = radius; } 
    7676         

  • OpenSceneGraph/trunk/include/osg/Referenced

    r7332 r7648  
    7777            not delete it, even if ref count goes to 0.  Warning, unref_nodelete()  
    7878            should only be called if the user knows exactly who will 
    79             be resonsible for, one should prefer unref() over unref_nodelete()  
     79            be responsible for, one should prefer unref() over unref_nodelete()  
    8080            as the later can lead to memory leaks.*/ 
    8181        void unref_nodelete() const; 
    … …  
    8484        inline int referenceCount() const { return _refCount; } 
    8585 
    86         /** Add a Observer that is observering this object, notify the Observer when this object gets deleted.*/ 
     86        /** Add a Observer that is observing this object, notify the Observer when this object gets deleted.*/ 
    8787        void addObserver(Observer* observer); 
    8888 
    89         /** Add a Observer that is observering this object, notify the Observer when this object gets deleted.*/ 
     89        /** Add a Observer that is observing this object, notify the Observer when this object gets deleted.*/ 
    9090        void removeObserver(Observer* observer); 
    9191 

  • OpenSceneGraph/trunk/include/osg/Sequence

    r6633 r7648  
    3838        // the relationship between the _frameTime vector and the _children 
    3939        // vector is a bit of a mess.  This is how it was in previous versions, 
    40         // and there's no way out of it if upward compatability needs to be 
     40        // and there's no way out of it if upward compatibility needs to be 
    4141        // maintained.  New code should set defaultTime and use addChild, and 
    4242        // not mess with the setTime method 

  • OpenSceneGraph/trunk/include/osg/Shader

    r5882 r7648  
    104104 
    105105        /** Mark internal glShader for deletion. 
    106           * Deletion requests are queued tuntil they can be executed 
     106          * Deletion requests are queued until they can be executed 
    107107          * in the proper GL context. */ 
    108108        static void deleteGlShader(unsigned int contextID, GLuint shader); 

  • OpenSceneGraph/trunk/include/osg/ShadowVolumeOccluder

    r5328 r7648  
    2323class CullStack; 
    2424 
    25 /** ShadowVolumeOccluder is a helper class for implementating shadow occlusion culling. */ 
     25/** ShadowVolumeOccluder is a helper class for implementing shadow occlusion culling. */ 
    2626class OSG_EXPORT ShadowVolumeOccluder 
    2727{ 

  • OpenSceneGraph/trunk/include/osg/ShapeDrawable

    r6422 r7648  
    174174        virtual bool supports(const Drawable::ConstAttributeFunctor&) const { return true; } 
    175175 
    176         /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has.*/ 
     176        /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the internal attributes that this Drawable has.*/ 
    177177        virtual void accept(Drawable::ConstAttributeFunctor& af) const; 
    178178 

  • OpenSceneGraph/trunk/include/osg/State

    r7178 r7648  
    7070 
    7171/** Encapsulates the current applied OpenGL modes, attributes and vertex arrays settings, 
    72   * implements lazy state updating and provides accessors for querrying the current state. 
    73   . The venerable Red Book says that "OpenGL is a state machine", and this class 
     72  * implements lazy state updating and provides accessors for querying the current state. 
     73  * The venerable Red Book says that "OpenGL is a state machine", and this class 
    7474  * represents the OpenGL state in OSG. Furthermore, \c State also has other 
    7575  * important features: 
    … …  
    8080  *   state change and that particular state is already in the requested state, 
    8181  *   no OpenGL call will be made. This ensures that the OpenGL pipeline is not 
    82   *   stalled by unncessary state changes. 
     82  *   stalled by unnecessary state changes. 
    8383  * - It allows to query the current OpenGL state without calls to \c glGet*(), 
    8484  *   which typically stall the graphics pipeline (see, for instance, 
    … …  
    378378        /** texture Attribute has been applied externally, 
    379379          * and therefore this attribute type has been dirtied 
    380           * and will need to be re-appplied on next osg::State.apply(..). 
     380          * and will need to be re-applied on next osg::State.apply(..). 
    381381          * note, if you have an osg::StateAttribute which you have applied externally 
    382382          * then use the have_applied(attribute) method as this will the osg::State to 
    … …  
    882882 
    883883        /** Set the current texture unit, return true if selected, 
    884           * false if selection failed such as when multitexturing is not supported. 
     884          * false if selection failed such as when multi texturing is not supported. 
    885885          * note, only updates values that change.*/ 
    886886        bool setActiveTextureUnit( unsigned int unit ); 
    … …  
    890890 
    891891        /** Set the current tex coord array texture unit, return true if selected, 
    892           * false if selection failed such as when multitexturing is not supported. 
     892          * false if selection failed such as when multi texturing is not supported. 
    893893          * note, only updates values that change.*/ 
    894894        bool setClientActiveTextureUnit( unsigned int unit ); 

  • OpenSceneGraph/trunk/include/osg/StateAttribute

    r7263 r7648  
    8787        /** list values which can be used to set either GLModeValues or OverrideValues. 
    8888          * When using in conjunction with GLModeValues, all Values have meaning.  
    89           * When using in conjection with StateAttribute OverrideValue only  
     89          * When using in conjunction with StateAttribute OverrideValue only  
    9090          * OFF,OVERRIDE and INHERIT are meaningful. 
    9191          * However, they are useful when using GLModeValue  
    … …  
    320320 
    321321        /** Release OpenGL objects in specified graphics context if State 
    322             object is passed, otherwise release OpenGL objexts for all graphics context if 
     322            object is passed, otherwise release OpenGL objects for all graphics context if 
    323323            State object pointer NULL.*/ 
    324324        virtual void releaseGLObjects(State* =0) const {} 

  • OpenSceneGraph/trunk/include/osg/StateSet

    r6180 r7648  
    3737class NodeVisitor; 
    3838 
    39 /** Stores a set of modes and attributes which respresent a set of OpenGL state. 
     39/** Stores a set of modes and attributes which represent a set of OpenGL state. 
    4040  *  Notice that a \c StateSet contains just a subset of the whole OpenGL state. 
    4141  * <p>In OSG, each \c Drawable and each \c Node has a reference to a 
    … …  
    9393 
    9494 
    95         /** Compute the DataVariance based on an assestment of callback etc.*/ 
     95        /** Compute the DataVariance based on an assessment of callback etc.*/ 
    9696        virtual void computeDataVariance(); 
    9797 

  • OpenSceneGraph/trunk/include/osg/StencilTwoSided

    r7038 r7648  
    166166         
    167167        /** Function to call to get the extension of a specified context. 
    168           * If the Exentsion object for that context has not yet been created 
     168          * If the Extension object for that context has not yet been created 
    169169          * and the 'createIfNotInitalized' flag been set to false then returns NULL. 
    170170          * If 'createIfNotInitalized' is true then the Extensions object is 

  • OpenSceneGraph/trunk/include/osg/TemplatePrimitiveFunctor

    r7601 r7648  
    276276         * begin(..),vertex(..) & end() are convenience methods for adapting 
    277277         * non vertex array primitives to vertex array based primitives. 
    278          * This is done to simplify the implementation of primtive functor 
     278         * This is done to simplify the implementation of primitive functor 
    279279         * subclasses - users only need override drawArray and drawElements. 
    280280         */ 

  • OpenSceneGraph/trunk/include/osg/TexEnvFilter

    r5328 r7648  
    4848        COMPARE_StateAttribute_Types(TexEnvFilter, sa) 
    4949 
    50         // compare each paramter in turn against the rhs. 
     50        // compare each parameter in turn against the rhs. 
    5151        COMPARE_StateAttribute_Parameter(_lodBias) 
    5252 

  • OpenSceneGraph/trunk/include/osg/TexGen

    r6311 r7648  
    7171            usage.usesTextureMode(GL_TEXTURE_GEN_T); 
    7272 
    73             // Not happy with turning all tex gen paramters on 
     73            // Not happy with turning all tex gen parameters on 
    7474            // as the OSG currently only supports 2D textures and therefore 
    7575            // only S and T will be required, R&Q would be redundant... 
    … …  
    122122        Mode _mode; 
    123123 
    124         /** Additional texgen coefficents for GL_OBJECT_PLANE or 
     124        /** Additional texgen coefficients for GL_OBJECT_PLANE or 
    125125          * GL_EYE_PLANE, */ 
    126126        Plane _plane_s, _plane_t, _plane_r, _plane_q; 

  • OpenSceneGraph/trunk/include/osg/Texture

    r7567 r7648  
    356356        /** Sets the maximum anisotropy value, default value is 1.0 for no 
    357357          * anisotropic filtering. If hardware does not support anisotropic 
    358           * filtering, use normal filtering (equivilant to a max anisotropy 
     358          * filtering, use normal filtering (equivalent to a max anisotropy 
    359359          * value of 1.0. Valid range is 1.0f upwards.  The maximum value 
    360360          * depends on the graphics system. */ 
    … …  
    372372 
    373373        /** Sets whether or not the apply() function will unreference the image 
    374           * data. If enabled, and the image data is only referened by this 
     374          * data. If enabled, and the image data is only referenced by this 
    375375          * Texture, apply() will delete the image data. */ 
    376376        inline void setUnRefImageDataAfterApply(bool flag) { _unrefImageDataAfterApply = flag; } 
    … …  
    496496          * If glGenerateMipmapEXT is not supported or texture's internal format is not supported 
    497497          * by the glGenerateMipmapEXT, then empty mipmap levels will 
    498           * be allocated manualy. The mipmap levels are also allocated if a non-mipmapped 
     498          * be allocated manually. The mipmap levels are also allocated if a non-mipmapped 
    499499          * min filter is used. */ 
    500500        void allocateMipmapLevels(); 
    … …  
    543543 
    544544 
    545         /** Set the PBuffer graphis context to read from when using PBuffers for RenderToTexture.*/ 
     545        /** Set the PBuffer graphics context to read from when using PBuffers for RenderToTexture.*/ 
    546546        void setReadPBuffer(GraphicsContext* context) { _readPBuffer = context; } 
    547547 
    548         /** Get the PBuffer graphis context to read from when using PBuffers for RenderToTexture.*/ 
     548        /** Get the PBuffer graphics context to read from when using PBuffers for RenderToTexture.*/ 
    549549        GraphicsContext* getReadPBuffer() { return _readPBuffer.get(); } 
    550550 
    551         /** Get the const PBuffer graphis context to read from when using PBuffers for RenderToTexture.*/ 
     551        /** Get the const PBuffer graphics context to read from when using PBuffers for RenderToTexture.*/ 
    552552        const GraphicsContext* getReadPBuffer() const { return _readPBuffer.get(); } 
    553553 
    554         /** Texture is a pure virtual base class, apply must be overriden. */ 
     554        /** Texture is a pure virtual base class, apply must be overridden. */ 
    555555        virtual void apply(State& state) const = 0; 
    556556 
    … …  
    562562 
    563563        /** If State is non-zero, this function releases OpenGL objects for 
    564           * the specified graphics context. Otherwise, releases OpenGL objexts 
     564          * the specified graphics context. Otherwise, releases OpenGL objects 
    565565          * for all graphics contexts. */ 
    566566        virtual void releaseGLObjects(State* state=0) const; 
    567567 
    568568        /** Encapsulates queries of extension availability, obtains extension 
    569           * function pointers, and provides convinience wrappers for 
     569          * function pointers, and provides convenience wrappers for 
    570570          * calling extension functions. */         
    571571        class OSG_EXPORT Extensions : public osg::Referenced 
    … …  
    682682        /** Overrides Extensions objects across graphics contexts. Typically 
    683683          * used to ensure the same lowest common denominator of extensions 
    684           * on sustems with different graphics pipes. */ 
     684          * on systems with different graphics pipes. */ 
    685685        static void setExtensions(unsigned int contextID,Extensions* extensions); 
    686686 
    … …  
    717717        void computeInternalFormatType() const; 
    718718 
    719         /** Helper method. Sets texture paramters. */ 
     719        /** Helper method. Sets texture parameters. */ 
    720720        void applyTexParameters(GLenum target, State& state) const; 
    721721 

  • OpenSceneGraph/trunk/include/osg/Texture1D

    r7385 r7648  
    9595 
    9696        /** Helper function. Sets the number of mipmap levels created for this 
    97           * texture. Should only be called within an osg::Texuture::apply(), or 
     97          * texture. Should only be called within an osg::Texture::apply(), or 
    9898          * during a custom OpenGL texture load. */ 
    9999        void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; } 
    … …  
    127127        void allocateMipmap(State& state) const; 
    128128 
    129         /** Helper method. Createa the texture without setting or using a 
     129        /** Helper method. Create the texture without setting or using a 
    130130          * texture binding. */ 
    131131        void applyTexImage1D(GLenum target, Image* image, State& state, GLsizei& width, GLsizei& numMipmapLevels) const; 

  • OpenSceneGraph/trunk/include/osg/Texture2D

    r7385 r7648  
    100100 
    101101        /** Helper function. Sets the number of mipmap levels created for this 
    102           * texture. Should only be called within an osg::Texuture::apply(), or 
     102          * texture. Should only be called within an osg::Texture::apply(), or 
    103103          * during a custom OpenGL texture load. */ 
    104104        void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; } 

  • OpenSceneGraph/trunk/include/osg/Texture2DArray

    r7408 r7648  
    6767 
    6868        /** Set the texture width and height. If width or height are zero then 
    69           * the repsective size value is calculated from the source image sizes. 
     69          * the respective size value is calculated from the source image sizes. 
    7070          * Depth parameter specifies the number of layers to be used. 
    7171        */ 
    … …  
    9797 
    9898        /** Set the number of mip map levels the the texture has been created with. 
    99           * Should only be called within an osg::Texuture::apply() and custom OpenGL texture load. 
     99          * Should only be called within an osg::Texture::apply() and custom OpenGL texture load. 
    100100        */ 
    101101        void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; } 
    … …  
    120120 
    121121        /** Extensions class which encapsulates the querying of extensions and 
    122           * associated function pointers, and provides convinience wrappers to  
     122          * associated function pointers, and provides convenience wrappers to  
    123123          * check for the extensions or use the associated functions. 
    124124        */ 
    … …  
    183183         
    184184        /** Function to call to get the extension of a specified context. 
    185           * If the Exentsion object for that context has not yet been created 
     185          * If the Extension object for that context has not yet been created 
    186186          * and the 'createIfNotInitalized' flag been set to false then returns NULL. 
    187187          * If 'createIfNotInitalized' is true then the Extensions object is  

  • OpenSceneGraph/trunk/include/osg/Texture3D

    r7385 r7648  
    109109 
    110110        /** Helper function. Sets the number of mipmap levels created for this 
    111           * texture. Should only be called within an osg::Texuture::apply(), or 
     111          * texture. Should only be called within an osg::Texture::apply(), or 
    112112          * during a custom OpenGL texture load. */ 
    113113        void setNumMipmapLevels(unsigned int num) const { _numMipmapLevels=num; } 
    … …  
    133133 
    134134        /** Encapsulates queries of extension availability, obtains extension 
    135           * function pointers, and provides convinience wrappers for 
     135          * function pointers, and provides convenience wrappers for 
    136136          * calling extension functions. */         
    137137        class OSG_EXPORT Extensions : public osg::Referenced 
    … …  
    193193         
    194194        /** Encapsulates queries of extension availability, obtains extension 
    195           * function pointers, and provides convinience wrappers for 
     195          * function pointers, and provides convenience wrappers for 
    196196          * calling extension functions. */         
    197197        static Extensions* getExtensions(unsigned int contextID,bool createIfNotInitalized); 
    … …  
    199199        /** Overrides Extensions objects across graphics contexts. Typically 
    200200          * used to ensure the same lowest common denominator of extensions 
    201           * on sustems with different graphics pipes. */ 
     201          * on systems with different graphics pipes. */ 
    202202        static void setExtensions(unsigned int contextID,Extensions* extensions); 
    203203 

  • OpenSceneGraph/trunk/include/osg/TextureRectangle

    r7385 r7648  
    7777 
    7878        /** Set the texture width and height. If width or height are zero then 
    79           * the repsective size value is calculated from the source image sizes. 
     79          * the respective size value is calculated from the source image sizes. 
    8080        */ 
    8181        inline void setTextureSize(int width, int height) const 

  • OpenSceneGraph/trunk/include/osg/Timer

    r5848 r7648  
    6868        inline double delta_n( Timer_t t1, Timer_t t2 ) const { return delta_s(t1,t2)*1e9; } 
    6969         
    70         /** Get the the numer of ticks per second.*/ 
     70        /** Get the the number of ticks per second.*/ 
    7171        inline double getSecondsPerTick() const { return _secsPerTick; } 
    7272 

  • OpenSceneGraph/trunk/include/osg/Transform

    r6109 r7648  
    3838/** Compute the matrix which transforms objects in local coords to eye coords, 
    3939  * by accumulating the Transform local to world matrices along the specified node path  
    40   * and multipling by the supplied initial camera modelview. 
     40  * and multiplying by the supplied initial camera modelview. 
    4141*/ 
    4242extern OSG_EXPORT Matrix computeLocalToEye(const Matrix& modelview, const NodePath& nodePath, bool ignoreCameras = true); 
    … …  
    4444/** Compute the matrix which transforms objects in eye coords to local coords, 
    4545  * by accumulating the Transform world to local matrices along the specified node path 
    46   * and multipling by the inverse of the supplied initialial camera modelview. 
     46  * and multiplying by the inverse of the supplied initial camera modelview. 
    4747*/ 
    4848extern OSG_EXPORT Matrix computeEyeToLocal(const Matrix& modelview, const NodePath& nodePath, bool ignoreCameras = true); 
    … …  
    101101          * also set the CullingActive flag on the transform, and hence all 
    102102          * of its parents, to false, thereby disabling culling of it and 
    103           * all its parents.  This is neccessary to prevent inappropriate 
     103          * all its parents.  This is necessary to prevent inappropriate 
    104104          * culling, but may impact cull times if the absolute transform is 
    105105          * deep in the scene graph.  It is therefore recommended to only use 
    … …  
    111111          * Render to texture Cameras that wish to use the main views LOD range computation  
    112112          * (which uses the viewpoint rather than the eye point) rather than use the local 
    113           * eye point defined by the this Transforms' abosolute view matrix. 
     113          * eye point defined by the this Transforms' absolute view matrix. 
    114114        */ 
    115115        void setReferenceFrame(ReferenceFrame rf); 

  • OpenSceneGraph/trunk/include/osg/TriangleFunctor

    r7601 r7648  
    356356      * begin(..),vertex(..) & end() are convenience methods for adapting 
    357357      * non vertex array primitives to vertex array based primitives. 
    358       * This is done to simplify the implementation of primtive functor 
     358      * This is done to simplify the implementation of primitive functor 
    359359      * subclasses - users only need override drawArray and drawElements. 
    360360    */ 

  • OpenSceneGraph/trunk/include/osg/Uniform

    r7371 r7648  
    379379 
    380380        /** Increment the modified count on the Uniform so Programs watching it know it update themselves. 
    381           * NOTE: autotomatically called during osg::Uniform::set*(); 
     381          * NOTE: automatically called during osg::Uniform::set*(); 
    382382          * you must call if modifying the internal data array directly. */ 
    383383        inline void dirty() { ++_modifiedCount; } 

  • OpenSceneGraph/trunk/include/osg/Vec2b

    r5328 r7648  
    3535        enum { num_components = 2 }; 
    3636         
    37         /** Vec member varaible. */ 
     37        /** Vec member variable. */ 
    3838        value_type _v[2]; 
    3939 

  • OpenSceneGraph/trunk/include/osg/Vec2d

    r5328 r7648  
    3636        enum { num_components = 2 }; 
    3737         
    38         /** Vec member varaible. */ 
    3938        value_type _v[2]; 
    4039 

  • OpenSceneGraph/trunk/include/osg/Vec2s

    r5328 r7648  
    2727        enum { num_components = 2 }; 
    2828         
    29         /** Vec member varaible. */ 
    3029        value_type _v[2]; 
    3130 

  • OpenSceneGraph/trunk/include/osg/Vec3b

    r5328 r7648  
    3333        enum { num_components = 3 }; 
    3434         
    35         /** Vec member varaible. */ 
    3635        value_type _v[3]; 
    3736 

  • OpenSceneGraph/trunk/include/osg/Vec3d

    r5328 r7648  
    3737        enum { num_components = 3 }; 
    3838         
    39         /** Vec member varaible. */ 
    4039        value_type _v[3]; 
    4140 

  • OpenSceneGraph/trunk/include/osg/Vec3f

    r5328 r7648  
    3636        enum { num_components = 3 }; 
    3737         
    38         /** Vec member varaible. */ 
    3938        value_type _v[3]; 
    4039 

  • OpenSceneGraph/trunk/include/osg/Vec3s

    r5328 r7648  
    2727        enum { num_components = 3 }; 
    2828         
    29         /** Vec member varaible. */ 
    3029        value_type _v[3]; 
    3130 

  • OpenSceneGraph/trunk/include/osg/Vec4b

    r5328 r7648  
    3333        enum { num_components = 4 }; 
    3434         
    35         /** Vec member varaible. */ 
    3635        value_type _v[4]; 
    3736 

  • OpenSceneGraph/trunk/include/osg/Vec4d

    r5328 r7648  
    3636        enum { num_components = 4 }; 
    3737         
    38         /** Vec member varaible. */ 
    3938        value_type _v[4]; 
    4039 

  • OpenSceneGraph/trunk/include/osg/Vec4f

    r5328 r7648  
    3535        enum { num_components = 4 }; 
    3636         
    37         /** Vec member varaible. */ 
     37        /** Vec member variable. */ 
    3838        value_type _v[4]; 
    3939 

  • OpenSceneGraph/trunk/include/osg/Vec4s

    r5328 r7648  
    2727        enum { num_components = 4 }; 
    2828         
    29         /** Vec member varaible. */ 
     29        /** Vec member variable. */ 
    3030        value_type _v[4]; 
    3131 

  • OpenSceneGraph/trunk/include/osg/Vec4ub

    r5328 r7648  
    3535        enum { num_components = 4 }; 
    3636         
    37         /** Vec member varaible. */ 
     37        /** Vec member variable. */ 
    3838        value_type _v[4]; 
    3939 

  • OpenSceneGraph/trunk/include/osg/VertexProgram

    r7038 r7648  
    131131            COMPARE_StateAttribute_Types(VertexProgram,sa) 
    132132 
    133             // compare each paramter in turn against the rhs. 
     133            // compare each parameter in turn against the rhs. 
    134134            COMPARE_StateAttribute_Parameter(_vertexProgram) 
    135135 
    … …  
    226226 
    227227        /** Release any OpenGL objects in specified graphics context if State 
    228           * object is passed, otherwise release OpenGL objexts for all graphics contexts if 
     228          * object is passed, otherwise release OpenGL objects for all graphics contexts if 
    229229          * State object pointer is NULL. 
    230230        */ 
    … …  
    270270         
    271271        /** Function to call to get the extension of a specified context. 
    272           * If the Exentsion object for that context has not yet been created 
     272          * If the Extension object for that context has not yet been created 
    273273          * and the 'createIfNotInitalized' flag been set to false then returns NULL. 
    274274          * If 'createIfNotInitalized' is true then the Extensions object is 

  • OpenSceneGraph/trunk/include/osg/Viewport

    r5863 r7648  
    5656            COMPARE_StateAttribute_Types(Viewport,sa) 
    5757 
    58             // compare each paramter in turn against the rhs. 
     58            // compare each parameter in turn against the rhs. 
    5959            COMPARE_StateAttribute_Parameter(_x) 
    6060            COMPARE_StateAttribute_Parameter(_y) 
    … …  
    105105 
    106106        /** Return the aspectRatio of the viewport, which is equal to width/height. 
    107           * If height is zero, the potental division by zero is avoided by simply returning 1.0f. 
     107          * If height is zero, the potential division by zero is avoided by simply returning 1.0f. 
    108108        */ 
    109109        inline double aspectRatio() const { if (_height!=0) return (double)_width/(double)_height; else return 1.0; } 

  • OpenSceneGraph/trunk/include/osg/io_utils

    r5328 r7648  
    230230 
    231231////////////////////////////////////////////////////////////////////////// 
    232 // Matrxf steaming operators. 
     232// Matrixf steaming operators. 
    233233inline std::ostream& operator<< (std::ostream& os, const Matrixf& m ) 
    234234{ 
    … …  
    246246 
    247247////////////////////////////////////////////////////////////////////////// 
    248 // Matrxd steaming operators. 
     248// Matrixd steaming operators. 
    249249inline std::ostream& operator<< (std::ostream& os, const Matrixd& m ) 
    250250{ 

  • OpenSceneGraph/trunk/include/osgDB/DatabasePager

    r7612 r7648  
    3737 
    3838/** Database paging class which manages the loading of files in a background thread,  
    39   * and syncronizing of loaded models with the main scene graph.*/ 
     39  * and synchronizing of loaded models with the main scene graph.*/ 
    4040class OSGDB_EXPORT DatabasePager : public osg::NodeVisitor::DatabaseRequestHandler, public OpenThreads::Thread 
    4141{ 
    … …  
    207207        } 
    208208         
    209         /** Turn the compilation of rendering objects for specfied graphics context on (true) or off(false). */ 
     209        /** Turn the compilation of rendering objects for specified graphics context on (true) or off(false). */ 
    210210        void setCompileGLObjectsForContextID(unsigned int contextID, bool on); 
    211211         
    212         /** Get whether the compilation of rendering objects for specfied graphics context on (true) or off(false). */ 
     212        /** Get whether the compilation of rendering objects for specified graphics context on (true) or off(false). */ 
    213213        bool getCompileGLObjectsForContextID(unsigned int contextID); 
    214214 
    215         /** Rerturn true if an external draw thread should call compileGLObjects(..) or not.*/ 
     215        /** Return true if an external draw thread should call compileGLObjects(..) or not.*/ 
    216216        bool requiresExternalCompileGLObjects(unsigned int contextID) const; 
    217217 

  • OpenSceneGraph/trunk/include/osgDB/Export

    r5328 r7648  
    4343 
    4444The osgDB library provides support for reading and writing scene graphs, providing a plugin framework and file utility classes.   
    45 The plugin framework in centred around the osgDB::Registry, and allows plugins which provide specific file format support to be dynamically loaded on demand. 
     45The plugin framework in centered around the osgDB::Registry, and allows plugins which provide specific file format support to be dynamically loaded on demand. 
    4646*/ 
    4747 

  • OpenSceneGraph/trunk/include/osgDB/FileUtils

    r5328 r7648  
    4444     
    4545 
    46 /** return true if a file exisits. */ 
     46/** return true if a file exists. */ 
    4747extern OSGDB_EXPORT bool fileExists(const std::string& filename); 
    4848 
    … …  
    5656  * return "" if directory does not contain file.  If caseInsensitive is set to true then 
    5757  * a case insensitive comparison is used to compare fileName to directory contents. 
    58   * This is useful when unix programs attempt read case insentive windows filenames. 
     58  * This is useful when unix programs attempt read case insensitive windows filenames. 
    5959  */ 
    6060extern OSGDB_EXPORT std::string findFileInDirectory(const std::string& fileName,const std::string& dirName,CaseSensitivity caseSensitivity=CASE_SENSITIVE); 
    … …  
    9393extern OSGDB_EXPORT std::string findLibraryFile(const std::string& filename,CaseSensitivity caseSensitivity=CASE_SENSITIVE); 
    9494 
    95 /** convert a string containing a list of paths  deliminated either with ';' (Windows) or ':' (All other platforms) into FilePath represetation.*/ 
     95/** convert a string containing a list of paths  delimited either with ';' (Windows) or ':' (All other platforms) into FilePath representation.*/ 
    9696extern OSGDB_EXPORT void convertStringPathIntoFilePathList(const std::string& paths,FilePathList& filepath); 
    9797 

  • OpenSceneGraph/trunk/include/osgDB/Registry

    r7518 r7648  
    8787 
    8888        /** Reads a file that configures extension mappings. File is ASCII text 
    89           * and each line contains the parameyters to the addFileExtensionAlias 
     89          * and each line contains the parameters to the addFileExtensionAlias 
    9090          * method. Lines can be commented out with an initial '#' character.*/ 
    9191        bool readPluginAliasConfigurationFile( const std::string& file ); 
    … …  
    289289 
    290290 
    291         /** initilize both the Data and Library FilePaths, by default called by the  
     291        /** initialize both the Data and Library FilePaths, by default called by the  
    292292          * constructor, so it should only be required if you want to force 
    293293          * the re-reading of environmental variables.*/ 
    294294        void initFilePathLists() { initDataFilePathList(); initLibraryFilePathList(); } 
    295295         
    296         /** initilize the Data FilePath by reading the OSG_FILE_PATH environmental variable.*/ 
     296        /** initialize the Data FilePath by reading the OSG_FILE_PATH environmental variable.*/ 
    297297        void initDataFilePathList(); 
    298298 
    … …  
    300300        void setDataFilePathList(const FilePathList& filepath) { _dataFilePath = filepath; } 
    301301 
    302         /** Set the data file path using a single string deliminated either with ';' (Windows) or ':' (All other platforms), which is used when search for data files.*/ 
     302        /** Set the data file path using a single string delimited either with ';' (Windows) or ':' (All other platforms), which is used when search for data files.*/ 
    303303        void setDataFilePathList(const std::string& paths); 
    304304 
    … …  
    309309        const FilePathList& getDataFilePathList() const { return _dataFilePath; } 
    310310 
    311         /** initilize the Library FilePath by reading the OSG_LIBRARY_PATH  
     311        /** initialize the Library FilePath by reading the OSG_LIBRARY_PATH  
    312312          * and the appropriate system environmental variables*/ 
    313313        void initLibraryFilePathList(); 
    … …  
    316316        void setLibraryFilePathList(const FilePathList& filepath) { _libraryFilePath = filepath; } 
    317317 
    318         /** Set the library file path using a single string deliminated either with ';' (Windows) or ':' (All other platforms), which is used when search for data files.*/ 
     318        /** Set the library file path using a single string delimited either with ';' (Windows) or ':' (All other platforms), which is used when search for data files.*/ 
    319319        void setLibraryFilePathList(const std::string& paths); 
    320320 
    … …  
    330330          * This would typically be called once per frame by applications which are doing database paging, 
    331331          * and need to prune objects that are no longer required. 
    332           * Time value is time in sceonds.*/ 
     332          * Time value is time in seconds.*/ 
    333333        void updateTimeStampOfObjectsInCacheWithExternalReferences(double currentTime); 
    334334 
    … …  
    339339          * Note, the currentTime is not the expiryTime, one would typically set the expiry time 
    340340          * to a fixed amount of time before currentTime, such as expiryTime = currentTime-10.0. 
    341           * Time value is time in sceonds.*/ 
     341          * Time value is time in seconds.*/ 
    342342        void removeExpiredObjectsInCache(double expiryTime); 
    343343         
    … …  
    345345        void clearObjectCache(); 
    346346 
    347         /** Add a filename,object,timestamp tripple to the Registry::ObjectCache.*/ 
     347        /** Add a filename,object,timestamp triple to the Registry::ObjectCache.*/ 
    348348        void addEntryToObjectCache(const std::string& filename, osg::Object* object, double timestamp = 0.0); 
    349349 
    … …  
    461461 
    462462 
    463         // forward declar helper class 
     463        // forward declare helper class 
    464464        class AvailableReaderWriterIterator; 
    465465        friend class AvailableReaderWriterIterator; 

  • OpenSceneGraph/trunk/include/osgDB/SharedStateManager

    r5328 r7648  
    6969        StateSetSet _sharedStateSetList; 
    7070 
    71         // Temporary lists just to avoid unnecesary find calls 
     71        // Temporary lists just to avoid unnecessary find calls 
    7272        typedef std::pair<osg::StateAttribute*, bool> TextureSharePair; 
    7373        typedef std::map<osg::StateAttribute*, TextureSharePair> TextureTextureSharePairMap; 

  • OpenSceneGraph/trunk/include/osgGA/AnimationPathManipulator

    r7101 r7648  
    2828// time  px py pz ax ay az aw 
    2929// where: 
    30 //    time = elapsed time in seconds from the begining of the animation 
    31 //    px py pz = World position in catesian coordinates 
     30//    time = elapsed time in seconds from the beginning of the animation 
     31//    px py pz = World position in cartesian coordinates 
    3232//    ax ay az aw = Orientation (attitude) defined as a quaternion 
    3333 

  • OpenSceneGraph/trunk/include/osgGA/EventQueue

    r7114 r7648  
    175175 
    176176 
    177         /** convinience method for create an event ready to fill in.  Clones the getCurrentEventState() to produce a up to date event state. */ 
     177        /** convenience method for create an event ready to fill in.  Clones the getCurrentEventState() to produce a up to date event state. */ 
    178178        GUIEventAdapter* createEvent(); 
    179179         

  • OpenSceneGraph/trunk/include/osgGA/GUIActionAdapter

    r7561 r7648  
    2222/** 
    2323Abstract base class defining the interface by which GUIEventHandlers may request 
    24 actions of the GUI system in use. These requests for actions should then be honoured 
     24actions of the GUI system in use. These requests for actions should then be honored 
    2525by the GUI toolkit of the user's application. 
    2626 
    … …  
    5858        virtual ~GUIActionAdapter() {} 
    5959         
    60         /** Provide a mechanism for getting the osg::View assocaited with this GUIActionAdapter. 
     60        /** Provide a mechanism for getting the osg::View associated with this GUIActionAdapter. 
    6161          * One would use this to case view to osgViewer::View(er) if supported by the subclass.*/ 
    6262        virtual osg::View* asView() { return 0; } 

  • OpenSceneGraph/trunk/include/osgGA/GUIEventAdapter

    r7420 r7648  
    143143             
    144144            /* 
    145              * Auxilliary Functions; note the duplicate definitions for left and right 
     145             * Auxiliary Functions; note the duplicate definitions for left and right 
    146146             * function keys;  Sun keyboards and a few other manufactures have such 
    147147             * function key groups on the left and/or right sides of the keyboard. 
    … …  
    323323        float getXmax() const { return _Xmax; } 
    324324 
    325         /** get mmouse minimum y. */ 
     325        /** get mouse minimum y. */ 
    326326        float getYmin() const { return _Ymin; } 
    327327 
    … …  
    378378 
    379379 
    380         /** return the getX() value normalised to the range of -1 to 1. 
     380        /** return the getX() value normalized to the range of -1 to 1. 
    381381          * -1 would be the left hand side of the window. 
    382382          * 0.0 would be the middle of the window.  
    … …  
    384384        inline float getXnormalized() const { return 2.0f*(getX()-getXmin())/(getXmax()-getXmin())-1.0f; } 
    385385 
    386         /** return the getY() value normalised to the range of -1 to 1. 
     386        /** return the getY() value normalized to the range of -1 to 1. 
    387387          * -1 would be the bottom of the window. 
    388388          * 0.0 would be the middle of the window.  

  • OpenSceneGraph/trunk/include/osgGA/GUIEventHandler

    r7420 r7648  
    6767        virtual bool handle(const GUIEventAdapter& ea,GUIActionAdapter& aa, osg::Object*, osg::NodeVisitor*) { return handle(ea,aa); } 
    6868 
    69         /** Convnience method that only passes on to the handle(,,,) method events that either haven't been 
     69        /** Convenience method that only passes on to the handle(,,,) method events that either haven't been 
    7070          * handled yet, or have been handled but haven't be set to be ignored by the IgnoreHandledEventsMask. 
    7171          * Note, this method is an inline method, and not appropriate for users to override, override the handle(,,,) 
    … …  
    8989        virtual bool handle(const GUIEventAdapter&,GUIActionAdapter&) { return false; } 
    9090         
    91         /** Convnience method that only passes on to the handle(,) method events that either haven't been 
     91        /** Convenience method that only passes on to the handle(,) method events that either haven't been 
    9292          * handled yet, or have been handled but haven't be set to be ignored by the IgnoreHandledEventsMask. 
    9393          * Note, this method is an inline method, and not appropriate for users to override, override the handle(,) 

  • OpenSceneGraph/trunk/include/osgGA/KeySwitchMatrixManipulator

    r6461 r7648  
    101101        virtual osg::Matrixd getInverseMatrix() const { return _current->getInverseMatrix(); } 
    102102 
    103         /** Get the FusionDistanceMode. Used by SceneView for setting up setereo convergence.*/ 
     103        /** Get the FusionDistanceMode. Used by SceneView for setting up stereo convergence.*/ 
    104104        virtual osgUtil::SceneView::FusionDistanceMode getFusionDistanceMode() const { return _current->getFusionDistanceMode(); } 
    105105 
    106         /** Get the FusionDistanceValue. Used by SceneView for setting up setereo convergence.*/ 
     106        /** Get the FusionDistanceValue. Used by SceneView for setting up stereo convergence.*/ 
    107107        virtual float getFusionDistanceValue() const { return _current->getFusionDistanceValue(); } 
    108108 

  • OpenSceneGraph/trunk/include/osgGA/MatrixManipulator

    r5638 r7648  
    4444        virtual const char* className() const { return "MatrixManipulator"; } 
    4545         
    46         /** callback class to use to allow matrix manipulators to querry the application for the local coordinate frame.*/ 
     46        /** callback class to use to allow matrix manipulators to query the application for the local coordinate frame.*/ 
    4747        class CoordinateFrameCallback : public osg::Referenced 
    4848        { 
    … …  
    9595        virtual osg::Matrixd getInverseMatrix() const = 0; 
    9696 
    97         /** Get the FusionDistanceMode. Used by SceneView for setting up setereo convergence.*/ 
     97        /** Get the FusionDistanceMode. Used by SceneView for setting up stereo convergence.*/ 
    9898        virtual osgUtil::SceneView::FusionDistanceMode getFusionDistanceMode() const { return osgUtil::SceneView::PROPORTIONAL_TO_SCREEN_DISTANCE; } 
    9999 
    100         /** Get the FusionDistanceValue. Used by SceneView for setting up setereo convergence.*/ 
     100        /** Get the FusionDistanceValue. Used by SceneView for setting up stereo convergence.*/ 
    101101        virtual float getFusionDistanceValue() const { return 1.0f; } 
    102102 
    … …  
    130130        } 
    131131         
    132         /** Get the mnaully set home position. */ 
     132        /** Get the manually set home position. */ 
    133133        virtual void getHomePosition(osg::Vec3d& eye, osg::Vec3d& center, osg::Vec3d& up) const 
    134134        { 

  • OpenSceneGraph/trunk/include/osgGA/NodeTrackerManipulator

    r7102 r7648  
    4949        { 
    5050            /** Track the center of the node's bounding sphere, but not rotations of the node.   
    51               * For datatbases which have a CoordinateSystemNode, the orientation is kept relative the coordinate frame if the center of the node. 
     51              * For databases which have a CoordinateSystemNode, the orientation is kept relative the coordinate frame if the center of the node. 
    5252              */ 
    5353            NODE_CENTER, 
    5454            /** Track the center of the node's bounding sphere, and the azimuth rotation (about the z axis of the current coordinate frame). 
    55               * For datatbases which have a CoordinateSystemNode, the orientation is kept relative the coordinate frame if the center of the node. 
     55              * For databases which have a CoordinateSystemNode, the orientation is kept relative the coordinate frame if the center of the node. 
    5656              */ 
    5757            NODE_CENTER_AND_AZIM, 
    … …  
    9191        virtual osg::Matrixd getInverseMatrix() const; 
    9292 
    93         /** Get the FusionDistanceMode. Used by SceneView for setting up setereo convergence.*/ 
     93        /** Get the FusionDistanceMode. Used by SceneView for setting up stereo convergence.*/ 
    9494        virtual osgUtil::SceneView::FusionDistanceMode getFusionDistanceMode() const { return osgUtil::SceneView::USE_FUSION_DISTANCE_VALUE; } 
    9595 
    96         /** Get the FusionDistanceValue. Used by SceneView for setting up setereo convergence.*/ 
     96        /** Get the FusionDistanceValue. Used by SceneView for setting up stereo convergence.*/ 
    9797        virtual float getFusionDistanceValue() const { return _distance; } 
    9898 

  • OpenSceneGraph/trunk/include/osgGA/TerrainManipulator

    r6461 r7648  
    5151        virtual osg::Matrixd getInverseMatrix() const; 
    5252 
    53         /** Get the FusionDistanceMode. Used by SceneView for setting up setereo convergence.*/ 
     53        /** Get the FusionDistanceMode. Used by SceneView for setting up stereo convergence.*/ 
    5454        virtual osgUtil::SceneView::FusionDistanceMode getFusionDistanceMode() const { return osgUtil::SceneView::USE_FUSION_DISTANCE_VALUE; } 
    5555 
    56         /** Get the FusionDistanceValue. Used by SceneView for setting up setereo convergence.*/ 
     56        /** Get the FusionDistanceValue. Used by SceneView for setting up stereo convergence.*/ 
    5757        virtual float getFusionDistanceValue() const { return _distance; } 
    5858 

  • OpenSceneGraph/trunk/include/osgGA/TrackballManipulator

    r5328 r7648  
    3939        virtual osg::Matrixd getInverseMatrix() const; 
    4040 
    41         /** Get the FusionDistanceMode. Used by SceneView for setting up setereo convergence.*/ 
     41        /** Get the FusionDistanceMode. Used by SceneView for setting up stereo convergence.*/ 
    4242        virtual osgUtil::SceneView::FusionDistanceMode getFusionDistanceMode() const { return osgUtil::SceneView::USE_FUSION_DISTANCE_VALUE; } 
    4343 
    44         /** Get the FusionDistanceValue. Used by SceneView for setting up setereo convergence.*/ 
     44        /** Get the FusionDistanceValue. Used by SceneView for setting up stereo convergence.*/ 
    4545        virtual float getFusionDistanceValue() const { return _distance; } 
    4646 

  • OpenSceneGraph/trunk/include/osgGA/UFOManipulator

    r5328 r7648  
    7171        virtual void setByMatrix( const osg::Matrixd &matrix ) ; 
    7272 
    73         /** Set the current position with the invers matrix 
     73        /** Set the current position with the inverse matrix 
    7474          \param invmat The inverse of a viewpoint matrix 
    7575          */ 

  • OpenSceneGraph/trunk/include/osgShadow/ShadowTechnique

    r6232 r7648  
    2828class ShadowedScene; 
    2929 
    30 /** ShadowedScene provides a mechansim for decorating a scene that the needs to have shadows cast upon it.*/ 
     30/** ShadowedScene provides a mechanism for decorating a scene that the needs to have shadows cast upon it.*/ 
    3131class OSGSHADOW_EXPORT ShadowTechnique : public osg::Object 
    3232{ 
    … …  
    4343        virtual void init(); 
    4444         
    45         /** run the update traversal of the ShadowedScene and update any loca chached data structures.*/ 
     45        /** run the update traversal of the ShadowedScene and update any local cached data structures.*/ 
    4646        virtual void update(osg::NodeVisitor& nv); 
    4747         
    … …  
    5454        virtual void traverse(osg::NodeVisitor& nv); 
    5555         
    56         /** Dirty so that cached data structurese are updated.*/ 
     56        /** Dirty so that cached data structures are updated.*/ 
    5757        virtual void dirty() { _dirty = true; } 
    5858 

  • OpenSceneGraph/trunk/include/osgSim/ElevationSlice

    r6667 r7648  
    2222namespace osgSim { 
    2323 
    24 /** Helper class for setting up and aquiring height above terrain intersections with terrain.*/ 
     24/** Helper class for setting up and acquiring height above terrain intersections with terrain.*/ 
    2525class OSGSIM_EXPORT ElevationSlice 
    2626{ 
    … …  
    6969 
    7070        /** Set the ReadCallback that does the reading of external PagedLOD models, and caching of loaded subgraphs. 
    71           * Note, if you have mulitple LineOfSight or ElevationSlice objects in use at one time then you should share a single 
     71          * Note, if you have multiple LineOfSight or ElevationSlice objects in use at one time then you should share a single 
    7272          * DatabaseCacheReadCallback between all of them. */ 
    7373        void setDatabaseCacheReadCallback(DatabaseCacheReadCallback* dcrc); 

  • OpenSceneGraph/trunk/include/osgSim/HeightAboveTerrain

    r6665 r7648  
    2222namespace osgSim { 
    2323 
    24 /** Helper class for setting up and aquiring height above terrain intersections with terrain.*/ 
     24/** Helper class for setting up and acquiring height above terrain intersections with terrain.*/ 
    2525class OSGSIM_EXPORT HeightAboveTerrain 
    2626{ 
    … …  
    4747 
    4848        /** Get the intersection height for a single height above terrain test. 
    49           * Note, you must call computeIntersections(..) before you can querry the HeightAboveTerrain.  
     49          * Note, you must call computeIntersections(..) before you can query the HeightAboveTerrain.  
    5050          * If no intersections are found then height returned will be the height above mean sea level. */ 
    5151        double getHeightAboveTerrain(unsigned int i) const  { return _HATList[i]._hat; } 
    … …  
    7373 
    7474        /** Set the ReadCallback that does the reading of external PagedLOD models, and caching of loaded subgraphs. 
    75           * Note, if you have mulitple LineOfSight or HeightAboveTerrain objects in use at one time then you should share a single 
     75          * Note, if you have multiple LineOfSight or HeightAboveTerrain objects in use at one time then you should share a single 
    7676          * DatabaseCacheReadCallback between all of them. */ 
    7777        void setDatabaseCacheReadCallback(DatabaseCacheReadCallback* dcrc); 

  • OpenSceneGraph/trunk/include/osgSim/ImpostorSprite

    r6422 r7648  
    132132        virtual bool supports(const Drawable::AttributeFunctor&) const { return true; } 
    133133 
    134         /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ 
     134        /** Accept an Drawable::AttributeFunctor and call its methods to tell it about the internal attributes that this Drawable has. */ 
    135135        virtual void accept(Drawable::AttributeFunctor& af); 
    136136 
    … …  
    138138        virtual bool supports(const Drawable::ConstAttributeFunctor&) const { return true; } 
    139139 
    140         /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. */ 
     140        /** Accept a Drawable::ConstAttributeFunctor and call its methods to tell it about the internal attributes that this Drawable has. */ 
    141141        virtual void accept(Drawable::ConstAttributeFunctor& af) const; 
    142142 
    … …  
    144144        virtual bool supports(const osg::PrimitiveFunctor&) const { return true; } 
    145145 
    146         /** Accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has. */ 
     146        /** Accept a PrimtiveFunctor and call its methods to tell it about the internal primitives that this Drawable has. */ 
    147147        virtual void accept(osg::PrimitiveFunctor& pf) const; 
    148148 

  • OpenSceneGraph/trunk/include/osgSim/LineOfSight

    r5859 r7648  
    4444}; 
    4545 
    46 /** Helper class for setting up and aquiring line of sight intersections with terrain. 
     46/** Helper class for setting up and acquiring line of sight intersections with terrain. 
    4747  * Supports automatic paging in of PagedLOD tiles. */ 
    4848class OSGSIM_EXPORT LineOfSight 
    … …  
    6161        unsigned int getNumLOS() const { return _LOSList.size(); } 
    6262         
    63         /** Set the start point of signel line of sight test.*/ 
     63        /** Set the start point of single line of sight test.*/ 
    6464        void setStartPoint(unsigned int i, const osg::Vec3d& start) { _LOSList[i]._start = start; } 
    6565 
    … …  
    9090 
    9191        /** Set the ReadCallback that does the reading of external PagedLOD models, and caching of loaded subgraphs. 
    92           * Note, if you have mulitple LineOfSight or HeightAboveTerrain objects in use at one time then you should share a single 
     92          * Note, if you have multiple LineOfSight or HeightAboveTerrain objects in use at one time then you should share a single 
    9393          * DatabaseCacheReadCallback between all of them. */ 
    9494        void setDatabaseCacheReadCallback(DatabaseCacheReadCallback* dcrc); 

  • OpenSceneGraph/trunk/include/osgTerrain/Locator

    r7434 r7648  
    4343            GEOGRAPHIC, 
    4444 
    45             /** PROJECTED coordinate systems are ones projected to a local projected coordindate system i.e. UTMs.*/ 
     45            /** PROJECTED coordinate systems are ones projected to a local projected coordinate system i.e. UTMs.*/ 
    4646            PROJECTED 
    4747        }; 
    4848 
    4949        /** Set the CoordinatesSyetemType. 
    50           * Note, the user must keep the CoordinateSystemString consistent with the type of the CoordindateSystem.*/ 
     50          * Note, the user must keep the CoordinateSystemString consistent with the type of the CoordinateSystem.*/ 
    5151        void setCoordinateSystemType(CoordinateSystemType type) { _coordinateSystemType = type; } 
    5252 

  • OpenSceneGraph/trunk/include/osgTerrain/Terrain

    r7201 r7648  
    2525namespace osgTerrain { 
    2626 
    27 /** Terrain provides a framework for loosly coupling height field data with height rendering algorithms. 
    28   * This allows TerrainTechnique's to be pluged in at runtime.*/ 
     27/** Terrain provides a framework for loosely coupling height field data with height rendering algorithms. 
     28  * This allows TerrainTechnique's to be plugged in at runtime.*/ 
    2929class OSGTERRAIN_EXPORT Terrain : public osg::Group 
    3030{ 

  • OpenSceneGraph/trunk/include/osgTerrain/TerrainTechnique

    r7201 r7648  
    4949        virtual void cleanSceneGraph(); 
    5050 
    51         /** Traverse the terain subgraph.*/ 
     51        /** Traverse the terrain subgraph.*/ 
    5252        virtual void traverse(osg::NodeVisitor& nv); 
    5353 
    54         /** Dirty so that cached data structurese will be updated on next use.*/ 
     54        /** Dirty so that cached data structures will be updated on next use.*/ 
    5555        virtual void dirty(); 
    5656 
    57         /** Return true if cached data structurese need updating.*/ 
     57        /** Return true if cached data structures need updating.*/ 
    5858        virtual bool isDirty() const { return _dirty; } 
    5959 

  • OpenSceneGraph/trunk/include/osgText/Font

    r7645 r7648  
    267267 
    268268        // parameter used to compute the size and position of empty space 
    269         // in the texture which could accomodate new glyphs. 
     269        // in the texture which could accommodate new glyphs. 
    270270        int _margin; 
    271271        float _marginRatio; 

  • OpenSceneGraph/trunk/include/osgText/String

    r6063 r7648  
    8080 
    8181        /** Set the text using a Unicode encoded std::string, which is converted to an internal TextString. 
    82           * The encoding parameter specificies which Unicode encodeding is used in the std::string. */ 
     82          * The encoding parameter specifies which Unicode encoding is used in the std::string. */ 
    8383        void set(const std::string& text,Encoding encoding); 
    8484 

  • OpenSceneGraph/trunk/include/osgText/Text

    r7645 r7648  
    264264    virtual bool supports(const osg::Drawable::ConstAttributeFunctor&) const { return true; } 
    265265 
    266     /** accept an ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has.*/ 
     266    /** accept an ConstAttributeFunctor and call its methods to tell it about the internal attributes that this Drawable has.*/ 
    267267    virtual void accept(osg::Drawable::ConstAttributeFunctor& af) const; 
    268268 
    … …  
    270270    virtual bool supports(const osg::PrimitiveFunctor&) const { return true; } 
    271271 
    272     /** accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has.*/ 
     272    /** accept a PrimtiveFunctor and call its methods to tell it about the internal primitives that this Drawable has.*/ 
    273273    virtual void accept(osg::PrimitiveFunctor& pf) const; 
    274274 

  • OpenSceneGraph/trunk/include/osgUtil/IntersectionVisitor

    r6898 r7648  
    2727class IntersectionVisitor; 
    2828 
    29 /** Pure virtual base class for implementating custom intersection technique. 
     29/** Pure virtual base class for implementing custom intersection technique. 
    3030  * To implement a specific intersection technique on must override all 
    3131  * the pure virtue methods, concrete examples of how to do this can be seen in 
    … …  
    7878 
    7979 
    80 /** Concrent class for passing multiple intersectors through the scene graph. 
     80/** Concrete class for passing multiple intersectors through the scene graph. 
    8181  * To be used in conjunction with IntersectionVisitor. */ 
    8282class OSGUTIL_EXPORT IntersectorGroup : public Intersector 
    … …  
    125125 
    126126        /** Callback used to implement the reading of external files, allowing support for paged databases to be 
    127           * intergrated with IntersectionVisitor.  A concrete implementation can be found in osgDB. 
     127          * integrated with IntersectionVisitor.  A concrete implementation can be found in osgDB. 
    128128          * Note, this loose coupling approach is required as osgUtil is independent from osgDB where the file reading 
    129129          * is implemented, and osgDB itself is dependent upon osgUtil so a circular dependency would result from 

  • OpenSceneGraph/trunk/include/osgUtil/LineSegmentIntersector

    r7222 r7648  
    2020{ 
    2121 
    22 /** Concrent class for implementing line intersections with the scene graph. 
     22/** Concrete class for implementing line intersections with the scene graph. 
    2323  * To be used in conjunction with IntersectionVisitor. */ 
    2424class OSGUTIL_EXPORT LineSegmentIntersector : public Intersector 
    … …  
    2626    public: 
    2727 
    28         /** Construct a LineSegmentIntersector the runs between the secified start and end points in MODEL coordinates. */ 
     28        /** Construct a LineSegmentIntersector the runs between the specified start and end points in MODEL coordinates. */ 
    2929        LineSegmentIntersector(const osg::Vec3d& start, const osg::Vec3d& end); 
    3030         
    31         /** Construct a LineSegmentIntersector the runs between the secified start and end points in the specified coordinate frame. */ 
     31        /** Construct a LineSegmentIntersector the runs between the specified start and end points in the specified coordinate frame. */ 
    3232        LineSegmentIntersector(CoordinateFrame cf, const osg::Vec3d& start, const osg::Vec3d& end); 
    3333         
    34         /** Convinience constructor for supporting picking in WINDOW, or PROJECTION coorindates 
     34        /** Convenience constructor for supporting picking in WINDOW, or PROJECTION coordinates 
    3535          * In WINDOW coordinates creates a start value of (x,y,0) and end value of (x,y,1). 
    3636          * In PROJECTION coordinates (clip space cube) creates a start value of (x,y,-1) and end value of (x,y,1). 

  • OpenSceneGraph/trunk/include/osgUtil/PlaneIntersector

    r5792 r7648  
    2222{ 
    2323 
    24 /** Concrent class for implementing polytope intersections with the scene graph. 
     24/** Concrete class for implementing polytope intersections with the scene graph. 
    2525  * To be used in conjunction with IntersectionVisitor. */ 
    2626class OSGUTIL_EXPORT PlaneIntersector : public Intersector 

  • OpenSceneGraph/trunk/include/osgUtil/PolytopeIntersector

    r7626 r7648  
    2020{ 
    2121 
    22 /** Concrent class for implementing polytope intersections with the scene graph. 
     22/** Concrete class for implementing polytope intersections with the scene graph. 
    2323  * To be used in conjunction with IntersectionVisitor. */ 
    2424class OSGUTIL_EXPORT PolytopeIntersector : public Intersector 

  • OpenSceneGraph/trunk/include/osgViewer/CompositeViewer

    r7535 r7648  
    7272 
    7373        /** Execute a main frame loop. 
    74           * Equivialant to while (!viewer.done()) viewer.frame(); 
     74          * Equivalent to while (!viewer.done()) viewer.frame(); 
    7575          * Also calls realize() if the viewer is not already realized, 
    7676          * and installs trackball manipulator if one is not already assigned. 

  • OpenSceneGraph/trunk/include/osgViewer/Export

    r7506 r7648  
    4646\namespace osgViewer 
    4747 
    48 The osgViewer library provides high level viewer functionality designed to make it easier to write a range of differnt types of viewers,  
     48The osgViewer library provides high level viewer functionality designed to make it easier to write a range of different types of viewers,  
    4949from viewers embedded in existing windows via SimpleViewer, through to highly scalable and flexible Viewer and Composite classes.  A 
    50 set of event handlers add functionality to these viewers so that you can rapidly compose the viewer functionality taylored to your needs. 
     50set of event handlers add functionality to these viewers so that you can rapidly compose the viewer functionality tailored to your needs. 
    5151Finally the viewer classes can be adapted to work with a range of different window toolkit API's via GraphicsWindow implementations, 
    5252with native Win32, X11 and Carbon implementations on Windows, Unices and OSX respectively, and other window toolkits such as WxWidgets, Qt etc. 

  • OpenSceneGraph/trunk/include/osgViewer/GraphicsWindow

    r7482 r7648  
    3131namespace osgViewer { 
    3232 
    33 /** Base class for providing Windowing API agnostic access to creating and managing graphisc window and events. 
     33/** Base class for providing Windowing API agnostic access to creating and managing graphics window and events. 
    3434  * Note, the GraphicsWindow is subclassed from osg::GraphicsContext, and to provide an implemention you'll need to implement its  
    3535  * range of pure virtual functions, you'll find these all have naming convention methodNameImplemention(..). 
    36   * GraphicsWindow adds the event queue ontop of the GraphicsContext, thereby adding a mechnism for adapting Windowing events 
     36  * GraphicsWindow adds the event queue on top of the GraphicsContext, thereby adding a mechanism for adapting Windowing events 
    3737  * as well as basics graphics context work, you should wire up custom GraphicsWindowImplementation to push their events through 
    3838  * into the EventQueue. */ 
    … …  
    136136        virtual bool valid() const { osg::notify(osg::NOTICE)<<"GraphicsWindow::valid() not implemented."<<std::endl; return false; } 
    137137 
    138         /** Realise the GraphicsContext implementation,  
    139           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ 
     138        /** Realize the GraphicsContext implementation,  
     139          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    140140        virtual bool realizeImplementation() { osg::notify(osg::NOTICE)<<"GraphicsWindow::realizeImplementation() not implemented."<<std::endl; return false; } 
    141141 
    142         /** Return true if the graphics context has been realised, and is ready to use, implementation. 
    143           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ 
     142        /** Return true if the graphics context has been realized, and is ready to use, implementation. 
     143          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    144144        virtual bool isRealizedImplementation() const  { osg::notify(osg::NOTICE)<<"GraphicsWindow::isRealizedImplementation() not implemented."<<std::endl; return false; } 
    145145 
    146146        /** Close the graphics context implementation. 
    147           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ 
     147          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    148148        virtual void closeImplementation()  { osg::notify(osg::NOTICE)<<"GraphicsWindow::closeImplementation() not implemented."<<std::endl; } 
    149149 
    150150        /** Make this graphics context current implementation. 
    151           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ 
     151          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    152152        virtual bool makeCurrentImplementation()  { osg::notify(osg::NOTICE)<<"GraphicsWindow::makeCurrentImplementation() not implemented."<<std::endl; return false;} 
    153153         
    154154        /** Make this graphics context current with specified read context implementation. 
    155           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ 
     155          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    156156        virtual bool makeContextCurrentImplementation(GraphicsContext* /*readContext*/)  { osg::notify(osg::NOTICE)<<"GraphicsWindow::makeContextCurrentImplementation(..) not implemented."<<std::endl; return false;} 
    157157 
    … …  
    160160 
    161161        /** Pure virtual, Bind the graphics context to associated texture implementation. 
    162           * Pure virtual - must be implemented by concrate implementations of GraphicsContext. */ 
     162          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    163163        virtual void bindPBufferToTextureImplementation(GLenum /*buffer*/)  { osg::notify(osg::NOTICE)<<"GraphicsWindow::bindPBufferToTextureImplementation(..) not implemented."<<std::endl; } 
    164164 
    165165        /** Swap the front and back buffers implementation. 
    166           * Pure virtual - must be implemented by Concrate implementations of GraphicsContext. */ 
     166          * Pure virtual - must be implemented by concrete implementations of GraphicsContext. */ 
    167167        virtual void swapBuffersImplementation()  { osg::notify(osg::NOTICE)<<"GraphicsWindow:: swapBuffersImplementation() not implemented."<<std::endl; } 
    168168 
    … …  
    232232        } 
    233233 
    234         // dumy implementations, assume that graphics context is *always* current and valid. 
     234        // dummy implementations, assume that graphics context is *always* current and valid. 
    235235        virtual bool valid() const { return true; } 
    236236        virtual bool realizeImplementation() { return true; } 

  • OpenSceneGraph/trunk/include/osgViewer/Scene

    r7453 r7648  
    2525namespace osgViewer{ 
    2626 
    27 /** Scene holds the highe level reference to a single scene graph.*/ 
     27/** Scene holds the higher level reference to a single scene graph.*/ 
    2828class OSGVIEWER_EXPORT Scene : public osg::Referenced 
    2929{ 

  • OpenSceneGraph/trunk/include/osgViewer/View

    r7561 r7648  
    4242        META_Object(osgViewer,View); 
    4343         
    44         /** Provide a mechanism for getting the osg::View assocaited from the GUIActionAdapter. 
     44        /** Provide a mechanism for getting the osg::View associated from the GUIActionAdapter. 
    4545          * One would use this to case view to osgViewer::View(er) if supported by the subclass.*/ 
    4646        virtual osg::View* asView() { return this; } 
    … …  
    8282        const osgDB::DatabasePager* getDatabasePager() const; 
    8383 
    84         /* Set the EventQueue that View uses to intregrate external non window related events.*/ 
     84        /* Set the EventQueue that View uses to integrate external non window related events.*/ 
    8585        void setEventQueue(osgGA::EventQueue* eventQueue) { _eventQueue = eventQueue; } 
    8686 
    … …  
    152152 
    153153         
    154         /** Convinience method for creating slave Cameras and associated GraphicsWindows across all screens.*/ 
     154        /** Convenience method for creating slave Cameras and associated GraphicsWindows across all screens.*/ 
    155155        void setUpViewAcrossAllScreens(); 
    156156 
    157         /** Convinience method for a single Camara on a single window.*/ 
     157        /** Convenience method for a single camera on a single window.*/ 
    158158        void setUpViewInWindow(int x, int y, int width, int height, unsigned int screenNum=0); 
    159159 
    160         /** Convinience method for a single Camara associated with a single full screen GraphicsWindow.*/ 
     160        /** Convenience method for a single camera associated with a single full screen GraphicsWindow.*/ 
    161161        void setUpViewOnSingleScreen(unsigned int screenNum=0); 
    162162         
    163163 
    164         /** Convinience method for spherical display using 6 slave cameras rendering the 6 sides of a cube map, and 7th camera doing distortion correction to present on a spherical display.*/ 
     164        /** Convenience method for spherical display using 6 slave cameras rendering the 6 sides of a cube map, and 7th camera doing distortion correction to present on a spherical display.*/ 
    165165        void setUpViewFor3DSphericalDisplay(double radius=1.0, double collar=0.45, unsigned int screenNum=0, osg::Image* intensityMap=0); 
    166166 
    167         /** Convinience method for spherical display by rendering main scene to as panoramic 2:1 texture and then doing distortion correction to present onto a spherical display.*/ 
     167        /** Convenience method for spherical display by rendering main scene to as panoramic 2:1 texture and then doing distortion correction to present onto a spherical display.*/ 
    168168        void setUpViewForPanoramicSphericalDisplay(double radius=1.0, double collar=0.45, unsigned int screenNum=0, osg::Image* intensityMap=0); 
    169169 

  • OpenSceneGraph/trunk/include/osgViewer/Viewer

    r7535 r7648  
    6969 
    7070        /** Execute a main frame loop. 
    71           * Equivialant to while (!viewer.done()) viewer.frame(); 
     71          * Equivalent to while (!viewer.done()) viewer.frame(); 
    7272          * Also calls realize() if the viewer is not already realized, 
    7373          * and installs trackball manipulator if one is not already assigned. 

  • OpenSceneGraph/trunk/include/osgViewer/ViewerBase

    r7535 r7648  
    3232class View; 
    3333 
    34 /** ViewerBase is the view base class that is inhertied by both Viewer and CompositeViewer.*/ 
     34/** ViewerBase is the view base class that is inherited by both Viewer and CompositeViewer.*/ 
    3535class OSGVIEWER_EXPORT ViewerBase : public virtual osg::Object 
    3636{ 
    … …  
    100100         /** Set the position of the end barrier. 
    101101          * AfterSwapBuffers will may result is slightly higher framerates, by may 
    102           * lead to inconcistent swapping between different windows. 
     102          * lead to inconsistent swapping between different windows. 
    103103          * BeforeSwapBuffers may lead to slightly lower framerate, but improve consistency in timing of swap buffers, 
    104104          * especially important if you are likely to consistently break frame.*/ 
    … …  
    110110  
    111111  
    112         /** Set the done flag to singnal the viewer's work is done and should exit the frame loop.*/ 
     112        /** Set the done flag to signal the viewer's work is done and should exit the frame loop.*/ 
    113113        void setDone(bool done) { _done = done; } 
    114114 
    115         /** Reurn true if  viewer's work is done and should exit the frame loop.*/ 
     115        /** Return true if  viewer's work is done and should exit the frame loop.*/ 
    116116        bool done() const { return _done; } 
    117117 
    … …  
    181181 
    182182        /** Execute a main frame loop. 
    183           * Equivialant to while (!viewer.done()) viewer.frame(); 
     183          * Equivalent to while (!viewer.done()) viewer.frame(); 
    184184          * Also calls realize() if the viewer is not already realized, 
    185185          * and installs trackball manipulator if one is not already assigned. 

  • OpenSceneGraph/trunk/include/osgViewer/api/Win32/GraphicsWindowWin32

    r7500 r7648  
    4747        virtual bool realizeImplementation(); 
    4848 
    49         /** Return true if the graphics context has been realised and is ready to use.*/ 
     49        /** Return true if the graphics context has been realized and is ready to use.*/ 
    5050        virtual bool isRealizedImplementation() const { return _realized; } 
    5151 

  • OpenSceneGraph/trunk/include/osgViewer/api/Win32/PixelBufferWin32

    r7023 r7648  
    1212*/ 
    1313 
    14 /* Note, elements of PixeBufferWin32 have used Prodcer/RenderSurface_Win32.cpp as both 
     14/* Note, elements of PixeBufferWin32 have used Producer/RenderSurface_Win32.cpp as both 
    1515 * a guide to use of X11/GLX and copiying directly in the case of setBorder(). 
    1616 * These elements are license under OSGPL as above, with Copyright (C) 2001-2004  Don Burns. 
    … …  
    4848        virtual bool realizeImplementation(); 
    4949 
    50         /** Return true if the graphics context has been realised and is ready to use.*/ 
     50        /** Return true if the graphics context has been realized and is ready to use.*/ 
    5151        virtual bool isRealizedImplementation() const { return _realized; } 
    5252 

  • OpenSceneGraph/trunk/src/osg/AnimationPath.cpp

    r6051 r7648  
    6666        // we have both a lower bound and the next item. 
    6767 
    68         // deta_time = second.time - first.time 
     68        // delta_time = second.time - first.time 
    6969        double delta_time = second->first - first->first; 
    7070 

  • OpenSceneGraph/trunk/src/osg/ApplicationUsage.cpp

    r7296 r7648  
    165165                    { 
    166166                        // word must be longer than a whole line so will need 
    167                         // to concatinate it. 
     167                        // to concatenate it. 
    168168                        width = explanationWidth-1; 
    169169                        concatinated = true; 

  • OpenSceneGraph/trunk/src/osg/ClipNode.cpp

    r7389 r7648  
    6363    if (std::find(_planes.begin(),_planes.end(),clipplane)==_planes.end()) 
    6464    { 
    65         // cliplane doesn't exist in list so add it. 
     65        // clipplane doesn't exist in list so add it. 
    6666        _planes.push_back(clipplane); 
    6767        setLocalStateSetModes(_value); 
    … …  
    8383    if (itr!=_planes.end()) 
    8484    { 
    85         // cliplane exist in list so erase it. 
     85        // clipplane exist in list so erase it. 
    8686        _planes.erase(itr); 
    8787        setLocalStateSetModes(_value); 

  • OpenSceneGraph/trunk/src/osg/CullingSet.cpp

    r5328 r7648  
    5858            //std::cout<<"  popping occluder "<<itr<<std::endl; 
    5959            // we have trapped for the case an occlude potentially occluding itself, 
    60             // to prevent this we disable the results mask so that no subsequnt  
     60            // to prevent this we disable the results mask so that no subsequent  
    6161            // when the next pushCurrentMask calls happens this occluder is switched off. 
    6262            itr->popCurrentMask(); 

  • OpenSceneGraph/trunk/src/osg/DeleteHandler.cpp

    r7091 r7648  
    1717{ 
    1818 
    19 // specialzed smart pointer, used to get round auto_ptr<>'s lack of the destructor reseting itself to 0. 
     19// specialized smart pointer, used to get round auto_ptr<>'s lack of the destructor reseting itself to 0. 
    2020struct DeleteHandlerPointer 
    2121{ 

  • OpenSceneGraph/trunk/src/osg/DrawPixels.cpp

    r6422 r7648  
    7272BoundingBox DrawPixels::computeBound() const 
    7373{ 
    74     // really needs to be dependant of view poistion and projection... will implement simple version right now. 
     74    // really needs to be dependent of view position and projection... will implement simple version right now. 
    7575    BoundingBox bbox; 
    7676    float diagonal = 0.0f; 

  • OpenSceneGraph/trunk/src/osg/Drawable.cpp

    r7601 r7648  
    207207} 
    208208 
    209 /** flush all the cached display list which need to be deleted 
     209/** flush all the cached display lists which need to be deleted 
    210210  * in the OpenGL context related to contextID.*/ 
    211211void Drawable::flushDeletedVertexBufferObjects(unsigned int contextID,double /*currentTime*/, double& availableTime) 
    … …  
    416416            // the number of callbacks has changed, need to pass this 
    417417            // on to parents so they know whether app traversal is 
    418             // reqired on this subgraph. 
     418            // required on this subgraph. 
    419419            for(ParentList::iterator itr =_parents.begin(); 
    420420                itr != _parents.end(); 
    … …  
    451451            // the number of callbacks has changed, need to pass this 
    452452            // on to parents so they know whether app traversal is 
    453             // reqired on this subgraph. 
     453            // required on this subgraph. 
    454454            for(ParentList::iterator itr =_parents.begin(); 
    455455                itr != _parents.end(); 
    … …  
    501501    GLuint& globj = _globjList[contextID]; 
    502502 
    503     // call the globj if already set otherwise comple and execute. 
     503    // call the globj if already set otherwise compile and execute. 
    504504    if( globj != 0 ) 
    505505    {    
    … …  
    558558        GLuint& globj = _globjList[contextID]; 
    559559 
    560         // call the globj if already set otherwise comple and execute. 
     560        // call the globj if already set otherwise compile and execute. 
    561561        if( globj != 0 ) 
    562562        { 

  • OpenSceneGraph/trunk/src/osg/FrameBufferObject.cpp

    r7379 r7648  
    192192 
    193193/************************************************************************** 
    194  * FrameBufferAttachement 
     194 * FrameBufferAttachment 
    195195 **************************************************************************/ 
    196196 
    … …  
    594594    if (dirtyAttachmentList) 
    595595    { 
    596         // the set of of attachements appears to be thread sensitive, it shouldn't be because  
     596        // the set of of attachments appears to be thread sensitive, it shouldn't be because  
    597597        // OpenGL FBO handles osg::FrameBufferObject has are multi-buffered... 
    598598        // so as a temporary fix will stick in a mutex to ensure that only one thread passes through here 

  • OpenSceneGraph/trunk/src/osg/Geode.cpp

    r5885 r7648  
    9999            // remove this Geode from the child parent list. 
    100100            _drawables[i]->removeParent(this); 
    101             // update the number of app calbacks removed 
     101            // update the number of app callbacks removed 
    102102            if (_drawables[i]->requiresUpdateTraversal()) ++updateCallbackRemoved; 
    103103            if (_drawables[i]->requiresEventTraversal()) ++eventCallbackRemoved; 
    … …  
    163163         
    164164        // note ref_ptr<> automatically handles decrementing origGset's reference count, 
    165         // and inccrementing newGset's reference count. 
     165        // and incrementing newGset's reference count. 
    166166        _drawables[i] = newDrawable; 
    167167 

  • OpenSceneGraph/trunk/src/osg/Geometry.cpp

    r7628 r7648  
    17081708 
    17091709 
    1710             // draw primtives by the more flexible "slow" path, 
     1710            // draw primitives by the more flexible "slow" path, 
    17111711            // sending OpenGL glBegin/glVertex.../glEnd(). 
    17121712            switch(primitiveset->getType()) 
    … …  
    22082208            break; 
    22092209        default: 
    2210             notify(WARN)<<"Warning: Geometry::accept(PrimtiveFunctor&) cannot handle Vertex Array type"<<_vertexData.array->getType()<<std::endl; 
     2210            notify(WARN)<<"Warning: Geometry::accept(PrimitiveFunctor&) cannot handle Vertex Array type"<<_vertexData.array->getType()<<std::endl; 
    22112211            return; 
    22122212        } 
    … …  
    22492249            break; 
    22502250        default: 
    2251             notify(WARN)<<"Warning: Geometry::accept(PrimtiveFunctor&) cannot handle Vertex Array type"<<_vertexData.array->getType()<<std::endl; 
     2251            notify(WARN)<<"Warning: Geometry::accept(PrimitiveFunctor&) cannot handle Vertex Array type"<<_vertexData.array->getType()<<std::endl; 
    22522252            return; 
    22532253        } 
    … …  
    24962496        break; 
    24972497    default: 
    2498         notify(WARN)<<"Warning: Geometry::accept(PrimtiveIndexFunctor&) cannot handle Vertex Array type"<<_vertexData.array->getType()<<std::endl; 
     2498        notify(WARN)<<"Warning: Geometry::accept(PrimitiveIndexFunctor&) cannot handle Vertex Array type"<<_vertexData.array->getType()<<std::endl; 
    24992499        return; 
    25002500    } 
    … …  
    26172617} 
    26182618 
    2619 unsigned int _computeNumberOfPrimtives(const osg::Geometry& geom) 
     2619unsigned int _computeNumberOfPrimitives(const osg::Geometry& geom) 
    26202620{ 
    26212621 
    … …  
    26392639        } 
    26402640 
    2641         // draw primtives by the more flexible "slow" path, 
     2641        // draw primitives by the more flexible "slow" path, 
    26422642        // sending OpenGL glBegin/glVertex.../glEnd(). 
    26432643        switch(primitiveset->getType()) 
    … …  
    26862686            break; 
    26872687        case(osg::Geometry::BIND_PER_PRIMITIVE): 
    2688             if (numElements!=_computeNumberOfPrimtives(geom)) return false; 
     2688            if (numElements!=_computeNumberOfPrimitives(geom)) return false; 
    26892689            break; 
    26902690        case(osg::Geometry::BIND_PER_VERTEX): 
    … …  
    27772777     
    27782778    // check to see if binding might be per primitive    
    2779     unsigned int numPrimitives = _computeNumberOfPrimtives(geom); 
     2779    unsigned int numPrimitives = _computeNumberOfPrimitives(geom); 
    27802780    if (numElements==numPrimitives) 
    27812781    { 

  • OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp

    r7595 r7648  
    338338        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex); 
    339339        s_contextIDMap[contextID]._compileContext = gc; 
    340         osg::notify(osg::INFO)<<"   succeded GraphicsContext::createCompileContext."<<std::endl; 
     340        osg::notify(osg::INFO)<<"   succeeded GraphicsContext::createCompileContext."<<std::endl; 
    341341        return gc.release(); 
    342342    } 
    … …  
    437437    } 
    438438 
    439     // release all the OpenGL objects in the scene graphs associted with this  
     439    // release all the OpenGL objects in the scene graphs associated with this  
    440440    for(Cameras::iterator itr = _cameras.begin(); 
    441441        itr != _cameras.end(); 
    … …  
    505505        _threadOfLastMakeCurrent = OpenThreads::Thread::CurrentThread(); 
    506506 
    507         // initialize extension process, note, only initializes on first 
     507        // initialize extension process, not only initializes on first 
    508508        // call, will be a non-op on subsequent calls.         
    509509        getState()->initializeExtensionProcs(); 
    … …  
    521521        _threadOfLastMakeCurrent = OpenThreads::Thread::CurrentThread(); 
    522522 
    523         // initialize extension proces, not only initializes on first 
     523        // initialize extension process, not only initializes on first 
    524524        // call, will be a non-op on subsequent calls.         
    525525        getState()->initializeExtensionProcs(); 
    … …  
    591591    osg::notify(osg::INFO)<<"Doing add"<<std::endl; 
    592592 
    593     // aquire the lock on the operations queue to prevent anyone else for modifying it at the same time 
     593    // acquire the lock on the operations queue to prevent anyone else for modifying it at the same time 
    594594    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex); 
    595595 
    … …  
    604604    osg::notify(osg::INFO)<<"Doing remove operation"<<std::endl; 
    605605 
    606     // aquire the lock on the operations queue to prevent anyone else for modifying it at the same time 
     606    // acquire the lock on the operations queue to prevent anyone else for modifying it at the same time 
    607607    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex); 
    608608 
    … …  
    624624    osg::notify(osg::INFO)<<"Doing remove named operation"<<std::endl; 
    625625     
    626     // aquire the lock on the operations queue to prevent anyone else for modifying it at the same time 
     626    // acquire the lock on the operations queue to prevent anyone else for modifying it at the same time 
    627627    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex); 
    628628 
    629     // find the remove all operations with specificed name 
     629    // find the remove all operations with specified name 
    630630    for(OperationQueue::iterator itr = _operations.begin(); 
    631631        itr!=_operations.end();) 

  • OpenSceneGraph/trunk/src/osg/GraphicsThread.cpp

    r7379 r7648  
    8787    reset(); 
    8888     
    89     // block this thread, untill the block is released externally. 
     89    // block this thread, until the block is released externally. 
    9090    block(); 
    9191     
    92     // re aquire the graphcis context. 
     92    // re acquire the graphics context. 
    9393    context->makeCurrent(); 
    9494} 

  • OpenSceneGraph/trunk/src/osg/Node.cpp

    r7332 r7648  
    240240            // the number of callbacks has changed, need to pass this 
    241241            // on to parents so they know whether app traversal is 
    242             // reqired on this subgraph. 
     242            // required on this subgraph. 
    243243            for(ParentList::iterator itr =_parents.begin(); 
    244244                itr != _parents.end(); 
    … …  
    276276            // the number of callbacks has changed, need to pass this 
    277277            // on to parents so they know whether app traversal is 
    278             // reqired on this subgraph. 
     278            // required on this subgraph. 
    279279            for(ParentList::iterator itr =_parents.begin(); 
    280280                itr != _parents.end(); 
    … …  
    318318            // the number of callbacks has changed, need to pass this 
    319319            // on to parents so they know whether app traversal is 
    320             // reqired on this subgraph. 
     320            // required on this subgraph. 
    321321            for(ParentList::iterator itr =_parents.begin(); 
    322322                itr != _parents.end(); 
    … …  
    354354            // the number of callbacks has changed, need to pass this 
    355355            // on to parents so they know whether app traversal is 
    356             // reqired on this subgraph. 
     356            // required on this subgraph. 
    357357            for(ParentList::iterator itr =_parents.begin(); 
    358358                itr != _parents.end(); 
    … …  
    394394            // the number of callbacks has changed, need to pass this 
    395395            // on to parents so they know whether app traversal is 
    396             // reqired on this subgraph. 
     396            // required on this subgraph. 
    397397            for(ParentList::iterator itr =_parents.begin(); 
    398398                itr != _parents.end(); 
    … …  
    429429            // the number of callbacks has changed, need to pass this 
    430430            // on to parents so they know whether app traversal is 
    431             // reqired on this subgraph. 
     431            // required on this subgraph. 
    432432            for(ParentList::iterator itr =_parents.begin(); 
    433433                itr != _parents.end(); 
    … …  
    466466            // the number of callbacks has changed, need to pass this 
    467467            // on to parents so they know whether app traversal is 
    468             // reqired on this subgraph. 
     468            // required on this subgraph. 
    469469            for(ParentList::iterator itr =_parents.begin(); 
    470470                itr != _parents.end(); 

  • OpenSceneGraph/trunk/src/osg/OperationThread.cpp

    r7213 r7648  
    6969    if (_currentOperationIterator == _operations.end()) 
    7070    { 
    71         // iterator at end of operations so reset to begining. 
     71        // iterator at end of operations so reset to beginning. 
    7272        _currentOperationIterator = _operations.begin(); 
    7373    } 
    … …  
    105105    osg::notify(osg::INFO)<<"Doing add"<<std::endl; 
    106106 
    107     // aquire the lock on the operations queue to prevent anyone else for modifying it at the same time 
     107    // acquire the lock on the operations queue to prevent anyone else for modifying it at the same time 
    108108    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex); 
    109109 
    … …  
    118118    osg::notify(osg::INFO)<<"Doing remove operation"<<std::endl; 
    119119 
    120     // aquire the lock on the operations queue to prevent anyone else for modifying it at the same time 
     120    // acquire the lock on the operations queue to prevent anyone else for modifying it at the same time 
    121121    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex); 
    122122 
    … …  
    141141    osg::notify(osg::INFO)<<"Doing remove named operation"<<std::endl; 
    142142     
    143     // aquire the lock on the operations queue to prevent anyone else for modifying it at the same time 
    144     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex); 
    145  
    146     // find the remove all operations with specificed name 
     143    // acquire the lock on the operations queue to prevent anyone else for modifying it at the same time 
     144    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex); 
     145 
     146    // find the remove all operations with specified name 
    147147    for(Operations::iterator itr = _operations.begin(); 
    148148        itr!=_operations.end();) 
    … …  
    186186    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex); 
    187187 
    188     // reset current operation iterator to begining if at end. 
     188    // reset current operation iterator to beginning if at end. 
    189189    if (_currentOperationIterator==_operations.end()) _currentOperationIterator = _operations.begin(); 
    190190     
    … …  
    422422        { 
    423423            // do a yield to get round a peculiar thread hang when testCancel() is called  
    424             // in certain cirumstances - of which there is no particular pattern. 
     424            // in certain circumstances - of which there is no particular pattern. 
    425425            YieldCurrentThread(); 
    426426            firstTime = false; 

  • OpenSceneGraph/trunk/src/osg/PolygonOffset.cpp

    r7170 r7648  
    6060    { 
    6161        if ((strstr((const char*)renderer,"Radeon")!=0) || 
    62             (strstr((const char*)renderer,"RADEON")!=0)) 
     62            (strstr((const char*)renderer,"RADEON")!=0) || 
     63            (strstr((const char*)renderer,"ALL-IN-WONDER")!=0)) 
    6364        { 
    6465            setFactorMultiplier(1.0f); 

  • OpenSceneGraph/trunk/src/osg/PolygonStipple.cpp

    r5328 r7648  
    5757{ 
    5858    // check the types are equal and then create the rhs variable 
    59     // used by the COMPARE_StateAttribute_Paramter macro's below. 
     59    // used by the COMPARE_StateAttribute_Parameter macro's below. 
    6060    COMPARE_StateAttribute_Types(PolygonStipple,sa) 
    6161 

  • OpenSceneGraph/trunk/src/osg/Program.cpp

    r7388 r7648  
    20082008{ 
    20092009    // check the types are equal and then create the rhs variable 
    2010     // used by the COMPARE_StateAttribute_Paramter macro's below. 
     2010    // used by the COMPARE_StateAttribute_Parameter macro's below. 
    20112011    COMPARE_StateAttribute_Types(Program,sa) 
    20122012     

  • OpenSceneGraph/trunk/src/osg/Referenced.cpp

    r7261 r7648  
    3232{ 
    3333 
    34 // specialzed smart pointer, used to get round auto_ptr<>'s lack of the destructor reseting itself to 0. 
     34// specialized smart pointer, used to get round auto_ptr<>'s lack of the destructor reseting itself to 0. 
    3535struct DeleteHandlerPointer 
    3636{ 
    … …  
    179179        if (!_refMutex) 
    180180        { 
    181             // we want thread safe ref()/unref() so assing a mutex 
     181            // we want thread safe ref()/unref() so assign a mutex 
    182182            _refMutex = new OpenThreads::Mutex; 
    183183        } 

  • OpenSceneGraph/trunk/src/osg/ShapeDrawable.cpp

    r6422 r7648  
    960960        glBegin(GL_QUAD_STRIP); 
    961961 
    962         // draw skirt at begining if required. 
     962        // draw skirt at beginning if required. 
    963963        if (field.getSkirtHeight()!=0.0f) 
    964964        { 
    … …  
    12951295/////////////////////////////////////////////////////////////////////////////// 
    12961296// 
    1297 // Accept a primtive functor for each of the shapes. 
     1297// Accept a primitive functor for each of the shapes. 
    12981298// 
    12991299 

  • OpenSceneGraph/trunk/src/osg/State.cpp

    r7257 r7648  
    111111    } 
    112112     
    113     // we can do a straight clear, we arn't intrested in GL_DEPTH_TEST defaults in texture modes. 
     113    // we can do a straight clear, we arn't interested in GL_DEPTH_TEST defaults in texture modes. 
    114114    for(TextureModeMapList::iterator tmmItr=_textureModeMapList.begin(); 
    115115        tmmItr!=_textureModeMapList.end(); 
    … …  
    148148    // note, this OpenGL op precludes the use of State::reset() without a 
    149149    // valid graphics context, therefore the new implementation below  
    150     // is prefered. 
     150    // is preferred. 
    151151    setActiveTextureUnit(0); 
    152152#else 
    … …  
    366366    if (_checkGLErrors==ONCE_PER_ATTRIBUTE) checkGLErrors("start of State::apply(StateSet*)"); 
    367367 
    368     // equivilant to: 
     368    // equivalent to: 
    369369    //pushStateSet(dstate); 
    370370    //apply(); 
    … …  
    429429    else 
    430430    { 
    431         // no incomming stateset, so simply apply state. 
     431        // no incoming stateset, so simply apply state. 
    432432        apply(); 
    433433    } 

  • OpenSceneGraph/trunk/src/osg/StateSet.cpp

    r7630 r7648  
    612612                 (rhs_mitr->second & StateAttribute::PROTECTED))  
    613613            { 
    614                 // override isn't on in rhs, so overrite it with incomming 
     614                // override isn't on in rhs, so override it with incoming 
    615615                // value. 
    616616                lhs_mitr->second = rhs_mitr->second; 
    … …  
    637637                 (rhs_aitr->second.second & StateAttribute::PROTECTED)) 
    638638            { 
    639                 // override isn't on in rhs, so overrite it with incomming 
     639                // override isn't on in rhs, so override it with incoming 
    640640                // value. 
    641641                if (lhs_aitr->second.first!=rhs_aitr->second.first) 
    … …  
    644644                    lhs_aitr->second.first->removeParent(this); 
    645645 
    646                     // override isn't on in rhs, so overrite it with incomming 
     646                    // override isn't on in rhs, so override it with incoming 
    647647                    // value. 
    648648                    lhs_aitr->second = rhs_aitr->second; 
    … …  
    684684                     (rhs_mitr->second & StateAttribute::PROTECTED))  
    685685                { 
    686                     // override isn't on in rhs, so overrite it with incomming 
     686                    // override isn't on in rhs, so override it with incoming 
    687687                    // value. 
    688688                    lhs_mitr->second = rhs_mitr->second; 
    … …  
    716716                     (rhs_aitr->second.second & StateAttribute::PROTECTED))  
    717717                { 
    718                     // override isn't on in rhs, so overrite it with incomming 
     718                    // override isn't on in rhs, so override it with incoming 
    719719                    // value. 
    720720                     
    … …  
    752752                 (rhs_uitr->second.second & StateAttribute::PROTECTED))  
    753753            { 
    754                 // override isn't on in rhs, so overrite it with incomming 
     754                // override isn't on in rhs, so override it with incoming 
    755755                // value. 
    756756 
    … …  
    17541754            // the number of callbacks has changed, need to pass this 
    17551755            // on to parents so they know whether app traversal is 
    1756             // reqired on this subgraph. 
     1756            // required on this subgraph. 
    17571757            for(ParentList::iterator itr =_parents.begin(); 
    17581758                itr != _parents.end(); 
    … …  
    17991799            // the number of callbacks has changed, need to pass this 
    18001800            // on to parents so they know whether app traversal is 
    1801             // reqired on this subgraph. 
     1801            // required on this subgraph. 
    18021802            for(ParentList::iterator itr =_parents.begin(); 
    18031803                itr != _parents.end(); 

  • OpenSceneGraph/trunk/src/osg/Texture.cpp

    r7385 r7648  
    511511        if (_textureObjectBuffer[i].valid())  
    512512        { 
    513             //notify(INFO) << "releasing texure "<<toblm[i].size()<<std::endl; 
     513            //notify(INFO) << "releasing texture "<<toblm[i].size()<<std::endl; 
    514514            toblm[i].push_back(_textureObjectBuffer[i]); 
    515515        } 
    … …  
    543543    { 
    544544 
    545         const unsigned int contextID = 0; // state.getContextID();  // set to 0 right now, assume same paramters for each graphics context... 
     545        const unsigned int contextID = 0; // state.getContextID();  // set to 0 right now, assume same parameters for each graphics context... 
    546546        const Extensions* extensions = getExtensions(contextID,true); 
    547547 

  • OpenSceneGraph/trunk/src/osg/Texture1D.cpp

    r7521 r7648  
    4242{ 
    4343    // check the types are equal and then create the rhs variable 
    44     // used by the COMPARE_StateAttribute_Paramter macro's below. 
     44    // used by the COMPARE_StateAttribute_Parameter macro's below. 
    4545    COMPARE_StateAttribute_Types(Texture1D,sa) 
    4646 
    … …  
    7979    if (result!=0) return result; 
    8080 
    81     // compare each paramter in turn against the rhs. 
     81    // compare each parameter in turn against the rhs. 
    8282    COMPARE_StateAttribute_Parameter(_textureWidth) 
    8383    COMPARE_StateAttribute_Parameter(_subloadCallback) 

  • OpenSceneGraph/trunk/src/osg/Texture2D.cpp

    r7521 r7648  
    5454{ 
    5555    // check the types are equal and then create the rhs variable 
    56     // used by the COMPARE_StateAttribute_Paramter macro's below. 
     56    // used by the COMPARE_StateAttribute_Parameter macro's below. 
    5757    COMPARE_StateAttribute_Types(Texture2D,sa) 
    5858 
    … …  
    9191    if (result!=0) return result; 
    9292 
    93     // compare each paramter in turn against the rhs. 
     93    // compare each parameter in turn against the rhs. 
    9494#if 1     
    9595    if (_textureWidth != 0 && rhs._textureWidth != 0) 

  • OpenSceneGraph/trunk/src/osg/Texture2DArray.cpp

    r7636 r7648  
    5252{ 
    5353    // check the types are equal and then create the rhs variable 
    54     // used by the COMPARE_StateAttribute_Paramter macro's below. 
     54    // used by the COMPARE_StateAttribute_Parameter macro's below. 
    5555    COMPARE_StateAttribute_Types(Texture2DArray,sa) 
    5656 
    … …  
    9292    if (result!=0) return result; 
    9393 
    94     // compare each paramter in turn against the rhs. 
     94    // compare each parameter in turn against the rhs. 
    9595    COMPARE_StateAttribute_Parameter(_textureWidth) 
    9696    COMPARE_StateAttribute_Parameter(_textureHeight) 
    … …  
    547547 
    548548    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &_max2DSize); 
    549     _maxLayerCount = 0; 
    550     if (_isTexture2DArraySupported) 
    551         glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS_EXT, &_maxLayerCount); 
     549    glGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS_EXT, &_maxLayerCount); 
    552550 
    553551    setGLExtensionFuncPtr(_glTexImage3D, "glTexImage3D","glTexImage3DEXT"); 

  • OpenSceneGraph/trunk/src/osg/Texture3D.cpp

    r7521 r7648  
    4949{ 
    5050    // check the types are equal and then create the rhs variable 
    51     // used by the COMPARE_StateAttribute_Paramter macro's below. 
     51    // used by the COMPARE_StateAttribute_Parameter macro's below. 
    5252    COMPARE_StateAttribute_Types(Texture3D,sa) 
    5353 
    … …  
    8686    if (result!=0) return result; 
    8787 
    88     // compare each paramter in turn against the rhs. 
     88    // compare each parameter in turn against the rhs. 
    8989    COMPARE_StateAttribute_Parameter(_textureWidth) 
    9090    COMPARE_StateAttribute_Parameter(_textureHeight) 

  • OpenSceneGraph/trunk/src/osg/TextureRectangle.cpp

    r7392 r7648  
    7777{ 
    7878    // check the types are equal and then create the rhs variable 
    79     // used by the COMPARE_StateAttribute_Paramter macro's below. 
     79    // used by the COMPARE_StateAttribute_Parameter macro's below. 
    8080    COMPARE_StateAttribute_Types(TextureRectangle,sa) 
    8181 
    … …  
    114114    if (result!=0) return result; 
    115115 
    116     // compare each paramter in turn against the rhs. 
     116    // compare each parameter in turn against the rhs. 
    117117    COMPARE_StateAttribute_Parameter(_textureWidth) 
    118118    COMPARE_StateAttribute_Parameter(_textureHeight) 

  • OpenSceneGraph/trunk/src/osg/View.cpp

    r7583 r7648  
    6161    } 
    6262     
    63     // detatch the cameras from this View to prevent dangling pointers 
     63    // detach the cameras from this View to prevent dangling pointers 
    6464    for(Slaves::iterator itr = _slaves.begin(); 
    6565        itr != _slaves.end(); 

  • OpenSceneGraph/trunk/src/osg/dxtctool.cpp

    r6459 r7648  
    5050bool dxtc_pixels::VFlip() const 
    5151{ 
    52     // Check that the given dimentions are 2^x, 2^y 
     52    // Check that the given dimensions are 2^x, 2^y 
    5353    if (! OpenGLSize()) 
    5454        return false; 

  • OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

    r7616 r7648  
    226226        //join(); 
    227227 
    228         // release the frameBlock and _databasePagerThreadBlock incase its holding up thread cancelation. 
     228        // release the frameBlock and _databasePagerThreadBlock in case its holding up thread cancellation. 
    229229        _databasePagerThreadBlock->release(); 
    230230 
    … …  
    362362        if (!foundEntry) 
    363363        { 
    364             osg::notify(osg::INFO)<<"In DatabasePager::requestNodeFile("<<fileName<<")"<<std::endl; 
     364            osg::notify(osg::INFO)<<"In DatabasePager::fileRquest("<<fileName<<")"<<std::endl; 
    365365 
    366366            osg::ref_ptr<DatabaseRequest> databaseRequest = new DatabaseRequest; 
    … …  
    449449        if (stateset) 
    450450        { 
    451             // search for the existance of any texture object attributes 
     451            // search for the existence of any texture object attributes 
    452452            bool foundTextureState = false; 
    453453            for(unsigned int i=0;i<stateset->getTextureAttributeList().size();++i) 
    … …  
    726726        { 
    727727            // do a yield to get round a peculiar thread hang when testCancel() is called  
    728             // in certain cirumstances - of which there is no particular pattern. 
     728            // in certain circumstances - of which there is no particular pattern. 
    729729            YieldCurrentThread(); 
    730730            firstTime = false; 
    … …  
    784784        group->addChild(databaseRequest->_loadedModel.get()); 
    785785 
    786         osg::notify(osg::INFO)<<"merged subgraph "<<databaseRequest->_fileName<<" after "<<databaseRequest->_numOfRequests<<" requests and time="<<(timeStamp-databaseRequest->_timestampFirstRequest)*1000.0<<std::endl; 
     786        osg::notify(osg::INFO)<<"merged subgraph"<<databaseRequest->_fileName<<" after "<<databaseRequest->_numOfRequests<<" requests and time="<<(timeStamp-databaseRequest->_timestampFirstRequest)*1000.0<<std::endl; 
    787787     
    788788        double timeToMerge = timeStamp-databaseRequest->_timestampFirstRequest; 
    … …  
    10431043        osg::ref_ptr<DatabaseRequest> databaseRequest; 
    10441044 
    1045         // get the first compileable entry. 
     1045        // get the first compilable entry. 
    10461046        { 
    10471047            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_dataToCompileListMutex); 

  • OpenSceneGraph/trunk/src/osgDB/DotOsgWrapper.cpp

    r5328 r7648  
    2828     
    2929 
    30     // copy the names in the space deliminated associates input into 
     30    // copy the names in the space delimited associates input into 
    3131    // a vector of separated names.     
    3232    std::string::size_type start_of_name = associates.find_first_not_of(' '); 

  • OpenSceneGraph/trunk/src/osgDB/Registry.cpp

    r7607 r7648  
    152152Registry::Registry() 
    153153{ 
    154     // comment out because it was causing problems under OSX - causing it to crash osgconv when constucting ostream in osg::notify(). 
     154    // comment out because it was causing problems under OSX - causing it to crash osgconv when constructing ostream in osg::notify(). 
    155155    // notify(INFO) << "Constructing osg::Registry"<<std::endl; 
    156156 
    … …  
    251251    addFileExtensionAlias("fnt",   "freetype");    // Windows bitmap fonts 
    252252     
    253     // wont't add type1 and type2 until resolve extension collision with Peformer binary and ascii files. 
     253    // wont't add type1 and type2 until resolve extension collision with Performer binary and ascii files. 
    254254    // addFileExtensionAlias("pfb",   "freetype");  // type1 binary 
    255255    // addFileExtensionAlias("pfa",   "freetype");  // type2 ascii 
    … …  
    282282    // the objects it contains when running the TXP plugin. 
    283283    // Not sure why, but perhaps there is is something in a TXP plugin 
    284     // which is deleted the data before its ref count hits zero, perhaps 
     284    // which deletes the data before its ref count hits zero, perhaps 
    285285    // even some issue with objects be allocated by a plugin that is 
    286     // mainted after that plugin is deleted...  Robert Osfield, Jan 2004. 
     286    // maintained after that plugin is deleted...  Robert Osfield, Jan 2004. 
    287287    clearObjectCache(); 
    288288    clearArchiveCache(); 
    … …  
    757757            // we have a composite name so now strip off the library name 
    758758            // are try to load it, and then retry the readObject to see 
    759             // if we can recongise the objects. 
     759            // if we can recognize the objects. 
    760760         
    761761            std::string libraryName = std::string(token,0,posDoubleColon); 
    … …  
    822822                        // we have a composite name so now strip off the library name 
    823823                        // are try to load it, and then retry the find to see 
    824                         // if we can recongise the objects. 
     824                        // if we can recognize the objects. 
    825825 
    826826                        std::string libraryName = std::string(token,0,posDoubleColon); 
    … …  
    884884            // we have a composite name so now strip off the library name 
    885885            // are try to load it, and then retry the readObject to see 
    886             // if we can recongise the objects. 
     886            // if we can recognize the objects. 
    887887         
    888888            std::string libraryName = std::string(token,0,posDoubleColon); 
    … …  
    944944                        // we have a composite name so now strip off the library name 
    945945                        // are try to load it, and then retry the find to see 
    946                         // if we can recongise the objects. 
     946                        // if we can recognize the objects. 
    947947 
    948948                        std::string libraryName = std::string(token,0,posDoubleColon); 
    … …  
    12181218                    // we have a composite name so now strip off the library name 
    12191219                    // are try to load it, and then retry the find to see 
    1220                     // if we can recongise the objects. 
     1220                    // if we can recognize the objects. 
    12211221 
    12221222                    std::string libraryName = std::string(token,0,posDoubleColon); 
    … …  
    15651565    ReaderWriter::ReadResult result = readImplementation(ReadArchiveFunctor(fileName, status, indexBlockSizeHint, options),false); 
    15661566 
    1567     // default to using chaching archive if no options structure provided, but if options are provided use archives 
     1567    // default to using caching archive if no options structure provided, but if options are provided use archives 
    15681568    // only if supplied. 
    15691569    if (result.validArchive() && 
    … …  
    18321832    ObjectsToRemove objectsToRemove; 
    18331833 
    1834     // first collect all the exprired entries in the ObjectToRemove list. 
     1834    // first collect all the expired entries in the ObjectToRemove list. 
    18351835    for(ObjectCache::iterator oitr=_objectCache.begin(); 
    18361836        oitr!=_objectCache.end(); 

  • OpenSceneGraph/trunk/src/osgGA/DriveManipulator.cpp

    r7186 r7648  
    553553 
    554554#if defined(ABOSULTE_PITCH) 
    555     // abosolute pitch 
     555    // absolute pitch 
    556556    double dy = _ga_t0->getYnormalized(); 
    557557    _pitch = -dy*0.5; 

  • OpenSceneGraph/trunk/src/osgGA/TerrainManipulator.cpp

    r5371 r7648  
    341341            ++i, endPoint = farPosition) 
    342342        { 
    343             // compute the itersection with the scene. 
     343            // compute the intersection with the scene. 
    344344            osgUtil::IntersectVisitor iv; 
    345345            iv.setTraversalMask(_intersectTraversalMask); 
    … …  
    368368    } 
    369369 
    370     // note LookAt = inv(CF)*inv(RM)*inv(T) which is equivilant to: 
     370    // note LookAt = inv(CF)*inv(RM)*inv(T) which is equivalent to: 
    371371    // inv(R) = CF*LookAt. 
    372372 
    … …  
    481481        _center += dv; 
    482482 
    483         // need to recompute the itersection point along the look vector. 
     483        // need to recompute the intersection point along the look vector. 
    484484         
    485485        if (_node.valid()) 

  • OpenSceneGraph/trunk/src/osgManipulator/Projector.cpp

    r6771 r7648  
    178178{ 
    179179    // To take a normal from world to local you need to transform it by the transpose of the inverse of the  
    180     // world to local matrix. Pre-multipling is equivalent to doing a post-multiplication of the transpose. 
     180    // world to local matrix. Pre-multiplying is equivalent to doing a post-multiplication of the transpose. 
    181181    osg::Vec3 localEyeDir = localToWorld * eyeDir; 
    182182    localEyeDir.normalize(); 

  • OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp

    r7623 r7648  
    323323 
    324324    invert the mesh matrix, apply this matrix to the object. This puts the object back at the origin 
    325     Transform the object by the nodes (nnegative) pivot point coords, this puts the PP at the origin 
    326     Tranform the node by the node matrix, which does the orientation about the pivot point, (and currently) transforms the object back by a translation to the PP. 
     325    Transform the object by the nodes (negative) pivot point coords, this puts the PP at the origin 
     326    Transform the node by the node matrix, which does the orientation about the pivot point, (and currently) transforms the object back by a translation to the PP. 
    327327 
    328328  */ 
    … …  
    787787            // and no longer require the decal hack below... 
    788788#if 0 
    789             // Eric orignal fallback 
     789            // Eric original fallback 
    790790            osg::Vec4 white(1.0f,1.0f,1.0f,alpha); 
    791791            material->setAmbient(osg::Material::FRONT_AND_BACK,white); 
    … …  
    793793            material->setSpecular(osg::Material::FRONT_AND_BACK,white); 
    794794#else 
    795             // try alternative to avoid staturating with white 
     795            // try alternative to avoid saturating with white 
    796796            // setting white as per OpenGL defaults. 
    797797            material->setAmbient(osg::Material::FRONT_AND_BACK,osg::Vec4(0.2f,0.2f,0.2f,alpha)); 

  • OpenSceneGraph/trunk/src/osgPlugins/ive/DrawArrayLengths.cpp

    r4401 r7648  
    5353        } 
    5454        else 
    55             throw Exception("DrawArrayLengths::read(): Could not cast this osg::DrawArrayLengths to an osg::PrimtiveSet."); 
     55            throw Exception("DrawArrayLengths::read(): Could not cast this osg::DrawArrayLengths to an osg::PrimitiveSet."); 
    5656 
    5757        // Read properties 

  • OpenSceneGraph/trunk/src/osgPlugins/ive/DrawElementsUByte.cpp

    r3564 r7648  
    4949        } 
    5050        else 
    51             throw Exception("DrawElementsUByte::read(): Could not cast this osg::DrawElementsUByte to an osg::PrimtiveSet."); 
     51            throw Exception("DrawElementsUByte::read(): Could not cast this osg::DrawElementsUByte to an osg::PrimitiveSet."); 
    5252 
    5353        // Read array length and its elements. 

  • OpenSceneGraph/trunk/src/osgPlugins/ive/DrawElementsUInt.cpp

    r3564 r7648  
    5151        } 
    5252        else 
    53             throw Exception("DrawElementsUInt::read(): Could not cast this osg::DrawElementsUInt to an osg::PrimtiveSet."); 
     53            throw Exception("DrawElementsUInt::read(): Could not cast this osg::DrawElementsUInt to an osg::PrimitiveSet."); 
    5454 
    5555        // Read array length and its elements. 

  • OpenSceneGraph/trunk/src/osgPlugins/ive/DrawElementsUShort.cpp

    r3564 r7648  
    5050        } 
    5151        else 
    52             throw Exception("DrawElementsUShort::read(): Could not cast this osg::DrawElementsUShort to an osg::PrimtiveSet."); 
     52            throw Exception("DrawElementsUShort::read(): Could not cast this osg::DrawElementsUShort to an osg::PrimitiveSet."); 
    5353 
    5454        // Read array length and its elements. 

  • OpenSceneGraph/trunk/src/osgPlugins/normals/Normals.cpp

    r5273 r7648  
    8484                _local_coords->push_back( (v + n)); 
    8585            } 
    86             else // BIND_PER_PRIMTIVE_SET, BIND_PER_PRIMTITIV, BIND_PER_VERTEX 
     86            else // BIND_PER_PRIMITIVE_SET, BIND_PER_PRIMITIVE, BIND_PER_VERTEX 
    8787            { 
    8888                Geometry::PrimitiveSetList& primitiveSets = geom->getPrimitiveSetList(); 

  • OpenSceneGraph/trunk/src/osgPlugins/osgViewer/View.cpp

    r7506 r7648  
    127127        } 
    128128         
    129         // skip trainling '}' 
     129        // skip trailing '}' 
    130130        ++fr; 
    131131         
    … …  
    198198        } 
    199199         
    200         // skip trainling '}' 
     200        // skip trailing '}' 
    201201        ++fr; 
    202202         

  • OpenSceneGraph/trunk/src/osgShadow/ParallelSplitShadowMap.cpp

    r7497 r7648  
    366366 
    367367                osg::Image* image = new osg::Image; 
    368                 // allocate the image data, noPixels x 1 x 1 with 4 rgba floats - equivilant to a Vec4! 
     368                // allocate the image data, noPixels x 1 x 1 with 4 rgba floats - equivalent to a Vec4! 
    369369                int noPixels = 1; 
    370370                image->allocateImage(noPixels,1,1,GL_RGBA,GL_FLOAT); 
    … …  
    393393                // texture for randomTexture (for smoothing shadow edges) 
    394394                osg::Image* image = new osg::Image; 
    395                 // allocate the image data, noPixels x noPixels x 1 with 4 rgba floats - equivilant to a Vec4! 
     395                // allocate the image data, noPixels x noPixels x 1 with 4 rgba floats - equivalent to a Vec4! 
    396396                int noPixels = 128; 
    397397                image->allocateImage(noPixels,noPixels,1,GL_RGBA,GL_FLOAT); 
    … …  
    494494    osgUtil::RenderStage* orig_rs = cv.getRenderStage(); 
    495495 
    496     // do traversal of shadow recieving scene which does need to be decorated by the shadow map 
     496    // do traversal of shadow receiving scene which does need to be decorated by the shadow map 
    497497    for (PSSMShadowSplitTextureMap::iterator it=_PSSMShadowSplitTextureMap.begin();it!=_PSSMShadowSplitTextureMap.end();it++) 
    498498    { 
    … …  
    551551    { 
    552552 
    553         // do traversal of shadow recieving scene which does need to be decorated by the shadow map 
     553        // do traversal of shadow receiving scene which does need to be decorated by the shadow map 
    554554        unsigned int iMaxSplit = _PSSMShadowSplitTextureMap.size(); 
    555555 
    … …  
    752752////////////////////////////////////////////////////////////////////////// 
    753753// 
    754 // compute directional light inital postion; 
     754// compute directional light initial position; 
    755755void ParallelSplitShadowMap::calculateLightInitalPosition(PSSMShadowSplitTexture &pssmShadowSplitTexture,osg::Vec3d *frustumCorners){ 
    756756    pssmShadowSplitTexture._frustumSplitCenter = frustumCorners[0]; 

  • OpenSceneGraph/trunk/src/osgShadow/ShadowMap.cpp

    r7635 r7648  
    303303        osgUtil::RenderStage* orig_rs = cv.getRenderStage(); 
    304304 
    305         // do traversal of shadow recieving scene which does need to be decorated by the shadow map 
     305        // do traversal of shadow receiving scene which does need to be decorated by the shadow map 
    306306        { 
    307307            cv.pushStateSet(_stateset.get()); 

  • OpenSceneGraph/trunk/src/osgShadow/ShadowTexture.cpp

    r6952 r7648  
    120120    } 
    121121 
    122     // do traversal of shadow recieving scene which does need to be decorated by the shadow texture 
     122    // do traversal of shadow receiving scene which does need to be decorated by the shadow texture 
    123123    { 
    124124        cv.pushStateSet(_stateset.get()); 

  • OpenSceneGraph/trunk/src/osgShadow/SoftShadowMap.cpp

    r7444 r7648  
    339339    osgUtil::RenderStage* orig_rs = cv.getRenderStage(); 
    340340 
    341     // do traversal of shadow recieving scene which does need to be decorated by the shadow map 
     341    // do traversal of shadow receiving scene which does need to be decorated by the shadow map 
    342342    { 
    343343        cv.pushStateSet(_stateset.get()); 

  • OpenSceneGraph/trunk/src/osgSim/Impostor.cpp

    r6248 r7648  
    264264 
    265265    // convert the corners of the sprite (in world coords) into their 
    266     // equivilant window coordinates by using the camera's project method. 
     266    // equivalent window coordinates by using the camera's project method. 
    267267    const osg::Matrix& MVPW = *(cv->getMVPW()); 
    268268    Vec3 c00_win = c00 * MVPW; 

  • OpenSceneGraph/trunk/src/osgSim/LineOfSight.cpp

    r6993 r7648  
    7474                { 
    7575                    osg::notify(osg::NOTICE)<<"Erasing "<<itr->first<<std::endl; 
    76                     // found a node which is only referenced in the cache so we can disgard it 
     76                    // found a node which is only referenced in the cache so we can discard it 
    7777                    // and know that the actual memory will be released. 
    7878                    _filenameSceneMap.erase(itr); 

  • OpenSceneGraph/trunk/src/osgSim/SphereSegment.cpp

    r6422 r7648  
    138138/** 
    139139SphereSegment::Side is a Drawable which represents one of the 
    140 planar areas, at either the minimum or maxium azimuth. 
     140planar areas, at either the minimum or maximum azimuth. 
    141141 */ 
    142142class SphereSegment::Side: public osg::Drawable 
    … …  
    702702                    start = 0; 
    703703                    end = _density; 
    704                     normal = -normal;   // Make sure normals orientationint 'outwards' 
     704                    normal = -normal;   // Make sure normals oriented 'outwards' 
    705705                } 
    706706                delta = end>start?1:-1; 
    … …  
    764764                    start = _density; 
    765765                    end = 0; 
    766                     normal = -normal;   // Make sure normals orientationint 'outwards' 
     766                    normal = -normal;   // Make sure normals orientated 'outwards' 
    767767                } 
    768768                else 
    … …  
    983983//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 
    984984// 
    985 // SphereSegment interesection code. 
     985// SphereSegment intersection code. 
    986986 
    987987class PolytopeVisitor : public osg::NodeVisitor 
    … …  
    18081808 
    18091809            // now need to build the toTraverse list for each hit edge, 
    1810             // but should only contain traingles that actually hit the intersection surface 
     1810            // but should only contain triangles that actually hit the intersection surface 
    18111811            EdgeList::iterator hitr; 
    18121812            for(hitr = hitEdges.begin(); 
    … …  
    18411841                    } 
    18421842 
    1843                     // osg::notify(osg::INFO)<<"Number active edges "<<numActiveEdges<<" num orignal edges "<<numEdges<<std::endl; 
     1843                    // osg::notify(osg::INFO)<<"Number active edges "<<numActiveEdges<<" num original edges "<<numEdges<<std::endl; 
    18441844                } 
    18451845            } 
    … …  
    19941994 
    19951995 
    1996         // handle a paird of surfaces that work to enclose a convex region, which means that  
     1996        // handle a paired of surfaces that work to enclose a convex region, which means that  
    19971997        // points can be inside either surface to be valid, and be outside both surfaces to be invalid. 
    19981998        template<class I> 
    … …  
    20482048 
    20492049                        // work out which intersector to use by discounting the one that 
    2050                         // isn't a plausible candiate. 
     2050                        // isn't a plausible candidate. 
    20512051                        bool possible1 = end1>=0.0; 
    20522052                        bool possible2 = end2>=0.0; 
    … …  
    21072107 
    21082108                        // work out which intersector to use by discounting the one that 
    2109                         // isn't a plausible candiate. 
     2109                        // isn't a plausible candidate. 
    21102110                        bool possible1 = start1>=0.0; 
    21112111                        bool possible2 = start2>=0.0; 
    … …  
    23112311            SphereSegment::LineList unfusedLines; 
    23122312 
    2313             // first seperat the already fused lines from the unfused ones. 
     2313            // first separate the already fused lines from the unfused ones. 
    23142314            for(SphereSegment::LineList::iterator itr = _generatedLines.begin(); 
    23152315                itr != _generatedLines.end(); 
    … …  
    24612461                    unfusedLines.push_back(newline); 
    24622462 
    2463                     osg::notify(osg::INFO)<<"Fusing two seperate lines "<<newline<<std::endl; 
     2463                    osg::notify(osg::INFO)<<"Fusing two separate lines "<<newline<<std::endl; 
    24642464                } 
    24652465 
    … …  
    25272527            edge->_p2Outside = _lowerOutside ? (d2<0.0) : (d2>0.0); 
    25282528 
    2529             // if both points inside then disgard 
     2529            // if both points inside then discard 
    25302530            if (d1<0.0 && d2<0.0) return false; 
    25312531 
    2532             // if both points outside then disgard 
     2532            // if both points outside then discard 
    25332533            if (d1>0.0 && d2>0.0) return false; 
    25342534 
    … …  
    26282628            edge->_p2Outside = _lowerOutside ? (elev2<_elev) : (elev2>_elev); 
    26292629 
    2630             // if both points inside then disgard 
     2630            // if both points inside then discard 
    26312631            if (elev1<_elev && elev2<_elev) return false; 
    26322632 
    2633             // if both points outside then disgard 
     2633            // if both points outside then discard 
    26342634            if (elev1>_elev && elev2>_elev) return false; 
    26352635 
    … …  
    27582758            edge->_p2Outside = radius2>_tif._radius; 
    27592759 
    2760             // if both points inside then disgard 
     2760            // if both points inside then discard 
    27612761            if (radius1<_tif._radius && radius2<_tif._radius) return false; 
    27622762 
    2763             // if both points outside then disgard 
     2763            // if both points outside then discard 
    27642764            if (radius1>_tif._radius && radius2>_tif._radius) return false; 
    27652765 
    … …  
    29782978    tif._generatedLines.insert(tif._generatedLines.end(), elevMaxLines.begin(), elevMaxLines.end()); 
    29792979  
    2980     osg::notify(osg::INFO)<<"number of seperate lines = "<<tif._generatedLines.size()<<std::endl; 
     2980    osg::notify(osg::INFO)<<"number of separate lines = "<<tif._generatedLines.size()<<std::endl; 
    29812981 
    29822982    float fuseDistance = 1.0; 
    29832983    tif.joinEnds(fuseDistance, true, true); 
    29842984 
    2985     osg::notify(osg::INFO)<<"number of seperate lines after fuse = "<<tif._generatedLines.size()<<std::endl; 
     2985    osg::notify(osg::INFO)<<"number of separate lines after fuse = "<<tif._generatedLines.size()<<std::endl; 
    29862986 
    29872987    float joinDistance = 1e8; 
    29882988    tif.joinEnds(joinDistance, false, false); 
    2989     osg::notify(osg::INFO)<<"number of seperate lines after join = "<<tif._generatedLines.size()<<std::endl; 
     2989    osg::notify(osg::INFO)<<"number of separate lines after join = "<<tif._generatedLines.size()<<std::endl; 
    29902990 
    29912991    tif.joinEnds(joinDistance, false, true); 
    2992     osg::notify(osg::INFO)<<"number of seperate lines after second join = "<<tif._generatedLines.size()<<std::endl; 
     2992    osg::notify(osg::INFO)<<"number of separate lines after second join = "<<tif._generatedLines.size()<<std::endl; 
    29932993  
    29942994    return tif._generatedLines; 

  • OpenSceneGraph/trunk/src/osgTerrain/GeometryTechnique.cpp

    r7375 r7648  
    490490            if (tf) 
    491491            { 
    492                 // up the precision of hte internal texture format to its maximum. 
     492                // up the precision of the internal texture format to its maximum. 
    493493                //image->setInternalTextureFormat(GL_LUMINANCE32F_ARB); 
    494494                image->setInternalTextureFormat(GL_LUMINANCE16); 
    … …  
    590590 
    591591    // if the elevationLayer and colorLayer are the same, and there is colorTF then 
    592     // simply assing as a texture coordinate. 
     592    // simply assign as a texture coordinate. 
    593593    if ((elevationLayer==colorLayer) && colorTF) colorLayer = 0; 
    594594     

  • OpenSceneGraph/trunk/src/osgTerrain/Layer.cpp

    r7316 r7648  
    234234///////////////////////////////////////////////////////////////////////////// 
    235235// 
    236 // HieghtFieldLayer 
     236// HeightFieldLayer 
    237237// 
    238238HeightFieldLayer::HeightFieldLayer(): 

  • OpenSceneGraph/trunk/src/osgTerrain/TerrainTechnique.cpp

    r7201 r7648  
    6161void TerrainTechnique::dirty() 
    6262{ 
    63     // osg::notify(osg::NOTICE)<<className()<<"::dirty(..) not implementated yet"<<std::endl;     
     63    // osg::notify(osg::NOTICE)<<className()<<"::dirty(..) not implemented yet"<<std::endl;     
    6464    _dirty = true; 
    6565} 

  • OpenSceneGraph/trunk/src/osgText/DefaultFont.cpp

    r7359 r7648  
    223223        glyph->setInternalTextureFormat(GL_ALPHA); 
    224224 
    225         // now populate data arry by converting bitmap into a luminance_alpha map. 
     225        // now populate data array by converting bitmap into a luminance_alpha map. 
    226226        unsigned char* ptr = rasters[i-32]; 
    227227        unsigned char value_on = 255; 

  • OpenSceneGraph/trunk/src/osgText/Font.cpp

    r7645 r7648  
    631631        if (s_renderer &&  
    632632            (strstr((const char*)s_renderer,"Radeon")!=0) ||  
    633             (strstr((const char*)s_renderer,"RADEON")!=0)) 
     633            (strstr((const char*)s_renderer,"RADEON")!=0) || 
     634            (strstr((const char*)s_renderer,"ALL-IN-WONDER")!=0)) 
    634635        { 
    635636            // we're running on an ATI, so need to work around its 

  • OpenSceneGraph/trunk/src/osgText/String.cpp

    r5515 r7648  
    88//////////////////////////////////////////////////////////////////////// 
    99// 
    10 // helper class to make it safer to querry std::string's for encoding. 
     10// helper class to make it safer to query std::string's for encoding. 
    1111// 
    1212struct look_ahead_iterator 

  • OpenSceneGraph/trunk/src/osgText/Text.cpp

    r7645 r7648  
    225225                --lastValidChar; 
    226226                 
    227                 //Substract off glyphs from the cursor position (to correctly center text) 
     227                // Subtract off glyphs from the cursor position (to correctly center text) 
    228228                Font::Glyph* glyph = activefont->getGlyph(*lastValidChar); 
    229229                if (glyph) 
    … …  
    366366            { 
    367367              // TODO: current behaviour top baselines lined up in both cases - need to implement 
    368               //       top of characters aligment - Question is this neccesary? 
     368              //       top of characters alignment - Question is this necessary? 
    369369              // ... otherwise, nothing to be done for these 6 cases 
    370370              //case LEFT_TOP: 
    … …  
    17591759} 
    17601760 
     1761 
    17611762void Text::renderWithPolygonOffset(osg::State& state, const osg::Vec4& colorMultiplier) const 
    17621763{ 
    … …  
    18191820    glPopAttrib(); 
    18201821} 
     1822     
    18211823 
    18221824void Text::renderWithNoDepthBuffer(osg::State& state, const osg::Vec4& colorMultiplier) const 

  • OpenSceneGraph/trunk/src/osgUtil/IntersectVisitor.cpp

    r6109 r7648  
    181181{ 
    182182 
    183     // overide the default node visitor mode. 
     183    // override the default node visitor mode. 
    184184    setTraversalMode(NodeVisitor::TRAVERSE_ACTIVE_CHILDREN); 
    185185     
    … …  
    187187    setEyePoint(Vec3(0.0f,0.0f,0.0f)); 
    188188 
    189     setLODSelectionMode(USE_HIGHEST_LEVEL_OF_DETAIL); // orignal IntersectVisitor behavior 
     189    setLODSelectionMode(USE_HIGHEST_LEVEL_OF_DETAIL); // original IntersectVisitor behavior 
    190190    //setLODSelectionMode(USE_SEGMENT_START_POINT_AS_EYE_POINT_FOR_LOD_LEVEL_SELECTION); 
    191191 

  • OpenSceneGraph/trunk/src/osgUtil/IntersectionVisitor.cpp

    r5764 r7648  
    153153IntersectionVisitor::IntersectionVisitor(Intersector* intersector, ReadCallback* readCallback) 
    154154{ 
    155     // overide the default node visitor mode. 
     155    // override the default node visitor mode. 
    156156    setTraversalMode(NodeVisitor::TRAVERSE_ACTIVE_CHILDREN); 
    157157     
    … …  
    163163void IntersectionVisitor::setIntersector(Intersector* intersector) 
    164164{ 
    165     // keep refernce around just in case intersector is already in the _intersectorStack, otherwsie the clear could delete it. 
     165    // keep reference around just in case intersector is already in the _intersectorStack, otherwise the clear could delete it. 
    166166    osg::ref_ptr<Intersector> temp = intersector; 
    167167 
    … …  
    289289    popModelMatrix(); 
    290290 
    291     // tidy up an cached cull variabes in the current intersector. 
     291    // tidy up an cached cull variables in the current intersector. 
    292292    leave(); 
    293293} 

  • OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

    r7601 r7648  
    20602060                    // now need to clean up primitiveset so it no longer contains the rhs combined primitives. 
    20612061 
    2062                     // first swap with a empty primtiveSet to empty it completely. 
     2062                    // first swap with a empty primitiveSet to empty it completely. 
    20632063                    osg::Geometry::PrimitiveSetList oldPrimitives; 
    20642064                    primitives.swap(oldPrimitives); 
    … …  
    21632163    } 
    21642164     
    2165     // shift the indices of the incomming primitives to account for the pre exisiting geometry. 
     2165    // shift the indices of the incoming primitives to account for the pre existing geometry. 
    21662166    for(osg::Geometry::PrimitiveSetList::iterator primItr=geom.getPrimitiveSetList().begin(); 
    21672167        primItr!=geom.getPrimitiveSetList().end(); 
    … …  
    23882388 
    23892389 
    2390     // shift the indices of the incomming primitives to account for the pre exisiting geometry. 
     2390    // shift the indices of the incoming primitives to account for the pre existing geometry. 
    23912391    for(osg::Geometry::PrimitiveSetList::iterator primItr=rhs.getPrimitiveSetList().begin(); 
    23922392        primItr!=rhs.getPrimitiveSetList().end(); 

  • OpenSceneGraph/trunk/src/osgUtil/PlaneIntersector.cpp

    r5792 r7648  
    407407                        if (de<0.0) 
    408408                        { 
    409                             // osg::notify(osg::NOTICE)<<"Disgard segment "<<std::endl; 
     409                            // osg::notify(osg::NOTICE)<<"Discard segment "<<std::endl; 
    410410                            return; 
    411411                        } 

  • OpenSceneGraph/trunk/src/osgUtil/RenderBin.cpp

    r7186 r7648  
    492492        if (dw) 
    493493        { 
    494               // then tot up the primtive types and no vertices. 
     494              // then tot up the primitive types and no vertices. 
    495495              dw->accept(stats); // use sub-class to find the stats for each drawable 
    496496        } 
    … …  
    513513            if (dw) 
    514514            { 
    515                 // then tot up the primtive types and no vertices. 
     515                // then tot up the primitive types and no vertices. 
    516516                dw->accept(stats); // use sub-class to find the stats for each drawable 
    517517            } 

  • OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp

    r7122 r7648  
    222222    osg::Camera::RenderTargetImplementation renderTargetFallback = _camera->getRenderTargetFallback(); 
    223223 
    224     osg::Camera::BufferAttachmentMap& bufferAttachements = _camera->getBufferAttachmentMap(); 
     224    osg::Camera::BufferAttachmentMap& bufferAttachments = _camera->getBufferAttachmentMap(); 
    225225 
    226226    // compute the required dimensions 
    … …  
    229229    int depth = 1; 
    230230    osg::Camera::BufferAttachmentMap::iterator itr; 
    231     for(itr = bufferAttachements.begin(); 
    232         itr != bufferAttachements.end(); 
     231    for(itr = bufferAttachments.begin(); 
     232        itr != bufferAttachments.end(); 
    233233        ++itr) 
    234234    { 
    … …  
    242242 
    243243    // attach an images that need to be copied after the stage is drawn. 
    244     for(itr = bufferAttachements.begin(); 
    245         itr != bufferAttachements.end(); 
     244    for(itr = bufferAttachments.begin(); 
     245        itr != bufferAttachments.end(); 
    246246        ++itr) 
    247247    { 
    … …  
    332332            bool depthAttached = false; 
    333333            bool stencilAttached = false; 
    334             for(osg::Camera::BufferAttachmentMap::iterator itr = bufferAttachements.begin(); 
    335                 itr != bufferAttachements.end(); 
     334            for(osg::Camera::BufferAttachmentMap::iterator itr = bufferAttachments.begin(); 
     335                itr != bufferAttachments.end(); 
    336336                ++itr) 
    337337            { 
    … …  
    424424    } 
    425425 
    426     // if any of the renderTargetImplementations require a seperate graphics context such as with pbuffer try in turn to 
     426    // if any of the renderTargetImplementations require a separate graphics context such as with pbuffer try in turn to 
    427427    // set up, but if each level fails then resort to the next level down.     
    428428    while (!getGraphicsContext() && 
    … …  
    455455            bool depthAttached = false; 
    456456            bool stencilAttached = false; 
    457             for(osg::Camera::BufferAttachmentMap::iterator itr = bufferAttachements.begin(); 
    458                 itr != bufferAttachements.end(); 
     457            for(osg::Camera::BufferAttachmentMap::iterator itr = bufferAttachments.begin(); 
     458                itr != bufferAttachments.end(); 
    459459                ++itr) 
    460460            { 
    … …  
    586586            else 
    587587            { 
    588                 osg::notify(osg::INFO)<<"Failed to aquire Graphics Context"<<std::endl; 
     588                osg::notify(osg::INFO)<<"Failed to acquire Graphics Context"<<std::endl; 
    589589                 
    590590                if (renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT) 
    … …  
    610610        osg::notify(osg::INFO)<<"Setting up osg::Camera::FRAME_BUFFER"<<std::endl; 
    611611 
    612         for(osg::Camera::BufferAttachmentMap::iterator itr = bufferAttachements.begin(); 
    613             itr != bufferAttachements.end(); 
     612        for(osg::Camera::BufferAttachmentMap::iterator itr = bufferAttachments.begin(); 
     613            itr != bufferAttachments.end(); 
    614614            ++itr) 
    615615        { 
    … …  
    861861        useRenderInfo.setState(useState); 
    862862         
    863         // syncronize the frame stamps 
     863        // synchronize the frame stamps 
    864864        useState->setFrameStamp(const_cast<osg::FrameStamp*>(state.getFrameStamp())); 
    865865 
    … …  
    990990    } 
    991991 
    992     // push the stages camera so that drawing code can querry it      
     992    // push the stages camera so that drawing code can query it      
    993993    if (_camera) renderInfo.pushCamera(_camera); 
    994994 

  • OpenSceneGraph/trunk/src/osgUtil/Simplifier.cpp

    r7440 r7648  
    357357        { 
    358358            _triangles.insert(triangle); 
    359             // if (_triangles.size()>2) osg::notify(osg::NOTICE)<<"Warning too many traingles ("<<_triangles.size()<<") sharing edge "<<std::endl; 
     359            // if (_triangles.size()>2) osg::notify(osg::NOTICE)<<"Warning too many triangles ("<<_triangles.size()<<") sharing edge "<<std::endl; 
    360360        } 
    361361         
    … …  
    465465        } 
    466466         
    467         // note return 1 - dotproduct, so that deviation is in the range of 0.0 to 2.0, where 0 is coincendent, 1.0 is 90 degrees, and 2.0 is 180 degrees. 
     467        // note return 1 - dotproduct, so that deviation is in the range of 0.0 to 2.0, where 0 is coincident, 1.0 is 90 degrees, and 2.0 is 180 degrees. 
    468468        float computeNormalDeviationOnEdgeCollapse(Edge* edge,Point* pNew) const 
    469469        { 
    … …  
    602602            triangle->_e3 = replaceEdgePoint(triangle->_e3.get(),pOriginal,pNew); 
    603603             
    604             // remove the triangle form the orignal point, and possibly the point if its the last triangle to use it 
     604            // remove the triangle form the original point, and possibly the point if its the last triangle to use it 
    605605            removePoint(triangle, pOriginal); 
    606606             

  • OpenSceneGraph/trunk/src/osgUtil/Tessellator.cpp

    r6786 r7648  
    623623        } 
    624624 
    625         // draw primtives by the more flexible "slow" path, 
     625        // draw primitives by the more flexible "slow" path, 
    626626        // sending OpenGL glBegin/glVertex.../glEnd(). 
    627627        switch(primitiveset->getType()) 

  • OpenSceneGraph/trunk/src/osgUtil/TriStripVisitor.cpp

    r5328 r7648  
    217217    } 
    218218 
    219     // check for the existance of surface primitives 
     219    // check for the existence of surface primitives 
    220220    unsigned int numSurfacePrimitives = 0; 
    221221    unsigned int numNonSurfacePrimitives = 0; 

  • OpenSceneGraph/trunk/src/osgViewer/CompositeViewer.cpp

    r7535 r7648  
    923923        if (scene->getDatabasePager()) 
    924924        {     
    925             // syncronize changes required by the DatabasePager thread to the scene graph 
     925            // synchronize changes required by the DatabasePager thread to the scene graph 
    926926            scene->getDatabasePager()->updateSceneGraph(_frameStamp->getReferenceTime()); 
    927927        } 

  • OpenSceneGraph/trunk/src/osgViewer/Renderer.cpp

    r7295 r7648  
    255255    if (_done || _graphicsThreadDoesCull) return; 
    256256 
    257     // note we assume lock has already been aquired. 
     257    // note we assume lock has already been acquired. 
    258258    osgUtil::SceneView* sceneView = _availableQueue.takeFront(); 
    259259 
    … …  
    275275        int frameNumber = fs ? fs->getFrameNumber() : 0; 
    276276 
    277         // do cull taversal 
     277        // do cull traversal 
    278278        osg::Timer_t beforeCullTick = osg::Timer::instance()->tick(); 
    279279 
    … …  
    357357        } 
    358358 
    359         bool aquireGPUStats = stats && _timerQuerySupported && stats->collectStats("gpu"); 
    360  
    361         if (aquireGPUStats)  
     359        bool acquireGPUStats = stats && _timerQuerySupported && stats->collectStats("gpu"); 
     360 
     361        if (acquireGPUStats)  
    362362        { 
    363363            checkQuery(stats); 
    364364        } 
    365365 
    366         // do draw traveral 
    367         if (aquireGPUStats)  
     366        // do draw traversal 
     367        if (acquireGPUStats)  
    368368        { 
    369369            checkQuery(stats); 
    … …  
    405405        } 
    406406 
    407         if (aquireGPUStats) 
     407        if (acquireGPUStats) 
    408408        { 
    409409            endQuery(); 
    … …  
    465465    } 
    466466 
    467     bool aquireGPUStats = stats && _timerQuerySupported && stats->collectStats("gpu"); 
    468  
    469     if (aquireGPUStats)  
     467    bool acquireGPUStats = stats && _timerQuerySupported && stats->collectStats("gpu"); 
     468 
     469    if (acquireGPUStats)  
    470470    { 
    471471        checkQuery(stats); 
    472472    } 
    473473 
    474     // do cull taversal 
     474    // do cull traversal 
    475475    osg::Timer_t beforeCullTick = osg::Timer::instance()->tick(); 
    476476 
    … …  
    488488 
    489489 
    490     // do draw traveral 
    491     if (aquireGPUStats)  
     490    // do draw traversal 
     491    if (acquireGPUStats)  
    492492    { 
    493493        checkQuery(stats); 
    … …  
    527527    } 
    528528 
    529     if (aquireGPUStats) 
     529    if (acquireGPUStats) 
    530530    { 
    531531        endQuery(); 

  • OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp

    r7507 r7648  
    567567 
    568568 
    569     // collect all the relevant camers 
     569    // collect all the relevant cameras 
    570570    ViewerBase::Cameras validCameras; 
    571571    viewer->getCameras(validCameras); 
    … …  
    582582    } 
    583583 
    584     // check for querry time support 
     584    // check for query time support 
    585585    unsigned int numCamrasWithTimerQuerySupport = 0; 
    586586    for(ViewerBase::Cameras::iterator citr = cameras.begin(); 
    … …  
    599599    } 
    600600 
    601     bool aquireGPUStats = numCamrasWithTimerQuerySupport==cameras.size(); 
     601    bool acquireGPUStats = numCamrasWithTimerQuerySupport==cameras.size(); 
    602602 
    603603    float leftPos = 10.0f; 
    … …  
    750750            ++citr) 
    751751        { 
    752             group->addChild(createCameraStats(font, pos, startBlocks, aquireGPUStats, characterSize, viewer->getStats(), *citr)); 
     752            group->addChild(createCameraStats(font, pos, startBlocks, acquireGPUStats, characterSize, viewer->getStats(), *citr)); 
    753753        } 
    754754 
    … …  
    887887} 
    888888 
    889 osg::Node* StatsHandler::createCameraStats(const std::string& font, osg::Vec3& pos, float startBlocks, bool aquireGPUStats, float characterSize, osg::Stats* viewerStats, osg::Camera* camera) 
     889osg::Node* StatsHandler::createCameraStats(const std::string& font, osg::Vec3& pos, float startBlocks, bool acquireGPUStats, float characterSize, osg::Stats* viewerStats, osg::Camera* camera) 
    890890{ 
    891891    osg::Stats* stats = camera->getStats(); 
    … …  
    973973    } 
    974974 
    975     if (aquireGPUStats) 
     975    if (acquireGPUStats) 
    976976    { 
    977977        pos.x() = leftPos; 
    … …  
    10161016void StatsHandler::getUsage(osg::ApplicationUsage& usage) const 
    10171017{ 
    1018     usage.addKeyboardMouseBinding("s","Onscreen stats."); 
     1018    usage.addKeyboardMouseBinding("s","On screen stats."); 
    10191019    usage.addKeyboardMouseBinding("S","Output stats to console."); 
    10201020} 

  • OpenSceneGraph/trunk/src/osgViewer/View.cpp

    r7622 r7648  
    6060 
    6161 
    62 /** callback class to use to allow matrix manipulators to querry the application for the local coordinate frame.*/ 
     62/** callback class to use to allow matrix manipulators to query the application for the local coordinate frame.*/ 
    6363class ViewerCoordinateFrameCallback : public osgGA::MatrixManipulator::CoordinateFrameCallback 
    6464{ 
    … …  
    143143    setThreadSafeRefUnref(true); 
    144144     
    145     // need to attach a Renderer to the maaster camera which has been default constructed 
     145    // need to attach a Renderer to the master camera which has been default constructed 
    146146    getCamera()->setRenderer(createRenderer(getCamera())); 
    147147 
    … …  
    158158    _scene = new Scene; 
    159159 
    160     // need to attach a Renderer to the maaster camera which has been default constructed 
     160    // need to attach a Renderer to the master camera which has been default constructed 
    161161    getCamera()->setRenderer(createRenderer(getCamera())); 
    162162 
    … …  
    272272    if (getSceneData()) 
    273273    {         
    274         // now make sure the scene graph is set up with the correct DataVariance to protect the dyamic elements of 
     274        // now make sure the scene graph is set up with the correct DataVariance to protect the dynamic elements of 
    275275        // the scene graph from being run in parallel. 
    276276        osgUtil::Optimizer::StaticObjectDetectionVisitor sodv; 

  • OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp

    r7535 r7648  
    431431    osg::Timer::instance()->setStartTick(); 
    432432 
    433     // pass on the start tick to all the associated eventqueues 
     433    // pass on the start tick to all the associated event queues 
    434434    setStartTick(osg::Timer::instance()->getStartTick()); 
    435435 
    … …  
    840840    if (_scene->getDatabasePager()) 
    841841    {     
    842         // syncronize changes required by the DatabasePager thread to the scene graph 
     842        // synchronize changes required by the DatabasePager thread to the scene graph 
    843843        _scene->getDatabasePager()->updateSceneGraph(_frameStamp->getReferenceTime()); 
    844844    } 

  • OpenSceneGraph/trunk/src/osgViewer/ViewerEventHandlers.cpp

    r7516 r7648  
    460460            // to either the newly created one or the existing one. However, the code do that was 
    461461            // EXTREMELY dirty, so I opted for a simpler solution. At a later date, someone may 
    462             // want to implement the original recomendation (which is in a mailing list reply 
     462            // want to implement the original recommendation (which is in a mailing list reply 
    463463            // from June 1st by Robert in a thread called "osgviewer Camera Animation (preliminary)". 
    464464            else if (ea.getKey() == _keyEventTogglePlayback) 
    … …  
    484484 
    485485 
    486                     // If we succesfully found our _filename file, set it and keep a copy 
     486                    // If we successfully found our _filename file, set it and keep a copy 
    487487                    // around of the original MatrixManipulator to restore later. 
    488488                    if (_animPathManipulator.valid() && _animPathManipulator->valid())