Merge "Added New methods to cater for second step initialization" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / builder / builder-impl.h

diff --git a/dali-toolkit/internal/builder/builder-impl.h b/dali-toolkit/internal/builder/builder-impl.h
index a5d6f06..4c018aa 100644 (file)
--- a/dali-toolkit/internal/builder/builder-impl.h
+++ b/dali-toolkit/internal/builder/builder-impl.h
@@ -23,6 +23,7 @@
 #include <list>
 #include <map>
 #include <dali/public-api/common/stage.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/actors/actor.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/object/property-map.h>
@@ -163,16 +164,6 @@ public:
   void CreateRenderTask( const std::string &name );
 
   /**
-   * @copydoc Toolkit::Builder::GetShaderEffect
-   */
-  ShaderEffect GetShaderEffect( const std::string &name );
-
-  /**
-   * @copydoc Toolkit::Builder::GetShaderEffect
-   */
-  ShaderEffect GetShaderEffect( const std::string &name, const Replacement& constant );
-
-  /**
    * @copydoc Toolkit::Builder::GetFrameBufferImage
    */
   FrameBufferImage GetFrameBufferImage( const std::string &name );
@@ -234,15 +225,14 @@ private:
 
   void SetupTask( RenderTask& task, const Toolkit::TreeNode& node, const Replacement& replacement );
 
+  void SetCustomProperties( const TreeNode& node, Handle& handle, const Replacement& constant, const std::string& childName, Property::AccessMode accessMode );
+
 private:
   Toolkit::JsonParser mParser;
 
   typedef std::map<const std::string, FrameBufferImage> ImageLut;
   ImageLut mFrameBufferImageLut;
 
-  typedef std::map<const std::string, ShaderEffect> ShaderEffectLut;
-  ShaderEffectLut mShaderEffectLut;
-
   typedef std::map<const std::string, Path> PathLut;
   PathLut mPathLut;