X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fcommon%2Fstage-impl.cpp;h=b54e34f36199a850dfb5c0ddb501552bff943b8f;hb=cc17e51c101f23c848fa2348f6097473fff41f33;hp=aea8308169473dc59b235f97ef36d3eb1987d2da;hpb=42f84c7a9fc4182693570eb0b5c2bde428410a20;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/common/stage-impl.cpp b/dali/internal/event/common/stage-impl.cpp index aea8308..b54e34f 100644 --- a/dali/internal/event/common/stage-impl.cpp +++ b/dali/internal/event/common/stage-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,9 +39,17 @@ #include #include #include +#include using Dali::Internal::SceneGraph::Node; +namespace +{ +#if defined(DEBUG_ENABLED) +Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_DEPTH_TIMER" ); +#endif +} + namespace Dali { @@ -56,8 +64,10 @@ const float DEFAULT_STEREO_BASE( 65.0f ); // Signals const char* const SIGNAL_KEY_EVENT = "keyEvent"; +const char* const SIGNAL_KEY_EVENT_GENERATED = "keyEventGenerated"; const char* const SIGNAL_EVENT_PROCESSING_FINISHED = "eventProcessingFinished"; const char* const SIGNAL_TOUCHED = "touched"; +const char* const SIGNAL_TOUCH = "touch"; const char* const SIGNAL_WHEEL_EVENT = "wheelEvent"; const char* const SIGNAL_CONTEXT_LOST = "contextLost"; const char* const SIGNAL_CONTEXT_REGAINED = "contextRegained"; @@ -72,19 +82,23 @@ SignalConnectorType signalConnector4( mType, SIGNAL_WHEEL_EVENT, & SignalConnectorType signalConnector5( mType, SIGNAL_CONTEXT_LOST, &Stage::DoConnectSignal ); SignalConnectorType signalConnector6( mType, SIGNAL_CONTEXT_REGAINED, &Stage::DoConnectSignal ); SignalConnectorType signalConnector7( mType, SIGNAL_SCENE_CREATED, &Stage::DoConnectSignal ); +SignalConnectorType signalConnector8( mType, SIGNAL_KEY_EVENT_GENERATED, &Stage::DoConnectSignal ); +SignalConnectorType signalConnector9( mType, SIGNAL_TOUCH, &Stage::DoConnectSignal ); } // unnamed namespace StagePtr Stage::New( AnimationPlaylist& playlist, PropertyNotificationManager& propertyNotificationManager, SceneGraph::UpdateManager& updateManager, - NotificationManager& notificationManager ) + NotificationManager& notificationManager, + Integration::RenderController& renderController ) { - return StagePtr( new Stage( playlist, propertyNotificationManager, updateManager, notificationManager ) ); + return StagePtr( new Stage( playlist, propertyNotificationManager, updateManager, notificationManager, renderController ) ); } -void Stage::Initialize() +void Stage::Initialize( bool renderToFbo ) { + mRenderToFbo = renderToFbo; mObjectRegistry = ObjectRegistry::New(); // Create the ordered list of layers @@ -186,37 +200,56 @@ void Stage::Remove( Actor& actor ) mRootLayer->Remove( actor ); } -void Stage::SetSize(float width, float height) +void Stage::SurfaceResized( float width, float height ) { - // Internally we want to report the actual size of the stage. - mSize.width = width; - mSize.height = height; + if( ( fabs( width - mSurfaceSize.width ) > Math::MACHINE_EPSILON_1000 ) || ( fabs( height - mSurfaceSize.height ) > Math::MACHINE_EPSILON_1000 ) ) + { + mSurfaceSize.width = width; + mSurfaceSize.height = height; - // Calculates the aspect ratio, near and far clipping planes, field of view and camera Z position. - mDefaultCamera->SetPerspectiveProjection( mSize ); + // Internally we want to report the actual size of the stage. + mSize.width = width; + mSize.height = height - mTopMargin; - // The depth of the stage gets set to the maximun of these values - mRootLayer->SetSize( mSize ); + // Calculates the aspect ratio, near and far clipping planes, field of view and camera Z position. + mDefaultCamera->SetPerspectiveProjection( mSurfaceSize ); - // Repeat for SystemOverlay actors - if( mSystemOverlay ) - { - mSystemOverlay->GetImpl()->SetSize( mSize.width, mSize.height ); - } + // Adjust the camera height to allow for top-margin + SetDefaultCameraPosition(); - SetDefaultSurfaceRectMessage( mUpdateManager, Rect( 0, 0, width, height ) ); + mRootLayer->SetSize( mSize.width, mSize.height ); - // if single render task to screen then set its viewport parameters - if( 1 == mRenderTaskList->GetTaskCount() ) - { - Dali::RenderTask mDefaultRenderTask = mRenderTaskList->GetTask(0); + // Repeat for SystemOverlay actors + if( mSystemOverlay ) + { + // Note that the SystemOverlay has a separate camera, configured for the full surface-size. + // This will remain unaffected by changes in SetDefaultCameraPosition() + mSystemOverlay->GetImpl()->SetSize( width, height ); + } + + SetDefaultSurfaceRectMessage( mUpdateManager, Rect( 0, 0, width, height ) ); + + // if single render task to screen then set its viewport parameters + if( 1 == mRenderTaskList->GetTaskCount() ) + { + Dali::RenderTask defaultRenderTask = mRenderTaskList->GetTask( 0u ); + + if(!defaultRenderTask.GetTargetFrameBuffer()) + { + defaultRenderTask.SetViewport( Viewport(0, 0, width, height) ); + } + } - if(!mDefaultRenderTask.GetTargetFrameBuffer()) + if( mRenderToFbo ) { - mDefaultRenderTask.SetViewport( Viewport(0, 0, width, height) ); + Dali::FrameBuffer frameBuffer = Dali::FrameBuffer::New( width, height, Dali::FrameBuffer::Attachment::NONE ); + Dali::Texture texture = Dali::Texture::New( Dali::TextureType::TEXTURE_2D, Dali::Pixel::RGB888, width, height ); + frameBuffer.AttachColorTexture( texture ); + + Dali::RenderTask defaultRenderTask = mRenderTaskList->GetTask( 0u ); + defaultRenderTask.SetFrameBuffer( frameBuffer ); } } - } Vector2 Stage::GetSize() const @@ -224,6 +257,23 @@ Vector2 Stage::GetSize() const return mSize; } +void Stage::SetTopMargin( unsigned int margin ) +{ + if (mTopMargin == margin) + { + return; + } + mTopMargin = margin; + + mSize.width = mSurfaceSize.width; + mSize.height = mSurfaceSize.height - mTopMargin; + + // Adjust the camera height to allow for top-margin + SetDefaultCameraPosition(); + + mRootLayer->SetSize( mSize.width, mSize.height ); +} + RenderTaskList& Stage::GetRenderTaskList() const { return *mRenderTaskList; @@ -239,6 +289,11 @@ void Stage::CreateDefaultCameraActor() Add(*(mDefaultCamera.Get())); } +void Stage::SetDefaultCameraPosition() +{ + mDefaultCamera->SetY( -(static_cast(mTopMargin) * 0.5f) ); +} + Actor& Stage::GetDefaultRootActor() { return *mRootLayer; @@ -491,12 +546,16 @@ void Stage::KeepRendering( float durationSeconds ) bool Stage::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { bool connected( true ); - Stage* stage = dynamic_cast(object); + Stage* stage = static_cast< Stage* >(object); // TypeRegistry guarantees that this is the correct type. if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_EVENT ) ) { stage->KeyEventSignal().Connect( tracker, functor ); } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_EVENT_GENERATED ) ) + { + stage->KeyEventGeneratedSignal().Connect( tracker, functor ); + } else if( 0 == strcmp( signalName.c_str(), SIGNAL_EVENT_PROCESSING_FINISHED ) ) { stage->EventProcessingFinishedSignal().Connect( tracker, functor ); @@ -505,6 +564,10 @@ bool Stage::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra { stage->TouchedSignal().Connect( tracker, functor ); } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_TOUCH ) ) + { + stage->TouchSignal().Connect( tracker, functor ); + } else if( 0 == strcmp( signalName.c_str(), SIGNAL_WHEEL_EVENT ) ) { stage->WheelEventSignal().Connect( tracker, functor ); @@ -537,6 +600,13 @@ void Stage::EmitKeyEventSignal(const KeyEvent& event) mKeyEventSignal.Emit( event ); } +bool Stage::EmitKeyEventGeneratedSignal(const KeyEvent& event) +{ + // Emit the KeyEventGenerated signal when KeyEvent is generated + + return mKeyEventGeneratedSignal.Emit( event ); +} + void Stage::EmitEventProcessingFinishedSignal() { mEventProcessingFinishedSignal.Emit(); @@ -565,6 +635,11 @@ Dali::Stage::KeyEventSignalType& Stage::KeyEventSignal() return mKeyEventSignal; } +Dali::DevelStage::KeyEventGeneratedSignalType& Stage::KeyEventGeneratedSignal() +{ + return mKeyEventGeneratedSignal; +} + Dali::Stage::EventProcessingFinishedSignalType& Stage::EventProcessingFinishedSignal() { return mEventProcessingFinishedSignal; @@ -611,19 +686,46 @@ void Stage::NotifyContextRegained() mContextRegainedSignal.Emit(); } + +void Stage::RequestRebuildDepthTree() +{ + DALI_LOG_INFO(gLogFilter, Debug::General, "RequestRebuildDepthTree()\n"); + mDepthTreeDirty = true; +} + +void Stage::RebuildDepthTree() +{ + // If the depth tree needs rebuilding, do it in this frame only. + if( mDepthTreeDirty ) + { + DALI_LOG_INFO(gLogFilter, Debug::Concise, "RebuildDepthTree() dirty:T\n"); + + ActorPtr actor( mRootLayer.Get() ); + actor->RebuildDepthTree(); + mDepthTreeDirty = false; + } +} + + Stage::Stage( AnimationPlaylist& playlist, PropertyNotificationManager& propertyNotificationManager, SceneGraph::UpdateManager& updateManager, - NotificationManager& notificationManager ) + NotificationManager& notificationManager, + Integration::RenderController& renderController ) : mAnimationPlaylist( playlist ), - mPropertyNotificationManager(propertyNotificationManager), - mUpdateManager(updateManager), - mNotificationManager(notificationManager), - mSize(Vector2::ZERO), - mBackgroundColor(Dali::Stage::DEFAULT_BACKGROUND_COLOR), + mPropertyNotificationManager( propertyNotificationManager ), + mUpdateManager( updateManager ), + mNotificationManager( notificationManager ), + mRenderController( renderController ), + mSize( Vector2::ZERO ), + mBackgroundColor( Dali::Stage::DEFAULT_BACKGROUND_COLOR ), mViewMode( MONO ), mStereoBase( DEFAULT_STEREO_BASE ), - mSystemOverlay(NULL) + mTopMargin( 0 ), + mSystemOverlay( NULL ), + mDepthTreeDirty( false ), + mForceNextUpdate( false ), + mRenderToFbo( false ) { } @@ -632,6 +734,11 @@ SceneGraph::UpdateManager& Stage::GetUpdateManager() return mUpdateManager; } +Integration::RenderController& Stage::GetRenderController() +{ + return mRenderController; +} + unsigned int* Stage::ReserveMessageSlot( std::size_t size, bool updateScene ) { return mUpdateManager.ReserveMessageSlot( size, updateScene ); @@ -642,6 +749,18 @@ BufferIndex Stage::GetEventBufferIndex() const return mUpdateManager.GetEventBufferIndex(); } +void Stage::ForceNextUpdate() +{ + mForceNextUpdate = true; +} + +bool Stage::IsNextUpdateForced() +{ + bool nextUpdateForced = mForceNextUpdate; + mForceNextUpdate = false; + return nextUpdateForced; +} + Stage::~Stage() { delete mSystemOverlay;