X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fshadow-view%2Fshadow-view-impl.cpp;h=5ce5e224f3d63c1b7d71c271afe1d09fd8051582;hp=9bc67c726f5e1dafa9350c180411ff8ef543a6b4;hb=826a077bb3183b5d317bfb22e14ab4e217d26f40;hpb=b458e407eba11c73f38da68bce8e967a30ea03e2 diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp index 9bc67c7..5ce5e22 100644 --- a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp +++ b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp @@ -182,9 +182,9 @@ void ShadowView::SetShadowPlane(Actor shadowPlane) ConstrainCamera(); - mShadowPlane.SetSizeMode( SIZE_EQUAL_TO_PARENT ); + mShadowPlane.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - mBlurRootActor.SetSizeMode( SIZE_EQUAL_TO_PARENT ); + mBlurRootActor.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); } void ShadowView::SetPointLight(Actor pointLight) @@ -239,7 +239,8 @@ void ShadowView::OnInitialize() { // root actor to parent all user added actors. Used as source actor for shadow render task. mChildrenRoot.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION ); - mChildrenRoot.SetSizeMode( SIZE_EQUAL_TO_PARENT ); + mChildrenRoot.SetRelayoutEnabled( true ); + mChildrenRoot.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); Vector2 stageSize = Stage::GetCurrent().GetSize(); mCameraActor = CameraActor::New(stageSize); @@ -249,7 +250,7 @@ void ShadowView::OnInitialize() // Target is constrained to point at the shadow plane origin mCameraActor.SetNearClippingPlane( 1.0f ); mCameraActor.SetType( Dali::Camera::FREE_LOOK ); // Camera orientation constrained to point at shadow plane world position - mCameraActor.SetRotation(Radian(Degree(180)), Vector3::YAXIS); + mCameraActor.SetOrientation(Radian(Degree(180)), Vector3::YAXIS); mCameraActor.SetPosition(DEFAULT_LIGHT_POSITION); mShadowRenderShader = ShaderEffect::New( RENDER_SHADOW_VERTEX_SOURCE, RENDER_SHADOW_FRAGMENT_SOURCE, @@ -275,9 +276,10 @@ void ShadowView::OnInitialize() mBlurRootActor = Actor::New(); + mBlurRootActor.SetRelayoutEnabled( true ); // Turn off inheritance to ensure filter renders properly mBlurRootActor.SetPositionInheritanceMode(USE_PARENT_POSITION); - mBlurRootActor.SetInheritRotation(false); + mBlurRootActor.SetInheritOrientation(false); mBlurRootActor.SetInheritScale(false); mBlurRootActor.SetColorMode(USE_OWN_COLOR); @@ -315,10 +317,10 @@ void ShadowView::ConstrainCamera() // is under control of application, can't use transform inheritance) Constraint cameraOrientationConstraint = - Constraint::New ( Actor::Property::ROTATION, + Constraint::New ( Actor::Property::ORIENTATION, Source( mShadowPlane, Actor::Property::WORLD_POSITION ), Source( mPointLight, Actor::Property::WORLD_POSITION ), - Source( mShadowPlane, Actor::Property::WORLD_ROTATION ), + Source( mShadowPlane, Actor::Property::WORLD_ORIENTATION ), &LookAt ); mCameraActor.ApplyConstraint( cameraOrientationConstraint );