projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Multilanguage support cache issue fix." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
filters
/
image-filter.h
diff --git
a/dali-toolkit/internal/filters/image-filter.h
b/dali-toolkit/internal/filters/image-filter.h
index
5a07ded
..
3a4fac9
100644
(file)
--- a/
dali-toolkit/internal/filters/image-filter.h
+++ b/
dali-toolkit/internal/filters/image-filter.h
@@
-19,10
+19,11
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
+#include <dali/public-api/actors/camera-actor.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/
public
-api/controls/effects-view/effects-view.h>
+#include <dali-toolkit/
devel
-api/controls/effects-view/effects-view.h>
namespace Dali
{
namespace Dali
{
@@
-136,22
+137,24
@@
public:
*/
void SetBackgroundColor( const Vector4& color );
*/
void SetBackgroundColor( const Vector4& color );
+protected:
+
/**
/**
- * Enable optional debug output in the shader
- * @param[in] flag Set true to enable, dalse to disable.
+ * Setup position and parameters for camera
*/
*/
- void
RenderDebug( bool flag
);
+ void
SetupCamera(
);
protected:
Image mInputImage;
FrameBufferImage mOutputImage;
FilterKernel mKernel;
Actor mRootActor;
protected:
Image mInputImage;
FrameBufferImage mOutputImage;
FilterKernel mKernel;
Actor mRootActor;
+ CameraActor mCameraActor;
Vector4 mBackgroundColor;
Vector2 mTargetSize;
Pixel::Format mPixelFormat;
bool mRefreshOnDemand;
Vector4 mBackgroundColor;
Vector2 mTargetSize;
Pixel::Format mPixelFormat;
bool mRefreshOnDemand;
- bool mDebugRender;
+
}; // class Imagefilter
} // namespace Internal
}; // class Imagefilter
} // namespace Internal