From: tscholb Date: Wed, 2 Nov 2022 07:51:36 +0000 (+0900) Subject: Revert "[Tizen](Vector) Support desired size" X-Git-Tag: accepted/tizen/7.0/unified/20221103.165457~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb3dbd16b79eeb760d76db8d7b993d02853e4f5f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Revert "[Tizen](Vector) Support desired size" This reverts commit ccde201431dc3525786ce0220902c5208777e1a5. --- diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp index cdd58b4dfe..09a4dd4e66 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp @@ -190,7 +190,6 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual04(void) tet_infoline("UtcDaliVisualFactoryGetAnimatedVectorImageVisual04: Request animated vector image visual with a Property::Map"); int startFrame = 1, endFrame = 3; - int desiredWidth = 100, desiredHeight = 150; float cornerRadius = 22.0f; float borderlineWidth = 2.0f; Vector4 borderlineColor = Vector4(1.0f, 1.0f, 1.0f, 1.0f); @@ -211,8 +210,7 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual04(void) .Add("borderlineWidth", borderlineWidth) .Add("borderlineColor", borderlineColor) .Add("borderlineOffset", borderlineOffset) - .Add("desiredWidth", desiredWidth) - .Add("desiredHeight", desiredHeight); + .Add("synchronousLoading", true); Visual::Base visual = VisualFactory::Get().CreateVisual(propertyMap); DALI_TEST_CHECK(visual); @@ -288,14 +286,6 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual04(void) DALI_TEST_CHECK(value); DALI_TEST_EQUALS(value->Get(), borderlineOffset, TEST_LOCATION); - value = resultMap.Find(ImageVisual::Property::DESIRED_WIDTH, Property::INTEGER); - DALI_TEST_CHECK(value); - DALI_TEST_EQUALS(value->Get(), desiredWidth, TEST_LOCATION); - - value = resultMap.Find(ImageVisual::Property::DESIRED_HEIGHT, Property::INTEGER); - DALI_TEST_CHECK(value); - DALI_TEST_EQUALS(value->Get(), desiredHeight, TEST_LOCATION); - actor.Unparent(); DALI_TEST_CHECK(actor.GetRendererCount() == 0u); @@ -308,7 +298,6 @@ int UtcDaliAnimatedVectorImageVisualGetPropertyMap01(void) tet_infoline("UtcDaliAnimatedVectorImageVisualGetPropertyMap01"); int startFrame = 1, endFrame = 3; - int desiredWidth = 100, desiredHeight = 150; Vector4 cornerRadius(50.0f, 22.0f, 0.0f, 3.0f); float borderlineWidth = 2.3f; Vector4 borderlineColor = Vector4(0.3f, 0.3f, 1.0f, 1.0f); @@ -327,9 +316,7 @@ int UtcDaliAnimatedVectorImageVisualGetPropertyMap01(void) .Add(DevelVisual::Property::BORDERLINE_WIDTH, borderlineWidth) .Add(DevelVisual::Property::BORDERLINE_COLOR, borderlineColor) .Add(DevelVisual::Property::BORDERLINE_OFFSET, borderlineOffset) - .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false) - .Add(ImageVisual::Property::DESIRED_WIDTH, desiredWidth) - .Add(ImageVisual::Property::DESIRED_HEIGHT, desiredHeight); + .Add(ImageVisual::Property::SYNCHRONOUS_LOADING, false); // request AnimatedVectorImageVisual with a property map VisualFactory factory = VisualFactory::Get(); @@ -410,14 +397,6 @@ int UtcDaliAnimatedVectorImageVisualGetPropertyMap01(void) DALI_TEST_CHECK(value); DALI_TEST_EQUALS(value->Get(), borderlineOffset, TEST_LOCATION); - value = resultMap.Find(ImageVisual::Property::DESIRED_WIDTH, Property::INTEGER); - DALI_TEST_CHECK(value); - DALI_TEST_EQUALS(value->Get(), desiredWidth, TEST_LOCATION); - - value = resultMap.Find(ImageVisual::Property::DESIRED_HEIGHT, Property::INTEGER); - DALI_TEST_CHECK(value); - DALI_TEST_EQUALS(value->Get(), desiredHeight, TEST_LOCATION); - // request AnimatedVectorImageVisual with an URL Visual::Base visual2 = factory.CreateVisual(TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions()); @@ -1999,68 +1978,3 @@ int UtcDaliAnimatedVectorImageVisualDynamicProperty(void) END_TEST; } - -int UtcDaliAnimatedVectorImageVisualDesiredSize(void) -{ - ToolkitTestApplication application; - tet_infoline("UtcDaliAnimatedVectorImageVisualDesiredSize"); - - TestGlAbstraction& gl = application.GetGlAbstraction(); - TraceCallStack& textureTrace = gl.GetTextureTrace(); - int desiredWidth = 150, desiredHeight = 200; - - Visual::Base visual = VisualFactory::Get().CreateVisual(TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions(desiredWidth, desiredHeight)); - DALI_TEST_CHECK(visual); - - DummyControl actor = DummyControl::New(true); - DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); - dummyImpl.RegisterVisual(DummyControl::Property::TEST_VISUAL, visual); - - application.GetScene().Add(actor); - - application.SendNotification(); - application.Render(); - - // Trigger count is 1 - resource ready - DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - - textureTrace.Enable(true); - - application.SendNotification(); - application.Render(); - - { - std::stringstream out; - out << GL_TEXTURE_2D << ", " << 0u << ", " << desiredWidth << ", " << desiredHeight; - DALI_TEST_CHECK(textureTrace.FindMethodAndParams("TexImage2D", out.str().c_str())); - } - - // Unparent to make next trigger - actor.Unparent(); - - application.SendNotification(); - application.Render(); - - // Set visual size - actor.SetProperty(Actor::Property::SIZE, Vector2(300.0f, 300.0f)); - application.GetScene().Add(actor); - - application.SendNotification(); - application.Render(); - - // Trigger count is 1 - resource ready - DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); - - textureTrace.Reset(); - - application.SendNotification(); - application.Render(); - - { - std::stringstream out; - out << GL_TEXTURE_2D << ", " << 0u << ", " << desiredWidth << ", " << desiredHeight; - DALI_TEST_CHECK(textureTrace.FindMethodAndParams("TexImage2D", out.str().c_str())); // The size should not be changed - } - - END_TEST; -} diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp index ca3b93d1e8..006554df82 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp @@ -70,20 +70,20 @@ Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New(Debug::NoLogging, AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties) { - AnimatedVectorImageVisualPtr visual(new AnimatedVectorImageVisual(factoryCache, shaderFactory, imageUrl, ImageDimensions{})); + AnimatedVectorImageVisualPtr visual(new AnimatedVectorImageVisual(factoryCache, shaderFactory, imageUrl)); visual->SetProperties(properties); visual->Initialize(); return visual; } -AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size) +AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl) { - AnimatedVectorImageVisualPtr visual(new AnimatedVectorImageVisual(factoryCache, shaderFactory, imageUrl, size)); + AnimatedVectorImageVisualPtr visual(new AnimatedVectorImageVisual(factoryCache, shaderFactory, imageUrl)); visual->Initialize(); return visual; } -AnimatedVectorImageVisual::AnimatedVectorImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size) +AnimatedVectorImageVisual::AnimatedVectorImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl) : Visual::Base(factoryCache, Visual::FittingMode::FILL, static_cast(Toolkit::DevelVisual::ANIMATED_VECTOR_IMAGE)), mUrl(imageUrl), mAnimationData(), @@ -91,7 +91,6 @@ AnimatedVectorImageVisual::AnimatedVectorImageVisual(VisualFactoryCache& factory mImageVisualShaderFactory(shaderFactory), mVisualSize(), mVisualScale(Vector2::ONE), - mDesiredSize(size), mPlacementActor(), mPlayState(DevelImageVisual::PlayState::STOPPED), mEventCallback(nullptr), @@ -133,12 +132,7 @@ void AnimatedVectorImageVisual::VectorAnimationManagerDestroyed() void AnimatedVectorImageVisual::GetNaturalSize(Vector2& naturalSize) { - if(mDesiredSize.GetWidth() > 0 && mDesiredSize.GetHeight() > 0) - { - naturalSize.x = mDesiredSize.GetWidth(); - naturalSize.y = mDesiredSize.GetHeight(); - } - else if(mVisualSize != Vector2::ZERO) + if(mVisualSize != Vector2::ZERO) { naturalSize = mVisualSize; } @@ -200,10 +194,6 @@ void AnimatedVectorImageVisual::DoCreatePropertyMap(Property::Map& map) const Property::Map layerInfo; mVectorAnimationTask->GetLayerInfo(layerInfo); map.Insert(Toolkit::DevelImageVisual::Property::CONTENT_INFO, layerInfo); - - map.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, IsSynchronousLoadingRequired()); - map.Insert(Toolkit::ImageVisual::Property::DESIRED_WIDTH, mDesiredSize.GetWidth()); - map.Insert(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, mDesiredSize.GetHeight()); } void AnimatedVectorImageVisual::DoCreateInstancePropertyMap(Property::Map& map) const @@ -256,14 +246,6 @@ void AnimatedVectorImageVisual::DoSetProperties(const Property::Map& propertyMap { DoSetProperty(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, keyValue.second); } - else if(keyValue.first == IMAGE_DESIRED_WIDTH) - { - DoSetProperty(Toolkit::ImageVisual::Property::DESIRED_WIDTH, keyValue.second); - } - else if(keyValue.first == IMAGE_DESIRED_HEIGHT) - { - DoSetProperty(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, keyValue.second); - } } } @@ -339,25 +321,6 @@ void AnimatedVectorImageVisual::DoSetProperty(Property::Index index, const Prope } break; } - case Toolkit::ImageVisual::Property::DESIRED_WIDTH: - { - int32_t desiredWidth = 0; - if(value.Get(desiredWidth)) - { - mDesiredSize.SetWidth(desiredWidth); - } - break; - } - - case Toolkit::ImageVisual::Property::DESIRED_HEIGHT: - { - int32_t desiredHeight = 0; - if(value.Get(desiredHeight)) - { - mDesiredSize.SetHeight(desiredHeight); - } - break; - } } } @@ -648,17 +611,8 @@ void AnimatedVectorImageVisual::SendAnimationData() void AnimatedVectorImageVisual::SetVectorImageSize() { - uint32_t width, height; - if(mDesiredSize.GetWidth() > 0 && mDesiredSize.GetHeight() > 0) - { - width = mDesiredSize.GetWidth(); - height = mDesiredSize.GetHeight(); - } - else - { - width = static_cast(mVisualSize.width * mVisualScale.width); - height = static_cast(mVisualSize.height * mVisualScale.height); - } + uint32_t width = static_cast(mVisualSize.width * mVisualScale.width); + uint32_t height = static_cast(mVisualSize.height * mVisualScale.height); if(mAnimationData.width != width || mAnimationData.height != height) { diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h index b0a7569ee8..72c8e60f6e 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h @@ -73,10 +73,9 @@ public: * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object * @param[in] shaderFactory The ImageVisualShaderFactory object * @param[in] imageUrl The URL to an animated vector image to use - * @param[in] size The width and height of the rasterized buffer. The visual size will be used if these are 0. * @return A smart-pointer to the newly allocated visual. */ - static AnimatedVectorImageVisualPtr New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size = ImageDimensions()); + static AnimatedVectorImageVisualPtr New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl); public: // from Visual /** @@ -112,9 +111,8 @@ protected: * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object * @param[in] shaderFactory The ImageVisualShaderFactory object * @param[in] imageUrl The URL to an animated vector image to use - * @param[in] size The width and height of the rasterized buffer. The visual size will be used if these are 0. */ - AnimatedVectorImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size); + AnimatedVectorImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl); /** * @brief A reference counted object may only be deleted by calling Unreference(). @@ -245,7 +243,6 @@ private: PropertyNotification mSizeNotification; Vector2 mVisualSize; Vector2 mVisualScale; - Dali::ImageDimensions mDesiredSize{}; WeakHandle mPlacementActor; DevelImageVisual::PlayState::Type mPlayState; CallbackBase* mEventCallback; // Not owned diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 2fcf2a989f..da12c4ff7b 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -318,7 +318,7 @@ void ImageVisual::DoSetProperty(Property::Index index, const Property::Value& va case Toolkit::ImageVisual::Property::DESIRED_WIDTH: { - int32_t desiredWidth = 0; + float desiredWidth = 0.0f; if(value.Get(desiredWidth)) { mDesiredSize.SetWidth(desiredWidth); @@ -332,7 +332,7 @@ void ImageVisual::DoSetProperty(Property::Index index, const Property::Value& va case Toolkit::ImageVisual::Property::DESIRED_HEIGHT: { - int32_t desiredHeight = 0; + float desiredHeight = 0.0f; if(value.Get(desiredHeight)) { mDesiredSize.SetHeight(desiredHeight); diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index f5bed54d01..57290a1084 100644 --- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp @@ -343,7 +343,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual(const std::string& url, ImageD } case VisualUrl::JSON: { - visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl, size); + visualPtr = AnimatedVectorImageVisual::New(GetFactoryCache(), GetImageVisualShaderFactory(), visualUrl); break; } case VisualUrl::REGULAR_IMAGE: