diff --git a/com.samsung.dali-demo.xml b/com.samsung.dali-demo.xml index 4c95b90..fb65fa3 100644 --- a/com.samsung.dali-demo.xml +++ b/com.samsung.dali-demo.xml @@ -325,9 +325,6 @@ - - - diff --git a/examples/simple-text-renderer/shaders/simple-text-renderer.frag b/examples/simple-text-renderer/shaders/simple-text-renderer.frag deleted file mode 100644 index f7fe862..0000000 --- a/examples/simple-text-renderer/shaders/simple-text-renderer.frag +++ /dev/null @@ -1,15 +0,0 @@ -#version 300 es - -precision mediump float; - -in vec2 vUV; -out vec4 FragColor; - -uniform sampler2D sAlbedo; -uniform vec4 uColor; - -void main() -{ - vec4 color = texture(sAlbedo, vUV); - FragColor = vec4(color.rgb, uColor.a * color.a); -} diff --git a/examples/simple-text-renderer/shaders/simple-text-renderer.vert b/examples/simple-text-renderer/shaders/simple-text-renderer.vert deleted file mode 100644 index 3cc55bf..0000000 --- a/examples/simple-text-renderer/shaders/simple-text-renderer.vert +++ /dev/null @@ -1,20 +0,0 @@ -#version 300 es - -precision mediump float; - -in vec2 aPosition; -in vec2 aTexCoord; - -out vec2 vUV; - -uniform vec3 uSize; -uniform mat4 uMvpMatrix; - -void main() -{ - vec4 vertexPosition = vec4(aPosition, 0.0, 1.0); - vertexPosition.xyz *= uSize; - gl_Position = uMvpMatrix * vertexPosition; - - vUV = aTexCoord; -} diff --git a/examples/simple-text-renderer/simple-text-renderer-example.cpp b/examples/simple-text-renderer/simple-text-renderer-example.cpp deleted file mode 100644 index 9e6d105..0000000 --- a/examples/simple-text-renderer/simple-text-renderer-example.cpp +++ /dev/null @@ -1,310 +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. - * - */ - -/** - * @file simple-text-renderer-example.cpp - * @brief Basic usage of Text Renderer utility. - */ - -// EXTERNAL INCLUDES -#include -#include -#include -#include - -// INTERNAL INCLUDES -#include "generated/simple-text-renderer-frag.h" -#include "generated/simple-text-renderer-vert.h" - -using namespace std; -using namespace Dali; -using namespace Dali::Toolkit; - -namespace -{ -const std::string IMAGE1 = DEMO_IMAGE_DIR "application-icon-1.png"; -const std::string IMAGE2 = DEMO_IMAGE_DIR "application-icon-6.png"; - -Renderer CreateRenderer() -{ - // Create the geometry. - struct Vertex - { - Dali::Vector2 position; - Dali::Vector2 texCoord; - }; - - static const Vertex vertices[] = {{Dali::Vector2(-0.5f, -0.5f), Dali::Vector2(0.0f, 0.0f)}, - {Dali::Vector2(0.5f, -0.5f), Dali::Vector2(1.0f, 0.0f)}, - {Dali::Vector2(-0.5f, 0.5f), Dali::Vector2(0.0f, 1.0f)}, - {Dali::Vector2(0.5f, 0.5f), Dali::Vector2(1.0f, 1.0f)}}; - - Property::Map property; - property.Add("aPosition", Property::VECTOR2).Add("aTexCoord", Property::VECTOR2); - - VertexBuffer vertexBuffer = VertexBuffer::New(property); - - vertexBuffer.SetData(vertices, sizeof(vertices) / sizeof(Vertex)); - - Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer(vertexBuffer); - - geometry.SetType(Geometry::TRIANGLE_STRIP); - - // Create the shader - Shader shader = Shader::New(SHADER_SIMPLE_TEXT_RENDERER_VERT, SHADER_SIMPLE_TEXT_RENDERER_FRAG); - - // Create the renderer - - Renderer renderer = Renderer::New(geometry, shader); - - return renderer; -} - -TextureSet CreateTextureSet(const Dali::Toolkit::DevelText::RendererParameters& textParameters, const std::vector& embeddedItems) -{ - Dali::Vector embeddedItemLayout; - - Devel::PixelBuffer pixelBuffer = Toolkit::DevelText::Render(textParameters, embeddedItemLayout); - - const int dstWidth = static_cast(pixelBuffer.GetWidth()); - const int dstHeight = static_cast(pixelBuffer.GetHeight()); - - unsigned int index = 0u; - for(const auto& itemLayout : embeddedItemLayout) - { - int width = static_cast(itemLayout.size.width); - int height = static_cast(itemLayout.size.height); - int x = static_cast(itemLayout.position.x); - int y = static_cast(itemLayout.position.y); - - Dali::Devel::PixelBuffer itemPixelBuffer = Dali::LoadImageFromFile(embeddedItems[index++]); - itemPixelBuffer.Resize(width, height); - itemPixelBuffer.Rotate(itemLayout.angle); - - width = static_cast(itemPixelBuffer.GetWidth()); - height = static_cast(itemPixelBuffer.GetHeight()); - - Dali::Pixel::Format itemPixelFormat = itemPixelBuffer.GetPixelFormat(); - - // Check if the item is out of the buffer. - - if((x + width < 0) || - (x > dstWidth) || - (y < 0) || - (y - height > dstHeight)) - { - // The embedded item is completely out of the buffer. - continue; - } - - // Crop if it exceeds the boundaries of the destination buffer. - int layoutX = 0; - int layoutY = 0; - int cropX = 0; - int cropY = 0; - int newWidth = width; - int newHeight = height; - - bool crop = false; - - if(0 > x) - { - newWidth += x; - cropX = std::abs(x); - crop = true; - } - else - { - layoutX = x; - } - - if(cropX + newWidth > dstWidth) - { - crop = true; - newWidth -= ((cropX + newWidth) - dstWidth); - } - - layoutY = y; - if(0.f > layoutY) - { - newHeight += layoutY; - cropY = std::abs(layoutY); - crop = true; - } - - if(cropY + newHeight > dstHeight) - { - crop = true; - newHeight -= ((cropY + newHeight) - dstHeight); - } - - uint16_t uiCropX = static_cast(cropX); - uint16_t uiCropY = static_cast(cropY); - uint16_t uiNewWidth = static_cast(newWidth); - uint16_t uiNewHeight = static_cast(newHeight); - - if(crop) - { - itemPixelBuffer.Crop(uiCropX, uiCropY, uiNewWidth, uiNewHeight); - } - - // Blend the item pixel buffer with the text's color according its blending mode. - if(Dali::TextAbstraction::ColorBlendingMode::MULTIPLY == itemLayout.colorBlendingMode) - { - Dali::Devel::PixelBuffer buffer = Dali::Devel::PixelBuffer::New(uiNewWidth, - uiNewHeight, - itemPixelFormat); - - unsigned char* bufferPtr = buffer.GetBuffer(); - const unsigned char* itemBufferPtr = itemPixelBuffer.GetBuffer(); - const unsigned int bytesPerPixel = Dali::Pixel::GetBytesPerPixel(itemPixelFormat); - const unsigned int size = uiNewWidth * uiNewHeight * bytesPerPixel; - - for(unsigned int i = 0u; i < size; i += bytesPerPixel) - { - *(bufferPtr + 0u) = static_cast(static_cast(*(itemBufferPtr + 0u)) * textParameters.textColor.r); - *(bufferPtr + 1u) = static_cast(static_cast(*(itemBufferPtr + 1u)) * textParameters.textColor.g); - *(bufferPtr + 2u) = static_cast(static_cast(*(itemBufferPtr + 2u)) * textParameters.textColor.b); - *(bufferPtr + 3u) = static_cast(static_cast(*(itemBufferPtr + 3u)) * textParameters.textColor.a); - - itemBufferPtr += bytesPerPixel; - bufferPtr += bytesPerPixel; - } - - itemPixelBuffer = buffer; - } - - Dali::Toolkit::DevelText::UpdateBuffer(itemPixelBuffer, pixelBuffer, layoutX, layoutY, true); - } - - PixelData pixelData = Devel::PixelBuffer::Convert(pixelBuffer); - - Texture texture = Texture::New(TextureType::TEXTURE_2D, - pixelData.GetPixelFormat(), - pixelData.GetWidth(), - pixelData.GetHeight()); - texture.Upload(pixelData); - - TextureSet textureSet = TextureSet::New(); - textureSet.SetTexture(0u, texture); - - return textureSet; -} - -} // namespace - -/** - * @brief The main class of the demo. - */ -class SimpleTextRendererExample : public ConnectionTracker -{ -public: - SimpleTextRendererExample(Application& application) - : mApplication(application) - { - // Connect to the Application's Init signal - mApplication.InitSignal().Connect(this, &SimpleTextRendererExample::Create); - } - - ~SimpleTextRendererExample() - { - // Nothing to do here. - } - - /** - * One-time setup in response to Application InitSignal. - */ - void Create(Application& application) - { - Window window = application.GetWindow(); - window.SetBackgroundColor(Color::WHITE); - window.SetBackgroundColor(Vector4(0.04f, 0.345f, 0.392f, 1.0f)); - - window.KeyEventSignal().Connect(this, &SimpleTextRendererExample::OnKeyEvent); - - const std::string image1 = ""; - const std::string image2 = ""; - - Dali::Toolkit::DevelText::RendererParameters textParameters; - textParameters.text = "Hello " + image1 + " world " + image2 + " this " + image1 + " is " + image2 + " a " + image1 + " demo " + image2 + " of " + image1 + " circular " + image2 + " text " + image1 + " width " + image2 + " icons."; - textParameters.horizontalAlignment = "center"; - textParameters.verticalAlignment = "center"; - textParameters.circularAlignment = "center"; - textParameters.fontFamily = "SamsungUI"; - textParameters.fontWeight = ""; - textParameters.fontWidth = ""; - textParameters.fontSlant = ""; - textParameters.layout = "circular"; - textParameters.textColor = Color::BLACK; - textParameters.fontSize = 25.f; - textParameters.textWidth = 360u; - textParameters.textHeight = 360u; - textParameters.radius = 180u; - textParameters.beginAngle = 15.f; - textParameters.incrementAngle = 360.f; - textParameters.ellipsisEnabled = true; - textParameters.markupEnabled = true; - - std::vector embeddedItems = {IMAGE2, IMAGE2, IMAGE2, IMAGE2, IMAGE2}; - - TextureSet textureSet = CreateTextureSet(textParameters, embeddedItems); - - Renderer renderer = CreateRenderer(); - renderer.SetTextures(textureSet); - - Actor actor = Actor::New(); - actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); - actor.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); - actor.SetProperty(Actor::Property::POSITION, Vector2(0.f, 0.f)); - actor.SetProperty(Actor::Property::SIZE, Vector2(360.f, 360.f)); - actor.SetProperty(Actor::Property::COLOR, Color::WHITE); - - actor.AddRenderer(renderer); - - window.Add(actor); - } - - /** - * 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; -}; - -/** Entry point for Linux & Tizen applications */ -int DALI_EXPORT_API main(int argc, char** argv) -{ - Application application = Application::New(&argc, &argv); - - SimpleTextRendererExample test(application); - - application.MainLoop(); - - return 0; -} diff --git a/resources/po/en_US.po b/resources/po/en_US.po index 22cab7a..15a2707 100755 --- a/resources/po/en_US.po +++ b/resources/po/en_US.po @@ -349,9 +349,6 @@ msgstr "Window" msgid "DALI_DEMO_STR_TITLE_ANIMATED_VECTOR_IMAGES" msgstr "Animated Vector Images" -msgid "DALI_DEMO_STR_TITLE_TEXT_RENDERER" -msgstr "Text Renderer" - msgid "DALI_DEMO_STR_TITLE_TEXT_VISUAL" msgstr "Text Visual" diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h index df8e338..7e321e9 100644 --- a/shared/dali-demo-strings.h +++ b/shared/dali-demo-strings.h @@ -151,7 +151,6 @@ extern "C" #define DALI_DEMO_STR_TITLE_WAVES dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_WAVES") #define DALI_DEMO_STR_TITLE_WEB_VIEW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_WEB_VIEW") #define DALI_DEMO_STR_TITLE_WINDOW dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_WINDOW") -#define DALI_DEMO_STR_TITLE_TEXT_RENDERER dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_RENDERER") #define DALI_DEMO_STR_TITLE_TEXT_VISUAL dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_VISUAL") #define DALI_DEMO_STR_TITLE_TEXT_LABEL_BITMAP_FONT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_TEXT_LABEL_BITMAP_FONT") #define DALI_DEMO_STR_TITLE_UNIFORM_BLOCKS dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_UNIFORM_BLOCKS") @@ -275,7 +274,6 @@ extern "C" #define DALI_DEMO_STR_TITLE_WAVES "Waves" #define DALI_DEMO_STR_TITLE_WEB_VIEW "Web View" #define DALI_DEMO_STR_TITLE_WINDOW "Window" -#define DALI_DEMO_STR_TITLE_TEXT_RENDERER "Text Renderer" #define DALI_DEMO_STR_TITLE_TEXT_VISUAL "Text Visual" #define DALI_DEMO_STR_TITLE_TEXT_LABEL_BITMAP_FONT "Text Bitmap Font" #define DALI_DEMO_STR_TITLE_UNIFORM_BLOCKS "Uniform Blocks" diff --git a/tests-reel/dali-tests-reel.cpp b/tests-reel/dali-tests-reel.cpp index e6827c3..38a841a 100644 --- a/tests-reel/dali-tests-reel.cpp +++ b/tests-reel/dali-tests-reel.cpp @@ -58,7 +58,6 @@ int DALI_EXPORT_API main(int argc, char** argv) demo.AddExample(Example("simple-scroll-view.example", DALI_DEMO_STR_TITLE_SIMPLE_SCROLL_VIEW)); demo.AddExample(Example("simple-text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL)); demo.AddExample(Example("simple-text-field.example", DALI_DEMO_STR_TITLE_TEXT_FIELD)); - demo.AddExample(Example("simple-text-renderer.example", DALI_DEMO_STR_TITLE_TEXT_RENDERER)); demo.AddExample(Example("simple-text-visual.example", DALI_DEMO_STR_TITLE_TEXT_VISUAL)); demo.AddExample(Example("simple-bitmap-font-text-label.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_BITMAP_FONT)); demo.AddExample(Example("uniform-blocks.example", DALI_DEMO_STR_TITLE_UNIFORM_BLOCKS));