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 "Recreate resources after blur is deactivated." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
shadow-view
/
shadow-view-impl.h
diff --git
a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
index
68e1c33
..
1cc97ca
100644
(file)
--- a/
dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
+++ b/
dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_SHADOW_VIEW_H__
-#define
__DALI_TOOLKIT_INTERNAL_SHADOW_VIEW_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_SHADOW_VIEW_H
+#define
DALI_TOOLKIT_INTERNAL_SHADOW_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.
@@
-24,7
+24,6
@@
#include <dali/public-api/actors/camera-actor.h>
#include <dali/public-api/animation/constraints.h>
#include <dali/public-api/render-tasks/render-task.h>
#include <dali/public-api/actors/camera-actor.h>
#include <dali/public-api/animation/constraints.h>
#include <dali/public-api/render-tasks/render-task.h>
-#include <dali/public-api/shader-effects/shader-effect.h>
#include <dali/public-api/object/property-map.h>
// INTERNAL INCLUDES
#include <dali/public-api/object/property-map.h>
// INTERNAL INCLUDES
@@
-72,16
+71,6
@@
public:
static Dali::Toolkit::ShadowView New(float downsampleWidthScale, float downsampleHeightScale);
/**
static Dali::Toolkit::ShadowView New(float downsampleWidthScale, float downsampleHeightScale);
/**
- * @copydoc Dali::Toolkit::ShadowView::Add(Actor child)
- */
- void Add(Actor child);
-
- /**
- * @copydoc Dali::Toolkit::ShadowView::Remove(Actor child)
- */
- void Remove(Actor child);
-
- /**
* @copydoc Dali::Toolkit::ShadowView::SetShadowPlaneBackground(Actor shadowPlaneBackground)
*/
void SetShadowPlaneBackground(Actor shadowPlaneBackground);
* @copydoc Dali::Toolkit::ShadowView::SetShadowPlaneBackground(Actor shadowPlaneBackground)
*/
void SetShadowPlaneBackground(Actor shadowPlaneBackground);
@@
-126,7
+115,16
@@
public:
private:
virtual void OnInitialize();
private:
virtual void OnInitialize();
- virtual void OnSizeSet(const Vector3& targetSize);
+
+ /**
+ * @copydoc Control::OnChildAdd()
+ */
+ virtual void OnChildAdd( Actor& child );
+
+ /**
+ * @copydoc Control::OnChildRemove()
+ */
+ virtual void OnChildRemove( Actor& child );
/**
* Constrain the camera actor to the position of the point light, pointing
/**
* Constrain the camera actor to the position of the point light, pointing
@@
-139,14
+137,14
@@
private:
void CreateBlurFilter();
private:
void CreateBlurFilter();
private:
-
Toolkit::ImageView
mShadowPlane; // Shadow renders into this actor
+
Actor
mShadowPlane; // Shadow renders into this actor
Actor mShadowPlaneBg; // mShadowPlane renders directly in front of this actor
Actor mPointLight; // Shadow is cast from this point light
/////////////////////////////////////////////////////////////
Actor mShadowPlaneBg; // mShadowPlane renders directly in front of this actor
Actor mPointLight; // Shadow is cast from this point light
/////////////////////////////////////////////////////////////
- FrameBuffer
Image
mSceneFromLightRenderTarget; // for rendering normal scene seen from light to texture instead of the screen
+ FrameBuffer mSceneFromLightRenderTarget; // for rendering normal scene seen from light to texture instead of the screen
- FrameBuffer
Image mOutputImage
;
+ FrameBuffer
mOutputFrameBuffer
;
Actor mChildrenRoot; // Subtree for all user added child actors that should be rendered normally
Actor mBlurRootActor; // Root actor for blur filter processing
Actor mChildrenRoot; // Subtree for all user added child actors that should be rendered normally
Actor mBlurRootActor; // Root actor for blur filter processing
@@
-154,7
+152,7
@@
private:
CameraActor mCameraActor; // Constrained to same position as mPointLight and pointing at mShadowPlane
CameraActor mCameraActor; // Constrained to same position as mPointLight and pointing at mShadowPlane
- Property::Map mShadow
RenderShader
;
+ Property::Map mShadow
VisualMap
;
BlurTwoPassFilter mBlurFilter;
Vector4 mCachedShadowColor; ///< Cached Shadow color.
BlurTwoPassFilter mBlurFilter;
Vector4 mCachedShadowColor; ///< Cached Shadow color.
@@
-199,4
+197,4
@@
inline const Toolkit::Internal::ShadowView& GetImpl( const Toolkit::ShadowView&
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_SHADOW_VIEW_H__
+#endif //
DALI_TOOLKIT_INTERNAL_SHADOW_VIEW_H