summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdeel Kazmi <adeel.kazmi@samsung.com>2021-02-23 18:54:05 +0000
committerAdeel Kazmi <adeel.kazmi@samsung.com>2021-02-23 19:44:20 +0000
commitfa8a8ab22743984c882e32444ca31010da8c5e3c (patch)
tree9724d0790da1bc3a8a1dd96a59179fc64a6fd7fd
parentbdbcb7800e892a8710f4fc6d21920c747b32595e (diff)
downloaddali-demo-fa8a8ab22743984c882e32444ca31010da8c5e3c.tar.gz
dali-demo-fa8a8ab22743984c882e32444ca31010da8c5e3c.tar.bz2
dali-demo-fa8a8ab22743984c882e32444ca31010da8c5e3c.zip
Remove alpha-blending-cpu example
It's in dali-test now Change-Id: Ie1758f9e694d8b79350059f222b8076913b2e64a
-rw-r--r--examples-reel/dali-examples-reel.cpp1
-rw-r--r--examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp158
-rwxr-xr-xresources/po/en_GB.po3
-rwxr-xr-xresources/po/en_US.po3
-rw-r--r--shared/dali-demo-strings.h4
5 files changed, 1 insertions, 168 deletions
diff --git a/examples-reel/dali-examples-reel.cpp b/examples-reel/dali-examples-reel.cpp
index f0e152ac..1f43d21d 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("alpha-blending-cpu.example", DALI_DEMO_STR_TITLE_ALPHA_BLENDING_CPU));
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/alpha-blending-cpu/alpha-blending-cpu-example.cpp b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
deleted file mode 100644
index 5a2573ff..00000000
--- a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2020 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 <dali-toolkit/dali-toolkit.h>
-#include <cstring>
-
-using namespace Dali;
-
-namespace
-{
-const char* const IMAGE_PATH_1(DEMO_IMAGE_DIR "people-small-7b.jpg"); // 100x100
-const char* const IMAGE_PATH_2(DEMO_IMAGE_DIR "people-medium-7.jpg");
-const char* const IMAGE_PATH_3(DEMO_IMAGE_DIR "people-medium-7-rgb565.png"); // is compressed
-const char* const IMAGE_PATH_4(DEMO_IMAGE_DIR "people-medium-7-masked.png"); // has alpha channel
-const char* const MASK_IMAGE_PATH_1(DEMO_IMAGE_DIR "store_mask_profile_n.png"); // 300x300
-const char* const MASK_IMAGE_PATH_2(DEMO_IMAGE_DIR "store_mask_profile_f.png");
-} // namespace
-
-class ImageViewAlphaBlendApp : public ConnectionTracker
-{
-public:
- ImageViewAlphaBlendApp(Application& application)
- : mApplication(application),
- mImageCombinationIndex(0)
- {
- // Connect to the Application's Init signal
- mApplication.InitSignal().Connect(this, &ImageViewAlphaBlendApp::Create);
- }
-
- ~ImageViewAlphaBlendApp()
- {
- // Nothing to do here;
- }
-
-private:
- // The Init signal is received once (only) during the Application lifetime
- void Create(Application& application)
- {
- // This creates an image view with one of 3 images, and one of 2 masks.
- // Clicking the screen will cycle through each combination of mask and image.
-
- // Get a handle to the window
- Window window = application.GetWindow();
- window.KeyEventSignal().Connect(this, &ImageViewAlphaBlendApp::OnKeyEvent);
- window.SetBackgroundColor(Color::WHITE);
-
- mImageView = Toolkit::ImageView::New();
-
- mImageView.SetProperty(Actor::Property::SIZE, Vector2(200, 200));
- mImageView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
- window.Add(mImageView);
-
- mImageLabel = Toolkit::TextLabel::New();
- mImageLabel.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER);
- mImageLabel.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::BOTTOM_CENTER);
- mImageLabel.SetProperty(Actor::Property::POSITION, Vector3(0.0f, -50.0f, 0.0f));
- mImageLabel.SetProperty(Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLACK);
- window.Add(mImageLabel);
-
- mMaskLabel = Toolkit::TextLabel::New();
- mMaskLabel.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER);
- mMaskLabel.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::BOTTOM_CENTER);
- mMaskLabel.SetProperty(Actor::Property::POSITION, Vector3(0.0f, 0.0f, 0.0f));
- mMaskLabel.SetProperty(Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLACK);
- window.Add(mMaskLabel);
-
- LoadImages();
-
- window.TouchedSignal().Connect(this, &ImageViewAlphaBlendApp::OnTouched);
- }
-
- void OnTouched(const TouchEvent& touch)
- {
- static bool touched = false;
- if(touch.GetState(0) == PointState::DOWN)
- {
- touched = true;
- }
-
- if(touch.GetState(0) == PointState::UP && touched)
- {
- mImageCombinationIndex++;
- touched = false;
- LoadImages();
- }
- }
-
- void LoadImages()
- {
- const char* images[4] = {IMAGE_PATH_1, IMAGE_PATH_2, IMAGE_PATH_3, IMAGE_PATH_4};
- const char* masks[2] = {MASK_IMAGE_PATH_1, MASK_IMAGE_PATH_2};
-
- const char* mask = masks[mImageCombinationIndex % 2]; // Cycle through masks
- const char* image = images[(mImageCombinationIndex / 2) % 4]; // then images
-
- Property::Map map;
- map.Add(Toolkit::Visual::Property::TYPE, Toolkit::Visual::Type::IMAGE);
- map.Add(Toolkit::ImageVisual::Property::URL, image);
- map.Add(Toolkit::ImageVisual::Property::ALPHA_MASK_URL, mask);
-
- if(mImageCombinationIndex % 2 == 0)
- {
- map.Add(Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, 1.f);
- map.Add(Toolkit::ImageVisual::Property::CROP_TO_MASK, false);
- }
- else
- {
- map.Add(Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, 1.6f);
- map.Add(Toolkit::ImageVisual::Property::CROP_TO_MASK, true);
- }
-
- mImageView.SetProperty(Toolkit::ImageView::Property::IMAGE, map);
-
- mImageLabel.SetProperty(Toolkit::TextLabel::Property::TEXT, strrchr(image, '/'));
- mMaskLabel.SetProperty(Toolkit::TextLabel::Property::TEXT, strrchr(mask, '/'));
- }
-
- void OnKeyEvent(const KeyEvent& event)
- {
- if(event.GetState() == KeyEvent::DOWN)
- {
- if(IsKey(event, Dali::DALI_KEY_ESCAPE) || IsKey(event, Dali::DALI_KEY_BACK))
- {
- mApplication.Quit();
- }
- }
- }
-
-private:
- Application& mApplication;
- Toolkit::ImageView mImageView;
- Toolkit::TextLabel mImageLabel;
- Toolkit::TextLabel mMaskLabel;
-
- int mImageCombinationIndex;
-};
-
-int DALI_EXPORT_API main(int argc, char** argv)
-{
- Application application = Application::New(&argc, &argv);
- ImageViewAlphaBlendApp test(application);
- application.MainLoop();
- return 0;
-}
diff --git a/resources/po/en_GB.po b/resources/po/en_GB.po
index 8b9bb904..8fd4410d 100755
--- a/resources/po/en_GB.po
+++ b/resources/po/en_GB.po
@@ -4,9 +4,6 @@ msgstr "Animated Images"
msgid "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES"
msgstr "Animated Shapes"
-msgid "DALI_DEMO_STR_TITLE_ALPHA_BLENDING_CPU"
-msgstr "CPU Alpha Blending"
-
msgid "DALI_DEMO_STR_TITLE_ARC_VISUAL"
msgstr "Arc Visual"
diff --git a/resources/po/en_US.po b/resources/po/en_US.po
index e3be5339..ea7c3288 100755
--- a/resources/po/en_US.po
+++ b/resources/po/en_US.po
@@ -4,9 +4,6 @@ msgstr "Animated Images"
msgid "DALI_DEMO_STR_TITLE_ANIMATED_SHAPES"
msgstr "Animated Shapes"
-msgid "DALI_DEMO_STR_TITLE_ALPHA_BLENDING_CPU"
-msgstr "CPU Alpha Blending"
-
msgid "DALI_DEMO_STR_TITLE_ARC_VISUAL"
msgstr "Arc Visual"
diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h
index 08a7a174..1f411e31 100644
--- a/shared/dali-demo-strings.h
+++ b/shared/dali-demo-strings.h
@@ -1,5 +1,5 @@
/*
- * 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.
@@ -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_ALPHA_BLENDING_CPU dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_ALPHA_BLENDING_CPU")
#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")
@@ -143,7 +142,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_ALPHA_BLENDING_CPU "CPU Alpha Blending"
#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"