diff --git a/examples/osgshadow/osgshadow.cpp b/examples/osgshadow/osgshadow.cpp index ff3d125e3..2a7f81d4f 100644 --- a/examples/osgshadow/osgshadow.cpp +++ b/examples/osgshadow/osgshadow.cpp @@ -30,7 +30,7 @@ // for the grid data.. #include "../osghangglide/terrain_coords.h" -const int RecievesShadowTraversalMask = 0x1; +const int ReceivesShadowTraversalMask = 0x1; const int CastsShadowTraversalMask = 0x2; namespace ModelOne @@ -352,7 +352,7 @@ namespace ModelTwo // the shadowed model osg::Node* shadowed = createBase(center-osg::Vec3(0.0f,0.0f,radius*0.25),radius); - shadowed->setNodeMask(RecievesShadowTraversalMask); + shadowed->setNodeMask(ReceivesShadowTraversalMask); osg::Group* group = new osg::Group; @@ -547,7 +547,7 @@ int main(int argc, char** argv) osg::ref_ptr model = osgDB::readNodeFiles(arguments); if (model.valid()) { - model->setNodeMask(CastsShadowTraversalMask | RecievesShadowTraversalMask); + model->setNodeMask(CastsShadowTraversalMask | ReceivesShadowTraversalMask); } else { @@ -573,7 +573,7 @@ int main(int argc, char** argv) osg::ref_ptr shadowedScene = new osgShadow::ShadowedScene; - shadowedScene->setRecievesShadowTraversalMask(RecievesShadowTraversalMask); + shadowedScene->setReceivesShadowTraversalMask(ReceivesShadowTraversalMask); shadowedScene->setCastsShadowTraversalMask(CastsShadowTraversalMask); @@ -617,7 +617,7 @@ int main(int argc, char** argv) geode->addDrawable( osg::createTexturedQuadGeometry( centerBase-widthVec*1.5f-depthVec*1.5f, widthVec*3.0f, depthVec*3.0f) ); - geode->setNodeMask(shadowedScene->getRecievesShadowTraversalMask()); + geode->setNodeMask(shadowedScene->getReceivesShadowTraversalMask()); geode->getOrCreateStateSet()->setTextureAttributeAndModes(0, new osg::Texture2D(osgDB::readImageFile("Images/lz.rgb"))); diff --git a/examples/osgshadowtexture/osgshadowtexture.cpp b/examples/osgshadowtexture/osgshadowtexture.cpp index a0f480ca9..3471cdf59 100644 --- a/examples/osgshadowtexture/osgshadowtexture.cpp +++ b/examples/osgshadowtexture/osgshadowtexture.cpp @@ -193,8 +193,8 @@ osg::Node* createModel(osg::ArgumentParser& arguments) osg::ref_ptr ls = new osg::LightSource; ls->getLight()->setPosition(osg::Vec4(lightPosition,1.0)); - shadowedScene->setRecievesShadowTraversalMask(0x1); - shadowed->setNodeMask(shadowedScene->getRecievesShadowTraversalMask()); + shadowedScene->setReceivesShadowTraversalMask(0x1); + shadowed->setNodeMask(shadowedScene->getReceivesShadowTraversalMask()); shadowedScene->setCastsShadowTraversalMask(0x2); shadower->setNodeMask(shadowedScene->getCastsShadowTraversalMask()); @@ -217,8 +217,8 @@ osg::Node* createModel(osg::ArgumentParser& arguments) osg::ref_ptr ls = new osg::LightSource; ls->getLight()->setPosition(osg::Vec4(lightPosition,1.0)); - shadowedScene->setRecievesShadowTraversalMask(0x1); - shadowed->setNodeMask(shadowedScene->getRecievesShadowTraversalMask()); + shadowedScene->setReceivesShadowTraversalMask(0x1); + shadowed->setNodeMask(shadowedScene->getReceivesShadowTraversalMask()); shadowedScene->setCastsShadowTraversalMask(0x2); shadower->setNodeMask(shadowedScene->getCastsShadowTraversalMask()); diff --git a/include/osgShadow/ShadowedScene b/include/osgShadow/ShadowedScene index 220a69aba..9194131f8 100644 --- a/include/osgShadow/ShadowedScene +++ b/include/osgShadow/ShadowedScene @@ -36,8 +36,8 @@ class OSGSHADOW_EXPORT ShadowedScene : public osg::Group virtual void traverse(osg::NodeVisitor& nv); - void setRecievesShadowTraversalMask(unsigned int mask) { _recievesShadowTraversalMask = mask; } - unsigned int getRecievesShadowTraversalMask() const { return _recievesShadowTraversalMask; } + void setReceivesShadowTraversalMask(unsigned int mask) { _receivesShadowTraversalMask = mask; } + unsigned int getReceivesShadowTraversalMask() const { return _receivesShadowTraversalMask; } void setCastsShadowTraversalMask(unsigned int mask) { _castsShadowTraversalMask = mask; } unsigned int getCastsShadowTraversalMask() const { return _castsShadowTraversalMask; } @@ -56,7 +56,7 @@ class OSGSHADOW_EXPORT ShadowedScene : public osg::Group virtual ~ShadowedScene(); - unsigned int _recievesShadowTraversalMask; + unsigned int _receivesShadowTraversalMask; unsigned int _castsShadowTraversalMask; osg::ref_ptr _shadowTechnique; diff --git a/src/osgShadow/ShadowTexture.cpp b/src/osgShadow/ShadowTexture.cpp index 743916c4c..e3d06a0d8 100644 --- a/src/osgShadow/ShadowTexture.cpp +++ b/src/osgShadow/ShadowTexture.cpp @@ -125,7 +125,7 @@ void ShadowTexture::cull(osgUtil::CullVisitor& cv) cv.pushStateSet(_stateset.get()); cv.setTraversalMask( traversalMask & - getShadowedScene()->getRecievesShadowTraversalMask() ); + getShadowedScene()->getReceivesShadowTraversalMask() ); _shadowedScene->osg::Group::traverse(cv); diff --git a/src/osgShadow/ShadowedScene.cpp b/src/osgShadow/ShadowedScene.cpp index eab45e038..23094438d 100644 --- a/src/osgShadow/ShadowedScene.cpp +++ b/src/osgShadow/ShadowedScene.cpp @@ -22,7 +22,7 @@ using namespace osgShadow; ShadowedScene::ShadowedScene(ShadowTechnique* st): - _recievesShadowTraversalMask(0xffffffff), + _receivesShadowTraversalMask(0xffffffff), _castsShadowTraversalMask(0xffffffff) { setNumChildrenRequiringUpdateTraversal(1); @@ -32,7 +32,7 @@ ShadowedScene::ShadowedScene(ShadowTechnique* st): ShadowedScene::ShadowedScene(const ShadowedScene& copy, const osg::CopyOp& copyop): osg::Group(copy,copyop), - _recievesShadowTraversalMask(copy._recievesShadowTraversalMask), + _receivesShadowTraversalMask(copy._receivesShadowTraversalMask), _castsShadowTraversalMask(copy._castsShadowTraversalMask) { setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1); diff --git a/src/osgWrappers/osgShadow/ShadowedScene.cpp b/src/osgWrappers/osgShadow/ShadowedScene.cpp index 738a436f6..b8c30e290 100644 --- a/src/osgWrappers/osgShadow/ShadowedScene.cpp +++ b/src/osgWrappers/osgShadow/ShadowedScene.cpp @@ -70,14 +70,14 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowedScene) __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", ""); - I_Method1(void, setRecievesShadowTraversalMask, IN, unsigned int, mask, + I_Method1(void, setReceivesShadowTraversalMask, IN, unsigned int, mask, Properties::NON_VIRTUAL, - __void__setRecievesShadowTraversalMask__unsigned_int, + __void__setReceivesShadowTraversalMask__unsigned_int, "", ""); - I_Method0(unsigned int, getRecievesShadowTraversalMask, + I_Method0(unsigned int, getReceivesShadowTraversalMask, Properties::NON_VIRTUAL, - __unsigned_int__getRecievesShadowTraversalMask, + __unsigned_int__getReceivesShadowTraversalMask, "", ""); I_Method1(void, setCastsShadowTraversalMask, IN, unsigned int, mask, @@ -118,9 +118,9 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowedScene) I_SimpleProperty(unsigned int, CastsShadowTraversalMask, __unsigned_int__getCastsShadowTraversalMask, __void__setCastsShadowTraversalMask__unsigned_int); - I_SimpleProperty(unsigned int, RecievesShadowTraversalMask, - __unsigned_int__getRecievesShadowTraversalMask, - __void__setRecievesShadowTraversalMask__unsigned_int); + I_SimpleProperty(unsigned int, ReceivesShadowTraversalMask, + __unsigned_int__getReceivesShadowTraversalMask, + __void__setReceivesShadowTraversalMask__unsigned_int); I_SimpleProperty(osgShadow::ShadowTechnique *, ShadowTechnique, __ShadowTechnique_P1__getShadowTechnique, __void__setShadowTechnique__ShadowTechnique_P1); diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp index 2ffc065ea..5728b9b6e 100644 --- a/src/osgWrappers/osgViewer/Viewer.cpp +++ b/src/osgWrappers/osgViewer/Viewer.cpp @@ -108,7 +108,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) I_Method4(osgViewer::GraphicsWindowEmbedded *, setUpViewerAsEmbeddedInWindow, IN, int, x, IN, int, y, IN, int, width, IN, int, height, Properties::VIRTUAL, __GraphicsWindowEmbedded_P1__setUpViewerAsEmbeddedInWindow__int__int__int__int, - "Convinience method for setting up the viewer so it can be used embedded in an external managed window. ", + "Convenience method for setting up the viewer so it can be used embedded in an external managed window. ", "Returns the GraphicsWindowEmbedded that can be used by applications to pass in events to the viewer. "); I_Method1(void, setThreadingModel, IN, osgViewer::Viewer::ThreadingModel, threadingModel, Properties::NON_VIRTUAL,