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=b69313c1bac6641cd2b609a55edb0bda2a271b19;hp=2bfd96ae7f8626a76969976530a833443c9f0e80;hb=99e2ea03e6d6059f5803d700932df1ff1c848cd3;hpb=306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682 diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp index 2bfd96a..b69313c 100644 --- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp +++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp @@ -19,39 +19,47 @@ #include // EXTERNAL INCLUDES +#include #include #include #include +#include +#include +#include +#include -using namespace Dali; +// INTERNAL INCLUDES +#include +#include -namespace // unnamed namespace +namespace Dali { -const char* DEFAULT_FRAME_IMAGE_PATH = DALI_IMAGE_DIR "magnifier-image-frame.png"; +namespace Toolkit +{ -const float IMAGE_BORDER_INDENT = 14.0f; ///< Indent of border in pixels. +namespace Internal +{ -/** - * ImageBorderSizeConstraint - */ -struct ImageBorderSizeConstraint +namespace // unnamed namespace { - 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; - } +Dali::BaseHandle Create() +{ + return Toolkit::Magnifier::New(); +} - Vector3 mSizeOffset; ///< The amount to offset the size from referenceSize -}; +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Magnifier, Toolkit::Control, Create ) + +DALI_PROPERTY_REGISTRATION( Toolkit, Magnifier, "frameVisibility", BOOLEAN, FRAME_VISIBILITY ) +DALI_PROPERTY_REGISTRATION( Toolkit, Magnifier, "magnificationFactor", FLOAT, MAGNIFICATION_FACTOR ) + +DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Magnifier, "sourcePosition", VECTOR3, SOURCE_POSITION ) + +DALI_TYPE_REGISTRATION_END() + +const float IMAGE_BORDER_INDENT = 5.0f; ///< Indent of border in pixels. struct CameraActorPositionConstraint { @@ -61,14 +69,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; @@ -83,25 +90,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; @@ -113,24 +113,13 @@ 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 */ } }; -} - -namespace Dali -{ - -namespace Toolkit -{ - -namespace Internal -{ +} // unnamed namespace /////////////////////////////////////////////////////////////////////////////////////////////////// // Magnifier @@ -152,8 +141,7 @@ Dali::Toolkit::Magnifier Magnifier::New() } Magnifier::Magnifier() -: Control( REQUIRES_TOUCH_EVENTS ), - mPropertySourcePosition(Property::INVALID_INDEX), +: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), mDefaultCameraDistance(1000.f), mActorSize(Vector3::ZERO), mMagnificationFactor(1.0f) @@ -165,15 +153,9 @@ void Magnifier::SetSourceActor(Actor actor) mTask.SetSourceActor( actor ); } -void Magnifier::SetSourcePosition(const Vector3& position) -{ - Self().SetProperty(mPropertySourcePosition, position); -} - void Magnifier::Initialize() { Actor self = Self(); - mPropertySourcePosition = self.RegisterProperty( Toolkit::Magnifier::SOURCE_POSITION_PROPERTY_NAME, Vector3::ZERO ); Vector2 stageSize(Stage::GetCurrent().GetSize()); // NOTE: @@ -189,10 +171,9 @@ void Magnifier::Initialize() mSourceActor = Actor::New(); 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, Toolkit::Magnifier::Property::SOURCE_POSITION ) ); + constraint.Apply(); // create the render task this will render content on top of everything // based on camera source position. @@ -219,27 +200,24 @@ void Magnifier::Initialize() // Use a 1 frame delayed source position to determine the camera actor's position. // This is necessary as the viewport is determined by the Magnifier's Actor's World position (which is computed // at the end of the update cycle i.e. after constraints have been applied.) - //Property::Index propertySourcePositionDelayed = mCameraActor.RegisterProperty("delayed-source-position", Vector3::ZERO); + //Property::Index propertySourcePositionDelayed = mCameraActor.RegisterProperty("delayedSourcePosition", 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() @@ -260,7 +238,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 ); @@ -279,23 +256,27 @@ void Magnifier::SetFrameVisibility(bool visible) { Actor self(Self()); - Image image = Image::New( DEFAULT_FRAME_IMAGE_PATH ); - mFrame = ImageActor::New( image ); - mFrame.SetDrawMode(DrawMode::OVERLAY); - mFrame.SetStyle( ImageActor::STYLE_NINE_PATCH ); - mFrame.SetPositionInheritanceMode(DONT_INHERIT_POSITION); + mFrame = Actor::New( ); + mFrame.SetInheritPosition(false); mFrame.SetInheritScale(true); + mFrame.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS ); + Vector3 sizeOffset(IMAGE_BORDER_INDENT*2.f - 2.f, IMAGE_BORDER_INDENT*2.f - 2.f, 0.0f); + mFrame.SetSizeModeFactor( sizeOffset ); - Constraint constraint = Constraint::New( Actor::POSITION, - ParentSource(Actor::WORLD_POSITION), - EqualToConstraint()); - mFrame.ApplyConstraint( constraint ); + Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get(); - mFrame.SetNinePatchBorder( Vector4::ONE * IMAGE_BORDER_INDENT ); - self.Add(mFrame); + Property::Map map; + map[ RENDERER_TYPE ] = BORDER_RENDERER; + map[ "borderColor" ] = Color::WHITE; + map[ "borderSize" ] = IMAGE_BORDER_INDENT; + Toolkit::Visual::Base borderVisual = visualFactory.CreateVisual( map ); + borderVisual.SetOnStage( mFrame ); - Vector3 sizeOffset(IMAGE_BORDER_INDENT*2.f - 2.f, IMAGE_BORDER_INDENT*2.f - 2.f, 0.0f); - mFrame.SetSize(mActorSize + sizeOffset); + Constraint constraint = Constraint::New( mFrame, Actor::Property::POSITION, EqualToConstraint() ); + constraint.AddSource( ParentSource( Actor::Property::WORLD_POSITION ) ); + constraint.Apply(); + + self.Add(mFrame); } else if(!visible && mFrame) { @@ -303,13 +284,9 @@ void Magnifier::SetFrameVisibility(bool visible) } } -void Magnifier::OnControlSizeSet(const Vector3& targetSize) +void Magnifier::OnSizeSet(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); - } + Control::OnSizeSet( targetSize ); // TODO: Once Camera/CameraActor properties function as proper animatable properties // this code can disappear. @@ -358,6 +335,56 @@ void Magnifier::Update() mCameraActor.SetAspectRatio( worldSize.width / worldSize.height ); } +void Magnifier::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ) +{ + Toolkit::Magnifier magnifier = Toolkit::Magnifier::DownCast( Dali::BaseHandle( object ) ); + + if( magnifier ) + { + Magnifier& magnifierImpl( GetImpl( magnifier ) ); + switch( index ) + { + case Toolkit::Magnifier::Property::FRAME_VISIBILITY: + { + magnifierImpl.SetFrameVisibility( value.Get< bool >() ); + break; + } + case Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR: + { + magnifierImpl.SetMagnificationFactor( value.Get< float >() ); + break; + } + } + } +} + +Property::Value Magnifier::GetProperty( BaseObject* object, Property::Index index ) +{ + Property::Value value; + + Toolkit::Magnifier magnifier = Toolkit::Magnifier::DownCast( Dali::BaseHandle( object ) ); + + if( magnifier ) + { + Magnifier& magnifierImpl( GetImpl( magnifier ) ); + switch( index ) + { + case Toolkit::Magnifier::Property::FRAME_VISIBILITY: + { + value = magnifierImpl.GetFrameVisibility(); + break; + } + case Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR: + { + value = magnifierImpl.GetMagnificationFactor(); + break; + } + } + } + + return value; +} + } // namespace Internal } // namespace Toolkit