X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-image%2Fanimated-image-visual.cpp;h=0ba78331f546c8623061d95d3de37cf944663d64;hb=refs%2Fchanges%2F64%2F123864%2F10;hp=9a2ba3cf75874e19081c0dc81beff6a829d470e4;hpb=0ade1ea02b460b002d9cd82cd3023a5107eb6294;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp
index 9a2ba3c..0ba7833 100644
--- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp
+++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp
@@ -40,7 +40,21 @@ namespace Toolkit
 namespace Internal
 {
 
-AnimatedImageVisualPtr AnimatedImageVisual::New( VisualFactoryCache& factoryCache, const std::string& imageUrl, const Property::Map& properties )
+namespace
+{
+// wrap modes
+DALI_ENUM_TO_STRING_TABLE_BEGIN( WRAP_MODE )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::WrapMode, DEFAULT )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::WrapMode, CLAMP_TO_EDGE )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::WrapMode, REPEAT )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::WrapMode, MIRRORED_REPEAT )
+DALI_ENUM_TO_STRING_TABLE_END( WRAP_MODE )
+
+const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
+
+}
+
+AnimatedImageVisualPtr AnimatedImageVisual::New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl, const Property::Map& properties )
 {
   AnimatedImageVisual* visual = new AnimatedImageVisual( factoryCache );
   visual->mImageUrl = imageUrl;
@@ -49,7 +63,7 @@ AnimatedImageVisualPtr AnimatedImageVisual::New( VisualFactoryCache& factoryCach
   return visual;
 }
 
-AnimatedImageVisualPtr AnimatedImageVisual::New( VisualFactoryCache& factoryCache, const std::string& imageUrl )
+AnimatedImageVisualPtr AnimatedImageVisual::New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl )
 {
   AnimatedImageVisual* visual = new AnimatedImageVisual( factoryCache );
   visual->mImageUrl = imageUrl;
@@ -60,9 +74,12 @@ AnimatedImageVisualPtr AnimatedImageVisual::New( VisualFactoryCache& factoryCach
 AnimatedImageVisual::AnimatedImageVisual( VisualFactoryCache& factoryCache )
 : Visual::Base( factoryCache ),
   mFrameDelayTimer(),
+  mPixelArea( FULL_TEXTURE_RECT ),
   mImageUrl(),
   mImageSize(),
-  mCurrentFrameIndex( 0 )
+  mCurrentFrameIndex( 0 ),
+  mWrapModeU( WrapMode::DEFAULT ),
+  mWrapModeV( WrapMode::DEFAULT )
 {}
 
 AnimatedImageVisual::~AnimatedImageVisual()
@@ -73,7 +90,7 @@ void AnimatedImageVisual::GetNaturalSize( Vector2& naturalSize )
 {
   if( mImageSize.GetWidth() == 0 &&  mImageSize.GetHeight() == 0)
   {
-    mImageSize = Dali::GetGifImageSize( mImageUrl );
+    mImageSize = Dali::GetGifImageSize( mImageUrl.GetUrl() );
   }
 
   naturalSize.width = mImageSize.GetWidth();
@@ -83,17 +100,49 @@ void AnimatedImageVisual::GetNaturalSize( Vector2& naturalSize )
 void AnimatedImageVisual::DoCreatePropertyMap( Property::Map& map ) const
 {
   map.Clear();
-  map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::Visual::IMAGE );
 
-  if( !mImageUrl.empty() )
+  map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::DevelVisual::ANIMATED_IMAGE );
+
+  if( mImageUrl.IsValid() )
   {
-    map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl );
+    map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl.GetUrl() );
   }
