X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=f19f390211ac906df3ff37c37f12186ea90f8e9a;hp=7cfdb0776bb6d9657536a6ef7d99df519503fc62;hb=475209602f0a7ad74883059a818cbbe41be263e1;hpb=e80261307788b4656435c4dd964beff7c85e7e8c diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp index 7cfdb07..f19f390 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -1,17 +1,22 @@ -// Copyright (c) 2014 Samsung Electronics Co., Ltd. +// Copyright (c) 2016 Samsung Electronics Co., Ltd. // CLASS HEADER #include "image-view-impl.h" -// INTERNAL INCLUDES -#include - // EXTERNAL INCLUDES #include #include -#include +#include #include +// INTERNAL INCLUDES +#include +#include +#include +#include +#include +#include + namespace Dali { @@ -24,70 +29,6 @@ namespace Internal namespace { -#define MAKE_SHADER(A)#A - -const char* VERTEX_SHADER = MAKE_SHADER( - attribute mediump vec2 aPosition; - attribute highp vec2 aTexCoord; - varying mediump vec2 vTexCoord; - uniform mediump mat4 uMvpMatrix; - uniform mediump vec3 uSize; - - void main() - { - mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0); - // TODO scale by the actor size when we are using RendererFactor generated renderers with a shared unit sized mesh: vertexPosition.xyz *= uSize; - vertexPosition = uMvpMatrix * vertexPosition; - - vTexCoord = aTexCoord; - gl_Position = vertexPosition; - } -); - -const char* FRAGMENT_SHADER = MAKE_SHADER( - varying mediump vec2 vTexCoord; - uniform sampler2D sTexture; - uniform lowp vec4 uColor; - - void main() - { - gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor; - } -); - -//TODO: remove when RendererFactory is implemented, so if there are multiple images that render as quads we only end up with one instance of geometry -Geometry CreateGeometry( int width, int height ) -{ - // Create vertices - const float halfWidth = width * .5f; - const float halfHeight = height * .5f; - struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; }; - TexturedQuadVertex texturedQuadVertexData[4] = { { Vector2(-halfWidth, -halfHeight), Vector2(0.f, 0.f) }, - { Vector2( halfWidth, -halfHeight), Vector2(1.f, 0.f) }, - { Vector2(-halfWidth, halfHeight), Vector2(0.f, 1.f) }, - { Vector2( halfWidth, halfHeight), Vector2(1.f, 1.f) } }; - - Property::Map texturedQuadVertexFormat; - texturedQuadVertexFormat["aPosition"] = Property::VECTOR2; - texturedQuadVertexFormat["aTexCoord"] = Property::VECTOR2; - PropertyBuffer texturedQuadVertices = PropertyBuffer::New( texturedQuadVertexFormat, 4 ); - texturedQuadVertices.SetData(texturedQuadVertexData); - - // Create indices - unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 }; - Property::Map indexFormat; - indexFormat["indices"] = Property::INTEGER; - PropertyBuffer indices = PropertyBuffer::New( indexFormat, 6 ); - indices.SetData(indexData); - - // Create the geometry object - Geometry texturedQuadGeometry = Geometry::New(); - texturedQuadGeometry.AddVertexBuffer( texturedQuadVertices ); - texturedQuadGeometry.SetIndexBuffer( indices ); - - return texturedQuadGeometry; -} - BaseHandle Create() { return Toolkit::ImageView::New(); @@ -95,15 +36,32 @@ BaseHandle Create() // Setup properties, signals and actions using the type-registry. DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ImageView, Toolkit::Control, Create ); -DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "resource-url", STRING, RESOURCE_URL ) +DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "resourceUrl", STRING, RESOURCE_URL ) +DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "image", MAP, IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "preMultipliedAlpha", BOOLEAN, PRE_MULTIPLIED_ALPHA ) + +DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT( Toolkit, ImageView, "pixelArea", Vector4(0.f, 0.f, 1.f, 1.f), PIXEL_AREA ) DALI_TYPE_REGISTRATION_END() + +void SetDefaultTransformMap( Property::Map& transformMap ) +{ + transformMap.Clear(); + transformMap + .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) ) + .Add( Toolkit::Visual::DevelProperty::Transform::Property::SIZE, Vector2(1.0f, 1.0f) ) + .Add( Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN, Toolkit::Align::CENTER ) + .Add( Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER ) + .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE, Vector4::ZERO ); + +} + } // anonymous namespace using namespace Dali; ImageView::ImageView() -: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ) +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ) { } @@ -115,7 +73,7 @@ Toolkit::ImageView ImageView::New() { ImageView* impl = new ImageView(); - Dali::Toolkit::ImageView handle = Dali::Toolkit::ImageView( *impl ); + Toolkit::ImageView handle = Toolkit::ImageView( *impl ); // Second-phase init of the implementation // This can only be done after the CustomActor connection has been made... @@ -128,36 +86,81 @@ Toolkit::ImageView ImageView::New() void ImageView::SetImage( Image image ) { - mImage = image; - - ResourceImage resourceImage = ResourceImage::DownCast( mImage ); - if( resourceImage ) + if( ( mImage != image ) || + ! mUrl.empty() || // If we're changing from a URL type to an Image type + ! mPropertyMap.Empty() ) // If we're changing from a property map type to an Image type { - mImageUrl = resourceImage.GetUrl(); + mUrl.clear(); + mPropertyMap.Clear(); + + mImage = image; + + mVisual = Toolkit::VisualFactory::Get().CreateVisual( image ); + RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); + mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 ); + + RelayoutRequest(); } - else +} + +void ImageView::SetImage( Property::Map map ) +{ + mUrl.clear(); + mImage.Reset(); + mPropertyMap = map; + + mVisual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap ); + RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); + + Property::Value* widthValue = mPropertyMap.Find( "width" ); + if( widthValue ) { - mImageUrl.clear(); + int width; + if( widthValue->Get( width ) ) + { + mImageSize = ImageDimensions( width, mImageSize.GetHeight() ); + } } - if( mImage ) + Property::Value* heightValue = mPropertyMap.Find( "height" ); + if( heightValue ) { - if( Self().OnStage() ) + int height; + if( heightValue->Get( height ) ) { - AttachImage(); + mImageSize = ImageDimensions( mImageSize.GetWidth(), height ); } - RelayoutRequest(); } - else + + RelayoutRequest(); +} + +void ImageView::SetImage( const std::string& url, ImageDimensions size ) +{ + if( ( mUrl != url ) || + mImage || // If we're changing from an Image type to a URL type + ! mPropertyMap.Empty() ) // If we're changing from a property map type to a URL type { - if( mRenderer ) + mImage.Reset(); + mPropertyMap.Clear(); + + mUrl = url; + + if( size.GetWidth() != 0u && size.GetHeight() != 0u ) { - Self().RemoveRenderer( mRenderer ); + mImageSize = size; } - mSampler.Reset(); - mMaterial.Reset(); - mMesh.Reset(); - mRenderer.Reset(); + + mVisual = Toolkit::VisualFactory::Get().CreateVisual( url, size ); + RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); + + // This transform fills the control + // Should provide a transform that handles aspect ratio according to image size + Property::Map transformMap; + SetDefaultTransformMap( transformMap ); + mVisual.SetTransformAndSize( transformMap, mSizeSet ); + + RelayoutRequest(); } } @@ -166,27 +169,59 @@ Image ImageView::GetImage() const return mImage; } +void ImageView::EnablePreMultipliedAlpha( bool preMultipled ) +{ + if( mVisual ) + { + Toolkit::GetImplementation( mVisual ).EnablePreMultipliedAlpha( preMultipled ); + } +} + +bool ImageView::IsPreMultipliedAlphaEnabled() const +{ + if( mVisual ) + { + return Toolkit::GetImplementation( mVisual ).IsPreMultipliedAlphaEnabled(); + } + return false; +} + +void ImageView::SetDepthIndex( int depthIndex ) +{ + if( mVisual ) + { + mVisual.SetDepthIndex( depthIndex ); + } +} + Vector3 ImageView::GetNaturalSize() { - // if no image then use Control's natural size + if( mVisual ) + { + Vector2 rendererNaturalSize; + mVisual.GetNaturalSize( rendererNaturalSize ); + return Vector3( rendererNaturalSize ); + } + Vector3 size; + size.x = mImageSize.GetWidth(); + size.y = mImageSize.GetHeight(); - if( mImage ) + if( size.x > 0 && size.y > 0 ) { - size.x = mImage.GetWidth(); - size.y = mImage.GetHeight(); size.z = std::min(size.x, size.y); + return size; } else { - size = Control::GetNaturalSize(); + // if no image then use Control's natural size + return Control::GetNaturalSize(); } - return size; } float ImageView::GetHeightForWidth( float width ) { - if( mImage ) + if( mImageSize.GetWidth() > 0 && mImageSize.GetHeight() > 0 ) { return GetHeightForWidthBase( width ); } @@ -198,7 +233,7 @@ float ImageView::GetHeightForWidth( float width ) float ImageView::GetWidthForHeight( float height ) { - if( mImage ) + if( mImageSize.GetWidth() > 0 && mImageSize.GetHeight() > 0 ) { return GetWidthForHeightBase( height ); } @@ -208,48 +243,26 @@ float ImageView::GetWidthForHeight( float height ) } } + /////////////////////////////////////////////////////////// // // Private methods // -void ImageView::AttachImage() +void ImageView::OnSizeSet( const Vector3& targetSize ) { - if( !mRenderer ) - { - Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER ); - mMaterial = Material::New( shader ); - - mSampler = Sampler::New( mImage, "sTexture" ); - mMaterial.AddSampler( mSampler ); + Control::OnSizeSet( targetSize ); + mSizeSet = targetSize; - Vector3 size = Self().GetCurrentSize(); - mMesh = CreateGeometry( size.width, size.height ); - mRenderer = Renderer::New( mMesh, mMaterial ); - Self().AddRenderer( mRenderer ); - } - else - { - mSampler.SetImage( mImage ); - } -} - -void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) -{ - Control::OnRelayout( size, container ); - - if( mRenderer ) + if( mVisual ) { - mMesh = CreateGeometry( size.width, size.height ); - mRenderer.SetGeometry( mMesh ); - } -} + Vector2 size( targetSize ); -void ImageView::OnStageConnection( int depth ) -{ - if( mImage ) - { - AttachImage(); + // This transform fills the control + // Should provide a transform that handles aspect ratio according to image size + Property::Map transformMap; + SetDefaultTransformMap( transformMap ); + mVisual.SetTransformAndSize( transformMap, size ); } } @@ -264,6 +277,7 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr if ( imageView ) { + ImageView& impl = GetImpl( imageView ); switch ( index ) { case Toolkit::ImageView::Property::RESOURCE_URL: @@ -271,11 +285,54 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr std::string imageUrl; if( value.Get( imageUrl ) ) { - ImageView& impl = GetImpl( imageView ); - impl.mImageUrl = imageUrl; + impl.SetImage( imageUrl, ImageDimensions() ); + } + break; + } - Image image = ResourceImage::New( imageUrl ); - impl.SetImage( image ); + case Toolkit::ImageView::Property::IMAGE: + { + std::string imageUrl; + Property::Map map; + if( value.Get( imageUrl ) ) + { + impl.SetImage( imageUrl, ImageDimensions() ); + } + // if its not a string then get a Property::Map from the property if possible. + else if( value.Get( map ) ) + { + Property::Value* shaderValue = map.Find( Toolkit::VisualProperty::SHADER, CUSTOM_SHADER ); + // set image only if property map contains image information other than custom shader + if( map.Count() > 1u || !shaderValue ) + { + impl.SetImage( map ); + } + // the property map contains only the custom shader + else if( impl.mVisual && map.Count() == 1u && shaderValue ) + { + Property::Map shaderMap; + if( shaderValue->Get( shaderMap ) ) + { + Internal::Visual::Base& visual = Toolkit::GetImplementation( impl.mVisual ); + visual.SetCustomShader( shaderMap ); + if( imageView.OnStage() ) + { + // force to create new core renderer to use the newly set shader + visual.SetOffStage( imageView ); + visual.SetOnStage( imageView ); + } + } + } + } + break; + } + + case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA: + { + bool isPre; + if( value.Get( isPre ) ) + { + impl.EnablePreMultipliedAlpha( isPre ); } break; } @@ -291,11 +348,40 @@ Property::Value ImageView::GetProperty( BaseObject* object, Property::Index prop if ( imageview ) { + ImageView& impl = GetImpl( imageview ); switch ( propertyIndex ) { case Toolkit::ImageView::Property::RESOURCE_URL: { - value = GetImpl( imageview ).mImageUrl; + if ( !impl.mUrl.empty() ) + { + value = impl.mUrl; + } + break; + } + + case Toolkit::ImageView::Property::IMAGE: + { + if ( !impl.mUrl.empty() ) + { + value = impl.mUrl; + } + else if( impl.mImage ) + { + Property::Map map; + Scripting::CreatePropertyMap( impl.mImage, map ); + value = map; + } + else if( !impl.mPropertyMap.Empty() ) + { + value = impl.mPropertyMap; + } + break; + } + + case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA: + { + value = impl.IsPreMultipliedAlphaEnabled(); break; } }