Changeset 8027

Show
Ignore:
Timestamp:
04/02/08 13:28:10
Author:
robert
Message:

From Jose Delport, typo fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp

    r7896 r8027  
    217217    if (!_camera) return; 
    218218     
    219     osg::State& state = *renderInfo.getState(); 
    220  
    221     osg::Camera::RenderTargetImplementation renderTargetImplemntation = _camera->getRenderTargetImplementation(); 
     219    osg::State& state = *renderInfo.getState(); 
     220 
     221    osg::Camera::RenderTargetImplementation renderTargetImplementation = _camera->getRenderTargetImplementation(); 
    222222    osg::Camera::RenderTargetImplementation renderTargetFallback = _camera->getRenderTargetFallback(); 
    223223 
     
    316316    } 
    317317     
    318     if (renderTargetImplemntation==osg::Camera::FRAME_BUFFER_OBJECT) 
     318    if (renderTargetImplementation==osg::Camera::FRAME_BUFFER_OBJECT) 
    319319    { 
    320320        osg::FBOExtensions* fbo_ext = osg::FBOExtensions::instance(state.getContextID(),true); 
     
    407407        if (!fbo_supported) 
    408408        { 
    409             if (renderTargetImplemntation<renderTargetFallback) 
    410                 renderTargetImplemntation = renderTargetFallback; 
     409            if (renderTargetImplementation<renderTargetFallback) 
     410                renderTargetImplementation = renderTargetFallback; 
    411411            else 
    412                 renderTargetImplemntation = osg::Camera::PIXEL_BUFFER_RTT; 
     412                renderTargetImplementation = osg::Camera::PIXEL_BUFFER_RTT; 
    413413        } 
    414414    } 
    415415     
    416416    // check whether PBuffer-RTT is supported or not 
    417     if (renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT &&  
     417    if (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT &&  
    418418        !osg::isGLExtensionSupported(state.getContextID(), "WGL_ARB_render_texture")) 
    419419    {     
    420         if (renderTargetImplemntation<renderTargetFallback) 
    421             renderTargetImplemntation = renderTargetFallback; 
     420        if (renderTargetImplementation<renderTargetFallback) 
     421            renderTargetImplementation = renderTargetFallback; 
    422422        else 
    423             renderTargetImplemntation = osg::Camera::PIXEL_BUFFER; 
     423            renderTargetImplementation = osg::Camera::PIXEL_BUFFER; 
    424424    } 
    425425 
     
    427427    // set up, but if each level fails then resort to the next level down.     
    428428    while (!getGraphicsContext() && 
    429            (renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT || 
    430             renderTargetImplemntation==osg::Camera::PIXEL_BUFFER || 
    431             renderTargetImplemntation==osg::Camera::SEPERATE_WINDOW) ) 
     429           (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT || 
     430            renderTargetImplementation==osg::Camera::PIXEL_BUFFER || 
     431            renderTargetImplementation==osg::Camera::SEPERATE_WINDOW) ) 
    432432    { 
    433433        osg::ref_ptr<osg::GraphicsContext> context = getGraphicsContext(); 
     
    443443            // osg::notify(osg::NOTICE)<<"traits = "<<traits->width<<" "<<traits->height<<std::endl; 
    444444 
    445             traits->pbuffer = (renderTargetImplemntation==osg::Camera::PIXEL_BUFFER || renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT); 
    446             traits->windowDecoration = (renderTargetImplemntation==osg::Camera::SEPERATE_WINDOW); 
    447             traits->doubleBuffer = (renderTargetImplemntation==osg::Camera::SEPERATE_WINDOW); 
     445            traits->pbuffer = (renderTargetImplementation==osg::Camera::PIXEL_BUFFER || renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT); 
     446            traits->windowDecoration = (renderTargetImplementation==osg::Camera::SEPERATE_WINDOW); 
     447            traits->doubleBuffer = (renderTargetImplementation==osg::Camera::SEPERATE_WINDOW); 
    448448 
    449449            osg::Texture* pBufferTexture = 0; 
     
    502502                        face = attachment._face; 
    503503 
    504                         if (renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT) 
     504                        if (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT) 
    505505                        { 
    506506                            traits->target = attachment._texture.valid() ? attachment._texture->getTextureTarget() : 0; 
     
    514514                    default: 
    515515                    { 
    516                         if (renderTargetImplemntation==osg::Camera::SEPERATE_WINDOW) 
     516                        if (renderTargetImplementation==osg::Camera::SEPERATE_WINDOW) 
    517517                            osg::notify(osg::NOTICE)<<"Warning: RenderStage::runCameraSetUp(State&) Window "; 
    518518                        else 
     
    573573                setReadBuffer(GL_FRONT); 
    574574 
    575                 if (pBufferTexture && renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT) 
     575                if (pBufferTexture && renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT) 
    576576                { 
    577577                   osg::notify(osg::INFO)<<"RenderStage::runCameraSetUp(State&) Assign graphis context to Texture"<<std::endl; 
     
    588588                osg::notify(osg::INFO)<<"Failed to acquire Graphics Context"<<std::endl; 
    589589                 
    590                 if (renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT) 
     590                if (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT) 
    591591                { 
    592592                    // fallback to using standard PBuffer, this will allow this while loop to continue 
    593                     if (renderTargetImplemntation<renderTargetFallback) 
    594                         renderTargetImplemntation = renderTargetFallback; 
     593                    if (renderTargetImplementation<renderTargetFallback) 
     594                        renderTargetImplementation = renderTargetFallback; 
    595595                    else 
    596                         renderTargetImplemntation = osg::Camera::PIXEL_BUFFER; 
     596                        renderTargetImplementation = osg::Camera::PIXEL_BUFFER; 
    597597                } 
    598598                else  
    599599                { 
    600                     renderTargetImplemntation = osg::Camera::FRAME_BUFFER; 
     600                    renderTargetImplementation = osg::Camera::FRAME_BUFFER; 
    601601                } 
    602602            } 
     
    606606     
    607607    // finally if all else has failed, then the frame buffer fallback will come in to play. 
    608     if (renderTargetImplemntation==osg::Camera::FRAME_BUFFER) 
     608    if (renderTargetImplementation==osg::Camera::FRAME_BUFFER) 
    609609    { 
    610610        osg::notify(osg::INFO)<<"Setting up osg::Camera::FRAME_BUFFER"<<std::endl;