X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-impl.h;h=4c018aafb85f3344e17460f69e4257b9e5cc7e1c;hp=a5d6f0663725277193e54d37bf105b766a8aa7bf;hb=29d3264d67c7dac9c3e7059140fa7eef3592a823;hpb=12b5da1b6e2e4b88f3cdb24b81d1b54b68b5f4f1 diff --git a/dali-toolkit/internal/builder/builder-impl.h b/dali-toolkit/internal/builder/builder-impl.h index a5d6f06..4c018aa 100644 --- a/dali-toolkit/internal/builder/builder-impl.h +++ b/dali-toolkit/internal/builder/builder-impl.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -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 ImageLut; ImageLut mFrameBufferImageLut; - typedef std::map ShaderEffectLut; - ShaderEffectLut mShaderEffectLut; - typedef std::map PathLut; PathLut mPathLut;