X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fmagnifier%2Fmagnifier-impl.cpp;h=fc6f71a4ae32c3880dcdfb6c7617c37f2c567069;hp=bb5790297c8f038531c185fa9b813c1c652f4e42;hb=cd7d41bc8e0a0816da28401207091344fbbe0b2c;hpb=9a450f332b63de22521e3e2a70c3378e574ad77f diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp index bb57902..fc6f71a 100644 --- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp +++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp @@ -1,21 +1,30 @@ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +// CLASS HEADER #include +// EXTERNAL INCLUDES +#include +#include +#include +#include +#include + using namespace Dali; namespace // unnamed namespace @@ -25,27 +34,6 @@ const char* DEFAULT_FRAME_IMAGE_PATH = DALI_IMAGE_DIR "magnifier-image-frame.png const float IMAGE_BORDER_INDENT = 14.0f; ///< Indent of border in pixels. -/** - * ImageBorderSizeConstraint - */ -struct ImageBorderSizeConstraint -{ - ImageBorderSizeConstraint() - : mSizeOffset(Vector3(IMAGE_BORDER_INDENT - 1, IMAGE_BORDER_INDENT - 1, 0.0f) * 2.0f) - { - } - - Vector3 operator()(const Vector3& current, - const PropertyInput& referenceSizeProperty) - { - const Vector3& referenceSize = referenceSizeProperty.GetVector3(); - - return referenceSize + mSizeOffset; - } - - Vector3 mSizeOffset; ///< The amount to offset the size from referenceSize -}; - struct CameraActorPositionConstraint { CameraActorPositionConstraint(const Vector2& stageSize, float defaultCameraDistance = 0.0f) @@ -54,14 +42,13 @@ struct CameraActorPositionConstraint { } - Vector3 operator()(const Vector3& current, - const PropertyInput& sourcePositionProperty) + void operator()( Vector3& current, const PropertyInputContainer& inputs ) { - const Vector3& sourcePosition = sourcePositionProperty.GetVector3(); + const Vector3& sourcePosition = inputs[0]->GetVector3(); - return Vector3( sourcePosition.x + mStageSize.x * 0.5f, - sourcePosition.y + mStageSize.y * 0.5f, - sourcePosition.z + mDefaultCameraDistance); + current.x = sourcePosition.x + mStageSize.x * 0.5f; + current.y = sourcePosition.y + mStageSize.y * 0.5f; + current.z = sourcePosition.z + mDefaultCameraDistance; } Vector2 mStageSize; @@ -76,25 +63,18 @@ struct RenderTaskViewportPositionConstraint { } - Vector2 operator()(const Vector2& current, - const PropertyInput& positionProperty, - const PropertyInput& magnifierSizeProperty, - const PropertyInput& magnifierScaleProperty) + void operator()( Vector2& current, const PropertyInputContainer& inputs ) { - Vector2 position(positionProperty.GetVector3()); // World position? - - //position -= mStageSize * 0.5f; + current = inputs[0]->GetVector3(); // World position? // should be updated when: // Magnifier's world position/size/scale/parentorigin/anchorpoint changes. // or Magnifier camera's world position changes. - Vector3 size = magnifierSizeProperty.GetVector3() * magnifierScaleProperty.GetVector3(); + Vector3 size = inputs[1]->GetVector3() * inputs[2]->GetVector3(); /* magnifier-size * magnifier-scale */ // Reposition, and resize viewport to reflect the world bounds of this Magnifier actor. - position.x += (mStageSize.width - size.width) * 0.5f; - position.y += (mStageSize.height - size.height) * 0.5f; - - return position; + current.x += ( mStageSize.width - size.width ) * 0.5f; + current.y += ( mStageSize.height - size.height ) * 0.5f; } Vector2 mStageSize; @@ -106,30 +86,12 @@ struct RenderTaskViewportSizeConstraint { } - Vector2 operator()(const Vector2& current, - const PropertyInput& magnifierSizeProperty, - const PropertyInput& magnifierScaleProperty) + void operator()( Vector2& current, const PropertyInputContainer& inputs ) { - return Vector2(magnifierSizeProperty.GetVector3() * magnifierScaleProperty.GetVector3()); + current = inputs[0]->GetVector3() * inputs[1]->GetVector3(); /* magnifier-size * magnifier-scale */ } }; -/** - * Returns relative border (0.0f...1.0f x 0.0f...1.0f) - * from an absolute pixel specified border. - * @param[in] absolute A border using absolute pixel coordinates - * @param[in] width The width of the texture - * @param[in] height The height of the texture. - * @return A border relative to the size of the Image texture dimensions. - */ -Vector4 GetRelativeBorder(Vector4 absolute, float width, float height) -{ - return Vector4( absolute.x / width, - absolute.y / height, - absolute.z / width, - absolute.w / height); -} - } namespace Dali @@ -161,8 +123,9 @@ Dali::Toolkit::Magnifier Magnifier::New() } Magnifier::Magnifier() -: ControlImpl(true), +: Control( REQUIRES_TOUCH_EVENTS ), mPropertySourcePosition(Property::INVALID_INDEX), + mDefaultCameraDistance(1000.f), mActorSize(Vector3::ZERO), mMagnificationFactor(1.0f) { @@ -184,10 +147,6 @@ void Magnifier::Initialize() mPropertySourcePosition = self.RegisterProperty( Toolkit::Magnifier::SOURCE_POSITION_PROPERTY_NAME, Vector3::ZERO ); Vector2 stageSize(Stage::GetCurrent().GetSize()); - Layer dummyLayer = Layer::New(); - Stage().GetCurrent().Add(dummyLayer); - dummyLayer.SetParentOrigin(ParentOrigin::CENTER); - // NOTE: // sourceActor is a dummy delegate actor that takes the source property position, // and generates a WORLD_POSITION, which is 1 frame behind the source property. @@ -199,12 +158,11 @@ void Magnifier::Initialize() // Perhaps this is a bug in the way the constraint system factors into what is dirty // and what is not. mSourceActor = Actor::New(); - dummyLayer.Add(mSourceActor); + Stage().GetCurrent().Add(mSourceActor); mSourceActor.SetParentOrigin(ParentOrigin::CENTER); - Constraint constraint = Constraint::New( Actor::POSITION, - Source( self, mPropertySourcePosition ), - EqualToConstraint() ); - mSourceActor.ApplyConstraint(constraint); + Constraint constraint = Constraint::New( mSourceActor, Actor::Property::POSITION, EqualToConstraint() ); + constraint.AddSource( Source( self, mPropertySourcePosition ) ); + constraint.Apply(); // create the render task this will render content on top of everything // based on camera source position. @@ -233,25 +191,22 @@ void Magnifier::Initialize() // at the end of the update cycle i.e. after constraints have been applied.) //Property::Index propertySourcePositionDelayed = mCameraActor.RegisterProperty("delayed-source-position", Vector3::ZERO); - constraint = Constraint::New( Actor::POSITION, - Source( mSourceActor, Actor::WORLD_POSITION ), - CameraActorPositionConstraint(stageSize, mDefaultCameraDistance) ); - mCameraActor.ApplyConstraint(constraint); + constraint = Constraint::New( mCameraActor, Actor::Property::POSITION, CameraActorPositionConstraint(stageSize, mDefaultCameraDistance) ); + constraint.AddSource( Source( mSourceActor, Actor::Property::WORLD_POSITION ) ); + constraint.Apply(); // Apply constraint to render-task viewport position - constraint = Constraint::New( RenderTask::VIEWPORT_POSITION, - Source( self, Actor::WORLD_POSITION ),//mPropertySourcePosition ), - Source( self, Actor::SIZE ), - Source( self, Actor::WORLD_SCALE), - RenderTaskViewportPositionConstraint(stageSize) ); - mTask.ApplyConstraint(constraint); + constraint = Constraint::New( mTask, RenderTask::Property::VIEWPORT_POSITION, RenderTaskViewportPositionConstraint(stageSize) ); + constraint.AddSource( Source( self, Actor::Property::WORLD_POSITION ) ); + constraint.AddSource( Source( self, Actor::Property::SIZE ) ); + constraint.AddSource( Source( self, Actor::Property::WORLD_SCALE ) ); + constraint.Apply(); // Apply constraint to render-task viewport position - constraint = Constraint::New( RenderTask::VIEWPORT_SIZE, - Source( self, Actor::SIZE ), - Source( self, Actor::WORLD_SCALE), - RenderTaskViewportSizeConstraint() ); - mTask.ApplyConstraint(constraint); + constraint = Constraint::New( mTask, RenderTask::Property::VIEWPORT_SIZE, RenderTaskViewportSizeConstraint() ); + constraint.AddSource( Source( self, Actor::Property::SIZE ) ); + constraint.AddSource( Source( self, Actor::Property::WORLD_SCALE ) ); + constraint.Apply(); } Magnifier::~Magnifier() @@ -272,7 +227,6 @@ void Magnifier::InitializeRenderTask() mCameraActor = CameraActor::New(); mCameraActor.SetType(Camera::FREE_LOOK); - mCameraActor.SetRotation(Quaternion(M_PI, Vector3::YAXIS)); // Look at stage stage.Add(mCameraActor); mTask.SetCameraActor( mCameraActor ); @@ -282,56 +236,47 @@ void Magnifier::InitializeRenderTask() bool Magnifier::GetFrameVisibility() const { - return mFrameLayer; + return mFrame; } void Magnifier::SetFrameVisibility(bool visible) { - if(visible && !mFrameLayer) + if(visible && !mFrame) { Actor self(Self()); - Layer mFrameLayer = Layer::New(); - mFrameLayer.SetParentOrigin( ParentOrigin::CENTER ); - Stage::GetCurrent().Add(mFrameLayer); - - Image image = Image::New( DEFAULT_FRAME_IMAGE_PATH ); - ImageActor frame = ImageActor::New( image ); - frame.SetDrawMode(DrawMode::OVERLAY); - frame.SetStyle( ImageActor::STYLE_NINE_PATCH ); - - frame.SetNinePatchBorder( Vector4::ONE * IMAGE_BORDER_INDENT ); - mFrameLayer.Add(frame); - - // Apply position constraint to the frame - Constraint constraint = Constraint::New( Actor::POSITION, - Source( self, Actor::WORLD_POSITION ), - EqualToConstraint() ); - frame.ApplyConstraint(constraint); - - // Apply scale constraint to the frame - constraint = Constraint::New( Actor::SCALE, - Source( self, Actor::SCALE ), - EqualToConstraint() ); - frame.ApplyConstraint(constraint); - - Source(self, Actor::SCALE), - - // Apply size constraint to the the frame - constraint = Constraint::New(Actor::SIZE, - Source(self, Actor::SIZE), - ImageBorderSizeConstraint()); - frame.ApplyConstraint(constraint); + Image image = ResourceImage::New( DEFAULT_FRAME_IMAGE_PATH ); + mFrame = ImageActor::New( image ); + mFrame.SetRelayoutEnabled( false ); + mFrame.SetDrawMode(DrawMode::OVERLAY); + mFrame.SetStyle( ImageActor::STYLE_NINE_PATCH ); + mFrame.SetPositionInheritanceMode(DONT_INHERIT_POSITION); + mFrame.SetInheritScale(true); + + Constraint constraint = Constraint::New( mFrame, Actor::Property::POSITION, EqualToConstraint() ); + constraint.AddSource( ParentSource( Actor::Property::WORLD_POSITION ) ); + constraint.Apply(); + + mFrame.SetNinePatchBorder( Vector4::ONE * IMAGE_BORDER_INDENT ); + self.Add(mFrame); + + Vector3 sizeOffset(IMAGE_BORDER_INDENT*2.f - 2.f, IMAGE_BORDER_INDENT*2.f - 2.f, 0.0f); + mFrame.SetSize(mActorSize + sizeOffset); } - else if(!visible && mFrameLayer) + else if(!visible && mFrame) { - Stage::GetCurrent().Remove(mFrameLayer); - mFrameLayer.Reset(); + UnparentAndReset(mFrame); } } void Magnifier::OnControlSizeSet(const Vector3& targetSize) { + if( mFrame ) + { + Vector3 sizeOffset(IMAGE_BORDER_INDENT*2.f - 2.f, IMAGE_BORDER_INDENT*2.f - 2.f, 0.0f); + mFrame.SetSize(targetSize + sizeOffset); + } + // TODO: Once Camera/CameraActor properties function as proper animatable properties // this code can disappear. // whenever the size of the magnifier changes, the field of view needs to change