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=c0a3f750ae71baa5d0f194eac952675533f443a0;hp=ea46680aa83d3c7660a13a4d2dab9e973919daac;hb=f15cbe6c00c4bcb9baffe8d6f95747e3c2e051d1;hpb=f00334715a31692c0bfd7eb0a7fc67c5ae09f327 diff --git a/dali-toolkit/internal/visuals/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h index ea46680..c0a3f75 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) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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,33 +22,28 @@ #include #include -#include #include -#include #include // INTERNAL INCLUDES #include +#include #include #include #include -#include #include namespace Dali { - class NativeImage; namespace Toolkit { - namespace Internal { - class ImageVisualShaderFactory; class ImageVisual; -typedef IntrusivePtr< ImageVisual > ImageVisualPtr; +typedef IntrusivePtr ImageVisualPtr; /** * The visual which renders an image to a quad geometry @@ -112,10 +107,9 @@ typedef IntrusivePtr< ImageVisual > ImageVisualPtr; * 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 TextureUploadObserver +class ImageVisual : public Visual::Base, public ConnectionTracker, public AtlasUploadObserver, public TextureUploadObserver { public: - /** * @brief Create a new image visual with a URL. * @@ -130,13 +124,13 @@ public: * @param[in] samplingMode The SamplingMode of the resource to load * @return A smart-pointer to the newly allocated visual. */ - static ImageVisualPtr New( VisualFactoryCache& factoryCache, - ImageVisualShaderFactory& shaderFactory, - const VisualUrl& imageUrl, - const Property::Map& properties, - ImageDimensions size = ImageDimensions(), - FittingMode::Type fittingMode = FittingMode::DEFAULT, - Dali::SamplingMode::Type samplingMode = SamplingMode::BOX_THEN_LINEAR ); + static ImageVisualPtr New(VisualFactoryCache& factoryCache, + ImageVisualShaderFactory& shaderFactory, + 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. @@ -151,46 +145,35 @@ public: * @param[in] samplingMode The SamplingMode of the resource to load * @return A smart-pointer to the newly allocated visual. */ - static ImageVisualPtr New( VisualFactoryCache& factoryCache, - ImageVisualShaderFactory& shaderFactory, - const VisualUrl& imageUrl, - ImageDimensions size = ImageDimensions(), - FittingMode::Type fittingMode = FittingMode::DEFAULT, - Dali::SamplingMode::Type samplingMode = SamplingMode::BOX_THEN_LINEAR ); - - /** - * @brief Create a new image visual with an Image type. - * - * @param[in] factoryCache The VisualFactoryCache object - * @param[in] shaderFactory The ImageVisualShaderFactory object - * @param[in] image The image to use - */ - static ImageVisualPtr New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const Image& image ); - -public: // from Visual - + static ImageVisualPtr New(VisualFactoryCache& factoryCache, + ImageVisualShaderFactory& shaderFactory, + const VisualUrl& imageUrl, + ImageDimensions size = ImageDimensions(), + FittingMode::Type fittingMode = FittingMode::DEFAULT, + Dali::SamplingMode::Type samplingMode = SamplingMode::BOX_THEN_LINEAR); + +public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - void GetNaturalSize( Vector2& naturalSize ) override; + void GetNaturalSize(Vector2& naturalSize) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - void DoCreatePropertyMap( Property::Map& map ) const override; + void DoCreatePropertyMap(Property::Map& map) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - void DoCreateInstancePropertyMap( Property::Map& map ) const override; + void DoCreateInstancePropertyMap(Property::Map& map) const override; /** * @copydoc Visual::Base::OnDoAction */ - void OnDoAction( const Dali::Property::Index actionName, const Dali::Property::Value& attributes ) override; + void OnDoAction(const Dali::Property::Index actionName, const Dali::Property::Value& attributes) override; protected: - /** * @brief Constructor with a URL. * @@ -203,41 +186,37 @@ protected: * @param[in] fittingMode The FittingMode of the resource to load * @param[in] samplingMode The SamplingMode of the resource to load */ - ImageVisual( VisualFactoryCache& factoryCache, - ImageVisualShaderFactory& shaderFactory, - const VisualUrl& imageUrl, - ImageDimensions size, - FittingMode::Type fittingMode, - Dali::SamplingMode::Type samplingMode ); + ImageVisual(VisualFactoryCache& factoryCache, + ImageVisualShaderFactory& shaderFactory, + const VisualUrl& imageUrl, + ImageDimensions size, + FittingMode::Type fittingMode, + Dali::SamplingMode::Type samplingMode); /** - * @brief Constructor with an Image type. - * - * @param[in] factoryCache The VisualFactoryCache object - * @param[in] shaderFactory The ImageVisualShaderFactory object - * @param[in] image The image to use + * @brief A reference counted object may only be deleted by calling Unreference(). */ - ImageVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const Image& image ); + virtual ~ImageVisual(); /** - * @brief A reference counted object may only be deleted by calling Unreference(). + * @copydoc Visual::Base::OnInitialize */ - virtual ~ImageVisual(); + void OnInitialize() override; /** * @copydoc Visual::Base::DoSetProperties */ - void DoSetProperties( const Property::Map& propertyMap ) override; + void DoSetProperties(const Property::Map& propertyMap) override; /** - * @copydoc Visual::Base::DoSetOnStage + * @copydoc Visual::Base::DoSetOnScene */ - void DoSetOnStage( Actor& actor ) override; + void DoSetOnScene(Actor& actor) override; /** - * @copydoc Visual::Base::DoSetOffStage + * @copydoc Visual::Base::DoSetOffScene */ - void DoSetOffStage( Actor& actor ) override; + void DoSetOffScene(Actor& actor) override; /** * @copydoc Visual::Base::OnSetTransform @@ -249,9 +228,18 @@ protected: */ bool IsResourceReady() const override; -public: + /** + * @copydoc Visual::Base::UpdateShader + */ + void UpdateShader() override; /** + * @copydoc Visual::Base::GenerateShader + */ + Shader GenerateShader() const override; + +public: + /** * @copydoc AtlasUploadObserver::UploadCompleted * * To avoid rendering garbage pixels, renderer should be added to actor after the resources are ready. @@ -265,18 +253,18 @@ public: * 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 UploadComplete( bool success, int32_t textureId, TextureSet textureSet, - bool usingAtlas, const Vector4& atlasRectangle, bool preMultiplied ) override; + void UploadComplete(bool success, int32_t textureId, TextureSet textureSet, bool usingAtlas, const Vector4& atlasRectangle, bool preMultiplied) override; private: - /** * @copydoc TextureUploadObserver::LoadComplete * * 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 PixelBuffer loading is finished. */ - void LoadComplete( bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied ) override {} + void LoadComplete(bool loadSuccess, Devel::PixelBuffer pixelBuffer, const VisualUrl& url, bool preMultiplied) override + { + } /** * Allocate the mask data when a masking property is defined in the property map @@ -284,13 +272,6 @@ private: void AllocateMaskData(); /** - * @brief Applies the image to the texture set used for this renderer - * - * @param[in] image The Image to apply to the texture set used for this renderer - */ - void ApplyImageToSampler( const Image& image ); - - /** * @brief Load the texture, will try to atlas unless unable or param set to false. * @param[in, out] atlasing flag if the image has been put in a atlas (true), passing false will not atlas even if possible. * @param[out] atlasRect if atlasing is used this the texture area of the image in the atlas. @@ -298,7 +279,7 @@ private: * @param[in] orientationCorrection flag determines if orientation correction should be performed * @param[in] forceReload flag determines if the texture should be reloaded from its source or use the cached texture. */ - void LoadTexture( bool& atlasing, Vector4& atlasRect, TextureSet& textures, bool orientationCorrection, TextureManager::ReloadPolicy forceReload ); + void LoadTexture(bool& atlasing, Vector4& atlasRect, TextureSet& textures, bool orientationCorrection, TextureManager::ReloadPolicy forceReload); /** * @brief Checks if atlasing should be attempted @@ -312,31 +293,6 @@ private: void InitializeRenderer(); /** - * @brief Initializes the Dali::Renderer from an image handle - * - * @param[in] image The image handle to intialize this ImageVisual from - */ - void InitializeRenderer( const Image& image ); - - /** - * @brief Creates the Dali::Renderer (potentially from the renderer cache), initializing it - * @param[in] textures to use - */ - void CreateRenderer( TextureSet& textures ); - - /** - * @brief Creates the Dali::Renderer for NativeImage with custom sampler type and prefix, initializing it - * @param NativeImageRenderer - */ - void CreateNativeImageRenderer( NativeImage& nativeImage ); - - /** - * @brief Query whether resources requires to be loaded synchronously. - * @return Returns true if synchronous resource loading is required, false otherwise. - */ - bool IsSynchronousResourceLoading() const; - - /** * Creates the texture set and adds the texture to it * @param[out] textureRect The texture area of the texture in the atlas. * @param[in] url The URL of the image resource to use. @@ -344,13 +300,13 @@ private: * @param[in] attemptAtlasing If true will attempt atlasing, otherwise create unique texture * @return the texture set to use */ - TextureSet CreateTextureSet( Vector4& textureRect, bool synchronousLoading, bool attemptAtlasing ); + TextureSet CreateTextureSet(Vector4& textureRect, bool synchronousLoading, bool attemptAtlasing); /** * Set the value to the uTextureRect uniform * @param[in] textureRect The texture rectangular area. */ - void SetTextureRectUniform( const Vector4& textureRect ); + void SetTextureRectUniform(const Vector4& textureRect); /** * Remove texture with valid TextureId @@ -362,37 +318,33 @@ private: * @param[in] index The index key of the value * @param[in] value The value */ - void DoSetProperty( Property::Index index, const Property::Value& value ); + void DoSetProperty(Property::Index index, const Property::Value& value); private: - - Image mImage; - Vector4 mPixelArea; - WeakHandle mPlacementActor; - VisualUrl mImageUrl; + Vector4 mPixelArea; + WeakHandle mPlacementActor; + VisualUrl mImageUrl; TextureManager::MaskingDataPointer mMaskingData; - Dali::ImageDimensions mDesiredSize; + Dali::ImageDimensions mDesiredSize; TextureManager::TextureId mTextureId; - TextureSet mTextures; + TextureSet mTextures; ImageVisualShaderFactory& mImageVisualShaderFactory; - Dali::FittingMode::Type mFittingMode:3; - Dali::SamplingMode::Type mSamplingMode:4; - Dali::WrapMode::Type mWrapModeU:3; - Dali::WrapMode::Type mWrapModeV:3; - Dali::Toolkit::ImageVisual::LoadPolicy::Type mLoadPolicy; + Dali::FittingMode::Type mFittingMode : 3; + Dali::SamplingMode::Type mSamplingMode : 4; + Dali::WrapMode::Type mWrapModeU : 3; + Dali::WrapMode::Type mWrapModeV : 3; + Dali::Toolkit::ImageVisual::LoadPolicy::Type mLoadPolicy; Dali::Toolkit::ImageVisual::ReleasePolicy::Type mReleasePolicy; - Vector4 mAtlasRect; - Dali::ImageDimensions mAtlasRectSize; - bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture - bool mLoading; ///< True if the texture is still loading. - bool mOrientationCorrection; ///< true if the image will have it's orientation corrected. + Vector4 mAtlasRect; + Dali::ImageDimensions mAtlasRectSize; + TextureManager::LoadState mLoadState; ///< The texture loading state + bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture + bool mOrientationCorrection; ///< true if the image will have it's orientation corrected. }; - - } // namespace Internal } // namespace Toolkit