X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Feffects-view%2Feffects-view-impl.h;h=54527d325da727d97516b609c6cb9b19339f5b13;hp=bf106e686abd213c68177d9eb7dc1c0214bb6119;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hpb=805ae527fca54726f894fb9936c288c7c0f7dbe7 diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h index bf106e6..54527d3 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H +#define DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -26,8 +26,7 @@ // INTERNAL INCLUDES #include #include -#include -#include +#include namespace Dali { @@ -215,11 +214,11 @@ private: // attributes/properties ///////////////////////////////////////////////////////////// // for rendering all user added children to offscreen target - FrameBufferImage mImageForChildren; - Toolkit::Visual mRendererForChildren; - RenderTask mRenderTaskForChildren; - CameraActor mCameraForChildren; - Actor mChildrenRoot; // for creating a subtree for all user added child actors + FrameBufferImage mImageForChildren; + Toolkit::Visual::Base mVisualForChildren; + RenderTask mRenderTaskForChildren; + CameraActor mCameraForChildren; + Actor mChildrenRoot; // for creating a subtree for all user added child actors ///////////////////////////////////////////////////////////// // background fill color @@ -231,8 +230,8 @@ private: // attributes/properties Vector2 mLastSize; ///////////////////////////////////////////////////////////// // post blur image - FrameBufferImage mImagePostFilter; - Toolkit::Visual mRendererPostFilter; + FrameBufferImage mImagePostFilter; + Toolkit::Visual::Base mVisualPostFilter; Vector mFilters; @@ -275,5 +274,4 @@ inline const Toolkit::Internal::EffectsView& GetImpl( const Toolkit::EffectsView } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H__ - +#endif // DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H