X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-data-impl.h;h=c31037f99480743eaae49590f3a7f21a8a638abf;hb=c8dddd14f39801fda39757d3819e191f4a4e8154;hp=999b41cfeeaa56c2e01db6cdc20be64ff225376a;hpb=8e7cfd0c114bf778287cc6e67d0f42f3c866e205;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.h b/dali-toolkit/internal/visuals/visual-base-data-impl.h index 999b41c..c31037f 100644 --- a/dali-toolkit/internal/visuals/visual-base-data-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.h @@ -24,6 +24,7 @@ // INTERNAL INCLUDES #include +#include #include namespace Dali @@ -53,10 +54,9 @@ struct Base::Impl enum Flags { IS_ON_STAGE = 1, - IS_FROM_CACHE = 1 << 1, - IS_ATLASING_APPLIED = 1<<2, - IS_PREMULTIPLIED_ALPHA = 1 << 3, - IS_SYNCHRONOUS_RESOURCE_LOADING = 1 << 4 + IS_ATLASING_APPLIED = 1<<1, + IS_PREMULTIPLIED_ALPHA = 1 << 2, + IS_SYNCHRONOUS_RESOURCE_LOADING = 1 << 3 }; struct CustomShader @@ -116,13 +116,16 @@ struct Base::Impl Renderer mRenderer; CustomShader* mCustomShader; SlotDelegate* mBlendSlotDelegate; ///< Used to own mix color animation connection + ResourceObserver* mResourceObserver; ///< Allows controls to observe when the visual resources are loaded and ready std::string mName; Transform mTransform; Vector4 mMixColor; Size mControlSize; float mDepthIndex; Property::Index mMixColorIndex; + Property::Index mOpacityIndex; int mFlags; + bool mResourceReady:1; }; } // namespace Visual