X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fcommon%2Fcore-impl.cpp;h=d176f707b2f187ed274eec8940e07fb35cb36829;hb=43799975e2a72746ed9cb47e1f528de55c080863;hp=97787c74bef8f8f8f2bb1874eeeda9faa6b5b6ad;hpb=fb38234733d0a5be37abdc281116c6032edbfa17;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/common/core-impl.cpp b/dali/internal/common/core-impl.cpp index 97787c7..d176f70 100644 --- a/dali/internal/common/core-impl.cpp +++ b/dali/internal/common/core-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -22,41 +22,36 @@ #include #include #include -#include +#include #include +#include #include + #include -#include #include -#include #include -#include +#include +#include +#include +#include +#include #include #include +#include +#include + +#include #include +#include + #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include using Dali::Internal::SceneGraph::UpdateManager; using Dali::Internal::SceneGraph::RenderManager; using Dali::Internal::SceneGraph::DiscardQueue; using Dali::Internal::SceneGraph::RenderQueue; -using Dali::Internal::SceneGraph::TextureCache; namespace { @@ -88,18 +83,6 @@ Core::Core( RenderController& renderController, PlatformAbstraction& platform, GestureManager& gestureManager, ResourcePolicy::DataRetention dataRetentionPolicy) : mRenderController( renderController ), mPlatform(platform), - mGestureEventProcessor(NULL), - mEventProcessor(NULL), - mUpdateManager(NULL), - mRenderManager(NULL), - mDiscardQueue(NULL), - mResourcePostProcessQueue(), - mNotificationManager(NULL), - mFontFactory(NULL), - mImageFactory(NULL), - mModelFactory(NULL), - mShaderFactory(NULL), - mEmojiFactory(NULL), mIsActive(true), mProcessingEvent(false) { @@ -115,72 +98,43 @@ Core::Core( RenderController& renderController, PlatformAbstraction& platform, mPropertyNotificationManager = PropertyNotificationManager::New(); - std::vector< ResourcePostProcessRequest> init; - mResourcePostProcessQueue = new ResourcePostProcessList(init); + mRenderTaskProcessor = new SceneGraph::RenderTaskProcessor(); - mRenderManager = RenderManager::New( glAbstraction, *mResourcePostProcessQueue ); + mRenderManager = RenderManager::New( glAbstraction, glSyncAbstraction ); RenderQueue& renderQueue = mRenderManager->GetRenderQueue(); - TextureCache& textureCache = mRenderManager->GetTextureCache(); - - ResourcePolicy::Discardable discardPolicy = ResourcePolicy::DISCARD; - if( dataRetentionPolicy == ResourcePolicy::DALI_RETAINS_ALL_DATA ) - { - discardPolicy = ResourcePolicy::RETAIN; - } - textureCache.SetDiscardBitmapsPolicy(discardPolicy); mDiscardQueue = new DiscardQueue( renderQueue ); - mResourceManager = new ResourceManager( mPlatform, - *mNotificationManager, - textureCache, - *mResourcePostProcessQueue, - *mRenderManager, - *mDiscardQueue, - renderQueue ); - - mTouchResampler = TouchResampler::New(); - mUpdateManager = new UpdateManager( *mNotificationManager, - glSyncAbstraction, *mAnimationPlaylist, *mPropertyNotificationManager, - *mResourceManager, *mDiscardQueue, renderController, *mRenderManager, renderQueue, - textureCache, - *mTouchResampler ); + *mRenderTaskProcessor ); - mResourceClient = new ResourceClient( *mResourceManager, *mUpdateManager, dataRetentionPolicy ); + mRenderManager->SetShaderSaver( *mUpdateManager ); mStage = IntrusivePtr( Stage::New( *mAnimationPlaylist, *mPropertyNotificationManager, *mUpdateManager, *mNotificationManager ) ); + // This must be called after stage is created but before stage initialization + mRelayoutController = IntrusivePtr< RelayoutController >( new RelayoutController( mRenderController ) ); + mStage->Initialize(); - mGestureEventProcessor = new GestureEventProcessor(*mStage, gestureManager, mRenderController); - mEventProcessor = new EventProcessor(*mStage, *mNotificationManager, *mGestureEventProcessor); + mGestureEventProcessor = new GestureEventProcessor( *mStage, *mUpdateManager, gestureManager, mRenderController ); + mEventProcessor = new EventProcessor( *mStage, *mNotificationManager, *mGestureEventProcessor ); - mFontFactory = new FontFactory(*mResourceClient); - mImageFactory = new ImageFactory( *mResourceClient ); - mModelFactory = new ModelFactory(*mResourceClient); - mShaderFactory = new ShaderFactory(*mResourceClient); - mShaderFactory->LoadDefaultShaders(); - mEmojiFactory = new EmojiFactory(); + mShaderFactory = new ShaderFactory(); + mUpdateManager->SetShaderSaver( *mShaderFactory ); GetImplementation(Dali::TypeRegistry::Get()).CallInitFunctions(); } Core::~Core() { - /** - * TODO this should be done by Adaptor, Core does not know about threading - * First stop the resource loading thread(s) - */ - mPlatform.JoinLoaderThreads(); - /* * The order of destructing these singletons is important!!! */ @@ -188,7 +142,15 @@ Core::~Core() // clear the thread local storage first // allows core to be created / deleted many times in the same thread (how TET cases work). // Do this before mStage.Reset() so Stage::IsInstalled() returns false - ThreadLocalStorage::Get().Remove(); + ThreadLocalStorage* tls = ThreadLocalStorage::GetInternal(); + if( tls ) + { + tls->Remove(); + delete tls; + } + + // Stop relayout requests being raised on stage destruction + mRelayoutController.Reset(); // Clean-up stage - remove default camera and root layer mStage->Uninitialize(); @@ -196,21 +158,6 @@ Core::~Core() // remove (last?) reference to stage mStage.Reset(); - delete mEventProcessor; - delete mGestureEventProcessor; - delete mNotificationManager; - delete mFontFactory; - delete mImageFactory; - delete mModelFactory; - delete mShaderFactory; - delete mResourceClient; - delete mResourceManager; - delete mUpdateManager; - delete mTouchResampler; - delete mEmojiFactory; - delete mRenderManager; - delete mDiscardQueue; - delete mResourcePostProcessQueue; } Integration::ContextNotifierInterface* Core::GetContextNotifier() @@ -222,8 +169,6 @@ void Core::RecoverFromContextLoss() { DALI_LOG_INFO(gCoreFilter, Debug::Verbose, "Core::RecoverFromContextLoss()\n"); - mImageFactory->RecoverFromContextLoss(); // Reload images from files - mFontFactory->RecoverFromContextLoss(); // Reload glyphs from cache into new atlas mStage->GetRenderTaskList().RecoverFromContextLoss(); // Re-trigger render-tasks } @@ -237,15 +182,26 @@ void Core::ContextDestroyed() mRenderManager->ContextDestroyed(); } -void Core::SurfaceResized(unsigned int width, unsigned int height) +void Core::SurfaceResized( unsigned int width, unsigned int height ) +{ + mStage->SurfaceResized( width, height ); + + // The stage-size may be less than surface-size (reduced by top-margin) + Vector2 size = mStage->GetSize(); + mRelayoutController->SetStageSize( size.width, size.height ); +} + +void Core::SetTopMargin( unsigned int margin ) { - mStage->SetSize(width, height); + mStage->SetTopMargin( margin ); + + // The stage-size may be less than surface-size (reduced by top-margin) + Vector2 size = mStage->GetSize(); + mRelayoutController->SetStageSize( size.width, size.height ); } -void Core::SetDpi(unsigned int dpiHorizontal, unsigned int dpiVertical) +void Core::SetDpi( unsigned int dpiHorizontal, unsigned int dpiVertical ) { - mPlatform.SetDpi( dpiHorizontal, dpiVertical ); - mFontFactory->SetDpi( dpiHorizontal, dpiVertical); mStage->SetDpi( Vector2( dpiHorizontal , dpiVertical) ); } @@ -266,38 +222,33 @@ void Core::Update( float elapsedSeconds, unsigned int lastVSyncTimeMilliseconds, // No need to keep update running if there are notifications to process. // Any message to update will wake it up anyways - - if ( mResourceManager->ResourcesToProcess() ) - { - // If we are still processing resources, then we have to continue the update - status.keepUpdating |= Integration::KeepUpdating::LOADING_RESOURCES; - } } void Core::Render( RenderStatus& status ) { - bool updateRequired = mRenderManager->Render( status ); - - status.SetNeedsUpdate( updateRequired ); + mRenderManager->Render( status ); } void Core::Suspend() { - mPlatform.Suspend(); - mIsActive = false; } void Core::Resume() { - mPlatform.Resume(); - mIsActive = true; // trigger processing of events queued up while paused ProcessEvents(); } +void Core::SceneCreated() +{ + mStage->EmitSceneCreatedSignal(); + + mRelayoutController->OnApplicationSceneCreated(); +} + void Core::QueueEvent( const Integration::Event& event ) { mEventProcessor->QueueEvent( event ); @@ -308,17 +259,16 @@ void Core::ProcessEvents() // Guard against calls to ProcessEvents() during ProcessEvents() if( mProcessingEvent ) { - DALI_LOG_ERROR( "ProcessEvents should not be called from within ProcessEvents!" ); + DALI_LOG_ERROR( "ProcessEvents should not be called from within ProcessEvents!\n" ); mRenderController.RequestProcessEventsOnIdle(); return; } mProcessingEvent = true; - - EventToUpdate& eventToUpdate = mUpdateManager->GetEventToUpdate(); + mRelayoutController->SetProcessingCoreEvents( true ); // Signal that any messages received will be flushed soon - eventToUpdate.EventProcessingStarted(); + mUpdateManager->EventProcessingStarted(); mEventProcessor->ProcessEvents(); @@ -327,38 +277,34 @@ void Core::ProcessEvents() // Avoid allocating MessageBuffers, triggering size-negotiation or sending any other spam whilst paused if( mIsActive ) { - // Emit signal here to start size negotiation and control relayout. + // Emit signal here to inform listeners that event processing has finished. mStage->EmitEventProcessingFinishedSignal(); - // Flush discard queue for image factory - mImageFactory->FlushReleaseQueue(); + // Run the size negotiation after event processing finished signal + mRelayoutController->Relayout(); - // send text requests if required - mFontFactory->SendTextRequests(); + // Rebuild depth tree after event processing has finished + mStage->RebuildDepthTree(); // Flush any queued messages for the update-thread - const bool messagesToProcess = eventToUpdate.FlushQueue(); + const bool messagesToProcess = mUpdateManager->FlushQueue(); // Check if the touch or gestures require updates. - const bool touchNeedsUpdate = mTouchResampler->NeedsUpdate(); const bool gestureNeedsUpdate = mGestureEventProcessor->NeedsUpdate(); - if( messagesToProcess || touchNeedsUpdate || gestureNeedsUpdate ) + if( messagesToProcess || gestureNeedsUpdate ) { // tell the render controller to keep update thread running mRenderController.RequestUpdate(); } } + mRelayoutController->SetProcessingCoreEvents( false ); + // ProcessEvents() may now be called again mProcessingEvent = false; } -void Core::UpdateTouchData(const Integration::TouchData& touch) -{ - mTouchResampler->SendTouchData( touch ); -} - unsigned int Core::GetMaximumUpdateCount() const { return MAXIMUM_UPDATE_COUNT; @@ -414,31 +360,6 @@ NotificationManager& Core::GetNotificationManager() return *(mNotificationManager); } -ResourceManager& Core::GetResourceManager() -{ - return *(mResourceManager); -} - -ResourceClient& Core::GetResourceClient() -{ - return *(mResourceClient); -} - -FontFactory& Core::GetFontFactory() -{ - return *(mFontFactory); -} - -ImageFactory& Core::GetImageFactory() -{ - return *(mImageFactory); -} - -ModelFactory& Core::GetModelFactory() -{ - return *(mModelFactory); -} - ShaderFactory& Core::GetShaderFactory() { return *(mShaderFactory); @@ -449,15 +370,15 @@ GestureEventProcessor& Core::GetGestureEventProcessor() return *(mGestureEventProcessor); } -EmojiFactory& Core::GetEmojiFactory() +RelayoutController& Core::GetRelayoutController() { - return *mEmojiFactory; + return *(mRelayoutController.Get()); } void Core::CreateThreadLocalStorage() { // a pointer to the ThreadLocalStorage object will be stored in TLS - // and automatically deleted when the thread is killed + // The ThreadLocalStorage object should be deleted by the Core destructor new ThreadLocalStorage(this); }