X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-cache.cpp;h=6b4bf10da17676e3da92a8e4b067a9d2ca308636;hp=a65c7795038bf7032f3e5e57467d6e9c1c9b495d;hb=35a7fe4e9b45558b58e365c637e704e2a51a5212;hpb=3c90f2e19f0526a936f5664dc446addbaa25ade8 diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.cpp b/dali-toolkit/internal/visuals/visual-factory-cache.cpp index a65c779..6b4bf10 100644 --- a/dali-toolkit/internal/visuals/visual-factory-cache.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-cache.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -22,12 +22,13 @@ #include // INTERNAL INCLUDES +#include +#include #include #include #include #include -#include -#include +#include #include namespace Dali @@ -36,10 +37,14 @@ namespace Toolkit { namespace Internal { +namespace +{ +const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); +} VisualFactoryCache::VisualFactoryCache(bool preMultiplyOnLoad) -: mSvgRasterizeThread(NULL), - mVectorAnimationManager(), +: mSvgRasterizeManager(nullptr), + mVectorAnimationManager(nullptr), mPreMultiplyOnLoad(preMultiplyOnLoad), mBrokenImageInfoContainer(), mDefaultBrokenImageUrl(""), @@ -49,7 +54,6 @@ VisualFactoryCache::VisualFactoryCache(bool preMultiplyOnLoad) VisualFactoryCache::~VisualFactoryCache() { - SvgRasterizeThread::TerminateThread(mSvgRasterizeThread); } Geometry VisualFactoryCache::GetGeometry(GeometryType type) @@ -126,14 +130,13 @@ NPatchLoader& VisualFactoryCache::GetNPatchLoader() return mNPatchLoader; } -SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread() +SvgRasterizeManager* VisualFactoryCache::GetSVGRasterizationManager() { - if(!mSvgRasterizeThread) + if(!mSvgRasterizeManager) { - mSvgRasterizeThread = new SvgRasterizeThread(); - mSvgRasterizeThread->Start(); + mSvgRasterizeManager = std::unique_ptr(new SvgRasterizeManager()); } - return mSvgRasterizeThread; + return mSvgRasterizeManager.get(); } VectorAnimationManager& VisualFactoryCache::GetVectorAnimationManager() @@ -221,10 +224,10 @@ Texture VisualFactoryCache::GetBrokenVisualImage(uint32_t brokenIndex) Devel::PixelBuffer pixelBuffer = LoadImageFromFile(mBrokenImageInfoContainer[brokenIndex].url); if(pixelBuffer) { - pixelData = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer - mBrokenImageInfoContainer[brokenIndex].texture = Texture::New(Dali::TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight()); + pixelData = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer + mBrokenImageInfoContainer[brokenIndex].texture = Texture::New(Dali::TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight()); mBrokenImageInfoContainer[brokenIndex].texture.Upload(pixelData); - mBrokenImageInfoContainer[brokenIndex].width = pixelData.GetWidth(); + mBrokenImageInfoContainer[brokenIndex].width = pixelData.GetWidth(); mBrokenImageInfoContainer[brokenIndex].height = pixelData.GetHeight(); } } @@ -270,7 +273,7 @@ Geometry VisualFactoryCache::GetNPatchGeometry(int index) geometry = GetGeometry(VisualFactoryCache::NINE_PATCH_GEOMETRY); if(!geometry) { - geometry = NPatchHelper::CreateGridGeometry(Uint16Pair(3,3)); + geometry = NPatchHelper::CreateGridGeometry(Uint16Pair(3, 3)); SaveGeometry(VisualFactoryCache::NINE_PATCH_GEOMETRY, geometry); } } @@ -286,7 +289,7 @@ Geometry VisualFactoryCache::GetNPatchGeometry(int index) geometry = GetGeometry(VisualFactoryCache::NINE_PATCH_GEOMETRY); if(!geometry) { - geometry = NPatchHelper::CreateGridGeometry(Uint16Pair(3,3)); + geometry = NPatchHelper::CreateGridGeometry(Uint16Pair(3, 3)); SaveGeometry(VisualFactoryCache::NINE_PATCH_GEOMETRY, geometry); } } @@ -337,16 +340,15 @@ void VisualFactoryCache::ApplyTextureAndUniforms(Renderer& renderer, int index) TextureSet textureSet; if(mNPatchLoader.GetNPatchData(mBrokenImageInfoContainer[index].npatchId, data) && data->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE) { - textureSet = data->GetTextures(); + textureSet = data->GetTextures(); mBrokenImageInfoContainer[index].texture = textureSet.GetTexture(0); NPatchHelper::ApplyTextureAndUniforms(renderer, data); renderer.SetTextures(textureSet); } } -void VisualFactoryCache::UpdateBrokenImageRenderer(Renderer& renderer, const Vector2& size) +void VisualFactoryCache::UpdateBrokenImageRenderer(Renderer& renderer, const Vector2& size, const bool& rendererIsImage) { - bool useDefaultBrokenImage = false; if(mBrokenImageInfoContainer.size() == 0) { @@ -354,7 +356,7 @@ void VisualFactoryCache::UpdateBrokenImageRenderer(Renderer& renderer, const Vec } // Load Information for broken image - for(uint32_t index = 0; (index < mBrokenImageInfoContainer.size()) && !useDefaultBrokenImage; index++) + for(uint32_t index = 0; (index < mBrokenImageInfoContainer.size()) && !useDefaultBrokenImage; index++) { if(mBrokenImageInfoContainer[index].width == 0 && mBrokenImageInfoContainer[index].height == 0) { @@ -365,16 +367,16 @@ void VisualFactoryCache::UpdateBrokenImageRenderer(Renderer& renderer, const Vec if(mBrokenImageInfoContainer[index].visualType == VisualUrl::Type::N_PATCH) { const NPatchData* data; - Rect border; - mBrokenImageInfoContainer[index].npatchId = mNPatchLoader.Load( mTextureManager, NULL, mBrokenImageInfoContainer[index].url, border, mPreMultiplyOnLoad, true); + Rect border; + mBrokenImageInfoContainer[index].npatchId = mNPatchLoader.Load(mTextureManager, NULL, mBrokenImageInfoContainer[index].url, border, mPreMultiplyOnLoad, true); if(mNPatchLoader.GetNPatchData(mBrokenImageInfoContainer[index].npatchId, data) && data->GetLoadingState() == NPatchData::LoadingState::LOAD_COMPLETE) { - mBrokenImageInfoContainer[index].width = data->GetCroppedWidth(); + mBrokenImageInfoContainer[index].width = data->GetCroppedWidth(); mBrokenImageInfoContainer[index].height = data->GetCroppedHeight(); } else { - DALI_LOG_ERROR("Can't update renderer for broken image. maybe image loading is failed [index:%d] [path:%s] \n",index, mBrokenImageInfoContainer[index].url.c_str()); + DALI_LOG_ERROR("Can't update renderer for broken image. maybe image loading is failed [index:%d] [path:%s] \n", index, mBrokenImageInfoContainer[index].url.c_str()); useDefaultBrokenImage = true; } } @@ -382,7 +384,7 @@ void VisualFactoryCache::UpdateBrokenImageRenderer(Renderer& renderer, const Vec { if(!GetBrokenVisualImage(index)) { - DALI_LOG_ERROR("Can't update renderer for broken image. maybe image loading is failed [index:%d] [path:%s] \n",index, mBrokenImageInfoContainer[index].url.c_str()); + DALI_LOG_ERROR("Can't update renderer for broken image. maybe image loading is failed [index:%d] [path:%s] \n", index, mBrokenImageInfoContainer[index].url.c_str()); useDefaultBrokenImage = true; } } @@ -401,7 +403,7 @@ void VisualFactoryCache::UpdateBrokenImageRenderer(Renderer& renderer, const Vec mBrokenImageInfoContainer[defaultBrokenIndex].url = mDefaultBrokenImageUrl; VisualUrl visualUrl(mBrokenImageInfoContainer[defaultBrokenIndex].url); mBrokenImageInfoContainer[defaultBrokenIndex].visualType = visualUrl.GetType(); - mUseDefaultBrokenImageOnly = true; + mUseDefaultBrokenImageOnly = true; } // Set Texutre to renderer @@ -410,15 +412,31 @@ void VisualFactoryCache::UpdateBrokenImageRenderer(Renderer& renderer, const Vec { // Set geometry and shader for npatch Geometry geometry = GetNPatchGeometry(brokenIndex); - Shader shader = GetNPatchShader(brokenIndex); + Shader shader = GetNPatchShader(brokenIndex); renderer.SetGeometry(geometry); renderer.SetShader(shader); ApplyTextureAndUniforms(renderer, brokenIndex); } else { - Texture brokenImage = GetBrokenVisualImage(brokenIndex); - TextureSet textureSet = TextureSet::New(); + // Create single image renderer only if rederer is not use normal ImageShader. i.e. npatch visual. + if(!rendererIsImage) + { + Geometry geometry = GetGeometry(QUAD_GEOMETRY); + Shader shader = GetShader(IMAGE_SHADER); + if(!shader) + { + std::string vertexShader = std::string(Dali::Shader::GetVertexShaderPrefix() + SHADER_IMAGE_VISUAL_SHADER_VERT.data()); + std::string fragmentShader = std::string(Dali::Shader::GetFragmentShaderPrefix() + SHADER_IMAGE_VISUAL_SHADER_FRAG.data()); + shader = Shader::New(vertexShader, fragmentShader); + shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT); + SaveShader(IMAGE_SHADER, shader); + } + renderer.SetGeometry(geometry); + renderer.SetShader(shader); + } + Texture brokenImage = GetBrokenVisualImage(brokenIndex); + TextureSet textureSet = TextureSet::New(); textureSet.SetTexture(0u, brokenImage); renderer.SetTextures(textureSet); } @@ -428,7 +446,7 @@ int32_t VisualFactoryCache::GetProperBrokenImageIndex(const Vector2& size) { // Sets the default broken type int32_t returnIndex = 0; - if((size.width == 0 || size.height == 0) || mUseDefaultBrokenImageOnly ) + if((size.width == 0 || size.height == 0) || mUseDefaultBrokenImageOnly) { // To do : Need to add observer about size return returnIndex;