+
+  map.Insert( Toolkit::ImageVisual::Property::PIXEL_AREA, mPixelArea );
+  map.Insert( Toolkit::ImageVisual::Property::WRAP_MODE_U, mWrapModeU );
+  map.Insert( Toolkit::ImageVisual::Property::WRAP_MODE_V, mWrapModeV );
+}
+
+void AnimatedImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const
+{
+  // Do nothing
 }
 
 void AnimatedImageVisual::DoSetProperties( const Property::Map& propertyMap )
 {
   // url already passed in from constructor
+
+  Property::Value* pixelAreaValue = propertyMap.Find( Toolkit::ImageVisual::Property::PIXEL_AREA, PIXEL_AREA_UNIFORM_NAME );
+  if( pixelAreaValue )
+  {
+    pixelAreaValue->Get( mPixelArea );
+  }
+
+  Property::Value* wrapModeValueU = propertyMap.Find( Toolkit::ImageVisual::Property::WRAP_MODE_U, IMAGE_WRAP_MODE_U );
+  if( wrapModeValueU )
+  {
+    int value;
+    Scripting::GetEnumerationProperty( *wrapModeValueU, WRAP_MODE_TABLE, WRAP_MODE_TABLE_COUNT, value );
+    mWrapModeU = Dali::WrapMode::Type( value );
+  }
+
+  Property::Value* wrapModeValueV = propertyMap.Find( Toolkit::ImageVisual::Property::WRAP_MODE_V, IMAGE_WRAP_MODE_V );
+  if( wrapModeValueV )
+  {
+    int value;
+    Scripting::GetEnumerationProperty( *wrapModeValueV, WRAP_MODE_TABLE, WRAP_MODE_TABLE_COUNT, value );
+    mWrapModeV = Dali::WrapMode::Type( value );
+  }
 }
 
 void AnimatedImageVisual::DoSetOnStage( Actor& actor )
@@ -101,18 +150,34 @@ void AnimatedImageVisual::DoSetOnStage( Actor& actor )
   Texture texture = PrepareAnimatedImage();
   if( texture ) // if the image loading is successful
   {
-    Shader shader = ImageVisual::GetImageShader( mFactoryCache, true, true );
+    bool defaultWrapMode = mWrapModeU <= WrapMode::CLAMP_TO_EDGE && mWrapModeV <= WrapMode::CLAMP_TO_EDGE;
+    Shader shader = ImageVisual::GetImageShader( mFactoryCache, true, defaultWrapMode );
+
     Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY );
+
     TextureSet textureSet = TextureSet::New();
+    textureSet.SetTexture( 0u, texture );
+
     mImpl->mRenderer = Renderer::New( geometry, shader );
     mImpl->mRenderer.SetTextures( textureSet );
-    textureSet.SetTexture( 0u, PrepareAnimatedImage() );
-    mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, mTextureRectContainer[0] );
 
     // Register transform properties
     mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT );
 
+    if( !defaultWrapMode ) // custom wrap mode
+    {
+      Vector2 wrapMode(mWrapModeU-WrapMode::CLAMP_TO_EDGE, mWrapModeV-WrapMode::CLAMP_TO_EDGE);
+      wrapMode.Clamp( Vector2::ZERO, Vector2( 2.f, 2.f ) );
+      mImpl->mRenderer.RegisterProperty( WRAP_MODE_UNIFORM_NAME, wrapMode );
+    }
+
+    if( mPixelArea != FULL_TEXTURE_RECT )
+    {
+      mImpl->mRenderer.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, mPixelArea );
+    }
+
     mCurrentFrameIndex = 0;
+    mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, mTextureRectContainer[mCurrentFrameIndex] );
     if( mFrameDelayContainer.Count() > 1 )
     {
       mFrameDelayTimer = Timer::New( mFrameDelayContainer[0] );
@@ -121,6 +186,9 @@ void AnimatedImageVisual::DoSetOnStage( Actor& actor )
     }
 
     actor.AddRenderer( mImpl->mRenderer );
+
+    // Animated Image loaded and ready to display
+    ResourceReady();
   }
 }
 
@@ -156,12 +224,16 @@ Texture AnimatedImageVisual::PrepareAnimatedImage()
 {
   // load from image file
   std::vector<Dali::PixelData> pixelDataList;
-  if( Dali::LoadAnimatedGifFromFile( mImageUrl.c_str() , pixelDataList, mFrameDelayContainer ) )
+
+  if( mImageUrl.IsLocal() )
   {
-    mImageSize.SetWidth( pixelDataList[0].GetWidth() );
-    mImageSize.SetHeight( pixelDataList[0].GetHeight() );
+    if( Dali::LoadAnimatedGifFromFile( mImageUrl.GetUrl().c_str() , pixelDataList, mFrameDelayContainer ) )
+    {
+      mImageSize.SetWidth( pixelDataList[0].GetWidth() );
+      mImageSize.SetHeight( pixelDataList[0].GetHeight() );
 
-    return Toolkit::ImageAtlas::PackToAtlas( pixelDataList, mTextureRectContainer );
+      return Toolkit::ImageAtlas::PackToAtlas( pixelDataList, mTextureRectContainer );
+    }
   }
 
   return Texture();