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
Fix compile error. Non initialized variable.
[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
ebbe453
..
117d34a
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
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.
@@
-18,10
+18,15
@@
*
*/
*
*/
+// 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>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/super-blur-view/super-blur-view.h>
-#include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
+#include <dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h>
+#include <dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
namespace Dali
{
namespace Dali
{
@@
-50,7
+55,7
@@
public:
/**
* @copydoc Dali::Toolkit::SuperBlurView::SetImage
*/
/**
* @copydoc Dali::Toolkit::SuperBlurView::SetImage
*/
- void Set
Image(Image inputImage
);
+ void Set
Texture( Texture texture
);
/**
* @copydoc Dali::Toolkit::SuperBlurView::GetBlurStrengthPropertyIndex
/**
* @copydoc Dali::Toolkit::SuperBlurView::GetBlurStrengthPropertyIndex
@@
-73,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
@@
-115,23
+120,33
@@
private: // from Control
virtual void OnInitialize();
/**
virtual void OnInitialize();
/**
- * @copydoc
Toolkit::Control::OnControlSizeSet
+ * @copydoc
CustomActorImpl::OnSizeSet()
*/
*/
- virtual void On
Control
SizeSet(const Vector3& targetSize);
+ virtual void OnSizeSet(const Vector3& targetSize);
/**
/**
- * @copydoc C
ontrol::OnRelayout
()
+ * @copydoc C
ustomActorImpl::OnSceneConnection
()
*/
*/
- virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
+ virtual void OnSceneConnection( int depth );
+
+ /**
+ * @copydoc CustomActorImpl::OnSceneDisconnection()
+ */
+ virtual void OnSceneDisconnection();
+
+ /**
+ * @copydoc CustomActorImpl::GetNaturalSize()
+ */
+ virtual Vector3 GetNaturalSize();
private:
/**
* Carry out the idx-th pass of blurring
* @param[in] idx The blur pass index
private:
/**
* 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
@@
-145,18
+160,18
@@
private:
void ClearBlurResource();
private:
void ClearBlurResource();
private:
+ std::vector<Toolkit::GaussianBlurView> mGaussianBlurView;
+ std::vector<FrameBuffer> mBlurredImage;
+ std::vector<Renderer> mRenderers;
+ Texture mInputTexture;
+ Vector2 mTargetSize;
- unsigned int mBlurLevels;
+ Toolkit::SuperBlurView::SuperBlurViewSignal mBlurFinishedSignal; ///< Signal emitted when blur has completed.
+ std::string mUrl;
Property::Index mBlurStrengthPropertyIndex;
Property::Index mBlurStrengthPropertyIndex;
-
- std::vector<Toolkit::GaussianBlurView> mGaussianBlurView;
- std::vector<FrameBufferImage> mBlurredImage;
- std::vector<ImageActor> mImageActors;
+ unsigned int mBlurLevels;
bool mResourcesCleared;
bool mResourcesCleared;
-
- Vector2 mTargetSize;
- Toolkit::SuperBlurView::SuperBlurViewSignal mBlurFinishedSignal; ///< Signal emitted when blur has completed.
};
}
};
}
@@
-180,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