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=b4fde0a814c4b71127f3ef375c3ca2b6ed4902b2;hp=0fa35b96160b6e5381d9c0e636322504ebf3884e;hb=f2039d47f9bed8104575da80a2ecf0bb6e37ff8d;hpb=8fea8f2ae64923690519e0de039ce4af51271d9f diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.cpp b/dali-toolkit/internal/visuals/visual-factory-cache.cpp index 0fa35b9..b4fde0a 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) 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. @@ -18,40 +18,37 @@ #include "visual-factory-cache.h" // EXTERNAL INCLUDES -#include #include +#include // INTERNAL INCLUDES +#include #include -#include #include -#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { - -VisualFactoryCache::VisualFactoryCache( bool preMultiplyOnLoad ) -: mSvgRasterizeThread( NULL ), +VisualFactoryCache::VisualFactoryCache(bool preMultiplyOnLoad) +: mSvgRasterizeThread(NULL), mVectorAnimationManager(), mBrokenImageUrl(""), - mPreMultiplyOnLoad( preMultiplyOnLoad ) + mPreMultiplyOnLoad(preMultiplyOnLoad) { } VisualFactoryCache::~VisualFactoryCache() { - SvgRasterizeThread::TerminateThread( mSvgRasterizeThread ); + SvgRasterizeThread::TerminateThread(mSvgRasterizeThread); } -Geometry VisualFactoryCache::GetGeometry( GeometryType type ) +Geometry VisualFactoryCache::GetGeometry(GeometryType type) { - if( !mGeometry[type] && type == QUAD_GEOMETRY ) + if(!mGeometry[type] && type == QUAD_GEOMETRY) { mGeometry[type] = CreateQuadGeometry(); } @@ -59,53 +56,55 @@ Geometry VisualFactoryCache::GetGeometry( GeometryType type ) return mGeometry[type]; } -void VisualFactoryCache::SaveGeometry( GeometryType type, Geometry geometry ) +void VisualFactoryCache::SaveGeometry(GeometryType type, Geometry geometry) { mGeometry[type] = geometry; } -Shader VisualFactoryCache::GetShader( ShaderType type ) +Shader VisualFactoryCache::GetShader(ShaderType type) { return mShader[type]; } -void VisualFactoryCache::SaveShader( ShaderType type, Shader shader ) +void VisualFactoryCache::SaveShader(ShaderType type, Shader shader) { mShader[type] = shader; } Geometry VisualFactoryCache::CreateQuadGeometry() { - const float halfWidth = 0.5f; + const float halfWidth = 0.5f; const float halfHeight = 0.5f; - struct QuadVertex { Vector2 position;}; - QuadVertex quadVertexData[4] = + struct QuadVertex { - { Vector2(-halfWidth, -halfHeight) }, - { Vector2(-halfWidth, halfHeight) }, - { Vector2( halfWidth, -halfHeight) }, - { Vector2( halfWidth, halfHeight) } + Vector2 position; }; + QuadVertex quadVertexData[4] = + { + {Vector2(-halfWidth, -halfHeight)}, + {Vector2(-halfWidth, halfHeight)}, + {Vector2(halfWidth, -halfHeight)}, + {Vector2(halfWidth, halfHeight)}}; Property::Map quadVertexFormat; quadVertexFormat["aPosition"] = Property::VECTOR2; - VertexBuffer quadVertices = VertexBuffer::New( quadVertexFormat ); - quadVertices.SetData( quadVertexData, 4 ); + VertexBuffer quadVertices = VertexBuffer::New(quadVertexFormat); + quadVertices.SetData(quadVertexData, 4); // Create the geometry object Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer( quadVertices ); - geometry.SetType( Geometry::TRIANGLE_STRIP ); + geometry.AddVertexBuffer(quadVertices); + geometry.SetType(Geometry::TRIANGLE_STRIP); return geometry; } ImageAtlasManagerPtr VisualFactoryCache::GetAtlasManager() { - if( !mAtlasManager ) + if(!mAtlasManager) { mAtlasManager = new ImageAtlasManager(); - mAtlasManager->SetBrokenImage( mBrokenImageUrl ); + mAtlasManager->SetBrokenImage(mBrokenImageUrl); } return mAtlasManager; @@ -123,9 +122,9 @@ NPatchLoader& VisualFactoryCache::GetNPatchLoader() SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread() { - if( !mSvgRasterizeThread ) + if(!mSvgRasterizeThread) { - mSvgRasterizeThread = new SvgRasterizeThread( new EventThreadCallback( MakeCallback( this, &VisualFactoryCache::ApplyRasterizedSVGToSampler ) ) ); + mSvgRasterizeThread = new SvgRasterizeThread(); mSvgRasterizeThread->Start(); } return mSvgRasterizeThread; @@ -133,86 +132,77 @@ SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread() VectorAnimationManager& VisualFactoryCache::GetVectorAnimationManager() { - if( !mVectorAnimationManager ) + if(!mVectorAnimationManager) { - mVectorAnimationManager = std::unique_ptr< VectorAnimationManager >( new VectorAnimationManager() ); + mVectorAnimationManager = std::unique_ptr(new VectorAnimationManager()); } return *mVectorAnimationManager; } -void VisualFactoryCache::ApplyRasterizedSVGToSampler() +Geometry VisualFactoryCache::CreateGridGeometry(Uint16Pair gridSize) { - while( RasterizingTaskPtr task = mSvgRasterizeThread->NextCompletedTask() ) - { - task->GetSvgVisual()->ApplyRasterizedImage(task->GetVectorRenderer(), task->GetPixelData(), task->IsLoaded()); - } -} - -Geometry VisualFactoryCache::CreateGridGeometry( Uint16Pair gridSize ) -{ - uint16_t gridWidth = gridSize.GetWidth(); + uint16_t gridWidth = gridSize.GetWidth(); uint16_t gridHeight = gridSize.GetHeight(); // Create vertices - Vector< Vector2 > vertices; - vertices.Reserve( ( gridWidth + 1 ) * ( gridHeight + 1 ) ); + Vector vertices; + vertices.Reserve((gridWidth + 1) * (gridHeight + 1)); - for( int y = 0; y < gridHeight + 1; ++y ) + for(int y = 0; y < gridHeight + 1; ++y) { - for( int x = 0; x < gridWidth + 1; ++x ) + for(int x = 0; x < gridWidth + 1; ++x) { - vertices.PushBack( Vector2( (float)x/gridWidth - 0.5f, (float)y/gridHeight - 0.5f) ); + vertices.PushBack(Vector2((float)x / gridWidth - 0.5f, (float)y / gridHeight - 0.5f)); } } // Create indices - Vector< unsigned short > indices; - indices.Reserve( (gridWidth+2)*gridHeight*2 - 2); + Vector indices; + indices.Reserve((gridWidth + 2) * gridHeight * 2 - 2); - for( unsigned int row = 0u; row < gridHeight; ++row ) + for(unsigned int row = 0u; row < gridHeight; ++row) { - unsigned int rowStartIndex = row*(gridWidth+1u); - unsigned int nextRowStartIndex = rowStartIndex + gridWidth +1u; + unsigned int rowStartIndex = row * (gridWidth + 1u); + unsigned int nextRowStartIndex = rowStartIndex + gridWidth + 1u; - if( row != 0u ) // degenerate index on non-first row + if(row != 0u) // degenerate index on non-first row { - indices.PushBack( rowStartIndex ); + indices.PushBack(rowStartIndex); } - for( unsigned int column = 0u; column < gridWidth+1u; column++) // main strip + for(unsigned int column = 0u; column < gridWidth + 1u; column++) // main strip { - indices.PushBack( rowStartIndex + column); - indices.PushBack( nextRowStartIndex + column); + indices.PushBack(rowStartIndex + column); + indices.PushBack(nextRowStartIndex + column); } - if( row != gridHeight-1u ) // degenerate index on non-last row + if(row != gridHeight - 1u) // degenerate index on non-last row { - indices.PushBack( nextRowStartIndex + gridWidth ); + indices.PushBack(nextRowStartIndex + gridWidth); } } Property::Map vertexFormat; - vertexFormat[ "aPosition" ] = Property::VECTOR2; - VertexBuffer vertexBuffer = VertexBuffer::New( vertexFormat ); - if( vertices.Size() > 0 ) + vertexFormat["aPosition"] = Property::VECTOR2; + VertexBuffer vertexBuffer = VertexBuffer::New(vertexFormat); + if(vertices.Size() > 0) { - vertexBuffer.SetData( &vertices[ 0 ], vertices.Size() ); + vertexBuffer.SetData(&vertices[0], vertices.Size()); } Property::Map indexFormat; - indexFormat[ "indices" ] = Property::INTEGER; - VertexBuffer indexVertexBuffer = VertexBuffer::New( indexFormat ); - + indexFormat["indices"] = Property::INTEGER; + VertexBuffer indexVertexBuffer = VertexBuffer::New(indexFormat); // Create the geometry object Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer( vertexBuffer ); - if( indices.Size() > 0 ) + geometry.AddVertexBuffer(vertexBuffer); + if(indices.Size() > 0) { - geometry.SetIndexBuffer( &indices[ 0 ], indices.Size() ); + geometry.SetIndexBuffer(&indices[0], indices.Size()); } - geometry.SetType( Geometry::TRIANGLE_STRIP ); + geometry.SetType(Geometry::TRIANGLE_STRIP); return geometry; } @@ -221,20 +211,19 @@ Texture VisualFactoryCache::GetBrokenVisualImage() { if(!mBrokenImageTexture && mBrokenImageUrl.size()) { - PixelData data; - Devel::PixelBuffer pixelBuffer = LoadImageFromFile( mBrokenImageUrl ); - if( pixelBuffer ) + PixelData data; + Devel::PixelBuffer pixelBuffer = LoadImageFromFile(mBrokenImageUrl); + if(pixelBuffer) { - data = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer - mBrokenImageTexture = Texture::New( Dali::TextureType::TEXTURE_2D, data.GetPixelFormat(), - data.GetWidth(), data.GetHeight() ); - mBrokenImageTexture.Upload( data ); + data = Devel::PixelBuffer::Convert(pixelBuffer); // takes ownership of buffer + mBrokenImageTexture = Texture::New(Dali::TextureType::TEXTURE_2D, data.GetPixelFormat(), data.GetWidth(), data.GetHeight()); + mBrokenImageTexture.Upload(data); } } return mBrokenImageTexture; } -void VisualFactoryCache::SetPreMultiplyOnLoad( bool preMultiply ) +void VisualFactoryCache::SetPreMultiplyOnLoad(bool preMultiply) { mPreMultiplyOnLoad = preMultiply; } @@ -248,13 +237,12 @@ void VisualFactoryCache::SetBrokenImageUrl(const std::string& brokenImageUrl) { mBrokenImageUrl = brokenImageUrl; - if( !mAtlasManager ) + if(!mAtlasManager) { mAtlasManager = new ImageAtlasManager(); } - mAtlasManager->SetBrokenImage( mBrokenImageUrl ); - mTextureManager.SetBrokenImageUrl( mBrokenImageUrl ); + mAtlasManager->SetBrokenImage(mBrokenImageUrl); } } // namespace Internal