X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Factors%2Factor-impl.h;h=53fe06a06d0de923bd80205cd09eddbaf6552167;hb=17f28cc04cbb2708a29a6ef7a353ce15fc434b2d;hp=92e25e5db11502c9377c8dcb3b26efc04b2f3b43;hpb=2331505c12081d7fae9b6a9a5d744670ec166b32;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h index 92e25e5..53fe06a 100755 --- a/dali/internal/event/actors/actor-impl.h +++ b/dali/internal/event/actors/actor-impl.h @@ -54,6 +54,7 @@ class ActorGestureData; class Animation; class RenderTask; class Renderer; +class Scene; typedef std::vector< ActorPtr > ActorContainer; typedef ActorContainer::iterator ActorIter; @@ -122,6 +123,12 @@ public: static ActorPtr New(); /** + * Helper to create node for derived classes who don't have their own node type + * @return pointer to newly created unique node + */ + static const SceneGraph::Node* CreateNode(); + + /** * Retrieve the name of the actor. * @return The name. */ @@ -243,6 +250,13 @@ public: } /** + * Calculates screen position and size. + * + * @return pair of two values, position of top-left corner on screen and size respectively. + */ + Rect<> CalculateScreenExtents( ) const; + + /** * Sets the size of an actor. * This does not interfere with the actors scale factor. * @param [in] width The new width. @@ -463,16 +477,6 @@ public: const Vector3& GetCurrentWorldPosition() const; /** - * @copydoc Dali::Actor::SetPositionInheritanceMode() - */ - void SetPositionInheritanceMode( PositionInheritanceMode mode ); - - /** - * @copydoc Dali::Actor::GetPositionInheritanceMode() - */ - PositionInheritanceMode GetPositionInheritanceMode() const; - - /** * @copydoc Dali::Actor::SetInheritPosition() */ void SetInheritPosition( bool inherit ); @@ -1543,8 +1547,9 @@ protected: * Protected Constructor. See Actor::New(). * The second-phase construction Initialize() member should be called immediately after this. * @param[in] derivedType The derived type of actor (if any). + * @param[in] reference to the node */ - Actor( DerivedType derivedType ); + Actor( DerivedType derivedType, const SceneGraph::Node& node ); /** * Second-phase constructor. Must be called immediately after creating a new Actor; @@ -1655,16 +1660,6 @@ public: virtual void OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, Animation::Type animationType ); /** - * @copydoc Dali::Internal::Object::GetPropertyOwner() - */ - virtual const SceneGraph::PropertyOwner* GetPropertyOwner() const; - - /** - * @copydoc Dali::Internal::Object::GetSceneObject() - */ - virtual const SceneGraph::PropertyOwner* GetSceneObject() const; - - /** * @copydoc Dali::Internal::Object::GetSceneObjectAnimatableProperty() */ virtual const SceneGraph::PropertyBase* GetSceneObjectAnimatableProperty( Property::Index index ) const; @@ -1677,7 +1672,7 @@ public: /** * @copydoc Dali::Internal::Object::GetPropertyComponentIndex() */ - virtual int GetPropertyComponentIndex( Property::Index index ) const; + virtual int32_t GetPropertyComponentIndex( Property::Index index ) const; /** * Retrieve the actor's node. @@ -1685,7 +1680,7 @@ public: */ const SceneGraph::Node& GetNode() const { - return *mNode; + return *static_cast( mUpdateObject ); } /** @@ -1718,6 +1713,20 @@ public: */ void LowerBelow( Internal::Actor& target ); +public: + + /** + * Sets the scene which this actor is added to. + * @param[in] scene The scene + */ + void SetScene( Scene& scene ); + + /** + * Gets the scene which this actor is added to. + * @return The scene + */ + Scene& GetScene() const; + private: struct SendMessage @@ -1730,11 +1739,9 @@ private: }; // Remove default constructor and copy constructor - Actor()=delete; - Actor( const Actor& )=delete; - - // Undefined - Actor& operator=( const Actor& rhs ); + Actor() = delete; + Actor( const Actor& ) = delete; + Actor& operator=( const Actor& rhs ) = delete; /** * Set the actors parent. @@ -1743,13 +1750,6 @@ private: void SetParent( Actor* parent ); /** - * Helper to create a Node for this Actor. - * To be overriden in derived classes. - * @return A newly allocated node. - */ - virtual SceneGraph::Node* CreateNode() const; - - /** * For use in derived classes, called after Initialize() */ virtual void OnInitialize() @@ -1935,11 +1935,12 @@ private: protected: + Scene* mScene; ///< The scene the actor is added to + Actor* mParent; ///< Each actor (except the root) can have one parent ActorContainer* mChildren; ///< Container of referenced actors, lazily initialized RendererContainer* mRenderers; ///< Renderer container - const SceneGraph::Node* mNode; ///< Not owned Vector3* mParentOrigin; ///< NULL means ParentOrigin::DEFAULT. ParentOrigin is non-animatable Vector3* mAnchorPoint; ///< NULL means AnchorPoint::DEFAULT. AnchorPoint is non-animatable @@ -1968,10 +1969,9 @@ protected: Vector3 mTargetPosition; ///< Event-side storage for position (not a pointer as most actors will have a position) Vector3 mTargetScale; ///< Event-side storage for scale - std::string mName; ///< Name of the actor - uint32_t mId; ///< A unique ID to identify the actor starting from 1, and 0 is reserved - uint32_t mSortedDepth; ///< The sorted depth index. A combination of tree traversal and sibling order. - int16_t mDepth; ///< The depth in the hierarchy of the actor. Only 32,767 levels of depth are supported + std::string mName; ///< Name of the actor + uint32_t mSortedDepth; ///< The sorted depth index. A combination of tree traversal and sibling order. + int16_t mDepth; ///< The depth in the hierarchy of the actor. Only 32,767 levels of depth are supported const bool mIsRoot : 1; ///< Flag to identify the root actor const bool mIsLayer : 1; ///< Flag to identify that this is a layer @@ -1992,14 +1992,13 @@ protected: bool mInheritLayoutDirection : 1; ///< Whether the actor inherits the layout direction from parent. LayoutDirection::Type mLayoutDirection : 2; ///< Layout direction, Left to Right or Right to Left. DrawMode::Type mDrawMode : 3; ///< Cached: How the actor and its children should be drawn - PositionInheritanceMode mPositionInheritanceMode : 3; ///< Cached: Determines how position is inherited ColorMode mColorMode : 3; ///< Cached: Determines whether mWorldColor is inherited ClippingMode::Type mClippingMode : 3; ///< Cached: Determines which clipping mode (if any) to use. private: static ActorContainer mNullChildren; ///< Empty container (shared by all actors, returned by GetChildren() const) - static uint32_t mActorCounter; ///< A counter to track the actor instance creation + }; } // namespace Internal