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 "Usage of CustomeView for ScrollContainer and code refactoring accordingly...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
image
/
image-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/image/image-visual.cpp
b/dali-toolkit/internal/visuals/image/image-visual.cpp
index
742f068
..
ab6d1b6
100644
(file)
--- a/
dali-toolkit/internal/visuals/image/image-visual.cpp
+++ b/
dali-toolkit/internal/visuals/image/image-visual.cpp
@@
-122,7
+122,7
@@
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
void main()\n
{\n
void main()\n
{\n
- mediump vec4 vertexPosition = uMvpMatrix *ComputeVertexPosition();\n
+ mediump vec4 vertexPosition = uMvpMatrix *
ComputeVertexPosition();\n
vTexCoord = pixelArea.xy+pixelArea.zw*(aPosition + vec2(0.5) );\n
gl_Position = vertexPosition;\n
}\n
vTexCoord = pixelArea.xy+pixelArea.zw*(aPosition + vec2(0.5) );\n
gl_Position = vertexPosition;\n
}\n
@@
-286,6
+286,8
@@
void ImageVisual::DoSetProperties( const Property::Map& propertyMap )
desiredHeightValue->Get( desiredHeight );
}
desiredHeightValue->Get( desiredHeight );
}
+ mDesiredSize = ImageDimensions( desiredWidth, desiredHeight );
+
Property::Value* pixelAreaValue = propertyMap.Find( Toolkit::ImageVisual::Property::PIXEL_AREA, PIXEL_AREA_UNIFORM_NAME );
if( pixelAreaValue )
{
Property::Value* pixelAreaValue = propertyMap.Find( Toolkit::ImageVisual::Property::PIXEL_AREA, PIXEL_AREA_UNIFORM_NAME );
if( pixelAreaValue )
{
@@
-308,8
+310,6
@@
void ImageVisual::DoSetProperties( const Property::Map& propertyMap )
mWrapModeV = Dali::WrapMode::Type( value );
}
mWrapModeV = Dali::WrapMode::Type( value );
}
- mDesiredSize = ImageDimensions( desiredWidth, desiredHeight );
-
Property::Value* syncLoading = propertyMap.Find( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, SYNCHRONOUS_LOADING );
if( syncLoading )
{
Property::Value* syncLoading = propertyMap.Find( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, SYNCHRONOUS_LOADING );
if( syncLoading )
{
@@
-332,7
+332,7
@@
void ImageVisual::DoSetProperties( const Property::Map& propertyMap )
}
}
}
}
-void ImageVisual::GetNaturalSize( Vector2& naturalSize )
const
+void ImageVisual::GetNaturalSize( Vector2& naturalSize )
{
if(mImage)
{
{
if(mImage)
{
@@
-522,7
+522,7
@@
TextureSet ImageVisual::CreateTextureSet( Vector4& textureRect, const std::strin
void ImageVisual::InitializeRenderer( const std::string& imageUrl )
{
void ImageVisual::InitializeRenderer( const std::string& imageUrl )
{
-
mImpl->mRenderer.Reset(
);
+
DALI_ASSERT_DEBUG( !mImpl->mRenderer && "Renderer should have been removed from stage and already reset before initialization"
);
mImageUrl = imageUrl;
mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED;
mImageUrl = imageUrl;
mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED;
@@
-586,8
+586,9
@@
void ImageVisual::InitializeRenderer( const std::string& imageUrl )
void ImageVisual::InitializeRenderer( const Image& image )
{
void ImageVisual::InitializeRenderer( const Image& image )
{
+ DALI_ASSERT_DEBUG( !mImpl->mRenderer && "Renderer should have been removed from stage and already reset before initialization" );
+
mImpl->mFlags &= ~Impl::IS_FROM_CACHE;
mImpl->mFlags &= ~Impl::IS_FROM_CACHE;
- mImpl->mRenderer.Reset();
// don't reuse CreateTextureSet
TextureSet textures = TextureSet::New();
// don't reuse CreateTextureSet
TextureSet textures = TextureSet::New();
@@
-728,6
+729,7
@@
Shader ImageVisual::GetImageShader( VisualFactoryCache& factoryCache, bool atlas
if( !shader )
{
shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_ATLAS_CLAMP );
if( !shader )
{
shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_ATLAS_CLAMP );
+ shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT );
factoryCache.SaveShader( VisualFactoryCache::IMAGE_SHADER_ATLAS_DEFAULT_WRAP, shader );
}
}
factoryCache.SaveShader( VisualFactoryCache::IMAGE_SHADER_ATLAS_DEFAULT_WRAP, shader );
}
}
@@
-737,6
+739,7
@@
Shader ImageVisual::GetImageShader( VisualFactoryCache& factoryCache, bool atlas
if( !shader )
{
shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_ATLAS_VARIOUS_WRAP );
if( !shader )
{
shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_ATLAS_VARIOUS_WRAP );
+ shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT );
factoryCache.SaveShader( VisualFactoryCache::IMAGE_SHADER_ATLAS_CUSTOM_WRAP, shader );
}
}
factoryCache.SaveShader( VisualFactoryCache::IMAGE_SHADER_ATLAS_CUSTOM_WRAP, shader );
}
}
@@
-747,10
+750,11
@@
Shader ImageVisual::GetImageShader( VisualFactoryCache& factoryCache, bool atlas
if( !shader )
{
shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_NO_ATLAS );
if( !shader )
{
shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_NO_ATLAS );
+ shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT );
factoryCache.SaveShader( VisualFactoryCache::IMAGE_SHADER, shader );
}
}
factoryCache.SaveShader( VisualFactoryCache::IMAGE_SHADER, shader );
}
}
- shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT );
+
return shader;
}
return shader;
}