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
Rendering API clean-up
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
renderers
/
svg
/
svg-renderer.cpp
diff --git
a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp
b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp
index
d3c128d
..
2642c74
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp
+++ b/
dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp
@@
-104,8
+104,9
@@
void SvgRenderer::DoSetOnStage( Actor& actor )
geometry = mFactoryCache.CreateQuadGeometry();
mFactoryCache.SaveGeometry( RendererFactoryCache::QUAD_GEOMETRY, geometry );
}
geometry = mFactoryCache.CreateQuadGeometry();
mFactoryCache.SaveGeometry( RendererFactoryCache::QUAD_GEOMETRY, geometry );
}
- Material material = Material::New( shader );
- mImpl->mRenderer = Renderer::New( geometry, material );
+ TextureSet textureSet = TextureSet::New();
+ mImpl->mRenderer = Renderer::New( geometry, shader );
+ mImpl->mRenderer.SetTextures( textureSet );
if( mImpl->mSize != Vector2::ZERO && mParsedImage )
{
if( mImpl->mSize != Vector2::ZERO && mParsedImage )
{
@@
-197,19
+198,19
@@
void SvgRenderer::ApplyRasterizedImage( PixelDataPtr rasterizedPixelData )
{
if( GetIsOnStage() )
{
{
if( GetIsOnStage() )
{
-
Material currentMaterial = mImpl->mRenderer.GetMaterial
();
+
TextureSet currentTextureSet = mImpl->mRenderer.GetTextures
();
if( mAtlasRect != FULL_TEXTURE_RECT )
{
if( mAtlasRect != FULL_TEXTURE_RECT )
{
- mAtlasManager.Remove( current
Material
, mAtlasRect );
+ mAtlasManager.Remove( current
TextureSet
, mAtlasRect );
}
Vector4 atlasRect;
}
Vector4 atlasRect;
-
Material material
= mAtlasManager.Add(atlasRect, rasterizedPixelData );
- if(
material
) // atlasing
+
TextureSet textureSet
= mAtlasManager.Add(atlasRect, rasterizedPixelData );
+ if(
textureSet
) // atlasing
{
{
- if(
material != currentMaterial
)
+ if(
textureSet != currentTextureSet
)
{
{
- mImpl->mRenderer.Set
Material( material
);
+ mImpl->mRenderer.Set
Textures( textureSet
);
}
mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, atlasRect );
mAtlasRect = atlasRect;
}
mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, atlasRect );
mAtlasRect = atlasRect;
@@
-221,27
+222,20
@@
void SvgRenderer::ApplyRasterizedImage( PixelDataPtr rasterizedPixelData )
if( mAtlasRect == FULL_TEXTURE_RECT )
{
if( mAtlasRect == FULL_TEXTURE_RECT )
{
-
material = currentMaterial
;
+
textureSet = currentTextureSet
;
}
else
{
}
else
{
-
material = Material::New( ImageRenderer::GetImageShader( mFactoryCache )
);
- mImpl->mRenderer.Set
Material( material
);
+
textureSet = TextureSet::New(
);
+ mImpl->mRenderer.Set
Textures( textureSet
);
mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT );
mAtlasRect = FULL_TEXTURE_RECT;
}
mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT );
mAtlasRect = FULL_TEXTURE_RECT;
}
- if(
material
)
+ if(
textureSet
)
{
{
- int index = material.GetTextureIndex( TEXTURE_UNIFORM_NAME );
- if( index != -1 )
- {
- material.SetTextureImage( index, texture );
- return;
- }
-
- material.AddTexture( texture, TEXTURE_UNIFORM_NAME );
+ textureSet.SetImage( 0u, texture );
}
}
}
}
}
}