Merge "Geometry Batching" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / visual-factory-impl.h

diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.h b/dali-toolkit/internal/visuals/visual-factory-impl.h
index 5a54a68..f6e8d9c 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-factory-impl.h
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_VISUAL_FACTORY_IMPL_H
 
 /*
- * 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.
@@ -22,7 +22,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/devel-api/visual-factory/visual.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 
 namespace Dali
 {
@@ -46,19 +46,6 @@ class VisualFactory : public BaseObject
 {
 public:
 
-  enum RendererType
-  {
-    COLOR,
-    BORDER,
-    GRADIENT,
-    IMAGE,
-    N_PATCH,
-    SVG,
-    MESH,
-    PRIMITIVE,
-    UNDEFINED
-  };
-
   /**
    * @brief Constructor
    *
@@ -69,23 +56,23 @@ public:
   /**
    * @copydoc Toolkit::RenderFactory::CreateVisual( const Property::Map& )
    */
-  Toolkit::Visual CreateVisual( const Property::Map& propertyMap );
+  Toolkit::Visual::Base CreateVisual( const Property::Map& propertyMap );
 
   /**
    * @copydoc Toolkit::RenderFactory::CreateVisual( const Image& )
    */
-  Toolkit::Visual CreateVisual( const Image& image );
+  Toolkit::Visual::Base CreateVisual( const Image& image );
 
   /**
    * @copydoc Toolkit::RenderFactory::CreateVisual( const std::string&, ImageDimensions )
    */
-  Toolkit::Visual CreateVisual( const std::string& image, ImageDimensions size );
+  Toolkit::Visual::Base CreateVisual( const std::string& image, ImageDimensions size );
 
 public:
   /**
-   * @brief Returns an image to be used when a renderer has failed to correctly render
+   * @brief Returns an image to be used when a visual has failed to correctly render
    */
-  static Image GetBrokenRendererImage();
+  static Image GetBrokenVisualImage();
 
 protected:
 
@@ -97,14 +84,6 @@ protected:
 private:
 
   /**
-   * Get the visual type from the property map.
-   *
-   * @param[in] propertyMap The map contains the properties of the visual
-   * @return The rendererType
-   */
-  RendererType GetRendererType( const Property::Map& propertyMap );
-
-  /**
    * Prepare the atlas manager
    */
   void CreateAtlasManager();