Changeset 8027
- Timestamp:
- 04/02/08 13:28:10
- Files:
-
- OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp
r7896 r8027 217 217 if (!_camera) return; 218 218 219 osg::State& state = *renderInfo.getState();220 221 osg::Camera::RenderTargetImplementation renderTargetImplem ntation = _camera->getRenderTargetImplementation();219 osg::State& state = *renderInfo.getState(); 220 221 osg::Camera::RenderTargetImplementation renderTargetImplementation = _camera->getRenderTargetImplementation(); 222 222 osg::Camera::RenderTargetImplementation renderTargetFallback = _camera->getRenderTargetFallback(); 223 223 … … 316 316 } 317 317 318 if (renderTargetImplem ntation==osg::Camera::FRAME_BUFFER_OBJECT)318 if (renderTargetImplementation==osg::Camera::FRAME_BUFFER_OBJECT) 319 319 { 320 320 osg::FBOExtensions* fbo_ext = osg::FBOExtensions::instance(state.getContextID(),true); … … 407 407 if (!fbo_supported) 408 408 { 409 if (renderTargetImplem ntation<renderTargetFallback)410 renderTargetImplem ntation = renderTargetFallback;409 if (renderTargetImplementation<renderTargetFallback) 410 renderTargetImplementation = renderTargetFallback; 411 411 else 412 renderTargetImplem ntation = osg::Camera::PIXEL_BUFFER_RTT;412 renderTargetImplementation = osg::Camera::PIXEL_BUFFER_RTT; 413 413 } 414 414 } 415 415 416 416 // check whether PBuffer-RTT is supported or not 417 if (renderTargetImplem ntation==osg::Camera::PIXEL_BUFFER_RTT &&417 if (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT && 418 418 !osg::isGLExtensionSupported(state.getContextID(), "WGL_ARB_render_texture")) 419 419 { 420 if (renderTargetImplem ntation<renderTargetFallback)421 renderTargetImplem ntation = renderTargetFallback;420 if (renderTargetImplementation<renderTargetFallback) 421 renderTargetImplementation = renderTargetFallback; 422 422 else 423 renderTargetImplem ntation = osg::Camera::PIXEL_BUFFER;423 renderTargetImplementation = osg::Camera::PIXEL_BUFFER; 424 424 } 425 425 … … 427 427 // set up, but if each level fails then resort to the next level down. 428 428 while (!getGraphicsContext() && 429 (renderTargetImplem ntation==osg::Camera::PIXEL_BUFFER_RTT ||430 renderTargetImplem ntation==osg::Camera::PIXEL_BUFFER ||431 renderTargetImplem ntation==osg::Camera::SEPERATE_WINDOW) )429 (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT || 430 renderTargetImplementation==osg::Camera::PIXEL_BUFFER || 431 renderTargetImplementation==osg::Camera::SEPERATE_WINDOW) ) 432 432 { 433 433 osg::ref_ptr<osg::GraphicsContext> context = getGraphicsContext(); … … 443 443 // osg::notify(osg::NOTICE)<<"traits = "<<traits->width<<" "<<traits->height<<std::endl; 444 444 445 traits->pbuffer = (renderTargetImplem ntation==osg::Camera::PIXEL_BUFFER || renderTargetImplemntation==osg::Camera::PIXEL_BUFFER_RTT);446 traits->windowDecoration = (renderTargetImplem ntation==osg::Camera::SEPERATE_WINDOW);447 traits->doubleBuffer = (renderTargetImplem ntation==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); 448 448 449 449 osg::Texture* pBufferTexture = 0; … … 502 502 face = attachment._face; 503 503 504 if (renderTargetImplem ntation==osg::Camera::PIXEL_BUFFER_RTT)504 if (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT) 505 505 { 506 506 traits->target = attachment._texture.valid() ? attachment._texture->getTextureTarget() : 0; … … 514 514 default: 515 515 { 516 if (renderTargetImplem ntation==osg::Camera::SEPERATE_WINDOW)516 if (renderTargetImplementation==osg::Camera::SEPERATE_WINDOW) 517 517 osg::notify(osg::NOTICE)<<"Warning: RenderStage::runCameraSetUp(State&) Window "; 518 518 else … … 573 573 setReadBuffer(GL_FRONT); 574 574 575 if (pBufferTexture && renderTargetImplem ntation==osg::Camera::PIXEL_BUFFER_RTT)575 if (pBufferTexture && renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT) 576 576 { 577 577 osg::notify(osg::INFO)<<"RenderStage::runCameraSetUp(State&) Assign graphis context to Texture"<<std::endl; … … 588 588 osg::notify(osg::INFO)<<"Failed to acquire Graphics Context"<<std::endl; 589 589 590 if (renderTargetImplem ntation==osg::Camera::PIXEL_BUFFER_RTT)590 if (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT) 591 591 { 592 592 // fallback to using standard PBuffer, this will allow this while loop to continue 593 if (renderTargetImplem ntation<renderTargetFallback)594 renderTargetImplem ntation = renderTargetFallback;593 if (renderTargetImplementation<renderTargetFallback) 594 renderTargetImplementation = renderTargetFallback; 595 595 else 596 renderTargetImplem ntation = osg::Camera::PIXEL_BUFFER;596 renderTargetImplementation = osg::Camera::PIXEL_BUFFER; 597 597 } 598 598 else 599 599 { 600 renderTargetImplem ntation = osg::Camera::FRAME_BUFFER;600 renderTargetImplementation = osg::Camera::FRAME_BUFFER; 601 601 } 602 602 } … … 606 606 607 607 // finally if all else has failed, then the frame buffer fallback will come in to play. 608 if (renderTargetImplem ntation==osg::Camera::FRAME_BUFFER)608 if (renderTargetImplementation==osg::Camera::FRAME_BUFFER) 609 609 { 610 610 osg::notify(osg::INFO)<<"Setting up osg::Camera::FRAME_BUFFER"<<std::endl;
