From: Shinwoo Kim Date: Tue, 1 Jun 2021 02:46:20 +0000 (+0900) Subject: Revert "[Tizen] Add AnimatedVectorImageVisualRive example" X-Git-Tag: accepted/tizen/unified/20210602.122507~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=e7241adb0798958357eac5c3f63a6cbeab576e36 Revert "[Tizen] Add AnimatedVectorImageVisualRive example" This reverts commit fa3e93c8822ad7e576a6b30b0193884c3d38f275. --- 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 54cb999..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 80003ec..0000000 Binary files a/resources/images/juice.riv and /dev/null differ 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"