X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-cache.cpp;h=594c12fd2479db09d9281959cee675f55752323d;hp=6a233cfe6b7669712f3765aeb0247b826354ea1a;hb=96e0b7fdbe4cfe733a38cbcc2b493a7aeff66d6d;hpb=cc0aefb3259c6fe818d9949ebf768843cc01e6fd

diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.cpp b/dali-toolkit/internal/visuals/visual-factory-cache.cpp
index 6a233cf..594c12f 100644
--- a/dali-toolkit/internal/visuals/visual-factory-cache.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-cache.cpp
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,20 @@
 // CLASS HEADER
 #include "visual-factory-cache.h"
 
-// EXTERNAL HEADER
+// EXTERNAL INCLUDES
 #include <dali/devel-api/common/hash.h>
+#include <dali/public-api/images/resource-image.h>
 
-// INTERNAL HEADER
+// INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/color/color-visual.h>
 #include <dali-toolkit/internal/visuals/svg/svg-visual.h>
+#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
+
+
+namespace
+{
+const char * const BROKEN_VISUAL_IMAGE_URL( DALI_IMAGE_DIR "broken.png");
+}
 
 namespace Dali
 {
@@ -33,8 +41,11 @@ namespace Toolkit
 namespace Internal
 {
 
-VisualFactoryCache::VisualFactoryCache()
-: mSvgRasterizeThread( NULL )
+VisualFactoryCache::VisualFactoryCache( bool preMultiplyOnLoad )
+: mSvgRasterizeThread( NULL ),
+  mVectorAnimationThread(),
+  mBrokenImageUrl(""),
+  mPreMultiplyOnLoad( preMultiplyOnLoad )
 {
 }
 
@@ -45,6 +56,11 @@ VisualFactoryCache::~VisualFactoryCache()
 
 Geometry VisualFactoryCache::GetGeometry( GeometryType type )
 {
+  if( !mGeometry[type] && type == QUAD_GEOMETRY )
+  {
+    mGeometry[type] = CreateQuadGeometry();
+  }
+
   return mGeometry[type];
 }
 
@@ -63,96 +79,6 @@ void VisualFactoryCache::SaveShader( ShaderType type, Shader shader )
   mShader[type] = shader;
 }
 
-int VisualFactoryCache::FindRenderer( const std::string& key ) const
-{
-  int hash = Dali::CalculateHash( key );
-
-  HashVector::Iterator startIt = mRendererHashes.Begin();
-  HashVector::Iterator it;
-
-  for(;;)
-  {
-    it = std::find( startIt, mRendererHashes.End(), hash );
-    if( it != mRendererHashes.End() )
-    {
-      int index = it - mRendererHashes.Begin();
-      const CachedRenderer* cachedRenderer = mRenderers[ index ];
-
-      if( cachedRenderer && cachedRenderer->mKey == key )
-      {
-        return index;
-      }
-    }
-    else
-    {
-      break;
-    }
-    startIt = it + 1;
-  }
-
-  return -1;
-}
-
-Renderer VisualFactoryCache::GetRenderer( const std::string& key ) const
-{
-  int index = FindRenderer( key );
-  if( index != -1 )
-  {
-    return mRenderers[ index ]->mRenderer.GetHandle();
-  }
-  else
-  {
-    return Renderer();
-  }
-}
-
-void VisualFactoryCache::SaveRenderer( const std::string& key, Renderer& renderer )
-{
-  int hash = Dali::CalculateHash( key );
-  const CachedRenderer* cachedRenderer = new CachedRenderer( key, renderer );
-
-  CachedRenderers::Iterator it = std::find( mRenderers.Begin(), mRenderers.End(), static_cast< CachedRenderer* >( NULL ) );
-  if( it != mRenderers.End() )
-  {
-    *it = cachedRenderer;
-    int index = it - mRenderers.Begin();
-    mRendererHashes[ index ] = hash;
-  }
-  else
-  {
-    mRendererHashes.PushBack( hash );
-    mRenderers.PushBack( cachedRenderer );
-  }
-}
-
-bool VisualFactoryCache::CleanRendererCache( const std::string& key )
-{
-  int index = FindRenderer( key );
-  if( index != -1 )
-  {
-    const CachedRenderer*& cachedRenderer = mRenderers[ index ];
-    if( !cachedRenderer->mRenderer.GetHandle() )
-    {
-      mRendererHashes[ index ] = Dali::INITIAL_HASH_VALUE;
-
-      delete cachedRenderer;
-      cachedRenderer = NULL;
-      return true;
-    }
-  }
-  return false;
-}
-
-void VisualFactoryCache::CacheDebugRenderer( Renderer& renderer )
-{
-  mDebugRenderer = renderer;
-}
-
-Renderer VisualFactoryCache::GetDebugRenderer()
-{
-  return mDebugRenderer;
-}
-
 Geometry VisualFactoryCache::CreateQuadGeometry()
 {
   const float halfWidth = 0.5f;
@@ -174,11 +100,32 @@ Geometry VisualFactoryCache::CreateQuadGeometry()
   // Create the geometry object
   Geometry geometry = Geometry::New();
   geometry.AddVertexBuffer( quadVertices );
-  geometry.SetGeometryType( Geometry::TRIANGLE_STRIP );
+  geometry.SetType( Geometry::TRIANGLE_STRIP );
 
   return geometry;
 }
 
+ImageAtlasManagerPtr VisualFactoryCache::GetAtlasManager()
+{
+  if( !mAtlasManager )
+  {
+    mAtlasManager = new ImageAtlasManager();
+    mAtlasManager->SetBrokenImage( mBrokenImageUrl );
+  }
+
+  return mAtlasManager;
+}
+
+TextureManager& VisualFactoryCache::GetTextureManager()
+{
+  return mTextureManager;
+}
+
+NPatchLoader& VisualFactoryCache::GetNPatchLoader()
+{
+  return mNPatchLoader;
+}
+
 SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread()
 {
   if( !mSvgRasterizeThread )
@@ -189,11 +136,21 @@ SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread()
   return mSvgRasterizeThread;
 }
 
+VectorAnimationThread& VisualFactoryCache::GetVectorAnimationThread()
+{
+  if( !mVectorAnimationThread )
+  {
+    mVectorAnimationThread = std::unique_ptr< VectorAnimationThread >( new VectorAnimationThread() );
+    mVectorAnimationThread->Start();
+  }
+  return *mVectorAnimationThread;
+}
+
 void VisualFactoryCache::ApplyRasterizedSVGToSampler()
 {
   while( RasterizingTaskPtr task = mSvgRasterizeThread->NextCompletedTask() )
   {
-    task->GetSvgVisual()->ApplyRasterizedImage( task->GetPixelData() );
+    task->GetSvgVisual()->ApplyRasterizedImage( task->GetParsedImage(), task->GetPixelData() );
   }
 }
 
@@ -261,14 +218,41 @@ Geometry VisualFactoryCache::CreateGridGeometry( Uint16Pair gridSize )
     geometry.SetIndexBuffer( &indices[ 0 ], indices.Size() );
   }
 
-  geometry.SetGeometryType( Geometry::TRIANGLE_STRIP );
+  geometry.SetType( Geometry::TRIANGLE_STRIP );
 
   return geometry;
 }
 
+Image VisualFactoryCache::GetBrokenVisualImage()
+{
+  return ResourceImage::New( mBrokenImageUrl );
+}
+
+void VisualFactoryCache::SetPreMultiplyOnLoad( bool preMultiply )
+{
+  mPreMultiplyOnLoad = preMultiply;
+}
+
+bool VisualFactoryCache::GetPreMultiplyOnLoad()
+{
+  return mPreMultiplyOnLoad;
+}
+
+void VisualFactoryCache::SetBrokenImageUrl(const std::string& brokenImageUrl)
+{
+  mBrokenImageUrl = brokenImageUrl;
+
+  if( !mAtlasManager )
+  {
+    mAtlasManager = new ImageAtlasManager();
+  }
+
+  mAtlasManager->SetBrokenImage( mBrokenImageUrl );
+  mTextureManager.SetBrokenImageUrl( mBrokenImageUrl );
+}
+
 } // namespace Internal
 
 } // namespace Toolkit
 
 } // namespace Dali
-