X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fcommon%2Fscene-impl.cpp;h=3e09540d34aedd33d58cabde10f9135574cd8307;hb=03d71cda4c49e173620c0b97f24bbb2df073ea65;hp=89e0f0ef794291775b6d6233907ce199ca4a6e77;hpb=182acae4df2a65a6876414c9540a3633a18911ff;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/common/scene-impl.cpp b/dali/internal/event/common/scene-impl.cpp index 89e0f0e..3e09540 100644 --- a/dali/internal/event/common/scene-impl.cpp +++ b/dali/internal/event/common/scene-impl.cpp @@ -63,6 +63,7 @@ Scene::Scene( const Size& size ) mSize( size ), mSurfaceSize( Vector2::ZERO ), mDpi( Vector2::ZERO ), + mBackgroundColor( DEFAULT_BACKGROUND_COLOR ), mDepthTreeDirty( false ), mEventProcessor( *this, ThreadLocalStorage::GetInternal()->GetGestureEventProcessor() ) { @@ -198,34 +199,54 @@ void Scene::SetSurface( Integration::RenderSurface& surface ) mSurface = &surface; if ( mSurface ) { - mSurfaceSize.width = static_cast( mSurface->GetPositionSize().width ); - mSurfaceSize.height = static_cast( mSurface->GetPositionSize().height ); + RenderTaskPtr defaultRenderTask = mRenderTaskList->GetTask( 0u ); + + mFrameBuffer = Dali::Internal::FrameBuffer::New( surface, Dali::FrameBuffer::Attachment::NONE ); + defaultRenderTask->SetFrameBuffer( mFrameBuffer ); + + SurfaceResized(); + } +} - mSize.width = mSurfaceSize.width; - mSize.height = mSurfaceSize.height; +void Scene::SurfaceResized() +{ + if( mSurface ) + { + const float fWidth = static_cast( mSurface->GetPositionSize().width ); + const float fHeight = static_cast( mSurface->GetPositionSize().height ); - // Calculates the aspect ratio, near and far clipping planes, field of view and camera Z position. - mDefaultCamera->SetPerspectiveProjection( mSurfaceSize ); + if( ( fabsf( mSurfaceSize.width - fWidth ) > Math::MACHINE_EPSILON_1 ) || ( fabsf( mSurfaceSize.height - fHeight ) > Math::MACHINE_EPSILON_1 ) ) + { + Rect newSize( 0, 0, static_cast( mSurface->GetPositionSize().width ), static_cast( mSurface->GetPositionSize().height ) ); - mRootLayer->SetSize( mSize.width, mSize.height ); + mSurfaceSize.width = fWidth; + mSurfaceSize.height = fHeight; - ThreadLocalStorage* tls = ThreadLocalStorage::GetInternal(); - SceneGraph::UpdateManager& updateManager = tls->GetUpdateManager(); - SetDefaultSurfaceRectMessage( updateManager, Rect( 0, 0, static_cast( mSurfaceSize.width ), static_cast( mSurfaceSize.height ) ) ); // truncated + mSize.width = mSurfaceSize.width; + mSize.height = mSurfaceSize.height; - RenderTaskPtr defaultRenderTask = mRenderTaskList->GetTask( 0u ); + // Calculates the aspect ratio, near and far clipping planes, field of view and camera Z position. + mDefaultCamera->SetPerspectiveProjection( mSurfaceSize ); - // if single render task to screen then set its viewport parameters - if( 1 == mRenderTaskList->GetTaskCount() ) - { - if( !defaultRenderTask->GetTargetFrameBuffer() ) + mRootLayer->SetSize( mSize.width, mSize.height ); + + ThreadLocalStorage* tls = ThreadLocalStorage::GetInternal(); + SceneGraph::UpdateManager& updateManager = tls->GetUpdateManager(); + SetDefaultSurfaceRectMessage( updateManager, newSize ); // truncated + + RenderTaskPtr defaultRenderTask = mRenderTaskList->GetTask( 0u ); + + // if single render task to screen then set its viewport parameters + if( 1 == mRenderTaskList->GetTaskCount() ) { - defaultRenderTask->SetViewport( Viewport( 0, 0, static_cast( mSurfaceSize.width ), static_cast( mSurfaceSize.height ) ) ); // truncated + if( !defaultRenderTask->GetTargetFrameBuffer() ) + { + defaultRenderTask->SetViewport( newSize ); // truncated + } } - } - mFrameBuffer = Dali::Internal::FrameBuffer::New( surface, Dali::FrameBuffer::Attachment::NONE ); - defaultRenderTask->SetFrameBuffer( mFrameBuffer ); + defaultRenderTask->GetFrameBuffer()->SetSize( static_cast( newSize.width ), static_cast( newSize.height ) ); + } } } @@ -260,17 +281,19 @@ void Scene::RebuildDepthTree() } } -void Scene::SetBackgroundColor(Vector4 color) +void Scene::SetBackgroundColor( const Vector4& color ) { + mBackgroundColor = color; + if( mSurface ) { - mSurface->SetBackgroundColor( color ); + mRenderTaskList->GetTask( 0u )->GetFrameBuffer()->SetBackgroundColor( color ); } } Vector4 Scene::GetBackgroundColor() const { - return mSurface ? mSurface->GetBackgroundColor() : DEFAULT_BACKGROUND_COLOR; + return mBackgroundColor; } void Scene::EmitKeyEventSignal(const KeyEvent& event) @@ -278,12 +301,6 @@ void Scene::EmitKeyEventSignal(const KeyEvent& event) mKeyEventSignal.Emit( event ); } -bool Scene::EmitKeyEventGeneratedSignal(const KeyEvent& event) -{ - // Emit the KeyEventGenerated signal when KeyEvent is generated - return mKeyEventGeneratedSignal.Emit( event ); -} - void Scene::EmitEventProcessingFinishedSignal() { mEventProcessingFinishedSignal.Emit(); @@ -305,11 +322,6 @@ Integration::Scene::KeyEventSignalType& Scene::KeyEventSignal() return mKeyEventSignal; } -Integration::Scene::KeyEventGeneratedSignalType& Scene::KeyEventGeneratedSignal() -{ - return mKeyEventGeneratedSignal; -} - Integration::Scene::EventProcessingFinishedSignalType& Scene::EventProcessingFinishedSignal() { return mEventProcessingFinishedSignal;