X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Frenderer-factory-impl.cpp;h=6b2e22e74eab1d2a79f2e6032192c1bd8ba75ce8;hp=b9d1d4015a59389101736e310b2ae97b5af12b90;hb=76dead7c21ac57622ca1a70c156efddc017059cf;hpb=21b42a30e8a6e94e5e523ebdaec055a91a38f046

diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
index b9d1d40..6b2e22e 100644
--- a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
+++ b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
@@ -31,16 +31,21 @@
 #include <dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.h>
 #include <dali-toolkit/internal/controls/renderers/image/image-renderer.h>
 #include <dali-toolkit/internal/controls/renderers/renderer-factory-cache.h>
+#include <dali-toolkit/internal/controls/renderers/image-atlas-manager.h>
 
 namespace
 {
-const char * const RENDERER_TYPE_NAME( "renderer-type" );
+const char * const RENDERER_TYPE_NAME( "rendererType" );
 
-const char * const COLOR_RENDERER("color-renderer");
-const char * const BORDER_RENDERER("border-renderer");
-const char * const GRADIENT_RENDERER("gradient-renderer");
-const char * const IMAGE_RENDERER("image-renderer");
-const char * const N_PATCH_RENDERER("n-patch-renderer");
+const char * const COLOR_RENDERER("colorRenderer");
+const char * const BORDER_RENDERER("borderRenderer");
+const char * const GRADIENT_RENDERER("gradientRenderer");
+const char * const IMAGE_RENDERER("imageRenderer");
+const char * const N_PATCH_RENDERER("nPatchRenderer");
+
+const std::string TEXTURE_UNIFORM_NAME = "sTexture";
+
+const char * const BROKEN_RENDERER_IMAGE_URL( DALI_IMAGE_DIR "broken.png");
 }
 
 namespace Dali
@@ -98,7 +103,8 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Property::Ma
     }
     else if( typeValue ==  IMAGE_RENDERER )
     {
-      rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ) );
+      CreateAtlasManager();
+      rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
     }
     else if( typeValue ==  N_PATCH_RENDERER )
     {
@@ -112,7 +118,8 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Property::Ma
 
   if( rendererPtr )
   {
-    rendererPtr->Initialize( propertyMap );
+    Actor actor;
+    rendererPtr->Initialize( actor, propertyMap );
   }
   else
   {
@@ -135,18 +142,24 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Vector4& col
   return Toolkit::ControlRenderer( rendererPtr );
 }
 
-bool RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, const Vector4& color )
+void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Vector4& color )
 {
-  ColorRenderer* rendererPtr = dynamic_cast< ColorRenderer* >( &GetImplementation( renderer ) );
-  if( rendererPtr )
+  if( renderer )
   {
-    rendererPtr->SetColor( color );
-    return false;
+    ColorRenderer* rendererPtr = dynamic_cast< ColorRenderer* >( &GetImplementation( renderer ) );
+    if( rendererPtr )
+    {
+      rendererPtr->SetColor( color );
+      return;
+    }
+
+    renderer.RemoveAndReset( actor );
   }
-  else
+
+  renderer = GetControlRenderer( color );
+  if( actor && actor.OnStage() )
   {
-    renderer = GetControlRenderer( color );
-    return true;
+    renderer.SetOnStage( actor );
   }
 }
 
@@ -186,40 +199,57 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Image& image
   }
   else
   {
-    ImageRenderer* rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ) );
-    rendererPtr->SetImage( image );
+    CreateAtlasManager();
+    ImageRenderer* rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+    Actor actor;
+    rendererPtr->SetImage( actor, image );
 
     return Toolkit::ControlRenderer( rendererPtr );
   }
 }
 
-bool RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, const Image& image )
+void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Image& image )
 {
-  NinePatchImage npatchImage = NinePatchImage::DownCast( image );
-  if( npatchImage )
+  if( renderer )
   {
-    NPatchRenderer* rendererPtr = dynamic_cast< NPatchRenderer* >( &GetImplementation( renderer ) );
-    if( rendererPtr )
+    if( ! image )
     {
-      rendererPtr->SetImage( npatchImage );
-      return false;
+      // If the image is empty, then reset the renderer and return
+      renderer.RemoveAndReset( actor );
+      return;
     }
-  }
-  else
-  {
-    ImageRenderer* rendererPtr = dynamic_cast< ImageRenderer* >( &GetImplementation( renderer ) );
-    if( rendererPtr )
+
+    NinePatchImage npatchImage = NinePatchImage::DownCast( image );
+    if( npatchImage )
     {
-      rendererPtr->SetImage( image );
-      return false;
+      NPatchRenderer* rendererPtr = dynamic_cast< NPatchRenderer* >( &GetImplementation( renderer ) );
+      if( rendererPtr )
+      {
+        rendererPtr->SetImage( npatchImage );
+        return;
+      }
     }
+    else
+    {
+      ImageRenderer* rendererPtr = dynamic_cast< ImageRenderer* >( &GetImplementation( renderer ) );
+      if( rendererPtr )
+      {
+        rendererPtr->SetImage( actor, image );
+        return;
+      }
+    }
+
+    renderer.RemoveAndReset( actor );
   }
 
   renderer = GetControlRenderer( image );
-  return true;
+  if( actor && actor.OnStage() )
+  {
+    renderer.SetOnStage( actor );
+  }
 }
 
-Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const std::string& url )
+Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const std::string& url, ImageDimensions size )
 {
   if( !mFactoryCache )
   {
@@ -235,76 +265,98 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const std::string&
   }
   else
   {
-    ImageRenderer* rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ) );
-    rendererPtr->SetImage( url );
+    CreateAtlasManager();
+    ImageRenderer* rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
+    Actor actor;
+    rendererPtr->SetImage( actor, url, size );
 
     return Toolkit::ControlRenderer( rendererPtr );
   }
 }
 
-bool RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, const std::string& url )
+void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const std::string& url, ImageDimensions size )
 {
-  if( NinePatchImage::IsNinePatchUrl( url ) )
+  if( renderer )
   {
-    NPatchRenderer* rendererPtr = dynamic_cast< NPatchRenderer* >( &GetImplementation( renderer ) );
-    if( rendererPtr )
+    if( url.empty() )
     {
-      rendererPtr->SetImage( url );
-      return false;
+      // If the URL is empty, then reset the renderer and return
+      renderer.RemoveAndReset( actor );
+      return;
     }
-  }
-  else
-  {
-    ImageRenderer* rendererPtr = dynamic_cast< ImageRenderer* >( &GetImplementation( renderer ) );
-    if( rendererPtr )
+    else if( NinePatchImage::IsNinePatchUrl( url ) )
+    {
+      NPatchRenderer* rendererPtr = dynamic_cast< NPatchRenderer* >( &GetImplementation( renderer ) );
+      if( rendererPtr )
+      {
+        rendererPtr->SetImage( url );
+        return;
+      }
+    }
+    else
     {
-      rendererPtr->SetImage( url );
-      return false;
+      ImageRenderer* rendererPtr = dynamic_cast< ImageRenderer* >( &GetImplementation( renderer ) );
+      if( rendererPtr )
+      {
+        rendererPtr->SetImage( actor, url, size );
+        return;
+      }
     }
+
+    renderer.RemoveAndReset( actor );
   }
 
+  renderer = GetControlRenderer( url, size );
+  if( actor && actor.OnStage() )
   {
-    renderer = GetControlRenderer( url );
-    return true;
+    renderer.SetOnStage( actor );
   }
 }
 
-bool RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, const Property::Map& propertyMap )
+void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Property::Map& propertyMap )
 {
-  Property::Value* type = propertyMap.Find( RENDERER_TYPE_NAME );
-  std::string typeValue ;
-  if( type && type->Get( typeValue ))
+  if( renderer )
   {
-    //If there's been a renderer type change then we have to return a new shader
-    if( typeValue ==  COLOR_RENDERER && typeid( renderer ) != typeid( ColorRenderer ) )
-    {
-      renderer = GetControlRenderer( propertyMap );
-      return true;
-    }
-    else if( typeValue ==  GRADIENT_RENDERER && typeid( renderer ) != typeid( GradientRenderer ) )
-    {
-      renderer = GetControlRenderer( propertyMap );
-      return true;
-    }
-    else if( typeValue ==  IMAGE_RENDERER && typeid( renderer ) != typeid( ImageRenderer ) )
-    {
-      renderer = GetControlRenderer( propertyMap );
-      return true;
-    }
-    else if( typeValue ==  N_PATCH_RENDERER && typeid( renderer ) != typeid( NPatchRenderer ) )
+    ControlRenderer& controlRenderer = GetImplementation( renderer );
+
+    Property::Value* type = propertyMap.Find( RENDERER_TYPE_NAME );
+    std::string typeValue ;
+
+    //If there's no renderer type specified or if there hasn't been a renderer type change then we can reuse the renderer
+    if( !type || !type->Get( typeValue ) ||
+        ( typeValue ==  IMAGE_RENDERER    && typeid( controlRenderer ) == typeid( ImageRenderer ) ) ||
+        ( typeValue ==  N_PATCH_RENDERER  && typeid( controlRenderer ) == typeid( NPatchRenderer ) ) ||
+        ( typeValue ==  COLOR_RENDERER    && typeid( controlRenderer ) == typeid( ColorRenderer ) )||
+        ( typeValue ==  GRADIENT_RENDERER && typeid( controlRenderer ) == typeid( GradientRenderer ) ) ||
+        ( typeValue ==  BORDER_RENDERER   && typeid( controlRenderer ) == typeid( BorderRenderer ) ) )
     {
-      renderer = GetControlRenderer( propertyMap );
-      return true;
-    }
-    else if( typeValue ==  BORDER_RENDERER && typeid( renderer ) != typeid( BorderRenderer ) )
-    {
-      renderer = GetControlRenderer( propertyMap );
-      return true;
+      controlRenderer.Initialize( actor, propertyMap );
+      return;
     }
+
+    renderer.RemoveAndReset( actor );
   }
 
-  GetImplementation( renderer ).Initialize( propertyMap );
-  return false;
+  renderer = GetControlRenderer( propertyMap );
+  if( actor && actor.OnStage() )
+  {
+    renderer.SetOnStage( actor );
+  }
+}
+
+Image RendererFactory::GetBrokenRendererImage()
+{
+  return ResourceImage::New( BROKEN_RENDERER_IMAGE_URL );
+}
+
+void RendererFactory::CreateAtlasManager()
+{
+  if( !mAtlasManager )
+  {
+    Shader shader = ImageRenderer::GetImageShader( *( mFactoryCache.Get() ) );
+    mAtlasManager = new ImageAtlasManager(shader, TEXTURE_UNIFORM_NAME);
+    mAtlasManager->SetBrokenImage( BROKEN_RENDERER_IMAGE_URL );
+  }
 }
 
 } // namespace Internal