diff --git a/examples/osgdepthshadow/osgdepthshadow.cpp b/examples/osgdepthshadow/osgdepthshadow.cpp index 448a01ed1..ce0121bc0 100644 --- a/examples/osgdepthshadow/osgdepthshadow.cpp +++ b/examples/osgdepthshadow/osgdepthshadow.cpp @@ -343,7 +343,7 @@ osg::Group* createShadowedScene(osg::Node* shadowed,osg::MatrixTransform* light_ camera->setRenderOrder(osg::CameraNode::PRE_RENDER); // tell the camera to use OpenGL frame buffer object where supported. - camera->setRenderTargetImplmentation(osg::CameraNode::FRAME_BUFFER_OBJECT); + camera->setRenderTargetImplementation(osg::CameraNode::FRAME_BUFFER_OBJECT); // attach the texture and use it as the color buffer. camera->attach(osg::CameraNode::DEPTH_BUFFER, texture); diff --git a/examples/osgdistortion/osgdistortion.cpp b/examples/osgdistortion/osgdistortion.cpp index 761e3d41b..99fe67ecf 100644 --- a/examples/osgdistortion/osgdistortion.cpp +++ b/examples/osgdistortion/osgdistortion.cpp @@ -58,7 +58,7 @@ osg::Node* createDistortionSubgraph(osg::Node* subgraph, const osg::Vec4& clearC camera->setRenderOrder(osg::CameraNode::PRE_RENDER); // tell the camera to use OpenGL frame buffer object where supported. - camera->setRenderTargetImplmentation(osg::CameraNode::FRAME_BUFFER_OBJECT); + camera->setRenderTargetImplementation(osg::CameraNode::FRAME_BUFFER_OBJECT); // attach the texture and use it as the color buffer. camera->attach(osg::CameraNode::COLOR_BUFFER, texture); @@ -157,7 +157,7 @@ osg::Node* createDistortionSubgraph(osg::Node* subgraph, const osg::Vec4& clearC camera->setRenderOrder(osg::CameraNode::NESTED_RENDER); // tell the camera to use OpenGL frame buffer object where supported. - camera->setRenderTargetImplmentation(osg::CameraNode::FRAME_BUFFER_OBJECT); + camera->setRenderTargetImplementation(osg::CameraNode::FRAME_BUFFER_OBJECT); // attach the texture and use it as the color buffer. camera->attach(osg::CameraNode::COLOR_BUFFER, texture); diff --git a/examples/osgfbo/osgfbo.cpp b/examples/osgfbo/osgfbo.cpp index 6e0b2adf3..020b13a07 100644 --- a/examples/osgfbo/osgfbo.cpp +++ b/examples/osgfbo/osgfbo.cpp @@ -98,7 +98,7 @@ void build_world(osg::Group *root) camera->setViewMatrixAsLookAt(bs.center()+osg::Vec3(0.0f,2.0f,0.0f)*bs.radius(),bs.center(),osg::Vec3(0.0f,0.0f,1.0f)); // tell the camera to use OpenGL frame buffer object where supported. - camera->setRenderTargetImplmentation(osg::CameraNode::FRAME_BUFFER_OBJECT); + camera->setRenderTargetImplementation(osg::CameraNode::FRAME_BUFFER_OBJECT); // attach the texture and use it as the color buffer. camera->attach(osg::CameraNode::COLOR_BUFFER,tex.get()); diff --git a/examples/osgprerender/osgprerender.cpp b/examples/osgprerender/osgprerender.cpp index 8af3a908e..8781b8ad9 100644 --- a/examples/osgprerender/osgprerender.cpp +++ b/examples/osgprerender/osgprerender.cpp @@ -229,7 +229,7 @@ osg::Node* createPreRenderSubGraph(osg::Node* subgraph, unsigned tex_width, unsi camera->setRenderOrder(osg::CameraNode::PRE_RENDER); // tell the camera to use OpenGL frame buffer object where supported. - camera->setRenderTargetImplmentation(renderImplementation); + camera->setRenderTargetImplementation(renderImplementation); // attach the texture and use it as the color buffer. camera->attach(osg::CameraNode::COLOR_BUFFER, texture); diff --git a/examples/osgprerendercubemap/osgprerendercubemap.cpp b/examples/osgprerendercubemap/osgprerendercubemap.cpp index 56110bc19..4b7ac4e08 100644 --- a/examples/osgprerendercubemap/osgprerendercubemap.cpp +++ b/examples/osgprerendercubemap/osgprerendercubemap.cpp @@ -217,7 +217,7 @@ osg::Group* createShadowedScene(osg::Node* reflectedSubgraph, osg::RefNodePath r camera->setRenderOrder(osg::CameraNode::PRE_RENDER); // tell the camera to use OpenGL frame buffer object where supported. - camera->setRenderTargetImplmentation(renderImplementation); + camera->setRenderTargetImplementation(renderImplementation); // attach the texture and use it as the color buffer. camera->attach(osg::CameraNode::COLOR_BUFFER, texture, 0, i); diff --git a/examples/osgshadowtexture/CreateShadowedScene.cpp b/examples/osgshadowtexture/CreateShadowedScene.cpp index 53d09c7ae..0da32a972 100644 --- a/examples/osgshadowtexture/CreateShadowedScene.cpp +++ b/examples/osgshadowtexture/CreateShadowedScene.cpp @@ -131,7 +131,7 @@ osg::Group* createShadowedScene(osg::Node* shadower,osg::Node* shadowed,const os camera->setRenderOrder(osg::CameraNode::PRE_RENDER); // tell the camera to use OpenGL frame buffer object where supported. - camera->setRenderTargetImplmentation(osg::CameraNode::FRAME_BUFFER_OBJECT); + camera->setRenderTargetImplementation(osg::CameraNode::FRAME_BUFFER_OBJECT); // attach the texture and use it as the color buffer. camera->attach(osg::CameraNode::COLOR_BUFFER, texture); diff --git a/include/osg/CameraNode b/include/osg/CameraNode index 54ca14d18..4e418e68e 100644 --- a/include/osg/CameraNode +++ b/include/osg/CameraNode @@ -190,8 +190,8 @@ class OSG_EXPORT CameraNode : public Transform, public CullSettings SEPERATE_WINDOW }; - void setRenderTargetImplmentation(RenderTargetImplementation impl) { _renderTargetImplementation = impl; } - RenderTargetImplementation getRenderTargetImplmentation() const { return _renderTargetImplementation; } + void setRenderTargetImplementation(RenderTargetImplementation impl) { _renderTargetImplementation = impl; } + RenderTargetImplementation getRenderTargetImplementation() const { return _renderTargetImplementation; } /** Set the draw buffer used at the start of each frame draw. diff --git a/src/osgSim/Impostor.cpp b/src/osgSim/Impostor.cpp index 822db2ac9..708c80544 100644 --- a/src/osgSim/Impostor.cpp +++ b/src/osgSim/Impostor.cpp @@ -456,7 +456,7 @@ ImpostorSprite* Impostor::createImpostorSprite(osgUtil::CullVisitor* cv) camera->setViewport(0,0,new_s,new_t); // tell the camera to use OpenGL frame buffer object where supported. - camera->setRenderTargetImplmentation(osg::CameraNode::FRAME_BUFFER_OBJECT); + camera->setRenderTargetImplementation(osg::CameraNode::FRAME_BUFFER_OBJECT); // set the camera to render before the main camera. camera->setRenderOrder(osg::CameraNode::PRE_RENDER); diff --git a/src/osgSim/OverlayNode.cpp b/src/osgSim/OverlayNode.cpp index 96def56ff..f40f1eb24 100644 --- a/src/osgSim/OverlayNode.cpp +++ b/src/osgSim/OverlayNode.cpp @@ -72,7 +72,7 @@ void OverlayNode::init() _camera->setRenderOrder(osg::CameraNode::PRE_RENDER); // tell the camera to use OpenGL frame buffer object where supported. - _camera->setRenderTargetImplmentation(osg::CameraNode::FRAME_BUFFER_OBJECT); + _camera->setRenderTargetImplementation(osg::CameraNode::FRAME_BUFFER_OBJECT); // attach the texture and use it as the color buffer. _camera->attach(osg::CameraNode::COLOR_BUFFER, _texture.get()); diff --git a/src/osgUtil/CullVisitor.cpp b/src/osgUtil/CullVisitor.cpp index 407b7e8d4..422ad8e34 100644 --- a/src/osgUtil/CullVisitor.cpp +++ b/src/osgUtil/CullVisitor.cpp @@ -1217,7 +1217,7 @@ void CullVisitor::apply(osg::CameraNode& camera) if (itr->second._image.valid()) rtts->setImage(itr->second._image.get()); } - if (camera.getRenderTargetImplmentation()==osg::CameraNode::FRAME_BUFFER_OBJECT) + if (camera.getRenderTargetImplementation()==osg::CameraNode::FRAME_BUFFER_OBJECT) { osg::ref_ptr fbo = rtts->getFrameBufferObject(); @@ -1274,8 +1274,8 @@ void CullVisitor::apply(osg::CameraNode& camera) } } } - else if (camera.getRenderTargetImplmentation()==osg::CameraNode::PIXEL_BUFFER || - camera.getRenderTargetImplmentation()==osg::CameraNode::SEPERATE_WINDOW ) + else if (camera.getRenderTargetImplementation()==osg::CameraNode::PIXEL_BUFFER || + camera.getRenderTargetImplementation()==osg::CameraNode::SEPERATE_WINDOW ) { osg::ref_ptr context = rtts->getGraphicsContext(); if (!context) @@ -1285,9 +1285,9 @@ void CullVisitor::apply(osg::CameraNode& camera) traits->_width = viewport->width(); traits->_height = viewport->height(); - traits->_pbuffer = (camera.getRenderTargetImplmentation()==osg::CameraNode::PIXEL_BUFFER); - traits->_windowDecoration = (camera.getRenderTargetImplmentation()==osg::CameraNode::SEPERATE_WINDOW); - traits->_doubleBuffer = (camera.getRenderTargetImplmentation()==osg::CameraNode::SEPERATE_WINDOW); + traits->_pbuffer = (camera.getRenderTargetImplementation()==osg::CameraNode::PIXEL_BUFFER); + traits->_windowDecoration = (camera.getRenderTargetImplementation()==osg::CameraNode::SEPERATE_WINDOW); + traits->_doubleBuffer = (camera.getRenderTargetImplementation()==osg::CameraNode::SEPERATE_WINDOW); rtts->setDrawBuffer(GL_FRONT);