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
Further Setter/Getter public API removal from Dali::Actor
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
super-blur-view
/
super-blur-view-impl.h
diff --git
a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
index
0c782c9
..
585703a
100644
(file)
--- a/
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
+++ b/
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H__
-#define
__DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H
+#define
DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H
/*
/*
- * Copyright (c) 201
7
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.
@@
-18,6
+18,10
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
+#include <dali/public-api/rendering/frame-buffer.h>
+#include <dali/public-api/rendering/renderer.h>
+
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h>
@@
-51,13
+55,7
@@
public:
/**
* @copydoc Dali::Toolkit::SuperBlurView::SetImage
*/
/**
* @copydoc Dali::Toolkit::SuperBlurView::SetImage
*/
- void SetImage(Image inputImage);
-
- /**
- * Get the image for blurring.
- * @return The image for blurring.
- */
- Image GetImage();
+ void SetTexture( Texture texture );
/**
* @copydoc Dali::Toolkit::SuperBlurView::GetBlurStrengthPropertyIndex
/**
* @copydoc Dali::Toolkit::SuperBlurView::GetBlurStrengthPropertyIndex
@@
-80,9
+78,9
@@
public:
Dali::Toolkit::SuperBlurView::SuperBlurViewSignal& BlurFinishedSignal();
/**
Dali::Toolkit::SuperBlurView::SuperBlurViewSignal& BlurFinishedSignal();
/**
- * @copydoc Dali::Toolkit::SuperBlurView::GetBlurred
Imag
e
+ * @copydoc Dali::Toolkit::SuperBlurView::GetBlurred
Textur
e
*/
*/
-
Image GetBlurredImag
e( unsigned int level );
+
Texture GetBlurredTextur
e( unsigned int level );
// Properties
// Properties
@@
-132,6
+130,11
@@
private: // from Control
virtual void OnStageConnection( int depth );
/**
virtual void OnStageConnection( int depth );
/**
+ * @copydoc CustomActorImpl::OnStageDisconnection()
+ */
+ virtual void OnStageDisconnection();
+
+ /**
* @copydoc CustomActorImpl::GetNaturalSize()
*/
virtual Vector3 GetNaturalSize();
* @copydoc CustomActorImpl::GetNaturalSize()
*/
virtual Vector3 GetNaturalSize();
@@
-141,9
+144,9
@@
private:
/**
* Carry out the idx-th pass of blurring
* @param[in] idx The blur pass index
/**
* Carry out the idx-th pass of blurring
* @param[in] idx The blur pass index
- * @param[in]
image The input image for the current blurring, it is either the original image or the blurred imag
e from the previous pass
+ * @param[in]
texture The input texture for the current blurring, it is either the original image or the blurred textur
e from the previous pass
*/
*/
- void Blur
Image( unsigned int idx, Image imag
e );
+ void Blur
Texture( unsigned int idx, Texture textur
e );
/**
* Signal handler to tell when the last blur view completes
/**
* Signal handler to tell when the last blur view completes
@@
-156,21
+159,16
@@
private:
*/
void ClearBlurResource();
*/
void ClearBlurResource();
- /**
- * Sets shader effect on the control renderer
- * @param[in,out] Sets custom shader effect on the given visual
- */
- void SetShaderEffect( Toolkit::Visual::Base& visual );
-
private:
std::vector<Toolkit::GaussianBlurView> mGaussianBlurView;
private:
std::vector<Toolkit::GaussianBlurView> mGaussianBlurView;
- std::vector<FrameBuffer
Image>
mBlurredImage;
- std::vector<
Toolkit::Visual::Base> mVisual
s;
-
Image mInputImag
e;
+ std::vector<FrameBuffer
>
mBlurredImage;
+ std::vector<
Renderer> mRenderer
s;
+
Texture mInputTextur
e;
Vector2 mTargetSize;
Toolkit::SuperBlurView::SuperBlurViewSignal mBlurFinishedSignal; ///< Signal emitted when blur has completed.
Vector2 mTargetSize;
Toolkit::SuperBlurView::SuperBlurViewSignal mBlurFinishedSignal; ///< Signal emitted when blur has completed.
+ std::string mUrl;
Property::Index mBlurStrengthPropertyIndex;
unsigned int mBlurLevels;
bool mResourcesCleared;
Property::Index mBlurStrengthPropertyIndex;
unsigned int mBlurLevels;
bool mResourcesCleared;
@@
-197,4
+195,4
@@
inline const Toolkit::Internal::SuperBlurView& GetImpl( const Toolkit::SuperBlur
}
}
-#endif /
* __DALI_TOOLKIT_INTERNALSUPER_BLUR_VIEW_H__ */
+#endif /
/ DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H