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
(Vector) Check failure of vector rendering
[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
bc4b164
..
d73f9e6
100644
(file)
--- a/
dali-toolkit/internal/filters/image-filter.h
+++ b/
dali-toolkit/internal/filters/image-filter.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_IMAGE_FILTER_H__
-#define
__DALI_TOOLKIT_INTERNAL_IMAGE_FILTER_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_IMAGE_FILTER_H
+#define
DALI_TOOLKIT_INTERNAL_IMAGE_FILTER_H
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-19,6
+19,9
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
+#include <dali/public-api/actors/camera-actor.h>
+#include <dali/public-api/rendering/frame-buffer.h>
+#include <dali/public-api/rendering/texture.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
@@
-35,7
+38,7
@@
namespace Internal
/**
* An interface class that provides a interface for image filters that perform
/**
* An interface class that provides a interface for image filters that perform
- * a simple shader effect on an input
image, rendering the output to a FrameBufferImage
.
+ * a simple shader effect on an input
texture, rendering the output to a FrameBuffer
.
*/
class ImageFilter
{
*/
class ImageFilter
{
@@
-75,16
+78,16
@@
public:
void SetRefreshOnDemand( bool onDemand );
/**
void SetRefreshOnDemand( bool onDemand );
/**
- * Set the input
imag
e
- * @param[in] The input/original
imag
e.
+ * Set the input
textur
e
+ * @param[in] The input/original
textur
e.
*/
*/
- void SetInput
Image( Image imag
e );
+ void SetInput
Texture( Texture textur
e );
/**
/**
- * Set the output
image
- * @return The output
image
.
+ * Set the output
frame buffer
+ * @return The output
frame buffer
.
*/
*/
- void SetOutput
Image( FrameBufferImage image
);
+ void SetOutput
FrameBuffer( FrameBuffer frameBuffer
);
/**
* Set size of ImageFilter. Used to create internal offscreen buffers
/**
* Set size of ImageFilter. Used to create internal offscreen buffers
@@
-136,22
+139,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:
protected:
-
Image mInputImag
e;
- FrameBuffer
Image mOutputImage
;
+
Texture mInputTextur
e;
+ FrameBuffer
mOutputFrameBuffer
;
FilterKernel mKernel;
Actor mRootActor;
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
@@
-160,5
+165,5
@@
protected:
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_IMAGE_FILTER_H__
+#endif //
DALI_TOOLKIT_INTERNAL_IMAGE_FILTER_H