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=cd22ebcd435cbc22c60355044924c98bbcc8f55a;hp=1b9e84abb20ccb280c22fb10851174392bbb214e;hb=c211a7d84885dca19c90b4656055002865e6fce2;hpb=cc0aefb3259c6fe818d9949ebf768843cc01e6fd diff --git a/dali-toolkit/internal/visuals/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h index 1b9e84a..cd22ebc 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.h +++ b/dali-toolkit/internal/visuals/image/image-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_IMAGE_VISUAL_H /* - * Copyright (c) 2015 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. @@ -18,14 +18,16 @@ * */ -// INTERNAL INCLUDES -#include -#include - // EXTERNAL INCLUDES +#include #include #include #include +#include + +// INTERNAL INCLUDES +#include +#include namespace Dali { @@ -73,63 +75,116 @@ typedef IntrusivePtr< ImageVisual > ImageVisualPtr; * "DEFAULT" * */ -class ImageVisual: public Visual, public ConnectionTracker +class ImageVisual: public Visual::Base, public ConnectionTracker, public AtlasUploadObserver { public: /** - * @brief Constructor. + * @brief Create a new image visual. + * + * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object + * @return A smart-pointer to the newly allocated visual. + */ + static ImageVisualPtr New( VisualFactoryCache& factoryCache ); + + /** + * @brief Create a new image visual 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 * * @param[in] factoryCache The VisualFactoryCache object - * @param[in] atlasManager The atlasManager object + * @param[in] imageUrl The URL of the image resource to use + * @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 */ - ImageVisual( VisualFactoryCache& factoryCache, ImageAtlasManager& atlasManager ); + static ImageVisualPtr New( VisualFactoryCache& factoryCache, + const std::string& imageUrl, + ImageDimensions size = ImageDimensions(), + FittingMode::Type fittingMode = FittingMode::DEFAULT, + Dali::SamplingMode::Type samplingMode = SamplingMode::BOX_THEN_LINEAR ); /** - * @brief A reference counted object may only be deleted by calling Unreference(). + * @brief Create a new image visual with an Image type. + * + * @param[in] factoryCache The VisualFactoryCache object + * @param[in] image The image to use */ - ~ImageVisual(); + static ImageVisualPtr New( VisualFactoryCache& factoryCache, const Image& image ); public: // from Visual /** - * @copydoc Visual::SetSize + * @copydoc Visual::Base::GetNaturalSize */ - virtual void SetSize( const Vector2& size ); + virtual void GetNaturalSize( Vector2& naturalSize ) const; /** - * @copydoc Visual::GetNaturalSize + * @copydoc Visual::Base::CreatePropertyMap */ - virtual void GetNaturalSize( Vector2& naturalSize ) const; + virtual void DoCreatePropertyMap( Property::Map& map ) const; /** - * @copydoc Visual::SetClipRect + * @copydoc Visual::Base::DoSetProperty */ - virtual void SetClipRect( const Rect& clipRect ); + virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ); /** - * @copydoc Visual::SetOffset + * @copydoc Visual::Base::DoGetProperty */ - virtual void SetOffset( const Vector2& offset ); + virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index ); + +protected: /** - * @copydoc Visual::CreatePropertyMap + * @brief Constructor. + * + * @param[in] factoryCache The VisualFactoryCache object */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + ImageVisual( VisualFactoryCache& factoryCache ); -protected: /** - * @copydoc Visual::DoInitialize + * @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 + * + * @param[in] factoryCache The VisualFactoryCache object + * @param[in] imageUrl The URL of the image resource to use + * @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 + */ + ImageVisual( VisualFactoryCache& factoryCache, + const std::string& imageUrl, + ImageDimensions size, + FittingMode::Type fittingMode, + Dali::SamplingMode::Type samplingMode ); + + /** + * @brief Constructor with an Image type. + * + * @param[in] factoryCache The VisualFactoryCache object + * @param[in] image The image to use + */ + ImageVisual( VisualFactoryCache& factoryCache, const Image& image ); + + /** + * @brief A reference counted object may only be deleted by calling Unreference(). + */ + virtual ~ImageVisual(); + + /** + * @copydoc Visual::Base::DoInitialize */ virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); /** - * @copydoc Visual::DoSetOnStage + * @copydoc Visual::Base::DoSetOnStage */ virtual void DoSetOnStage( Actor& actor ); /** - * @copydoc Visual::DoSetOffStage + * @copydoc Visual::Base::DoSetOffStage */ virtual void DoSetOffStage( Actor& actor ); @@ -138,32 +193,18 @@ public: /** * Get the standard image rendering shader. * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object + * @param[in] atlasing Whether texture atlasing is applied. + * @param[in] defaultTextureWrapping Whether the default texture wrap mode is applied. */ - static Shader GetImageShader( VisualFactoryCache& factoryCache ); + static Shader GetImageShader( VisualFactoryCache& factoryCache, bool atlasing, bool defaultTextureWrapping ); /** - * @brief Sets the image of this visual to the resource at imageUrl - * The visual will load the Image asynchronously when the associated actor is put on stage, and destroy the image when it is off stage + * @copydoc AtlasUploadObserver::UploadCompleted * - * @param[in] actor The Actor the renderer is applied to if, empty if the renderer has not been applied to any Actor - * @param[in] imageUrl The URL of the image resource to use - * @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 - */ - void SetImage( Actor& actor, - const std::string& imageUrl, - ImageDimensions size=ImageDimensions(), - FittingMode::Type fittingMode = FittingMode::DEFAULT, - Dali::SamplingMode::Type samplingMode = SamplingMode::BOX_THEN_LINEAR ); - - /** - * @brief Sets the image to be rendered by this visual - * - * @param[in] actor The Actor the renderer is applied to if, empty if the renderer has not been applied to any Actor - * @param[in] image The image to use + * To avoid rendering garbage pixels, renderer should be added to actor after the resources are ready. + * This callback is the place to add the renderer as it would be called once the loading is finished. */ - void SetImage( Actor& actor, const Image& image ); + virtual void UploadCompleted(); private: @@ -204,14 +245,14 @@ private: /** * @brief Query whether resources requires to be loaded synchronously. - * @return Returns true if synchronoud resource loading is required, false otherwise. + * @return Returns true if synchronous resource loading is required, false otherwise. */ bool IsSynchronousResourceLoading() const; /** - * @brief Do the synchronous resource loading + * @brief Load the resource synchronously */ - void DoSynchronousResourceLoading(); + void LoadResourceSynchronously(); /** * Load the image. @@ -252,13 +293,16 @@ private: private: Image mImage; - ImageAtlasManager& mAtlasManager; PixelData mPixels; + Vector4 mPixelArea; + WeakHandle mPlacementActor; std::string mImageUrl; Dali::ImageDimensions mDesiredSize; Dali::FittingMode::Type mFittingMode; Dali::SamplingMode::Type mSamplingMode; + Dali::WrapMode::Type mWrapModeU; + Dali::WrapMode::Type mWrapModeV; std::string mNativeFragmentShaderCode; bool mNativeImageFlag;