From f62d6372a1539743ce52afb1506cd75fc0ad817b Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Fri, 18 Jun 2021 14:41:56 +0900 Subject: [PATCH] Revert "Add AnimatedVectorImageVisualRive example" This reverts commit 1b9d1f6f62ae2f59376282f82d823a28a24680af. Change-Id: I61ad780ec76918f67e1976976ac61950492b61fc --- build/tizen/CMakeLists.txt | 1 - examples-reel/dali-examples-reel.cpp | 1 - .../animated-vector-images-rive-example.cpp | 225 --------------------- resources/images/juice.riv | Bin 8104 -> 0 bytes resources/po/en_GB.po | 3 - resources/po/en_US.po | 3 - resources/po/ko.po | 3 - shared/dali-demo-strings.h | 2 - 8 files changed, 238 deletions(-) delete mode 100644 examples/animated-vector-images-rive/animated-vector-images-rive-example.cpp delete mode 100644 resources/images/juice.riv diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 820188d..df31de6 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -154,7 +154,6 @@ INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.ktx" ${IMAGES_D INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.astc" ${IMAGES_DIR}) INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.svg" ${IMAGES_DIR}) INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.json" ${IMAGES_DIR}) -INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.riv" ${IMAGES_DIR}) FILE(GLOB LOCAL_VIDEOS_LIST RELATIVE "${LOCAL_VIDEOS_DIR}" "${LOCAL_VIDEOS_DIR}/*") FOREACH(flag ${LOCAL_VIDEOS_LIST}) diff --git a/examples-reel/dali-examples-reel.cpp b/examples-reel/dali-examples-reel.cpp index 41de8e9..5d137cb 100644 --- a/examples-reel/dali-examples-reel.cpp +++ b/examples-reel/dali-examples-reel.cpp @@ -41,7 +41,6 @@ int DALI_EXPORT_API main(int argc, char** argv) demo.AddExample(Example("animated-images.example", DALI_DEMO_STR_TITLE_ANIMATED_IMAGES)); demo.AddExample(Example("animated-shapes.example", DALI_DEMO_STR_TITLE_ANIMATED_SHAPES)); demo.AddExample(Example("animated-vector-images.example", DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES)); - demo.AddExample(Example("animated-vector-images-rive.example", DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES_RIVE)); demo.AddExample(Example("arc-visual.example", DALI_DEMO_STR_TITLE_ARC_VISUAL)); demo.AddExample(Example("bloom-view.example", DALI_DEMO_STR_TITLE_BLOOM_VIEW)); demo.AddExample(Example("builder.example", DALI_DEMO_STR_TITLE_SCRIPT_BASED_UI)); diff --git a/examples/animated-vector-images-rive/animated-vector-images-rive-example.cpp b/examples/animated-vector-images-rive/animated-vector-images-rive-example.cpp deleted file mode 100644 index f3457a4..0000000 --- a/examples/animated-vector-images-rive/animated-vector-images-rive-example.cpp +++ /dev/null @@ -1,225 +0,0 @@ -/* - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include "shared/view.h" - -using namespace Dali; -using namespace Dali::Toolkit; - -namespace -{ -const char* BACKGROUND_IMAGE(DEMO_IMAGE_DIR "background-gradient.jpg"); -const char* TOOLBAR_IMAGE(DEMO_IMAGE_DIR "top-bar.png"); -const char* APPLICATION_TITLE("Animated Vector Images Rive"); - -const char* IMAGE_PATH[] = { - DEMO_IMAGE_DIR "juice.riv" - }; - -const unsigned int NUMBER_OF_IMAGES = 1; - -enum CellPlacement -{ - TOP_BUTTON, - LOWER_BUTTON, - IMAGE, - NUMBER_OF_ROWS -}; - -unsigned int GetControlIndex(Control control) -{ - std::string controlName = control.GetProperty(Dali::Actor::Property::NAME); - unsigned int index = 0; - - if(controlName != "") - { - index = std::stoul(controlName); - } - - return index; -} - -} // namespace - -// This example shows the usage of AnimatedVectorImageVisual(Rive). -// It doesn't work on Ubuntu because the visual uses the external library to render frames. -class AnimatedVectorImageViewController : public ConnectionTracker -{ -public: - AnimatedVectorImageViewController(Application& application) - : mApplication(application) - { - // Connect to the Application's Init signal - mApplication.InitSignal().Connect(this, &AnimatedVectorImageViewController::Create); - } - - void Create(Application& application) - { - // The Init signal is received once (only) during the Application lifetime - - // Creates a default view with a default tool bar. - // The view is added to the window. - mContentLayer = DemoHelper::CreateView(application, - mView, - mToolBar, - BACKGROUND_IMAGE, - TOOLBAR_IMAGE, - APPLICATION_TITLE); - - // Create a table view to show a pair of buttons above each image. - mTable = TableView::New(CellPlacement::NUMBER_OF_ROWS, NUMBER_OF_IMAGES); - mTable.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); - mTable.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); - mTable.SetResizePolicy(ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS); - Vector3 offset(0.9f, 0.70f, 0.0f); - mTable.SetProperty(Actor::Property::SIZE_MODE_FACTOR, offset); - mTable.SetFitHeight(CellPlacement::TOP_BUTTON); - mTable.SetFitHeight(CellPlacement::LOWER_BUTTON); - mContentLayer.Add(mTable); - - for(unsigned int x = 0; x < NUMBER_OF_IMAGES; x++) - { - mPlayButtons[x] = PushButton::New(); - mPlayButtons[x].SetProperty(Button::Property::LABEL, "Play"); - mPlayButtons[x].SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER); - mPlayButtons[x].SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER); - mPlayButtons[x].ClickedSignal().Connect(this, &AnimatedVectorImageViewController::OnPlayButtonClicked); - mPlayButtons[x].SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH); - mPlayButtons[x].SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT); - std::string s = std::to_string(x); - mPlayButtons[x].SetProperty(Dali::Actor::Property::NAME, s); - mTable.AddChild(mPlayButtons[x], TableView::CellPosition(CellPlacement::TOP_BUTTON, x)); - - mStopButtons[x] = PushButton::New(); - mStopButtons[x].SetProperty(Button::Property::LABEL, "Stop"); - mStopButtons[x].SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER); - mStopButtons[x].SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER); - mStopButtons[x].ClickedSignal().Connect(this, &AnimatedVectorImageViewController::OnStopButtonClicked); - mStopButtons[x].SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH); - mStopButtons[x].SetResizePolicy(ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT); - mStopButtons[x].SetProperty(Dali::Actor::Property::NAME, s); - mTable.AddChild(mStopButtons[x], TableView::CellPosition(CellPlacement::LOWER_BUTTON, x)); - - mImageViews[x] = ImageView::New(); - Property::Map imagePropertyMap; - imagePropertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE); - imagePropertyMap.Insert(ImageVisual::Property::URL, IMAGE_PATH[x]); - imagePropertyMap.Insert(DevelImageVisual::Property::LOOP_COUNT, 3); - mImageViews[x].SetProperty(ImageView::Property::IMAGE, imagePropertyMap); - - mImageViews[x].SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); - mImageViews[x].SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); - mImageViews[x].SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); - mImageViews[x].SetProperty(Dali::Actor::Property::NAME, s); - - DevelControl::VisualEventSignal(mImageViews[x]).Connect(this, &AnimatedVectorImageViewController::OnVisualEvent); - - mTable.AddChild(mImageViews[x], TableView::CellPosition(CellPlacement::IMAGE, x)); - } - - application.GetWindow().KeyEventSignal().Connect(this, &AnimatedVectorImageViewController::OnKeyEvent); - } - -private: - bool OnPlayButtonClicked(Button button) - { - unsigned int controlIndex = GetControlIndex(button); - - ImageView imageView = mImageViews[controlIndex]; - - Property::Map map = imageView.GetProperty(ImageView::Property::IMAGE); - Property::Value* value = map.Find(DevelImageVisual::Property::PLAY_STATE); - - if(value) - { - if(value->Get() != static_cast(DevelImageVisual::PlayState::PLAYING)) - { - mPlayButtons[controlIndex].SetProperty(Button::Property::LABEL, "Pause"); - - DevelControl::DoAction(imageView, ImageView::Property::IMAGE, DevelAnimatedVectorImageVisual::Action::PLAY, Property::Value()); - } - else - { - mPlayButtons[controlIndex].SetProperty(Button::Property::LABEL, "Play"); - - DevelControl::DoAction(imageView, ImageView::Property::IMAGE, DevelAnimatedVectorImageVisual::Action::PAUSE, Property::Value()); - } - } - - return true; - } - - bool OnStopButtonClicked(Button button) - { - unsigned int controlIndex = GetControlIndex(button); - ImageView imageView = mImageViews[controlIndex]; - DevelControl::DoAction(imageView, ImageView::Property::IMAGE, DevelAnimatedVectorImageVisual::Action::STOP, Property::Value()); - - return true; - } - - void OnVisualEvent(Control control, Dali::Property::Index visualIndex, Dali::Property::Index signalId) - { - unsigned int controlIndex = GetControlIndex(control); - - if(visualIndex == ImageView::Property::IMAGE && signalId == DevelAnimatedVectorImageVisual::Signal::ANIMATION_FINISHED) - { - mPlayButtons[controlIndex].SetProperty(Button::Property::LABEL, "Play"); - } - } - - /** - * Main key event handler - */ - void OnKeyEvent(const KeyEvent& event) - { - if(event.GetState() == KeyEvent::DOWN) - { - if(IsKey(event, DALI_KEY_ESCAPE) || IsKey(event, DALI_KEY_BACK)) - { - mApplication.Quit(); - } - } - } - -private: - Application& mApplication; - - Control mView; ///< The View instance. - ToolBar mToolBar; ///< The View's Toolbar. - Layer mContentLayer; ///< Content layer - TableView mTable; - ImageView mImageViews[NUMBER_OF_IMAGES]; - PushButton mPlayButtons[NUMBER_OF_IMAGES]; - PushButton mStopButtons[NUMBER_OF_IMAGES]; -}; - -int DALI_EXPORT_API main(int argc, char** argv) -{ - Application application = Application::New(&argc, &argv, DEMO_THEME_PATH); - AnimatedVectorImageViewController test(application); - application.MainLoop(); - return 0; -} diff --git a/resources/images/juice.riv b/resources/images/juice.riv deleted file mode 100644 index 98aa917fbcf90564aeefe5a2028620c059878800..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8104 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 Hb;|9(u0?cj diff --git a/resources/po/en_GB.po b/resources/po/en_GB.po index 3cca600..1d472d2 100755 --- a/resources/po/en_GB.po +++ b/resources/po/en_GB.po @@ -297,6 +297,3 @@ msgstr "Web View" msgid "DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES" msgstr "Animated Vector Images" - -msgid "DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES_RIVE" -msgstr "Animated Vector Images Rive" diff --git a/resources/po/en_US.po b/resources/po/en_US.po index 5fe6a68..729b67f 100755 --- a/resources/po/en_US.po +++ b/resources/po/en_US.po @@ -298,9 +298,6 @@ msgstr "Web View" msgid "DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES" msgstr "Animated Vector Images" -msgid "DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES_RIVE" -msgstr "Animated Vector Images Rive" - msgid "DALI_DEMO_STR_TITLE_TEXT_RENDERER" msgstr "Text Renderer" diff --git a/resources/po/ko.po b/resources/po/ko.po index c56be6f..d96a77d 100755 --- a/resources/po/ko.po +++ b/resources/po/ko.po @@ -192,6 +192,3 @@ msgstr "PBR" msgid "DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES" msgstr "애니메이션 벡터 이미지" - -msgid "DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES_RIVE" -msgstr "애니메이션 벡터 이미지 라이브" diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h index 323b5e0..b0c7861 100644 --- a/shared/dali-demo-strings.h +++ b/shared/dali-demo-strings.h @@ -37,7 +37,6 @@ extern "C" #define DALI_DEMO_STR_TITLE_ANIMATED_IMAGES dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ANIMATED_IMAGES") #define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES") #define DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES") -#define DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES_RIVE dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES_RIVE") #define DALI_DEMO_STR_TITLE_ARC_VISUAL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ARC_VISUAL") #define DALI_DEMO_STR_TITLE_BASIC_LIGHT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BASIC_LIGHT") #define DALI_DEMO_STR_TITLE_BENCHMARK dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_BENCHMARK") @@ -144,7 +143,6 @@ extern "C" #define DALI_DEMO_STR_TITLE_ANIMATED_IMAGES "Animated Images" #define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES "Animated Shapes" #define DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES "Animated Vector Images" -#define DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES_RIVE "Animated Vector Images Rive" #define DALI_DEMO_STR_TITLE_ARC_VISUAL "Arc Visual" #define DALI_DEMO_STR_TITLE_BASIC_LIGHT "Basic Light" #define DALI_DEMO_STR_TITLE_BENCHMARK "ImageView Benchmark" -- 2.7.4