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=0a25ffa3cfcaba6c782e18e85f5780ef568967be;hp=a91aa715934657ab0e4b00d91f78c63150aee4bf;hb=4c6d34154c81cf86b4c3662b81e1223f3326ceb5;hpb=6da8438e9ac7350d9cc6f69b35cbcc4ab3987da1

diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
index a91aa71..0a25ffa 100644
--- a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
+++ b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
@@ -31,16 +31,19 @@
 #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");
 }
@@ -100,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 )
     {
@@ -140,20 +144,22 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Vector4& col
 
 void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Vector4& color )
 {
-  ColorRenderer* rendererPtr = dynamic_cast< ColorRenderer* >( &GetImplementation( renderer ) );
-  if( rendererPtr )
-  {
-    rendererPtr->SetColor( color );
-  }
-  else
+  if( renderer )
   {
-    renderer.RemoveAndReset( actor );
-    renderer = GetControlRenderer( color );
-
-    if( actor.OnStage() )
+    ColorRenderer* rendererPtr = dynamic_cast< ColorRenderer* >( &GetImplementation( renderer ) );
+    if( rendererPtr )
     {
-      renderer.SetOnStage( actor );
+      rendererPtr->SetColor( color );
+      return;
     }
+
+    renderer.RemoveAndReset( actor );
+  }
+
+  renderer = GetControlRenderer( color );
+  if( actor && actor.OnStage() )
+  {
+    renderer.SetOnStage( actor );
   }
 }
 
@@ -193,7 +199,8 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Image& image
   }
   else
   {
-    ImageRenderer* rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ) );
+    CreateAtlasManager();
+    ImageRenderer* rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
     Actor actor;
     rendererPtr->SetImage( actor, image );
 
@@ -224,17 +231,18 @@ void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor&
         return;
       }
     }
+
+    renderer.RemoveAndReset( actor );
   }
 
-  renderer.RemoveAndReset( actor );
   renderer = GetControlRenderer( image );
-  if( actor.OnStage() )
+  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 )
   {
@@ -250,15 +258,16 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const std::string&
   }
   else
   {
-    ImageRenderer* rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ) );
+    CreateAtlasManager();
+    ImageRenderer* rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) );
     Actor actor;
-    rendererPtr->SetImage( actor, url );
+    rendererPtr->SetImage( actor, url, size );
 
     return Toolkit::ControlRenderer( rendererPtr );
   }
 }
 
-void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const std::string& url )
+void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const std::string& url, ImageDimensions size )
 {
   if( renderer )
   {
@@ -276,15 +285,16 @@ void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor&
       ImageRenderer* rendererPtr = dynamic_cast< ImageRenderer* >( &GetImplementation( renderer ) );
       if( rendererPtr )
       {
-        rendererPtr->SetImage( actor, url );
+        rendererPtr->SetImage( actor, url, size );
         return;
       }
     }
+
+    renderer.RemoveAndReset( actor );
   }
 
-  renderer.RemoveAndReset( actor );
-  renderer = GetControlRenderer( url );
-  if( actor.OnStage() )
+  renderer = GetControlRenderer( url, size );
+  if( actor && actor.OnStage() )
   {
     renderer.SetOnStage( actor );
   }
@@ -294,45 +304,31 @@ void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor&
 {
   if( renderer )
   {
+    ControlRenderer& controlRenderer = GetImplementation( renderer );
+
     Property::Value* type = propertyMap.Find( RENDERER_TYPE_NAME );
     std::string typeValue ;
-    if( type && type->Get( 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 ) ) )
     {
-      //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;
-      }
-      else if( typeValue ==  GRADIENT_RENDERER && typeid( renderer ) != typeid( GradientRenderer ) )
-      {
-        renderer = GetControlRenderer( propertyMap );
-        return;
-      }
-      else if( typeValue ==  IMAGE_RENDERER && typeid( renderer ) != typeid( ImageRenderer ) )
-      {
-        renderer = GetControlRenderer( propertyMap );
-        return;
-      }
-      else if( typeValue ==  N_PATCH_RENDERER && typeid( renderer ) != typeid( NPatchRenderer ) )
-      {
-        renderer = GetControlRenderer( propertyMap );
-        return;
-      }
-      else if( typeValue ==  BORDER_RENDERER && typeid( renderer ) != typeid( BorderRenderer ) )
-      {
-        renderer = GetControlRenderer( propertyMap );
-        return;
-      }
+      controlRenderer.Initialize( actor, propertyMap );
+      return;
     }
 
-    GetImplementation( renderer ).Initialize( actor, propertyMap );
+    renderer.RemoveAndReset( actor );
   }
-  else
+
+  renderer = GetControlRenderer( propertyMap );
+  if( actor && actor.OnStage() )
   {
-    renderer = GetControlRenderer( propertyMap );
+    renderer.SetOnStage( actor );
   }
-
 }
 
 Image RendererFactory::GetBrokenRendererImage()
@@ -340,6 +336,16 @@ 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
 
 } // namespace Toolkit