projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Make to use DevelTexture::ApplyNativeFragmentShader in video-view" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-factory-cache.cpp
diff --git
a/dali-toolkit/internal/visuals/visual-factory-cache.cpp
b/dali-toolkit/internal/visuals/visual-factory-cache.cpp
index
e6a0efd
..
b4fde0a
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-cache.cpp
+++ b/
dali-toolkit/internal/visuals/visual-factory-cache.cpp
@@
-1,5
+1,5
@@
-
/*
- * Copyright (c) 202
0
Samsung Electronics Co., Ltd.
+/*
+ * Copyright (c) 202
1
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.
*
* 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 "visual-factory-cache.h"
// EXTERNAL INCLUDES
-#include <dali/devel-api/common/hash.h>
#include <dali/devel-api/adaptor-framework/image-loading.h>
#include <dali/devel-api/adaptor-framework/image-loading.h>
+#include <dali/devel-api/common/hash.h>
// INTERNAL INCLUDES
// INTERNAL INCLUDES
+#include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h>
#include <dali-toolkit/internal/visuals/color/color-visual.h>
#include <dali-toolkit/internal/visuals/color/color-visual.h>
-#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
-#include <dali-toolkit/internal/visuals/
animated-vector-image/vector-animation-manager
.h>
+#include <dali-toolkit/internal/visuals/
svg/svg-visual
.h>
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
-VisualFactoryCache::VisualFactoryCache( bool preMultiplyOnLoad )
-: mSvgRasterizeThread( NULL ),
+VisualFactoryCache::VisualFactoryCache(bool preMultiplyOnLoad)
+: mSvgRasterizeThread(NULL),
mVectorAnimationManager(),
mBrokenImageUrl(""),
mVectorAnimationManager(),
mBrokenImageUrl(""),
- mPreMultiplyOnLoad(
preMultiplyOnLoad
)
+ mPreMultiplyOnLoad(
preMultiplyOnLoad
)
{
}
VisualFactoryCache::~VisualFactoryCache()
{
{
}
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();
}
{
mGeometry[type] = CreateQuadGeometry();
}
@@
-59,53
+56,55
@@
Geometry VisualFactoryCache::GetGeometry( GeometryType type )
return mGeometry[type];
}
return mGeometry[type];
}
-void VisualFactoryCache::SaveGeometry(
GeometryType type, Geometry geometry
)
+void VisualFactoryCache::SaveGeometry(
GeometryType type, Geometry geometry
)
{
mGeometry[type] = geometry;
}
{
mGeometry[type] = geometry;
}
-Shader VisualFactoryCache::GetShader(
ShaderType type
)
+Shader VisualFactoryCache::GetShader(
ShaderType type
)
{
return mShader[type];
}
{
return mShader[type];
}
-void VisualFactoryCache::SaveShader(
ShaderType type, Shader shader
)
+void VisualFactoryCache::SaveShader(
ShaderType type, Shader shader
)
{
mShader[type] = shader;
}
Geometry VisualFactoryCache::CreateQuadGeometry()
{
{
mShader[type] = shader;
}
Geometry VisualFactoryCache::CreateQuadGeometry()
{
- const float halfWidth = 0.5f;
+ const float halfWidth
= 0.5f;
const float halfHeight = 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;
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();
// 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()
{
return geometry;
}
ImageAtlasManagerPtr VisualFactoryCache::GetAtlasManager()
{
- if(
!mAtlasManager
)
+ if(
!mAtlasManager
)
{
mAtlasManager = new ImageAtlasManager();
{
mAtlasManager = new ImageAtlasManager();
- mAtlasManager->SetBrokenImage(
mBrokenImageUrl
);
+ mAtlasManager->SetBrokenImage(
mBrokenImageUrl
);
}
return mAtlasManager;
}
return mAtlasManager;
@@
-123,7
+122,7
@@
NPatchLoader& VisualFactoryCache::GetNPatchLoader()
SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread()
{
SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread()
{
- if(
!mSvgRasterizeThread
)
+ if(
!mSvgRasterizeThread
)
{
mSvgRasterizeThread = new SvgRasterizeThread();
mSvgRasterizeThread->Start();
{
mSvgRasterizeThread = new SvgRasterizeThread();
mSvgRasterizeThread->Start();
@@
-133,78
+132,77
@@
SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread()
VectorAnimationManager& VisualFactoryCache::GetVectorAnimationManager()
{
VectorAnimationManager& VisualFactoryCache::GetVectorAnimationManager()
{
- if(
!mVectorAnimationManager
)
+ if(
!mVectorAnimationManager
)
{
{
- mVectorAnimationManager = std::unique_ptr<
VectorAnimationManager >( new VectorAnimationManager()
);
+ mVectorAnimationManager = std::unique_ptr<
VectorAnimationManager>(new VectorAnimationManager()
);
}
return *mVectorAnimationManager;
}
}
return *mVectorAnimationManager;
}
-Geometry VisualFactoryCache::CreateGridGeometry(
Uint16Pair gridSize
)
+Geometry VisualFactoryCache::CreateGridGeometry(
Uint16Pair gridSize
)
{
{
- uint16_t gridWidth = gridSize.GetWidth();
+ uint16_t gridWidth
= gridSize.GetWidth();
uint16_t gridHeight = gridSize.GetHeight();
// Create vertices
uint16_t gridHeight = gridSize.GetHeight();
// Create vertices
- Vector<
Vector2
> vertices;
- vertices.Reserve(
( gridWidth + 1 ) * ( gridHeight + 1 )
);
+ Vector<
Vector2
> 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
}
}
// Create indices
- Vector<
unsigned short
> indices;
- indices.Reserve(
(gridWidth+2)*gridHeight*
2 - 2);
+ Vector<
unsigned short
> 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;
}
}
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;
}
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();
// 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;
}
return geometry;
}
@@
-213,20
+211,19
@@
Texture VisualFactoryCache::GetBrokenVisualImage()
{
if(!mBrokenImageTexture && mBrokenImageUrl.size())
{
{
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;
}
}
}
return mBrokenImageTexture;
}
-void VisualFactoryCache::SetPreMultiplyOnLoad(
bool preMultiply
)
+void VisualFactoryCache::SetPreMultiplyOnLoad(
bool preMultiply
)
{
mPreMultiplyOnLoad = preMultiply;
}
{
mPreMultiplyOnLoad = preMultiply;
}
@@
-240,12
+237,12
@@
void VisualFactoryCache::SetBrokenImageUrl(const std::string& brokenImageUrl)
{
mBrokenImageUrl = brokenImageUrl;
{
mBrokenImageUrl = brokenImageUrl;
- if(
!mAtlasManager
)
+ if(
!mAtlasManager
)
{
mAtlasManager = new ImageAtlasManager();
}
{
mAtlasManager = new ImageAtlasManager();
}
- mAtlasManager->SetBrokenImage(
mBrokenImageUrl
);
+ mAtlasManager->SetBrokenImage(
mBrokenImageUrl
);
}
} // namespace Internal
}
} // namespace Internal