X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fevents%2Fgesture-event-processor.cpp;h=118c783f64397a96ac1cb9170de5117079e5c32e;hb=7d85b865d2daf8d235eaea3d3b4716eb5105a2be;hp=a6ad63af369cd9580d1b4b759afef11a3df93f6b;hpb=43799975e2a72746ed9cb47e1f528de55c080863;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/events/gesture-event-processor.cpp b/dali/internal/event/events/gesture-event-processor.cpp index a6ad63a..118c783 100644 --- a/dali/internal/event/events/gesture-event-processor.cpp +++ b/dali/internal/event/events/gesture-event-processor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -18,97 +18,81 @@ // CLASS HEADER #include +#if defined(DEBUG_ENABLED) +#include +#endif + // INTERNAL INCLUDES -#include -#include -#include -#include -#include -#include +#include #include #include -#include +#include +#include #include -#include namespace Dali { - namespace Internal { - -GestureEventProcessor::GestureEventProcessor( Stage& stage, SceneGraph::UpdateManager& updateManager, Integration::GestureManager& gestureManager, Integration::RenderController& renderController ) -: mStage( stage ), - mGestureManager( gestureManager ), - mLongPressGestureProcessor( stage, gestureManager ), - mPanGestureProcessor( stage, gestureManager, updateManager ), - mPinchGestureProcessor( stage, gestureManager ), - mTapGestureProcessor( stage, gestureManager ), - mRenderController( renderController ), - mUpdateRequired( false ) +GestureEventProcessor::GestureEventProcessor(SceneGraph::UpdateManager& updateManager, Integration::RenderController& renderController) +: mLongPressGestureProcessor(), + mPanGestureProcessor(updateManager), + mPinchGestureProcessor(), + mTapGestureProcessor(), + mRotationGestureProcessor(), + mRenderController(renderController), + envOptionMinimumPanDistance(-1), + envOptionMinimumPanEvents(-1) { } -GestureEventProcessor::~GestureEventProcessor() -{ -} +GestureEventProcessor::~GestureEventProcessor() = default; -void GestureEventProcessor::ProcessGestureEvent(const Integration::GestureEvent& event) +void GestureEventProcessor::ProcessTouchEvent(Scene& scene, const Integration::TouchEvent& event) { - if( Gesture::Started == event.state || Gesture::Continuing == event.state ) - { - SetUpdateRequired(); - } - - switch(event.gestureType) - { - case Gesture::LongPress: - mLongPressGestureProcessor.Process(static_cast(event)); - break; - - case Gesture::Pan: - mPanGestureProcessor.Process(static_cast(event)); - break; - - case Gesture::Pinch: - mPinchGestureProcessor.Process(static_cast(event)); - break; - - case Gesture::Tap: - mTapGestureProcessor.Process(static_cast(event)); - break; - } + mLongPressGestureProcessor.ProcessTouch(scene, event); + mPanGestureProcessor.ProcessTouch(scene, event); + mPinchGestureProcessor.ProcessTouch(scene, event); + mTapGestureProcessor.ProcessTouch(scene, event); + mRotationGestureProcessor.ProcessTouch(scene, event); } -void GestureEventProcessor::AddGestureDetector(GestureDetector* gestureDetector) +void GestureEventProcessor::AddGestureDetector(GestureDetector* gestureDetector, Scene& scene) { - switch (gestureDetector->GetType()) + switch(gestureDetector->GetType()) { - case Gesture::LongPress: + case GestureType::LONG_PRESS: { LongPressGestureDetector* longPress = static_cast(gestureDetector); - mLongPressGestureProcessor.AddGestureDetector(longPress); + mLongPressGestureProcessor.AddGestureDetector(longPress, scene); break; } - case Gesture::Pan: + case GestureType::PAN: { PanGestureDetector* pan = static_cast(gestureDetector); - mPanGestureProcessor.AddGestureDetector(pan); + mPanGestureProcessor.AddGestureDetector(pan, scene, envOptionMinimumPanDistance, envOptionMinimumPanEvents); break; } - case Gesture::Pinch: + case GestureType::PINCH: { PinchGestureDetector* pinch = static_cast(gestureDetector); - mPinchGestureProcessor.AddGestureDetector(pinch); + mPinchGestureProcessor.AddGestureDetector(pinch, scene); break; } - case Gesture::Tap: + case GestureType::TAP: { TapGestureDetector* tap = static_cast(gestureDetector); - mTapGestureProcessor.AddGestureDetector(tap); + mTapGestureProcessor.AddGestureDetector(tap, scene); + break; + } + + case GestureType::ROTATION: + { + RotationGestureDetector* rotation = static_cast(gestureDetector); + mRotationGestureProcessor.AddGestureDetector(rotation, scene); break; } } @@ -116,111 +100,106 @@ void GestureEventProcessor::AddGestureDetector(GestureDetector* gestureDetector) void GestureEventProcessor::RemoveGestureDetector(GestureDetector* gestureDetector) { - switch (gestureDetector->GetType()) + switch(gestureDetector->GetType()) { - case Gesture::LongPress: + case GestureType::LONG_PRESS: { LongPressGestureDetector* longPress = static_cast(gestureDetector); mLongPressGestureProcessor.RemoveGestureDetector(longPress); break; } - case Gesture::Pan: + case GestureType::PAN: { PanGestureDetector* pan = static_cast(gestureDetector); mPanGestureProcessor.RemoveGestureDetector(pan); break; } - case Gesture::Pinch: + case GestureType::PINCH: { PinchGestureDetector* pinch = static_cast(gestureDetector); mPinchGestureProcessor.RemoveGestureDetector(pinch); break; } - case Gesture::Tap: + case GestureType::TAP: { TapGestureDetector* tap = static_cast(gestureDetector); mTapGestureProcessor.RemoveGestureDetector(tap); break; } + + case GestureType::ROTATION: + { + RotationGestureDetector* rotation = static_cast(gestureDetector); + mRotationGestureProcessor.RemoveGestureDetector(rotation); + break; + } } } void GestureEventProcessor::GestureDetectorUpdated(GestureDetector* gestureDetector) { - switch (gestureDetector->GetType()) + switch(gestureDetector->GetType()) { - case Gesture::LongPress: + case GestureType::LONG_PRESS: { LongPressGestureDetector* longPress = static_cast(gestureDetector); mLongPressGestureProcessor.GestureDetectorUpdated(longPress); break; } - case Gesture::Pan: + case GestureType::PAN: { PanGestureDetector* pan = static_cast(gestureDetector); mPanGestureProcessor.GestureDetectorUpdated(pan); break; } - case Gesture::Pinch: + case GestureType::PINCH: { PinchGestureDetector* pinch = static_cast(gestureDetector); mPinchGestureProcessor.GestureDetectorUpdated(pinch); break; } - case Gesture::Tap: + case GestureType::TAP: { TapGestureDetector* tap = static_cast(gestureDetector); mTapGestureProcessor.GestureDetectorUpdated(tap); break; } + + case GestureType::ROTATION: + { + // Nothing to do + break; + } } } -void GestureEventProcessor::SetUpdateRequired() +void GestureEventProcessor::SetGestureProperties(const Dali::Gesture& gesture) { - mUpdateRequired = true; -} + DALI_ASSERT_DEBUG(gesture.GetType() == GestureType::PAN && "Only PanGesture has a scene object\n"); -void GestureEventProcessor::SetGestureProperties( const Gesture& gesture ) -{ - if( Gesture::Started == gesture.state || Gesture::Continuing == gesture.state ) + const Dali::PanGesture& pan = static_cast(gesture); + if(mPanGestureProcessor.SetPanGestureProperties(pan)) { - SetUpdateRequired(); - // We may not be updating so we need to ask the render controller for an update. - mRenderController.RequestUpdate(); - } - - switch ( gesture.type ) - { - case Gesture::Pan: - { - const PanGesture& pan = static_cast< const PanGesture& >( gesture ); - mPanGestureProcessor.SetPanGestureProperties( pan ); - break; - } - - case Gesture::LongPress: - case Gesture::Pinch: - case Gesture::Tap: - { - DALI_ASSERT_DEBUG( false && "Gesture type does not have scene object\n" ); - break; - } + mRenderController.RequestUpdate(false); } } bool GestureEventProcessor::NeedsUpdate() { - bool updateRequired( mUpdateRequired ); + bool updateRequired = false; - mUpdateRequired = false; + updateRequired |= mLongPressGestureProcessor.NeedsUpdate(); + updateRequired |= mPanGestureProcessor.NeedsUpdate(); + updateRequired |= mPinchGestureProcessor.NeedsUpdate(); + updateRequired |= mTapGestureProcessor.NeedsUpdate(); + updateRequired |= mRotationGestureProcessor.NeedsUpdate(); return updateRequired; } @@ -235,36 +214,131 @@ void GestureEventProcessor::SetPanGesturePredictionMode(int mode) mPanGestureProcessor.SetPredictionMode(mode); } -void GestureEventProcessor::SetPanGesturePredictionAmount( unsigned int amount ) +void GestureEventProcessor::SetPanGesturePredictionAmount(uint32_t amount) { mPanGestureProcessor.SetPredictionAmount(amount); } -void GestureEventProcessor::SetPanGestureMaximumPredictionAmount( unsigned int amount ) +void GestureEventProcessor::SetPanGestureMaximumPredictionAmount(uint32_t amount) { mPanGestureProcessor.SetMaximumPredictionAmount(amount); } -void GestureEventProcessor::SetPanGestureMinimumPredictionAmount( unsigned int amount ) +void GestureEventProcessor::SetPanGestureMinimumPredictionAmount(uint32_t amount) { mPanGestureProcessor.SetMinimumPredictionAmount(amount); } -void GestureEventProcessor::SetPanGesturePredictionAmountAdjustment( unsigned int amount ) +void GestureEventProcessor::SetPanGesturePredictionAmountAdjustment(uint32_t amount) { mPanGestureProcessor.SetPredictionAmountAdjustment(amount); } -void GestureEventProcessor::SetPanGestureSmoothingMode(int mode) +void GestureEventProcessor::SetPanGestureSmoothingMode(int32_t mode) { mPanGestureProcessor.SetSmoothingMode(mode); } -void GestureEventProcessor::SetPanGestureSmoothingAmount( float amount ) +void GestureEventProcessor::SetPanGestureSmoothingAmount(float amount) { mPanGestureProcessor.SetSmoothingAmount(amount); } +void GestureEventProcessor::SetPanGestureUseActualTimes(bool value) +{ + mPanGestureProcessor.SetUseActualTimes(value); +} + +void GestureEventProcessor::SetPanGestureInterpolationTimeRange(int32_t value) +{ + mPanGestureProcessor.SetInterpolationTimeRange(value); +} + +void GestureEventProcessor::SetPanGestureScalarOnlyPredictionEnabled(bool value) +{ + mPanGestureProcessor.SetScalarOnlyPredictionEnabled(value); +} + +void GestureEventProcessor::SetPanGestureTwoPointPredictionEnabled(bool value) +{ + mPanGestureProcessor.SetTwoPointPredictionEnabled(value); +} + +void GestureEventProcessor::SetPanGestureTwoPointInterpolatePastTime(int value) +{ + mPanGestureProcessor.SetTwoPointInterpolatePastTime(value); +} + +void GestureEventProcessor::SetPanGestureTwoPointVelocityBias(float value) +{ + mPanGestureProcessor.SetTwoPointVelocityBias(value); +} + +void GestureEventProcessor::SetPanGestureTwoPointAccelerationBias(float value) +{ + mPanGestureProcessor.SetTwoPointAccelerationBias(value); +} + +void GestureEventProcessor::SetPanGestureMultitapSmoothingRange(int32_t value) +{ + mPanGestureProcessor.SetMultitapSmoothingRange(value); +} + +void GestureEventProcessor::SetPanGestureMinimumDistance(int32_t value) +{ + envOptionMinimumPanDistance = value; +} + +void GestureEventProcessor::SetPanGestureMinimumPanEvents(int32_t value) +{ + envOptionMinimumPanEvents = value; +} + +void GestureEventProcessor::SetPinchGestureMinimumDistance(float value) +{ + mPinchGestureProcessor.SetMinimumPinchDistance(value); +} + +void GestureEventProcessor::SetPinchGestureMinimumTouchEvents(uint32_t value) +{ + mPinchGestureProcessor.SetMinimumTouchEvents(value); +} + +void GestureEventProcessor::SetPinchGestureMinimumTouchEventsAfterStart(uint32_t value) +{ + mPinchGestureProcessor.SetMinimumTouchEventsAfterStart(value); +} + +void GestureEventProcessor::SetRotationGestureMinimumTouchEvents(uint32_t value) +{ + mRotationGestureProcessor.SetMinimumTouchEvents(value); +} + +void GestureEventProcessor::SetRotationGestureMinimumTouchEventsAfterStart(uint32_t value) +{ + mRotationGestureProcessor.SetMinimumTouchEventsAfterStart(value); +} + +void GestureEventProcessor::SetLongPressMinimumHoldingTime(uint32_t value) +{ + mLongPressGestureProcessor.SetMinimumHoldingTime(value); +} + +uint32_t GestureEventProcessor::GetLongPressMinimumHoldingTime() const +{ + return mLongPressGestureProcessor.GetMinimumHoldingTime(); +} + +const PanGestureProcessor& GestureEventProcessor::GetPanGestureProcessor() +{ + return mPanGestureProcessor; +} + +void GestureEventProcessor::SetTapMaximumAllowedTime(uint32_t time) +{ + mTapGestureProcessor.SetMaximumAllowedTime(time); +} + } // namespace Internal } // namespace Dali