X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Fmanager%2Fupdate-manager.h;h=72df33cadcec428d09e9cfa4af09abe85232398a;hb=0adda602532f61db5b44eb2796f9a74d7a37b519;hp=c4b3904c758858a88c021563b9039d0500cef71f;hpb=70ac0bad6473d7a21dfcb5eae3506dc9400e7824;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/update/manager/update-manager.h b/dali/internal/update/manager/update-manager.h old mode 100644 new mode 100755 index c4b3904..72df33c --- a/dali/internal/update/manager/update-manager.h +++ b/dali/internal/update/manager/update-manager.h @@ -34,6 +34,7 @@ #include #include #include +#include // for OwnerPointer< FrameCallback > #include // for OwnerPointer< Renderer > #include // for OwnerPointer< TextureSet > #include @@ -131,6 +132,7 @@ public: * @param[in] renderManager This is responsible for rendering the results of each "update". * @param[in] renderQueue Used to queue messages for the next render. * @param[in] renderTaskProcessor Handles RenderTasks and RenderInstrucitons. + * @param[in] partialUpdateAvailble whether the partial update is available */ UpdateManager( NotificationManager& notificationManager, CompleteNotificationInterface& animationPlaylist, @@ -139,7 +141,8 @@ public: Integration::RenderController& controller, RenderManager& renderManager, RenderQueue& renderQueue, - RenderTaskProcessor& renderTaskProcessor ); + RenderTaskProcessor& renderTaskProcessor, + bool partialUpdateAvailable ); /** * Destructor. @@ -150,7 +153,6 @@ public: /** * Installs a new layer as the root node. - * @pre The UpdateManager does not already have an installed root node. * @pre The layer is of derived Node type Layer. * @pre The layer does not have a parent. * @param[in] layer The new root node. @@ -159,6 +161,15 @@ public: void InstallRoot( OwnerPointer& layer ); /** + * Uninstalls the root node. + * @pre The layer is of derived Node type Layer. + * @pre The layer does not have a parent. + * @param[in] layer The root node. + * @post The node is owned by UpdateManager. + */ + void UninstallRoot( Layer* layer ); + + /** * Add a Node; UpdateManager takes ownership. * @pre The node does not have a parent. * @note even though nodes are pool allocated, they also contain other heap allocated data, thus using OwnerPointer when transferring the data @@ -201,7 +212,7 @@ public: * Remove a camera from scene * @param[in] camera to remove */ - void RemoveCamera( const Camera* camera ); + void RemoveCamera( Camera* camera ); /** * Add a newly created object. @@ -549,7 +560,7 @@ public: * @param[in] frameBuffer The framebuffer to add * The framebuffer will be owned by RenderManager */ - void AddFrameBuffer( Render::FrameBuffer* frameBuffer ); + void AddFrameBuffer( OwnerPointer< Render::FrameBuffer >& frameBuffer ); /** * Removes a FrameBuffer from the render manager @@ -585,18 +596,18 @@ public: bool isRenderingToFbo ); /** - * Set the background color i.e. the glClear color used at the beginning of each frame. - * @param[in] color The new background color. - */ - void SetBackgroundColor(const Vector4& color); - - /** * Set the default surface rect. * @param[in] rect The rect value representing the surface. */ void SetDefaultSurfaceRect( const Rect& rect ); /** + * Set the default surface orientation. + * @param[in] orientation The orientation value representing the surface. + */ + void SetDefaultSurfaceOrientation( int orientation ); + + /** * @copydoc Dali::Stage::KeepRendering() */ void KeepRendering( float durationSeconds ); @@ -627,10 +638,10 @@ public: /** * Adds an implementation of the FrameCallbackInterface. - * @param[in] frameCallback A pointer to the implementation of the FrameCallbackInterface + * @param[in] frameCallback An OwnerPointer to the SceneGraph FrameCallback object * @param[in] rootNode A pointer to the root node to apply the FrameCallback to */ - void AddFrameCallback( FrameCallbackInterface* frameCallback, const Node* rootNode ); + void AddFrameCallback( OwnerPointer< FrameCallback >& frameCallback, const Node* rootNode ); /** * Removes the specified implementation of FrameCallbackInterface. @@ -740,6 +751,20 @@ inline void InstallRootMessage( UpdateManager& manager, OwnerPointer& roo new (slot) LocalType( &manager, &UpdateManager::InstallRoot, root ); } +inline void UninstallRootMessage( UpdateManager& manager, const Layer* constRoot ) +{ + // Scene graph thread can destroy this object. + Layer* root = const_cast< Layer* >( constRoot ); + + typedef MessageValue1< UpdateManager, Layer* > LocalType; + + // Reserve some memory inside the message queue + uint32_t* slot = manager.ReserveMessageSlot( sizeof( LocalType ) ); + + // Construct message in the message queue memory; note that delete should not be called on the return value + new (slot) LocalType( &manager, &UpdateManager::UninstallRoot, root ); +} + inline void AddNodeMessage( UpdateManager& manager, OwnerPointer& node ) { // Message has ownership of Node while in transit from event -> update @@ -809,13 +834,13 @@ inline void AddCameraMessage( UpdateManager& manager, OwnerPointer< Camera >& ca inline void RemoveCameraMessage( UpdateManager& manager, const Camera* camera ) { - typedef MessageValue1< UpdateManager, const Camera* > LocalType; + typedef MessageValue1< UpdateManager, Camera* > LocalType; // Reserve some memory inside the message queue uint32_t* slot = manager.ReserveMessageSlot( sizeof( LocalType ) ); // Construct message in the message queue memory; note that delete should not be called on the return value - new (slot) LocalType( &manager, &UpdateManager::RemoveCamera, camera ); + new (slot) LocalType( &manager, &UpdateManager::RemoveCamera, const_cast( camera ) ); } inline void AddObjectMessage( UpdateManager& manager, OwnerPointer& object ) @@ -830,7 +855,7 @@ inline void AddObjectMessage( UpdateManager& manager, OwnerPointer LocalType; @@ -838,7 +863,7 @@ inline void RemoveObjectMessage( UpdateManager& manager, PropertyOwner* object ) uint32_t* slot = manager.ReserveMessageSlot( sizeof( LocalType ) ); // Construct message in the message queue memory; note that delete should not be called on the return value - new (slot) LocalType( &manager, &UpdateManager::RemoveObject, object ); + new (slot) LocalType( &manager, &UpdateManager::RemoveObject, const_cast( object ) ); } inline void AddAnimationMessage( UpdateManager& manager, OwnerPointer< SceneGraph::Animation >& animation ) @@ -960,7 +985,7 @@ inline void AddShaderMessage( UpdateManager& manager, OwnerPointer< Shader >& sh } // The render thread can safely change the Shader -inline void RemoveShaderMessage( UpdateManager& manager, Shader& shader ) +inline void RemoveShaderMessage( UpdateManager& manager, const Shader* shader ) { typedef MessageValue1< UpdateManager, Shader* > LocalType; @@ -968,11 +993,11 @@ inline void RemoveShaderMessage( UpdateManager& manager, Shader& shader ) uint32_t* slot = manager.ReserveMessageSlot( sizeof( LocalType ) ); // Construct message in the message queue memory; note that delete should not be called on the return value - new (slot) LocalType( &manager, &UpdateManager::RemoveShader, &shader ); + new (slot) LocalType( &manager, &UpdateManager::RemoveShader, const_cast( shader ) ); } inline void SetShaderProgramMessage( UpdateManager& manager, - Shader& shader, + const Shader& shader, Internal::ShaderDataPtr shaderData, bool modifiesGeometry ) { @@ -982,29 +1007,29 @@ inline void SetShaderProgramMessage( UpdateManager& manager, uint32_t* slot = manager.ReserveMessageSlot( sizeof( LocalType ) ); // Construct message in the message queue memory; note that delete should not be called on the return value - new (slot) LocalType( &manager, &UpdateManager::SetShaderProgram, &shader, shaderData, modifiesGeometry ); + new (slot) LocalType( &manager, &UpdateManager::SetShaderProgram, const_cast( &shader ), shaderData, modifiesGeometry ); } -inline void SetBackgroundColorMessage( UpdateManager& manager, const Vector4& color ) +inline void SetDefaultSurfaceRectMessage( UpdateManager& manager, const Rect& rect ) { - typedef MessageValue1< UpdateManager, Vector4 > LocalType; + typedef MessageValue1< UpdateManager, Rect > LocalType; // Reserve some memory inside the message queue uint32_t* slot = manager.ReserveMessageSlot( sizeof( LocalType ) ); // Construct message in the message queue memory; note that delete should not be called on the return value - new (slot) LocalType( &manager, &UpdateManager::SetBackgroundColor, color ); + new (slot) LocalType( &manager, &UpdateManager::SetDefaultSurfaceRect, rect ); } -inline void SetDefaultSurfaceRectMessage( UpdateManager& manager, const Rect& rect ) +inline void SetDefaultSurfaceOrientationMessage( UpdateManager& manager, int orientation ) { - typedef MessageValue1< UpdateManager, Rect > LocalType; + typedef MessageValue1< UpdateManager, int > LocalType; // Reserve some memory inside the message queue - uint32_t* slot = manager.ReserveMessageSlot( sizeof( LocalType ) ); + unsigned int* slot = manager.ReserveMessageSlot( sizeof( LocalType ) ); // Construct message in the message queue memory; note that delete should not be called on the return value - new (slot) LocalType( &manager, &UpdateManager::SetDefaultSurfaceRect, rect ); + new (slot) LocalType( &manager, &UpdateManager::SetDefaultSurfaceOrientation, orientation ); } inline void KeepRenderingMessage( UpdateManager& manager, float durationSeconds ) @@ -1033,7 +1058,7 @@ inline void SetRenderingBehaviorMessage( UpdateManager& manager, DevelStage::Ren * Create a message for setting the depth of a layer * @param[in] manager The update manager * @param[in] layers list of layers - * @param[in] rootLayer True if the layers are added via the SystemOverlay API + * @param[in] rootLayer The rool layer */ inline void SetLayerDepthsMessage( UpdateManager& manager, const std::vector< Layer* >& layers, const Layer* rootLayer ) { @@ -1056,14 +1081,14 @@ inline void AddRendererMessage( UpdateManager& manager, OwnerPointer< Renderer > new (slot) LocalType( &manager, &UpdateManager::AddRenderer, object ); } -inline void RemoveRendererMessage( UpdateManager& manager, Renderer& object ) +inline void RemoveRendererMessage( UpdateManager& manager, const Renderer& object ) { typedef MessageValue1< UpdateManager, Renderer* > LocalType; // Reserve some memory inside the message queue uint32_t* slot = manager.ReserveMessageSlot( sizeof( LocalType ) ); // Construct message in the message queue memory; note that delete should not be called on the return value - new (slot) LocalType( &manager, &UpdateManager::RemoveRenderer, &object ); + new (slot) LocalType( &manager, &UpdateManager::RemoveRenderer, const_cast( &object ) ); } // The render thread can safely change the Shader @@ -1335,15 +1360,15 @@ inline void GenerateMipmapsMessage( UpdateManager& manager, Render::Texture& tex } -inline void AddFrameBuffer( UpdateManager& manager, Render::FrameBuffer& frameBuffer ) +inline void AddFrameBuffer( UpdateManager& manager, OwnerPointer< Render::FrameBuffer >& frameBuffer ) { - typedef MessageValue1< UpdateManager, Render::FrameBuffer* > LocalType; + typedef MessageValue1< UpdateManager, OwnerPointer< Render::FrameBuffer > > LocalType; // Reserve some memory inside the message queue uint32_t* slot = manager.ReserveMessageSlot( sizeof( LocalType ) ); // Construct message in the message queue memory; note that delete should not be called on the return value - new (slot) LocalType( &manager, &UpdateManager::AddFrameBuffer, &frameBuffer ); + new (slot) LocalType( &manager, &UpdateManager::AddFrameBuffer, frameBuffer ); } inline void RemoveFrameBuffer( UpdateManager& manager, Render::FrameBuffer& frameBuffer ) @@ -1390,15 +1415,15 @@ inline void AddResetterMessage( UpdateManager& manager, OwnerPointer& frameCallback, const Node& rootNode ) { - typedef MessageValue2< UpdateManager, FrameCallbackInterface*, const Node* > LocalType; + typedef MessageValue2< UpdateManager, OwnerPointer< FrameCallback >, const Node* > LocalType; // Reserve some memory inside the message queue uint32_t* slot = manager.ReserveMessageSlot( sizeof( LocalType ) ); // Construct message in the message queue memory; note that delete should not be called on the return value - new (slot) LocalType( &manager, &UpdateManager::AddFrameCallback, &frameCallback, &rootNode ); + new (slot) LocalType( &manager, &UpdateManager::AddFrameCallback, frameCallback, &rootNode ); } inline void RemoveFrameCallbackMessage( UpdateManager& manager, FrameCallbackInterface& frameCallback )