X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-data-impl.h;h=568af248e95d8a9fc57eeb835a1e2d7420115e5f;hp=3c8f0727ccdb19d565763f2984072b910a3c3c50;hb=750fadba87bb959c9af32e89e3f1bc7af6cb6dd2;hpb=4b3917be0d1fbe4eab6020b2a7e9abdabd32225d diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.h b/dali-toolkit/internal/visuals/visual-base-data-impl.h index 3c8f072..568af24 100644 --- a/dali-toolkit/internal/visuals/visual-base-data-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.h @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include // INTERNAL INCLUDES #include @@ -96,14 +96,9 @@ struct Base::Impl void UpdatePropertyMap(const Property::Map& map); /** - * Register the uniform properties onto the renderer - */ - void RegisterUniforms(Renderer renderer, Toolkit::Direction::Type direction); - - /** * Set the uniform properties onto the renderer */ - void SetUniforms(Renderer renderer, Toolkit::Direction::Type direction); + void SetUniforms(VisualRenderer renderer, Toolkit::Direction::Type direction); /** * Convert the control size and the transform attributes into the actual @@ -117,11 +112,9 @@ struct Base::Impl Vector4 mOffsetSizeMode; Toolkit::Align::Type mOrigin; Toolkit::Align::Type mAnchorPoint; - Property::Index mOffsetIndex{Property::INVALID_INDEX}; - Property::Index mSizeIndex{Property::INVALID_INDEX}; }; - Renderer mRenderer; + VisualRenderer mRenderer; CustomShader* mCustomShader; EventObserver* mEventObserver; ///< Allows controls to observe when the visual has events to notify std::string mName; @@ -134,11 +127,6 @@ struct Base::Impl Vector4 mCornerRadius; float mCornerRadiusPolicy; int mDepthIndex; - Property::Index mMixColorIndex; - Property::Index mBorderlineWidthIndex; - Property::Index mBorderlineColorIndex; - Property::Index mBorderlineOffsetIndex; - Property::Index mCornerRadiusIndex; FittingMode mFittingMode; ///< How the contents should fit the view int mFlags; Toolkit::Visual::ResourceStatus mResourceStatus;