X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fcommon%2Fscene-impl.cpp;h=09486d869a7619018b96e6f843d62e3c06738627;hb=eda3f227c59a38be39cfe77ac2c75223a37a6e23;hp=af08928c76d9ab46c2a83c4da69a6839dab28103;hpb=88ae3723ccc6986111eb84b77e6fea69034c9cae;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 old mode 100755 new mode 100644 index af08928..09486d8 --- a/dali/internal/event/common/scene-impl.cpp +++ b/dali/internal/event/common/scene-impl.cpp @@ -64,7 +64,6 @@ Scene::Scene() mSize(), // Don't set the proper value here, this will be set when the surface is set later mDpi(), mBackgroundColor( DEFAULT_BACKGROUND_COLOR ), - mSurfaceOrientation( 0 ), mDepthTreeDirty( false ), mEventProcessor( *this, ThreadLocalStorage::GetInternal()->GetGestureEventProcessor() ) { @@ -138,7 +137,7 @@ void Scene::Initialize( Size size ) RenderTaskPtr renderTask = mRenderTaskList->CreateTask( mRootLayer.Get(), mDefaultCamera.Get() ); renderTask->SetClearEnabled(true); - SurfaceResized( size.width, size.height, mSurfaceOrientation, false ); + SurfaceResized( size.width, size.height ); // Create scene graph object mSceneObject = new SceneGraph::Scene(); @@ -206,27 +205,23 @@ Actor& Scene::GetDefaultRootActor() return *mRootLayer; } -void Scene::SurfaceResized( float width, float height, int orientation, bool forceUpdate ) +void Scene::SurfaceResized( float width, float height ) { - if( ( fabsf( mSize.width - width ) > Math::MACHINE_EPSILON_1 ) || ( fabsf( mSize.height - height ) > Math::MACHINE_EPSILON_1 ) - || ( orientation != mSurfaceOrientation ) || ( forceUpdate ) ) + if( ( fabsf( mSize.width - width ) > Math::MACHINE_EPSILON_1 ) || ( fabsf( mSize.height - height ) > Math::MACHINE_EPSILON_1 ) ) { Rect< int32_t > newSize( 0, 0, static_cast< int32_t >( width ), static_cast< int32_t >( height ) ); // truncated mSize.width = width; mSize.height = height; - mSurfaceOrientation = orientation; // Calculates the aspect ratio, near and far clipping planes, field of view and camera Z position. mDefaultCamera->SetPerspectiveProjection( mSize ); - mDefaultCamera->RotateProjection( mSurfaceOrientation ); mRootLayer->SetSize( mSize.width, mSize.height ); ThreadLocalStorage* tls = ThreadLocalStorage::GetInternal(); SceneGraph::UpdateManager& updateManager = tls->GetUpdateManager(); SetDefaultSurfaceRectMessage( updateManager, newSize ); - SetDefaultSurfaceOrientationMessage( updateManager, mSurfaceOrientation ); // set default render-task viewport parameters RenderTaskPtr defaultRenderTask = mRenderTaskList->GetTask( 0u ); @@ -296,7 +291,7 @@ SceneGraph::Scene* Scene::GetSceneObject() const return mSceneObject; } -void Scene::EmitKeyEventSignal(const Dali::KeyEvent& event) +void Scene::EmitKeyEventSignal(const KeyEvent& event) { if ( !mKeyEventSignal.Empty() ) { @@ -305,10 +300,9 @@ void Scene::EmitKeyEventSignal(const Dali::KeyEvent& event) } } -bool Scene::EmitKeyEventGeneratedSignal(const Dali::KeyEvent& event) +bool Scene::EmitKeyEventGeneratedSignal(const KeyEvent& event) { // Emit the KeyEventGenerated signal when KeyEvent is generated - Dali::Integration::Scene handle( this ); return mKeyEventGeneratedSignal.Emit( event ); } @@ -386,11 +380,6 @@ Integration::Scene::WheelEventSignalType& Scene::WheelEventSignal() return mWheelEventSignal; } -std::vector& Scene::GetItemsDirtyRects() -{ - return mItemsDirtyRects; -} - } // Internal } // Dali