X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fimage%2Fimage-visual.h;h=f771f6d982e5e3d4b18bbc5603f1cf5cc6e59681;hp=c2eca0e3c8badb2cc4f28a46db87180e786cdc97;hb=c46c71ad6367e90da584952677f44a97723156f0;hpb=97d688bcdfb692dd2ff535c1965077dd747cfcf6 diff --git a/dali-toolkit/internal/visuals/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h index c2eca0e..f771f6d 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.h +++ b/dali-toolkit/internal/visuals/image/image-visual.h @@ -26,8 +26,9 @@ #include // INTERNAL INCLUDES -#include #include +#include +#include namespace Dali { @@ -48,14 +49,29 @@ typedef IntrusivePtr< ImageVisual > ImageVisualPtr; * * The following properties are optional * - * | %Property Name | Type | - * |--------------------|------------------| - * | url | STRING | - * | fittingMode | STRING | - * | samplingMode | STRING | - * | desiredWidth | INT | - * | desiredHeight | INT | - * | synchronousLoading | BOOLEAN | + * | %Property Name | Type | + * |--------------------|-------------------| + * | url | STRING | + * | fittingMode | INTEGER OR STRING | + * | samplingMode | INTEGER OR STRING | + * | desiredWidth | INTEGER | + * | desiredHeight | INTEGER | + * | synchronousLoading | BOOLEAN | + * | pixelArea | VECTOR4 | + * | wrapModeU | INTEGER OR STRING | + * | wrapModeV | INTEGER OR STRING | + * + * where pixelArea is a rectangular area. + * In its Vector4 value, the first two elements indicate the top-left position of the area, + * and the last two elements are the area width and height respectively. + * If not specified, the default value is [0.0, 0.0, 1.0, 1.0], i.e. the entire area of the image. + * + * where wrapModeU and wrapModeV separately decide how the texture should be sampled when the u and v coordinate exceeds the range of 0.0 to 1.0. + * Its value should be one of the following wrap mode: + * "DEFAULT" + * "CLAMP_TO_EDGE" + * "REPEAT" + * "MIRRORED_REPEAT" * * where imageFittingMode should be one of the following fitting modes: * "SHRINK_TO_FIT" @@ -74,18 +90,33 @@ typedef IntrusivePtr< ImageVisual > ImageVisualPtr; * "DONT_CARE" * "DEFAULT" * + * + * If the Visual is in a LayerUI it will pixel align the image, using a Layer3D will disable pixel alignment. + * Changing layer behaviour between LayerUI to Layer3D whilst the visual is already staged will not have an effect. */ class ImageVisual: public Visual::Base, public ConnectionTracker, public AtlasUploadObserver { public: /** - * @brief Create a new image visual. + * @brief Create a new image visual with a URL. * - * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object + * The visual will load the Image asynchronously when the associated actor is put on stage, and destroy the image when it is off stage + * + * @param[in] factoryCache The VisualFactoryCache object + * @param[in] imageUrl The URL of the image resource to use + * @param[in] properties A Property::Map containing settings for this visual + * @param[in] size The width and height to fit the loaded image to. + * @param[in] fittingMode The FittingMode of the resource to load + * @param[in] samplingMode The SamplingMode of the resource to load * @return A smart-pointer to the newly allocated visual. */ - static ImageVisualPtr New( VisualFactoryCache& factoryCache ); + static ImageVisualPtr New( VisualFactoryCache& factoryCache, + const VisualUrl& imageUrl, + const Property::Map& properties, + ImageDimensions size = ImageDimensions(), + FittingMode::Type fittingMode = FittingMode::DEFAULT, + Dali::SamplingMode::Type samplingMode = SamplingMode::BOX_THEN_LINEAR ); /** * @brief Create a new image visual with a URL. @@ -97,9 +128,10 @@ public: * @param[in] size The width and height to fit the loaded image to. * @param[in] fittingMode The FittingMode of the resource to load * @param[in] samplingMode The SamplingMode of the resource to load + * @return A smart-pointer to the newly allocated visual. */ static ImageVisualPtr New( VisualFactoryCache& factoryCache, - const std::string& imageUrl, + const VisualUrl& imageUrl, ImageDimensions size = ImageDimensions(), FittingMode::Type fittingMode = FittingMode::DEFAULT, Dali::SamplingMode::Type samplingMode = SamplingMode::BOX_THEN_LINEAR ); @@ -117,7 +149,7 @@ public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ) const; + virtual void GetNaturalSize( Vector2& naturalSize ); /** * @copydoc Visual::Base::CreatePropertyMap @@ -125,25 +157,13 @@ public: // from Visual virtual void DoCreatePropertyMap( Property::Map& map ) const; /** - * @copydoc Visual::Base::DoSetProperty - */ - virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ); - - /** - * @copydoc Visual::Base::DoGetProperty + * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index ); + virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; protected: /** - * @brief Constructor. - * - * @param[in] factoryCache The VisualFactoryCache object - */ - ImageVisual( VisualFactoryCache& factoryCache ); - - /** * @brief Constructor with a URL. * * The visual will load the Image asynchronously when the associated actor is put on stage, and destroy the image when it is off stage @@ -155,7 +175,7 @@ protected: * @param[in] samplingMode The SamplingMode of the resource to load */ ImageVisual( VisualFactoryCache& factoryCache, - const std::string& imageUrl, + const VisualUrl& imageUrl, ImageDimensions size, FittingMode::Type fittingMode, Dali::SamplingMode::Type samplingMode ); @@ -188,6 +208,11 @@ protected: */ virtual void DoSetOffStage( Actor& actor ); + /** + * @copydoc Visual::Base::OnSetTransform + */ + virtual void OnSetTransform(); + public: /** @@ -216,11 +241,9 @@ private: void ApplyImageToSampler( const Image& image ); /** - * @brief Initializes the Dali::Renderer from an image url string - * - * @param[in] imageUrl The image url string to intialize this ImageVisual from + * @brief Initializes the Dali::Renderer from the image url */ - void InitializeRenderer( const std::string& imageUrl ); + void InitializeRenderer(); /** * @brief Initializes the Dali::Renderer from an image handle @@ -260,7 +283,7 @@ private: * @param[in] attemptAtlasing If true will attempt atlasing, otherwise create unique texture * @return the texture set to use */ - TextureSet CreateTextureSet( Vector4& textureRect, const std::string& url, bool synchronousLoading, bool attemptAtlasing ); + TextureSet CreateTextureSet( Vector4& textureRect, bool synchronousLoading, bool attemptAtlasing ); /** * Callback function of image resource loading succeed @@ -275,9 +298,16 @@ private: void SetTextureRectUniform( const Vector4& textureRect ); /** - * Clean the renderer from cache, and remove the image from atlas if it is not used anymore + * Remove the image from atlas if it is not used anymore. */ - void CleanCache(const std::string& url); + void RemoveFromAtlas(const std::string& url); + + /** + * Helper method to set individual values by index key. + * @param[in] index The index key of the value + * @param[in] value The value + */ + void DoSetProperty( Property::Index index, const Property::Value& value ); private: @@ -285,7 +315,7 @@ private: PixelData mPixels; Vector4 mPixelArea; WeakHandle mPlacementActor; - std::string mImageUrl; + VisualUrl mImageUrl; Dali::ImageDimensions mDesiredSize; Dali::FittingMode::Type mFittingMode:3; @@ -293,6 +323,8 @@ private: Dali::WrapMode::Type mWrapModeU:3; Dali::WrapMode::Type mWrapModeV:3; + bool mAttemptAtlasing:1; // If true will attempt atlasing, otherwise create unique texture + }; } // namespace Internal