From 4d4a75e818b94b76275c4d24f26cfbfae9482fd8 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 2 Apr 2008 11:28:10 +0000 Subject: [PATCH] From Jose Delport, typo fixes --- src/osgUtil/RenderStage.cpp | 50 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/osgUtil/RenderStage.cpp b/src/osgUtil/RenderStage.cpp index a3335d590..c0c86d3e8 100644 --- a/src/osgUtil/RenderStage.cpp +++ b/src/osgUtil/RenderStage.cpp @@ -216,9 +216,9 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo) if (!_camera) return; - osg::State& state = *renderInfo.getState(); + osg::State& state = *renderInfo.getState(); - osg::Camera::RenderTargetImplementation renderTargetImplemntation = _camera->getRenderTargetImplementation(); + osg::Camera::RenderTargetImplementation renderTargetImplementation = _camera->getRenderTargetImplementation(); osg::Camera::RenderTargetImplementation renderTargetFallback = _camera->getRenderTargetFallback(); osg::Camera::BufferAttachmentMap& bufferAttachments = _camera->getBufferAttachmentMap(); @@ -315,7 +315,7 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo) } } - if (renderTargetImplemntation==osg::Camera::FRAME_BUFFER_OBJECT) + if (renderTargetImplementation==osg::Camera::FRAME_BUFFER_OBJECT) { osg::FBOExtensions* fbo_ext = osg::FBOExtensions::instance(state.getContextID(),true); bool fbo_supported = fbo_ext && fbo_ext->isSupported(); @@ -406,29 +406,29 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo) if (!fbo_supported) { - if (renderTargetImplemntation context = getGraphicsContext(); if (!context) @@ -442,9 +442,9 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo) // osg::notify(osg::NOTICE)<<"traits = "<width<<" "<height<pbuffer = (renderTargetImplemntation==osg::Camera::PIXEL_BUFFER || renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT); - traits->windowDecoration = (renderTargetImplemntation==osg::Camera::SEPERATE_WINDOW); - traits->doubleBuffer = (renderTargetImplemntation==osg::Camera::SEPERATE_WINDOW); + traits->pbuffer = (renderTargetImplementation==osg::Camera::PIXEL_BUFFER || renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT); + traits->windowDecoration = (renderTargetImplementation==osg::Camera::SEPERATE_WINDOW); + traits->doubleBuffer = (renderTargetImplementation==osg::Camera::SEPERATE_WINDOW); osg::Texture* pBufferTexture = 0; GLenum bufferFormat = GL_NONE; @@ -501,7 +501,7 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo) level = attachment._level; face = attachment._face; - if (renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT) + if (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT) { traits->target = attachment._texture.valid() ? attachment._texture->getTextureTarget() : 0; traits->format = bufferFormat; @@ -513,7 +513,7 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo) } default: { - if (renderTargetImplemntation==osg::Camera::SEPERATE_WINDOW) + if (renderTargetImplementation==osg::Camera::SEPERATE_WINDOW) osg::notify(osg::NOTICE)<<"Warning: RenderStage::runCameraSetUp(State&) Window "; else osg::notify(osg::NOTICE)<<"Warning: RenderStage::runCameraSetUp(State&) Pbuffer "; @@ -572,7 +572,7 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo) setDrawBuffer(GL_FRONT); setReadBuffer(GL_FRONT); - if (pBufferTexture && renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT) + if (pBufferTexture && renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT) { osg::notify(osg::INFO)<<"RenderStage::runCameraSetUp(State&) Assign graphis context to Texture"<setReadPBuffer(context.get()); @@ -587,17 +587,17 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo) { osg::notify(osg::INFO)<<"Failed to acquire Graphics Context"<