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 "Adding support for multiple images in AnimatedImageVisual" into devel/master
[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
3488c2c
..
0c782c9
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
@@
-2,7
+2,7
@@
#define __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
7
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.
@@
-21,7
+21,8
@@
// 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>
-#include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-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
{
@@
-53,6
+54,12
@@
public:
void SetImage(Image inputImage);
/**
void SetImage(Image inputImage);
/**
+ * Get the image for blurring.
+ * @return The image for blurring.
+ */
+ Image GetImage();
+
+ /**
* @copydoc Dali::Toolkit::SuperBlurView::GetBlurStrengthPropertyIndex
*/
Property::Index GetBlurStrengthPropertyIndex() const;
* @copydoc Dali::Toolkit::SuperBlurView::GetBlurStrengthPropertyIndex
*/
Property::Index GetBlurStrengthPropertyIndex() const;
@@
-119,6
+126,16
@@
private: // from Control
*/
virtual void OnSizeSet(const Vector3& targetSize);
*/
virtual void OnSizeSet(const Vector3& targetSize);
+ /**
+ * @copydoc CustomActorImpl::OnStageConnection()
+ */
+ virtual void OnStageConnection( int depth );
+
+ /**
+ * @copydoc CustomActorImpl::GetNaturalSize()
+ */
+ virtual Vector3 GetNaturalSize();
+
private:
/**
private:
/**
@@
-139,19
+156,24
@@
private:
*/
void ClearBlurResource();
*/
void ClearBlurResource();
-private:
-
- unsigned int mBlurLevels;
-
-
Property::Index mBlurStrengthPropertyIndex
;
+ /**
+ * 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;
std::vector<FrameBufferImage> mBlurredImage;
std::vector<Toolkit::GaussianBlurView> mGaussianBlurView;
std::vector<FrameBufferImage> mBlurredImage;
- std::vector<ImageActor> mImageActors;
- bool mResourcesCleared;
-
+ std::vector<Toolkit::Visual::Base> mVisuals;
+ Image mInputImage;
Vector2 mTargetSize;
Vector2 mTargetSize;
+
Toolkit::SuperBlurView::SuperBlurViewSignal mBlurFinishedSignal; ///< Signal emitted when blur has completed.
Toolkit::SuperBlurView::SuperBlurViewSignal mBlurFinishedSignal; ///< Signal emitted when blur has completed.
+
+ Property::Index mBlurStrengthPropertyIndex;
+ unsigned int mBlurLevels;
+ bool mResourcesCleared;
};
}
};
}