/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
*
*/
-#include <iostream>
-
-#include <stdlib.h>
-#include <cmath>
-#include <dali/public-api/dali-core.h>
+#include <dali-test-suite-utils.h>
+#include <dali/devel-api/events/pan-gesture-devel.h>
#include <dali/integration-api/events/touch-event-integ.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
-#include <dali/integration-api/system-overlay.h>
-#include <dali/integration-api/profiling.h>
#include <dali/integration-api/input-options.h>
-#include <dali-test-suite-utils.h>
-#include <test-touch-utils.h>
+#include <dali/integration-api/profiling.h>
+#include <dali/integration-api/render-task-list-integ.h>
+#include <dali/public-api/dali-core.h>
+#include <stdlib.h>
+#include <test-touch-event-utils.h>
+
+#include <cmath>
+#include <iostream>
using namespace Dali;
///////////////////////////////////////////////////////////////////////////////
namespace
{
-const int PAN_EVENT_TIME_DELTA = 8;
+const int PAN_EVENT_TIME_DELTA = 8;
const int PAN_GESTURE_UPDATE_COUNT = 50;
// Stores data that is populated in the callback and will be read by the test cases
SignalData()
: functorCalled(false),
voidFunctorCalled(false),
- receivedGesture(Gesture::Clear)
- {}
+ receivedGesture()
+ {
+ }
void Reset()
{
- functorCalled = false;
+ functorCalled = false;
voidFunctorCalled = false;
- receivedGesture.state = Gesture::Clear;
- receivedGesture.velocity = Vector2(0.0f, 0.0f);
- receivedGesture.displacement = Vector2(0.0f, 0.0f);
- receivedGesture.position = Vector2(0.0f, 0.0f);
- receivedGesture.screenPosition = Vector2(0.0f, 0.0f);
- receivedGesture.numberOfTouches = 0;
+ receivedGesture.Reset();
pannedActor.Reset();
}
- bool functorCalled;
- bool voidFunctorCalled;
+ bool functorCalled;
+ bool voidFunctorCalled;
PanGesture receivedGesture;
- Actor pannedActor;
+ Actor pannedActor;
};
// Functor that sets the data when called
struct GestureReceivedFunctor
{
- GestureReceivedFunctor(SignalData& data) : signalData(data) { }
+ GestureReceivedFunctor(SignalData& data)
+ : signalData(data)
+ {
+ }
void operator()(Actor actor, const PanGesture& pan)
{
- signalData.functorCalled = true;
+ signalData.functorCalled = true;
signalData.receivedGesture = pan;
- signalData.pannedActor = actor;
+ signalData.pannedActor = actor;
}
void operator()()
// Functor that removes the gestured actor from stage
struct UnstageActorFunctor : public GestureReceivedFunctor
{
- UnstageActorFunctor( SignalData& data, Gesture::State& stateToUnstage )
- : GestureReceivedFunctor( data ),
- stateToUnstage( stateToUnstage )
+ UnstageActorFunctor(SignalData& data, GestureState& stateToUnstage, Integration::Scene scene)
+ : GestureReceivedFunctor(data),
+ stateToUnstage(stateToUnstage),
+ scene(scene)
{
}
- void operator()( Actor actor, const PanGesture& pan )
+ void operator()(Actor actor, const PanGesture& pan)
{
- GestureReceivedFunctor::operator()( actor, pan );
+ GestureReceivedFunctor::operator()(actor, pan);
- if ( pan.state == stateToUnstage )
+ if(pan.GetState() == stateToUnstage)
{
- Stage::GetCurrent().Remove( actor );
+ scene.Remove(actor);
}
}
- Gesture::State& stateToUnstage;
-};
-
-// Functor for receiving a touch event
-struct TouchEventFunctor
-{
- bool operator()(Actor actor, const TouchEvent& touch)
- {
- return false;
- }
+ GestureState& stateToUnstage;
+ Integration::Scene scene;
};
// Data for constraints
struct ConstraintData
{
ConstraintData()
- : panning( false ),
- called( false )
+ : panning(false),
+ called(false)
{
}
Vector2 localPosition;
Vector2 localDisplacement;
Vector2 localVelocity;
- bool panning;
- bool called;
+ bool panning;
+ bool called;
void Reset()
{
screenPosition = screenDisplacement = screenVelocity = localPosition = localDisplacement = localVelocity = Vector2::ZERO;
- panning = false;
- called = false;
+ panning = false;
+ called = false;
}
};
// Constraint used with panning properties
struct PanConstraint
{
- PanConstraint( ConstraintData& data ) : constraintData(data) { }
+ PanConstraint(ConstraintData& data)
+ : constraintData(data)
+ {
+ }
- void operator()( Vector3& current, const PropertyInputContainer& inputs )
+ void operator()(Vector3& current, const PropertyInputContainer& inputs)
{
- constraintData.screenPosition = inputs[0]->GetVector2();
+ constraintData.screenPosition = inputs[0]->GetVector2();
constraintData.screenDisplacement = inputs[1]->GetVector2();
- constraintData.screenVelocity = inputs[2]->GetVector2();
- constraintData.localPosition = inputs[3]->GetVector2();
- constraintData.localDisplacement = inputs[4]->GetVector2();
- constraintData.localVelocity = inputs[5]->GetVector2();
- constraintData.panning = inputs[6]->GetBoolean();
- constraintData.called = true;
- current = Vector3::ZERO;
+ constraintData.screenVelocity = inputs[2]->GetVector2();
+ constraintData.localPosition = inputs[3]->GetVector2();
+ constraintData.localDisplacement = inputs[4]->GetVector2();
+ constraintData.localVelocity = inputs[5]->GetVector2();
+ constraintData.panning = inputs[6]->GetBoolean();
+ constraintData.called = true;
+ current = Vector3::ZERO;
}
ConstraintData& constraintData;
};
-// Generate a PanGestureEvent to send to Core
-Integration::PanGestureEvent GeneratePan(
- Gesture::State state,
- Vector2 previousPosition,
- Vector2 currentPosition,
- unsigned long timeDelta,
- unsigned int numberOfTouches = 1,
- unsigned int time = 1u)
-{
- Integration::PanGestureEvent pan(state);
-
- pan.previousPosition = previousPosition;
- pan.currentPosition = currentPosition;
- pan.timeDelta = timeDelta;
- pan.numberOfTouches = numberOfTouches;
- pan.time = time;
-
- return pan;
-}
-
// Generate a PanGesture
-PanGesture GeneratePan( unsigned int time,
- Gesture::State state,
- Vector2 screenPosition,
- Vector2 localPosition,
- Vector2 screenDisplacement = Vector2::ONE,
- Vector2 localDisplacement = Vector2::ONE,
- Vector2 screenVelocity = Vector2::ONE,
- Vector2 localVelocity = Vector2::ONE,
- unsigned int numberOfTouches = 1 )
+PanGesture GeneratePan(unsigned int time,
+ GestureState state,
+ Vector2 screenPosition,
+ Vector2 localPosition,
+ Vector2 screenDisplacement = Vector2::ONE,
+ Vector2 localDisplacement = Vector2::ONE,
+ Vector2 screenVelocity = Vector2::ONE,
+ Vector2 localVelocity = Vector2::ONE,
+ unsigned int numberOfTouches = 1)
{
- PanGesture pan( state );
+ Dali::PanGesture pan = DevelPanGesture::New(state);
- pan.time = time;
+ DevelPanGesture::SetTime(pan, time);
- pan.screenPosition = screenPosition;
- pan.position = localPosition;
+ DevelPanGesture::SetScreenPosition(pan, screenPosition);
+ DevelPanGesture::SetPosition(pan, localPosition);
- pan.screenDisplacement = screenDisplacement;
- pan.displacement = localDisplacement;
+ DevelPanGesture::SetScreenDisplacement(pan, screenDisplacement);
+ DevelPanGesture::SetDisplacement(pan, localDisplacement);
- pan.screenVelocity = screenVelocity;
- pan.velocity = localVelocity;
+ DevelPanGesture::SetScreenVelocity(pan, screenVelocity);
+ DevelPanGesture::SetVelocity(pan, localVelocity);
- pan.numberOfTouches = numberOfTouches;
+ DevelPanGesture::SetNumberOfTouches(pan, numberOfTouches);
return pan;
}
-/**
- * Helper to generate PanGestureEvent
- *
- * @param[in] application Application instance
- * @param[in] state The Gesture State
- * @param[in] pos The current position of touch.
- */
-static void SendPan(TestApplication& application, Gesture::State state, const Vector2& pos)
-{
- static Vector2 last;
- static int LastTime = 0;
-
- if( (state == Gesture::Started) ||
- (state == Gesture::Possible) )
- {
- last.x = pos.x;
- last.y = pos.y;
- }
-
- application.ProcessEvent(GeneratePan(state, last, pos, PAN_EVENT_TIME_DELTA));
-
- last.x = pos.x;
- last.y = pos.y;
- LastTime += PAN_EVENT_TIME_DELTA;
-}
-
-static Vector2 PerformSwipeGestureSwipe(TestApplication& application, Vector2 start, Vector2 direction, int frames, bool finish = true)
-{
- // Now do a pan starting from (start) and heading (direction)
- Vector2 pos(start);
- SendPan(application, Gesture::Possible, pos);
- SendPan(application, Gesture::Started, pos);
- application.SendNotification();
- application.Render();
-
- for(int i = 0;i<frames;i++)
- {
- pos += direction; // Move in this direction
- SendPan(application, Gesture::Continuing, pos);
- application.SendNotification();
- application.Render();
- }
-
- if(finish)
- {
- SendPan(application, Gesture::Finished, pos);
- application.SendNotification();
- application.Render();
- }
-
- return pos;
-}
-
-} // anon namespace
+} // namespace
///////////////////////////////////////////////////////////////////////////////
{
TestApplication application;
- PanGestureDetector detector = PanGestureDetector::New();;
+ PanGestureDetector detector = PanGestureDetector::New();
- PanGestureDetector copy( detector );
- DALI_TEST_CHECK( detector );
+ PanGestureDetector copy(detector);
+ DALI_TEST_CHECK(detector);
END_TEST;
}
{
TestApplication application;
- PanGestureDetector detector = PanGestureDetector::New();;
+ PanGestureDetector detector = PanGestureDetector::New();
PanGestureDetector assign;
assign = detector;
- DALI_TEST_CHECK( detector );
+ DALI_TEST_CHECK(detector);
- DALI_TEST_CHECK( detector == assign );
+ DALI_TEST_CHECK(detector == assign);
END_TEST;
}
// Attach an actor and emit a touch event on the actor to ensure complete line coverage
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
detector.Attach(actor);
- Stage::GetCurrent().Add(actor);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
- Integration::TouchEvent touchEvent(1);
- Integration::Point point;
- point.SetDeviceId( 1 );
- point.SetState( PointState::DOWN );
- point.SetScreenPosition( Vector2( 20.0f, 20.0f ) );
- touchEvent.AddPoint(point);
- application.ProcessEvent(touchEvent);
+ // Use long press function for touch event
+ TestStartLongPress(application);
+
END_TEST;
}
PanGestureDetector detector2 = PanGestureDetector::DownCast(object);
DALI_TEST_CHECK(detector2);
- PanGestureDetector detector3 = DownCast< PanGestureDetector >(object);
+ PanGestureDetector detector3 = DownCast<PanGestureDetector>(object);
DALI_TEST_CHECK(detector3);
- BaseHandle unInitializedObject;
+ BaseHandle unInitializedObject;
PanGestureDetector detector4 = PanGestureDetector::DownCast(unInitializedObject);
DALI_TEST_CHECK(!detector4);
- PanGestureDetector detector5 = DownCast< PanGestureDetector >(unInitializedObject);
+ PanGestureDetector detector5 = DownCast<PanGestureDetector>(unInitializedObject);
DALI_TEST_CHECK(!detector5);
- GestureDetector detector6 = PanGestureDetector::New();
+ GestureDetector detector6 = PanGestureDetector::New();
PanGestureDetector detector7 = PanGestureDetector::DownCast(detector6);
DALI_TEST_CHECK(detector7);
END_TEST;
// Attach an actor and change the minimum touches
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
- SignalData data;
+ SignalData data;
GestureReceivedFunctor functor(data);
detector.Attach(actor);
detector.DetectedSignal().Connect(&application, functor);
- TestGestureManager& gestureManager = application.GetGestureManager();
- gestureManager.Initialize();
-
detector.SetMinimumTouchesRequired(3);
- // Gesture detection should have been updated only
- DALI_TEST_EQUALS(true, gestureManager.WasCalled(TestGestureManager::UpdateType), TEST_LOCATION);
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::RegisterType), TEST_LOCATION);
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::UnregisterType), TEST_LOCATION);
-
- // Reset values
- gestureManager.Initialize();
-
// Create a second gesture detector that requires even less minimum touches
PanGestureDetector secondDetector = PanGestureDetector::New();
secondDetector.Attach(actor);
- // Gesture detection should have been updated only
- DALI_TEST_EQUALS(true, gestureManager.WasCalled(TestGestureManager::UpdateType), TEST_LOCATION);
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::RegisterType), TEST_LOCATION);
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::UnregisterType), TEST_LOCATION);
+ DALI_TEST_EQUALS(3, detector.GetMinimumTouchesRequired(), TEST_LOCATION);
+
END_TEST;
}
// Attach an actor and change the maximum touches
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
- SignalData data;
+ SignalData data;
GestureReceivedFunctor functor(data);
detector.Attach(actor);
detector.DetectedSignal().Connect(&application, functor);
- TestGestureManager& gestureManager = application.GetGestureManager();
- gestureManager.Initialize();
-
detector.SetMaximumTouchesRequired(4);
- // Gesture detection should have been updated only
- DALI_TEST_EQUALS(true, gestureManager.WasCalled(TestGestureManager::UpdateType), TEST_LOCATION);
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::RegisterType), TEST_LOCATION);
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::UnregisterType), TEST_LOCATION);
-
- // Reset values
- gestureManager.Initialize();
-
- // Create a second gesture detector that requires even less maximum touches
- PanGestureDetector secondDetector = PanGestureDetector::New();
- secondDetector.Attach(actor);
+ DALI_TEST_EQUALS(4, detector.GetMaximumTouchesRequired(), TEST_LOCATION);
- // Gesture detection should NOT have been updated
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::UpdateType), TEST_LOCATION);
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::RegisterType), TEST_LOCATION);
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::UnregisterType), TEST_LOCATION);
END_TEST;
}
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
- SignalData data;
+ SignalData data;
GestureReceivedFunctor functor(data);
PanGestureDetector detector = PanGestureDetector::New();
detector.DetectedSignal().Connect(&application, functor);
// Do a pan outside actor's area
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(110.0f, 110.0f), Vector2(112.0f, 112.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(110.0f, 110.0f), Vector2(112.0f, 112.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(110.0f, 110.0f), Vector2(121.0f, 121.0f), time);
+
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
// Continue pan into actor's area - we should still not receive the signal
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(112.0f, 112.0f), Vector2(20.0f, 20.0f), 10));
+ TestMovePan(application, Vector2(20.0f, 20.0f), time);
+
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
// Stop panning - we should still not receive the signal
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 20.0f), Vector2(12.0f, 12.0f), 10));
+ TestEndPan(application, Vector2(12.0f, 12.0f), time);
+
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
END_TEST;
}
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
- SignalData data;
+ SignalData data;
GestureReceivedFunctor functor(data);
PanGestureDetector detector = PanGestureDetector::New();
detector.DetectedSignal().Connect(&application, functor);
// Start pan within the actor's area
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION);
- DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(10.0f, 0.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(1.0f, 0.0f), data.receivedGesture.velocity, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(10.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(1.0f, data.receivedGesture.GetSpeed(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(GestureState::STARTED, data.receivedGesture.GetState(), TEST_LOCATION);
+ DALI_TEST_EQUALS(1u, data.receivedGesture.GetNumberOfTouches(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(16.0f, 0.0f), data.receivedGesture.GetDisplacement(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(0.5f, 0.0f), data.receivedGesture.GetVelocity(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(16.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(0.5f, data.receivedGesture.GetSpeed(), 0.01f, TEST_LOCATION);
// Continue the pan within the actor's area - we should still receive the signal
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+
+ TestMovePan(application, Vector2(26.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
- DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(0.0f, -10.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(0.0f, -1.0f), data.receivedGesture.velocity, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(10.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(GestureState::CONTINUING, data.receivedGesture.GetState(), TEST_LOCATION);
+ DALI_TEST_EQUALS(1u, data.receivedGesture.GetNumberOfTouches(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(0.0f, -16.0f), data.receivedGesture.GetDisplacement(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(0.0f, -1.0f), data.receivedGesture.GetVelocity(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(16.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
DALI_TEST_EQUALS(1.0f, data.receivedGesture.GetSpeed(), 0.01f, TEST_LOCATION);
// Pan Gesture leaves actor's area - we should still receive the signal
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 10.0f), Vector2(320.0f, 10.0f), 10));
+
+ TestMovePan(application, Vector2(346.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
- DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(300.0f, 0.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(30.0f, 0.0f), data.receivedGesture.velocity, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(300.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(30.0f, data.receivedGesture.GetSpeed(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(GestureState::CONTINUING, data.receivedGesture.GetState(), TEST_LOCATION);
+ DALI_TEST_EQUALS(1u, data.receivedGesture.GetNumberOfTouches(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(320.0f, 0.0f), data.receivedGesture.GetDisplacement(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(20.0f, 0.0f), data.receivedGesture.GetVelocity(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(320.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(20.0f, data.receivedGesture.GetSpeed(), 0.01f, TEST_LOCATION);
// Gesture ends - we would receive a finished state
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(320.0f, 10.0f), Vector2(310.0f, 10.0f), 10));
+
+ TestEndPan(application, Vector2(314.0f, 4.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Gesture::Finished, data.receivedGesture.state, TEST_LOCATION);
- DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(-10.0f, 0.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(-1.0f, 0.0f), data.receivedGesture.velocity, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(10.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(1.0f, data.receivedGesture.GetSpeed(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(GestureState::FINISHED, data.receivedGesture.GetState(), TEST_LOCATION);
+ DALI_TEST_EQUALS(1u, data.receivedGesture.GetNumberOfTouches(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(-32.0f, 0.0f), data.receivedGesture.GetDisplacement(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(-2.0f, 0.0f), data.receivedGesture.GetVelocity(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(32.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(2.0f, data.receivedGesture.GetSpeed(), 0.01f, TEST_LOCATION);
END_TEST;
}
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
- SignalData data;
+ SignalData data;
GestureReceivedFunctor functor(data);
PanGestureDetector detector = PanGestureDetector::New();
detector.DetectedSignal().Connect(&application, functor);
// Start pan within the actor's area
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION);
- DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(10.0f, 0.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(1.0f, 0.0f), data.receivedGesture.velocity, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(10.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(1.0f, data.receivedGesture.GetSpeed(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(GestureState::STARTED, data.receivedGesture.GetState(), TEST_LOCATION);
+ DALI_TEST_EQUALS(1u, data.receivedGesture.GetNumberOfTouches(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(16.0f, 0.0f), data.receivedGesture.GetDisplacement(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(0.5f, 0.0f), data.receivedGesture.GetVelocity(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(16.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(0.5f, data.receivedGesture.GetSpeed(), 0.01f, TEST_LOCATION);
// Continue the pan within the actor's area - we should still receive the signal
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+
+ TestMovePan(application, Vector2(26.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
- DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(0.0f, -10.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(0.0f, -1.0f), data.receivedGesture.velocity, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(10.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(GestureState::CONTINUING, data.receivedGesture.GetState(), TEST_LOCATION);
+ DALI_TEST_EQUALS(1u, data.receivedGesture.GetNumberOfTouches(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(0.0f, -16.0f), data.receivedGesture.GetDisplacement(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(0.0f, -1.0f), data.receivedGesture.GetVelocity(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(16.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
DALI_TEST_EQUALS(1.0f, data.receivedGesture.GetSpeed(), 0.01f, TEST_LOCATION);
// Gesture ends within actor's area - we would receive a finished state
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
- DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Gesture::Finished, data.receivedGesture.state, TEST_LOCATION);
- DALI_TEST_EQUALS(1u, data.receivedGesture.numberOfTouches, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(-10.0f, 0.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(-1.0f, 0.0f), data.receivedGesture.velocity, 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(10.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
- DALI_TEST_EQUALS(1.0f, data.receivedGesture.GetSpeed(), 0.01f, TEST_LOCATION);
- END_TEST;
-}
-
-int UtcDaliPanGestureSignalReceptionCancelled(void)
-{
- TestApplication application;
-
- Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
-
- // Render and notify
- application.SendNotification();
- application.Render();
-
- SignalData data;
- GestureReceivedFunctor functor(data);
-
- PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach(actor);
- detector.DetectedSignal().Connect(&application, functor);
-
- // Start pan within the actor's area
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION);
- // Continue the pan within the actor's area - we should still receive the signal
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
- DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Gesture::Continuing, data.receivedGesture.state, TEST_LOCATION);
+ TestEndPan(application, Vector2(10.0f, 4.0f), time);
- // The gesture is cancelled
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Cancelled, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Gesture::Cancelled, data.receivedGesture.state, TEST_LOCATION);
+ DALI_TEST_EQUALS(GestureState::FINISHED, data.receivedGesture.GetState(), TEST_LOCATION);
+ DALI_TEST_EQUALS(1u, data.receivedGesture.GetNumberOfTouches(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(-16.0f, 0.0f), data.receivedGesture.GetDisplacement(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(Vector2(-1.0f, 0.0f), data.receivedGesture.GetVelocity(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(16.0f, data.receivedGesture.GetDistance(), 0.01f, TEST_LOCATION);
+ DALI_TEST_EQUALS(1.0f, data.receivedGesture.GetSpeed(), 0.01f, TEST_LOCATION);
END_TEST;
}
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
- SignalData data;
+ SignalData data;
GestureReceivedFunctor functor(data);
PanGestureDetector detector = PanGestureDetector::New();
detector.DetectedSignal().Connect(&application, functor);
// Start pan within the actor's area
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
// Continue the pan within the actor's area - we should still receive the signal
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+
+ TestMovePan(application, Vector2(26.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
// Gesture ends within actor's area
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+
+ TestEndPan(application, Vector2(10.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
// Detach actor
// Ensure we are no longer signalled
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+ TestMovePan(application, Vector2(26.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+ TestEndPan(application, Vector2(10.0f, 4.0f), time);
+
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
END_TEST;
}
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
- SignalData data;
+ SignalData data;
GestureReceivedFunctor functor(data);
PanGestureDetector detector = PanGestureDetector::New();
detector.DetectedSignal().Connect(&application, functor);
// Start pan within the actor's area
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+ application.SendNotification();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
// Continue the pan within the actor's area - we should still receive the signal
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+
+ TestMovePan(application, Vector2(26.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
// Detach actor during the pan, we should not receive the next event
// Gesture ends within actor's area
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+
+ TestEndPan(application, Vector2(10.0f, 4.0f), time);
+
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
END_TEST;
}
{
TestApplication application;
- SignalData data;
+ SignalData data;
GestureReceivedFunctor functor(data);
PanGestureDetector detector = PanGestureDetector::New();
// Attach a temporary actor to stop detector being removed from PanGestureProcessor when main actor
// is destroyed.
Actor tempActor = Actor::New();
- tempActor.SetSize(100.0f, 100.0f);
- tempActor.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
- Stage::GetCurrent().Add(tempActor);
+ tempActor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ tempActor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT);
+ application.GetScene().Add(tempActor);
detector.Attach(tempActor);
+ uint32_t time = 100;
+
// Actor lifetime is scoped
{
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
detector.Attach(actor);
// Start pan within the actor's area
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
// Continue the pan within the actor's area - we should still receive the signal
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+
+ TestMovePan(application, Vector2(26.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
// Remove the actor from stage and reset the data
- Stage::GetCurrent().Remove(actor);
+ application.GetScene().Remove(actor);
// Render and notify
application.SendNotification();
// Gesture ends within the area where the actor used to be
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+
+ TestEndPan(application, Vector2(10.0f, 4.0f), time);
+
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
END_TEST;
}
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetOrientation(Dali::Degree(90.0f), Vector3::ZAXIS);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ORIENTATION, Quaternion(Dali::Degree(90.0f), Vector3::ZAXIS));
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
- SignalData data;
+ SignalData data;
GestureReceivedFunctor functor(data);
PanGestureDetector detector = PanGestureDetector::New();
detector.DetectedSignal().Connect(&application, functor);
// Do an entire pan, only check finished value
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(11.0f, 12.0f), Vector2(27.0f, 12.0f), time);
+
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
+
+ TestEndPan(application, Vector2(25.0f, 28.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(8.0f, -5.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION); // Actor relative
+ DALI_TEST_EQUALS(Vector2(16.0f, 2.0f), data.receivedGesture.GetDisplacement(), 0.01f, TEST_LOCATION); // Actor relative
// Rotate actor again and render a couple of times
- actor.SetOrientation(Dali::Degree(180.0f), Vector3::ZAXIS);
+ actor.SetProperty(Actor::Property::ORIENTATION, Quaternion(Dali::Degree(180.0f), Vector3::ZAXIS));
application.SendNotification();
application.Render();
// Do an entire pan, only check finished value
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+ TestStartPan(application, Vector2(11.0f, 12.0f), Vector2(27.0f, 12.0f), time);
+
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
+
+ TestEndPan(application, Vector2(25.0f, 28.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(-5.0f, -8.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION); // Actor relative
+ DALI_TEST_EQUALS(Vector2(2.0f, -16.0f), data.receivedGesture.GetDisplacement(), 0.01f, TEST_LOCATION); // Actor relative
// Rotate actor again and render a couple of times
- actor.SetOrientation(Dali::Degree(270.0f), Vector3::ZAXIS);
+ actor.SetProperty(Actor::Property::ORIENTATION, Quaternion(Dali::Degree(270.0f), Vector3::ZAXIS));
application.SendNotification();
application.Render();
// Do an entire pan, only check finished value
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+ TestStartPan(application, Vector2(11.0f, 12.0f), Vector2(27.0f, 12.0f), time);
+
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
+
+ TestEndPan(application, Vector2(25.0f, 28.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(-8.0f, 5.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION); // Actor relative
+ DALI_TEST_EQUALS(Vector2(-16.0f, -2.0f), data.receivedGesture.GetDisplacement(), 0.01f, TEST_LOCATION); // Actor relative
END_TEST;
}
TestApplication application;
Actor parent = Actor::New();
- parent.SetSize(100.0f, 100.0f);
- parent.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(parent);
+ parent.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ parent.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(parent);
// Set child to completely cover parent.
// Change rotation of child to be different from parent so that we can check if our local coordinate
// conversion of the parent actor is correct.
Actor child = Actor::New();
- child.SetSize(100.0f, 100.0f);
- child.SetAnchorPoint(AnchorPoint::CENTER);
- child.SetParentOrigin(ParentOrigin::CENTER);
- child.SetOrientation(Dali::Degree(90.0f), Vector3::ZAXIS);
+ child.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ child.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+ child.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+ child.SetProperty(Actor::Property::ORIENTATION, Quaternion(Dali::Degree(90.0f), Vector3::ZAXIS));
parent.Add(child);
- TouchEventFunctor touchFunctor;
- child.TouchedSignal().Connect(&application, touchFunctor);
-
// Render and notify
application.SendNotification();
application.Render();
- SignalData data;
+ SignalData data;
GestureReceivedFunctor functor(data);
PanGestureDetector detector = PanGestureDetector::New();
detector.DetectedSignal().Connect(&application, functor);
// Do an entire pan, only check finished value - hits child area but parent should still receive it
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(11.0f, 12.0f), Vector2(27.0f, 12.0f), time);
+
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
+
+ TestEndPan(application, Vector2(25.0f, 28.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(true, parent == data.pannedActor, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(5.0f, 8.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION); // Actor relative
+ DALI_TEST_EQUALS(Vector2(-2.0f, 16.0f), data.receivedGesture.GetDisplacement(), 0.01f, TEST_LOCATION); // Actor relative
// Attach child and generate same touch points to yield a different displacement
// (Also proves that you can detach and then re-attach another actor)
detector.Detach(parent);
// Do an entire pan, only check finished value
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(11.0f, 12.0f), Vector2(22.0f, 12.0f), 10));
+ TestStartPan(application, Vector2(11.0f, 12.0f), Vector2(27.0f, 12.0f), time);
+
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(22.0f, 12.0f), Vector2(27.0f, 20.0f), 10));
+
+ TestEndPan(application, Vector2(25.0f, 28.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(true, child == data.pannedActor, TEST_LOCATION);
- DALI_TEST_EQUALS(Vector2(8.0f, -5.0f), data.receivedGesture.displacement, 0.01f, TEST_LOCATION); // Actor relative
+ DALI_TEST_EQUALS(Vector2(16.0f, 2.0f), data.receivedGesture.GetDisplacement(), 0.01f, TEST_LOCATION); // Actor relative
END_TEST;
}
TestApplication application;
Actor first = Actor::New();
- first.SetSize(100.0f, 100.0f);
- first.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(first);
+ first.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ first.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(first);
Actor second = Actor::New();
- second.SetSize(100.0f, 100.0f);
- second.SetX(100.0f);
- second.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(second);
+ second.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ second.SetProperty(Actor::Property::POSITION_X, 100.0f);
+ second.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(second);
// Render and notify
application.SendNotification();
application.Render();
- SignalData data;
+ SignalData data;
GestureReceivedFunctor functor(data);
PanGestureDetector detector = PanGestureDetector::New();
detector.Attach(second);
detector.DetectedSignal().Connect(&application, functor);
+ DALI_TEST_EQUALS(application.GetScene().GetRootLayer(), first.GetParent(), TEST_LOCATION);
+ DALI_TEST_EQUALS(application.GetScene().GetRootLayer(), second.GetParent(), TEST_LOCATION);
+
// Start pan within second actor's area
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(110.0f, 20.0f), Vector2(120.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(110.0f, 20.0f), Vector2(120.0f, 20.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(110.0f, 20.0f), Vector2(126.0f, 20.0f), time);
+
+ DALI_TEST_EQUALS(application.GetScene().GetRootLayer(), first.GetParent(), TEST_LOCATION);
+ DALI_TEST_EQUALS(application.GetScene().GetRootLayer(), second.GetParent(), TEST_LOCATION);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(true, second == data.pannedActor, TEST_LOCATION);
// Pan moves into first actor's area - second actor should receive the pan
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(120.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+
+ TestMovePan(application, Vector2(126.0f, 20.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(true, second == data.pannedActor, TEST_LOCATION);
// Gesture ends within actor's area
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
+
+ TestMovePan(application, Vector2(26.0f, 20.0f), time);
+ TestEndPan(application, Vector2(10.0f, 4.0f), time);
+
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
+
END_TEST;
}
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
- SignalData data;
+ SignalData data;
GestureReceivedFunctor functor(data);
PanGestureDetector detector = PanGestureDetector::New();
detector.DetectedSignal().Connect(&application, functor);
// Start pan in actor's area
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
// Pan continues within actor's area
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
+
+ TestMovePan(application, Vector2(26.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
// Actor become invisible - actor should not receive the next pan
- actor.SetVisible(false);
+ actor.SetProperty(Actor::Property::VISIBLE, false);
// Render and notify
application.SendNotification();
// Gesture ends within actor's area
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 10.0f), Vector2(10.0f, 10.0f), 10));
- DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
- END_TEST;
-}
-
-int UtcDaliPanGestureSignalReceptionMultipleGestureDetectors(void)
-{
- TestApplication application;
- Dali::TestGestureManager& gestureManager = application.GetGestureManager();
-
- Actor first = Actor::New();
- first.SetSize(100.0f, 100.0f);
- first.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(first);
-
- Actor second = Actor::New();
- second.SetSize(100.0f, 100.0f);
- second.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- first.Add(second);
-
- // Render and notify
- application.SendNotification();
- application.Render();
-
- SignalData data;
- GestureReceivedFunctor functor(data);
-
- PanGestureDetector firstDetector = PanGestureDetector::New();
- firstDetector.Attach(first);
- firstDetector.DetectedSignal().Connect(&application, functor);
-
- // secondDetector is scoped
- {
- // Reset gestureManager statistics
- gestureManager.Initialize();
-
- PanGestureDetector secondDetector = PanGestureDetector::New();
- secondDetector.SetMinimumTouchesRequired(2);
- secondDetector.SetMaximumTouchesRequired(2);
- secondDetector.Attach(second);
- secondDetector.DetectedSignal().Connect(&application, functor);
-
- DALI_TEST_EQUALS(true, gestureManager.WasCalled(TestGestureManager::UpdateType), TEST_LOCATION);
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::RegisterType), TEST_LOCATION);
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::UnregisterType), TEST_LOCATION);
-
- // Start pan within second actor's area
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10, 2));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10, 2));
- DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(true, second == data.pannedActor, TEST_LOCATION);
-
- // Two touch pan changes to single touch - we should receive a finished state
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10));
- DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Gesture::Finished, data.receivedGesture.state, TEST_LOCATION);
- DALI_TEST_EQUALS(true, second == data.pannedActor, TEST_LOCATION);
-
- // Pan continues as single touch gesture - we should not receive any gesture
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 10.0f), Vector2(30.0f, 10.0f), 10));
- DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
-
- // Pan ends - still no signal
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(30.0f, 10.0f), Vector2(30.0f, 20.0f), 10));
- DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
-
- // Single touch pan starts - first actor should be panned
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(true, first == data.pannedActor, TEST_LOCATION);
-
- // Pan changes to double-touch - we should receive a finished state
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10, 2));
- DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(Gesture::Finished, data.receivedGesture.state, TEST_LOCATION);
- DALI_TEST_EQUALS(true, first == data.pannedActor, TEST_LOCATION);
-
- // Pan continues as double touch gesture - we should not receive any gesture
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 10.0f), Vector2(30.0f, 10.0f), 10));
- DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
-
- // Pan ends - still no signal
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(30.0f, 10.0f), Vector2(30.0f, 20.0f), 10));
- DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
- // Reset gesture manager statistics
- gestureManager.Initialize();
- }
+ TestEndPan(application, Vector2(10.0f, 4.0f), time);
- // secondDetector has now been deleted. Gesture detection should have been updated only
- DALI_TEST_EQUALS(true, gestureManager.WasCalled(TestGestureManager::UpdateType), TEST_LOCATION);
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::RegisterType), TEST_LOCATION);
- DALI_TEST_EQUALS(false, gestureManager.WasCalled(TestGestureManager::UnregisterType), TEST_LOCATION);
+ DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
END_TEST;
}
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
Actor actor2 = Actor::New();
- actor2.SetSize(100.0f, 100.0f);
- actor2.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
- Stage::GetCurrent().Add(actor2);
+ actor2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT);
+ application.GetScene().Add(actor2);
// Render and notify
application.SendNotification();
application.Render();
// Attach actor to one detector
- SignalData firstData;
+ SignalData firstData;
GestureReceivedFunctor firstFunctor(firstData);
- PanGestureDetector firstDetector = PanGestureDetector::New();
+ PanGestureDetector firstDetector = PanGestureDetector::New();
firstDetector.Attach(actor);
firstDetector.DetectedSignal().Connect(&application, firstFunctor);
// Attach actor to another detector
- SignalData secondData;
+ SignalData secondData;
GestureReceivedFunctor secondFunctor(secondData);
- PanGestureDetector secondDetector = PanGestureDetector::New();
+ PanGestureDetector secondDetector = PanGestureDetector::New();
secondDetector.Attach(actor);
secondDetector.DetectedSignal().Connect(&application, secondFunctor);
secondDetector.Attach(actor2);
// Pan in actor's area - both detector's functors should be called
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(true, firstData.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
// Pan continues in actor's area - both detector's functors should be called
firstData.Reset();
secondData.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10));
+
+ TestMovePan(application, Vector2(10.0f, 20.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, firstData.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
firstDetector.Detach(actor);
firstData.Reset();
secondData.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10));
+
+ TestEndPan(application, Vector2(10.0f, 4.0f), time);
+
DALI_TEST_EQUALS(false, firstData.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
// New pan on actor, only secondDetector has actor attached
firstData.Reset();
secondData.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(false, firstData.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(true, secondData.functorCalled, TEST_LOCATION);
secondDetector.Detach(actor);
firstData.Reset();
secondData.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10));
- DALI_TEST_EQUALS(false, firstData.functorCalled, TEST_LOCATION);
- DALI_TEST_EQUALS(false, secondData.functorCalled, TEST_LOCATION);
- END_TEST;
-}
-
-int UtcDaliPanGestureSignalReceptionMultipleStarted(void)
-{
- // Should handle two started events gracefully.
-
- TestApplication application;
-
- Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
-
- SignalData data;
- GestureReceivedFunctor functor(data);
-
- PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach(actor);
- detector.DetectedSignal().Connect(&application, functor);
-
- // Render and notify
- application.SendNotification();
- application.Render();
-
- // Start pan in actor's area
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
-
- // Send another start in actor's area
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
-
- // Add a child actor to overlap actor and send another start in actor's area
- Actor child = Actor::New();
- child.SetSize(100.0f, 100.0f);
- child.SetAnchorPoint(AnchorPoint::CENTER);
- child.SetParentOrigin(ParentOrigin::CENTER);
- actor.Add(child);
-
- TouchEventFunctor touchFunctor;
- child.TouchedSignal().Connect(&application, touchFunctor);
- // Render and notify
- application.SendNotification();
- application.Render();
+ TestMovePan(application, Vector2(10.0f, 20.0f), time);
- // Send another possible and start in actor's area
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(false, firstData.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(false, secondData.functorCalled, TEST_LOCATION);
- // Send another start in actor's area
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
END_TEST;
}
TestApplication application;
Actor actor1 = Actor::New();
- actor1.SetSize(100.0f, 100.0f);
- actor1.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor1);
- SignalData data1;
+ actor1.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor1);
+ SignalData data1;
GestureReceivedFunctor functor1(data1);
- PanGestureDetector detector1 = PanGestureDetector::New();
+ PanGestureDetector detector1 = PanGestureDetector::New();
detector1.Attach(actor1);
detector1.DetectedSignal().Connect(&application, functor1);
Actor actor2 = Actor::New();
- actor2.SetSize(100.0f, 100.0f);
- actor2.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
- actor2.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
- Stage::GetCurrent().Add(actor2);
- SignalData data2;
+ actor2.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_RIGHT);
+ actor2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_RIGHT);
+ application.GetScene().Add(actor2);
+ SignalData data2;
GestureReceivedFunctor functor2(data2);
- PanGestureDetector detector2 = PanGestureDetector::New();
+ PanGestureDetector detector2 = PanGestureDetector::New();
detector2.Attach(actor2);
detector2.DetectedSignal().Connect(&application, functor2);
application.Render();
// Start pan in actor1's area, only data1 should be set
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(true, data1.functorCalled, TEST_LOCATION);
DALI_TEST_EQUALS(false, data2.functorCalled, TEST_LOCATION);
END_TEST;
}
-int UtcDaliPanGestureSignalReceptionDifferentPossible(void)
+int UtcDaliPanGestureSignalReceptionAttachActorAfterDown(void)
{
+ // This test checks to ensure a pan is possible after attaching an actor after a down (possible) event
+
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
+ // Gesture possible in actor's area (using long-press)
+ uint32_t time = 100;
+ TestStartLongPress(application, 10.0f, 20.0f, time);
+ time += TestGetFrameInterval();
+
// Attach actor to detector
- SignalData data;
- GestureReceivedFunctor functor( data );
- PanGestureDetector detector = PanGestureDetector::New();
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ PanGestureDetector detector = PanGestureDetector::New();
+ detector.DetectedSignal().Connect(&application, functor);
detector.Attach(actor);
- detector.DetectedSignal().Connect( &application, functor );
- // Gesture possible in actor's area.
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ // Start a pan, initially it'll only be possible, we shouldn't receive it
+ TestMovePan(application, Vector2(10.0f, 20.0f), time);
+ time += TestGetFrameInterval();
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
- // Move actor somewhere else
- actor.SetPosition( 100.0f, 100.0f );
+ // Now the pan truly starts, we should receive a signal
+ TestMovePan(application, Vector2(26.0f, 20.0f), time);
+ time += TestGetFrameInterval();
+ TestMovePan(application, Vector2(32.0f, 32.0f), time);
+ time += TestGetFrameInterval();
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- // Render and notify
- application.SendNotification();
- application.Render();
+ // Finish the pan, we should still receive a signal
+ data.Reset();
+ TestEndPan(application, Vector2(32.0f, 32.0f), time);
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- // Emit Started event, we should not receive the long press.
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
+ END_TEST;
+}
- // LongPress possible in empty area.
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
+int UtcDaliPanGestureSignalReceptionAttachActorAfterDownAfterInitialPanToAnotherActor(void)
+{
+ // This test checks to ensure a pan is possible after attaching an actor after a down (possible) event even if another
+ // pan actor was there before (parent)
- // Move actor in to the long press position.
- actor.SetPosition( 0.0f, 0.0f );
+ TestApplication application;
+
+ Actor parent = Actor::New();
+ parent.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ parent.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(parent);
+
+ Actor child = Actor::New();
+ child.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ child.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
+ child.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+ parent.Add(child);
+
+ // Create detector for parent and attach
+ SignalData parentData;
+ GestureReceivedFunctor parentFunctor(parentData);
+ PanGestureDetector parentDetector = PanGestureDetector::New();
+ parentDetector.DetectedSignal().Connect(&application, parentFunctor);
+ parentDetector.Attach(parent);
+
+ // Create detector for child but do not attach
+ SignalData childData;
+ GestureReceivedFunctor childFunctor(childData);
+ PanGestureDetector childDetector = PanGestureDetector::New();
+ childDetector.DetectedSignal().Connect(&application, childFunctor);
// Render and notify
application.SendNotification();
application.Render();
- // Emit Started event, we should not receive the long press.
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
+ // Do a full pan in both actors' area, only the parent's functor should be called
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+ DALI_TEST_EQUALS(parentData.functorCalled, true, TEST_LOCATION);
+ DALI_TEST_EQUALS(childData.functorCalled, false, TEST_LOCATION);
+ parentData.Reset();
+ childData.Reset();
+ TestEndPan(application, Vector2(26.0f, 20.0f), time);
+ DALI_TEST_EQUALS(parentData.functorCalled, true, TEST_LOCATION);
+ DALI_TEST_EQUALS(childData.functorCalled, false, TEST_LOCATION);
+ parentData.Reset();
+ childData.Reset();
+
+ // Gesture possible in both actors' area (using long-press), no functors called
+ TestStartLongPress(application, 10.0f, 20.0f, time);
+ time += TestGetFrameInterval();
+ DALI_TEST_EQUALS(parentData.functorCalled, false, TEST_LOCATION);
+ DALI_TEST_EQUALS(childData.functorCalled, false, TEST_LOCATION);
+
+ // Attach the child as well now
+ childDetector.Attach(child);
+
+ // Now the pan truly starts, we should receive a signal for the child only
+ TestMovePan(application, Vector2(26.0f, 20.0f), time);
+ time += TestGetFrameInterval();
+ TestMovePan(application, Vector2(32.0f, 32.0f), time);
+ time += TestGetFrameInterval();
+ DALI_TEST_EQUALS(parentData.functorCalled, false, TEST_LOCATION);
+ DALI_TEST_EQUALS(childData.functorCalled, true, TEST_LOCATION);
+ parentData.Reset();
+ childData.Reset();
+
+ // Finish the pan, again only the child should still receive a signal
+ TestEndPan(application, Vector2(32.0f, 32.0f), time);
+ DALI_TEST_EQUALS(parentData.functorCalled, false, TEST_LOCATION);
+ DALI_TEST_EQUALS(childData.functorCalled, true, TEST_LOCATION);
- // Normal long press in actor's area for completeness.
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
END_TEST;
}
-int UtcDaliPanGestureEmitIncorrectState(void)
+int UtcDaliPanGestureSignalReceptionDifferentPossible(void)
{
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
// Attach actor to detector
- SignalData data;
- GestureReceivedFunctor functor( data );
- PanGestureDetector detector = PanGestureDetector::New();
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ PanGestureDetector detector = PanGestureDetector::New();
detector.Attach(actor);
- detector.DetectedSignal().Connect( &application, functor );
+ detector.DetectedSignal().Connect(&application, functor);
- // Try a Clear state
- try
- {
- application.ProcessEvent(GeneratePan(Gesture::Clear, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- tet_result(TET_FAIL);
- }
- catch ( Dali::DaliException& e )
- {
- DALI_TEST_ASSERT( e, "Incorrect state", TEST_LOCATION );
- }
+ // Gesture possible in actor's area.
+ uint32_t time = 100;
+ TestStartLongPress(application, 10.0f, 20.0f, time);
+ time += TestGetFrameInterval();
+
+ DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
+
+ // Move actor somewhere else
+ actor.SetProperty(Actor::Property::POSITION, Vector2(100.0f, 100.0f));
+
+ // Render and notify
+ application.SendNotification();
+ application.Render();
+
+ // Emit STARTED event, we should not receive the pan.
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+ TestEndPan(application, Vector2(26.0f, 20.0f), time);
+ time += TestGetFrameInterval();
+
+ DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
+
+ // LONG_PRESS possible in empty area.
+ TestStartLongPress(application, 10.0f, 20.0f, time);
+ time += TestGetFrameInterval();
+
+ DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
+
+ // Move actor in to the long press position.
+ actor.SetProperty(Actor::Property::POSITION, Vector2(0.0f, 0.0f));
+
+ // Render and notify
+ application.SendNotification();
+ application.Render();
+
+ // Emit STARTED event, we should be receiving the pan now.
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+ TestEndPan(application, Vector2(26.0f, 20.0f), time);
+ time += TestGetFrameInterval();
+
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+
+ // Normal pan in actor's area for completeness.
+ data.Reset();
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+ TestEndPan(application, Vector2(26.0f, 20.0f), time);
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
END_TEST;
}
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
// State to remove actor in.
- Gesture::State stateToUnstage( Gesture::Started );
+ GestureState stateToUnstage(GestureState::STARTED);
// Attach actor to detector
- SignalData data;
- UnstageActorFunctor functor( data, stateToUnstage );
- PanGestureDetector detector = PanGestureDetector::New();
+ SignalData data;
+ UnstageActorFunctor functor(data, stateToUnstage, application.GetScene());
+ PanGestureDetector detector = PanGestureDetector::New();
detector.Attach(actor);
- detector.DetectedSignal().Connect( &application, functor );
+ detector.DetectedSignal().Connect(&application, functor);
// Emit signals
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+
+ TestEndPan(application, Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
data.Reset();
application.Render();
// Re-add actor to stage
- Stage::GetCurrent().Add(actor);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
- // Change state to Gesture::Continuing to remove
- stateToUnstage = Gesture::Continuing;
+ // Change state to GestureState::CONTINUING to remove
+ stateToUnstage = GestureState::CONTINUING;
// Emit signals
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+
+ TestMovePan(application, Vector2(26.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+
+ TestEndPan(application, Vector2(10.0f, 4.0f), time);
+
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
data.Reset();
application.Render();
// Re-add actor to stage
- Stage::GetCurrent().Add(actor);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
- // Change state to Gesture::Finished to remove
- stateToUnstage = Gesture::Finished;
+ // Change state to GestureState::FINISHED to remove
+ stateToUnstage = GestureState::FINISHED;
// Emit signals
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+
+ TestMovePan(application, Vector2(26.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+
+ TestEndPan(application, Vector2(10.0f, 4.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- tet_result( TET_PASS ); // If we get here then we have handled actor stage removal gracefully.
+ tet_result(TET_PASS); // If we get here then we have handled actor stage removal gracefully.
END_TEST;
}
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Create and add a second actor so that GestureDetector destruction does not come into play.
- Actor dummyActor( Actor::New() );
- dummyActor.SetSize( 100.0f, 100.0f );
- dummyActor.SetPosition( 100.0f, 100.0f );
- dummyActor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(dummyActor);
+ Actor dummyActor(Actor::New());
+ dummyActor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ dummyActor.SetProperty(Actor::Property::POSITION, Vector2(100.0f, 100.0f));
+ dummyActor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(dummyActor);
// Render and notify
application.SendNotification();
application.Render();
// State to remove actor in.
- Gesture::State stateToUnstage( Gesture::Started );
+ GestureState stateToUnstage(GestureState::STARTED);
// Attach actor to detector
- SignalData data;
- UnstageActorFunctor functor( data, stateToUnstage );
- PanGestureDetector detector = PanGestureDetector::New();
+ SignalData data;
+ UnstageActorFunctor functor(data, stateToUnstage, application.GetScene());
+ PanGestureDetector detector = PanGestureDetector::New();
detector.Attach(actor);
detector.Attach(dummyActor);
- detector.DetectedSignal().Connect( &application, functor );
+ detector.DetectedSignal().Connect(&application, functor);
- // Here we are testing a Started actor which is removed in the Started callback, but then added back
+ // Here we are testing a STARTED actor which is removed in the STARTED callback, but then added back
// before we get a continuing state. As we were removed from the stage, even if we're at the same
// position, we should still not be signalled.
// Emit signals
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
data.Reset();
application.Render();
// Re add to the stage, we should not be signalled
- Stage::GetCurrent().Add(actor);
+ application.GetScene().Add(actor);
// Render and notify
application.SendNotification();
application.Render();
// Continue signal emission
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ TestMovePan(application, Vector2(26.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+
+ TestEndPan(application, Vector2(10.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
data.Reset();
// Here we delete an actor in started, we should not receive any subsequent signalling.
// Emit signals
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
data.Reset();
application.Render();
// Continue signal emission
- application.ProcessEvent(GeneratePan(Gesture::Continuing, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
- data.Reset();
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
- END_TEST;
-}
-
-int UtcDaliPanGestureSystemOverlay(void)
-{
- TestApplication application;
- Dali::Integration::Core& core = application.GetCore();
- Dali::Integration::SystemOverlay& systemOverlay( core.GetSystemOverlay() );
- systemOverlay.GetOverlayRenderTasks().CreateTask();
-
- Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- systemOverlay.Add(actor);
-
- // Render and notify
- application.SendNotification();
- application.Render();
-
- SignalData data;
- GestureReceivedFunctor functor(data);
-
- PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach(actor);
- detector.DetectedSignal().Connect(&application, functor);
-
- Vector2 screenCoordsStart( 10.0f, 20.0f );
- Vector2 screenCoordsEnd( 20.0f, 20.0f );
-
- // Start pan within the actor's area
- application.ProcessEvent( GeneratePan( Gesture::Possible, screenCoordsStart, screenCoordsEnd, 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, screenCoordsStart, screenCoordsEnd, 10 ) );
- DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- END_TEST;
-}
-
-int UtcDaliPanGestureBehindTouchableSystemOverlay(void)
-{
- TestApplication application;
- Dali::Integration::Core& core = application.GetCore();
- Dali::Integration::SystemOverlay& systemOverlay( core.GetSystemOverlay() );
- systemOverlay.GetOverlayRenderTasks().CreateTask();
-
- // SystemOverlay actor
- Actor systemOverlayActor = Actor::New();
- systemOverlayActor.SetSize(100.0f, 100.0f);
- systemOverlayActor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- systemOverlay.Add(systemOverlayActor);
-
- // Stage actor
- Actor stageActor = Actor::New();
- stageActor.SetSize(100.0f, 100.0f);
- stageActor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(stageActor);
-
- // Render and notify
- application.SendNotification();
- application.Render();
-
- // Set system-overlay actor to touchable
- TouchEventData touchData;
- TouchEventDataFunctor touchFunctor( touchData );
- systemOverlayActor.TouchedSignal().Connect(&application, touchFunctor);
-
- // Set stage actor to receive the gesture
- SignalData data;
- GestureReceivedFunctor functor(data);
-
- PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach(stageActor);
- detector.DetectedSignal().Connect(&application, functor);
-
- Vector2 screenCoordsStart( 10.0f, 20.0f );
- Vector2 screenCoordsEnd( 20.0f, 20.0f );
-
- // Start pan within the two actors' area
- application.ProcessEvent( GeneratePan( Gesture::Possible, screenCoordsStart, screenCoordsEnd, 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, screenCoordsStart, screenCoordsEnd, 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Finished, screenCoordsStart, screenCoordsEnd, 10 ) );
- DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( false, touchData.functorCalled, TEST_LOCATION );
-
- data.Reset();
- touchData.Reset();
-
- // Do touch in the same area
- application.ProcessEvent( touchFunctor.GenerateSingleTouch( PointState::DOWN, screenCoordsStart ) );
- DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( true, touchData.functorCalled, TEST_LOCATION );
-
- END_TEST;
-}
-
-int UtcDaliPanGestureTouchBehindGesturedSystemOverlay(void)
-{
- TestApplication application;
- Dali::Integration::Core& core = application.GetCore();
- Dali::Integration::SystemOverlay& systemOverlay( core.GetSystemOverlay() );
- systemOverlay.GetOverlayRenderTasks().CreateTask();
-
- // SystemOverlay actor
- Actor systemOverlayActor = Actor::New();
- systemOverlayActor.SetSize(100.0f, 100.0f);
- systemOverlayActor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- systemOverlay.Add(systemOverlayActor);
-
- // Stage actor
- Actor stageActor = Actor::New();
- stageActor.SetSize(100.0f, 100.0f);
- stageActor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(stageActor);
-
- // Render and notify
- application.SendNotification();
- application.Render();
-
- // Set stage actor to touchable
- TouchEventData touchData;
- TouchEventDataFunctor touchFunctor( touchData );
- stageActor.TouchedSignal().Connect(&application, touchFunctor);
-
- // Set system-overlay actor to have the gesture
- SignalData data;
- GestureReceivedFunctor functor(data);
-
- PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach(systemOverlayActor);
- detector.DetectedSignal().Connect(&application, functor);
-
- Vector2 screenCoordsStart( 10.0f, 20.0f );
- Vector2 screenCoordsEnd( 20.0f, 20.0f );
-
- // Start pan within the two actors' area
- application.ProcessEvent( GeneratePan( Gesture::Possible, screenCoordsStart, screenCoordsEnd, 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, screenCoordsStart, screenCoordsEnd, 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Finished, screenCoordsStart, screenCoordsEnd, 10 ) );
- DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( false, touchData.functorCalled, TEST_LOCATION );
+ TestMovePan(application, Vector2(26.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+ DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
data.Reset();
- touchData.Reset();
- // Do touch in the same area
- application.ProcessEvent( touchFunctor.GenerateSingleTouch( PointState::DOWN, screenCoordsStart ) );
- DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( true, touchData.functorCalled, TEST_LOCATION );
+ TestEndPan(application, Vector2(10.0f, 4.0f), time);
+ DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
END_TEST;
}
TestApplication application;
PanGestureDetector detector = PanGestureDetector::New();
- DALI_TEST_EQUALS( detector.GetAngleCount(), 0u, TEST_LOCATION );
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 0u, TEST_LOCATION);
- detector.AddAngle( PanGestureDetector::DIRECTION_LEFT, Radian( Math::PI * 0.25 ) );
- DALI_TEST_EQUALS( detector.GetAngleCount(), 1u, TEST_LOCATION );
+ detector.AddAngle(PanGestureDetector::DIRECTION_LEFT, Radian(Math::PI * 0.25));
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 1u, TEST_LOCATION);
bool found = false;
- for( size_t i = 0; i < detector.GetAngleCount(); i++)
+ for(size_t i = 0; i < detector.GetAngleCount(); i++)
{
- if( detector.GetAngle(i).first == PanGestureDetector::DIRECTION_LEFT )
+ if(detector.GetAngle(i).first == PanGestureDetector::DIRECTION_LEFT)
{
- tet_result( TET_PASS );
+ tet_result(TET_PASS);
found = true;
break;
}
}
- if(!found )
+ if(!found)
{
- tet_printf("%s, angle not added\n", TEST_LOCATION );
- tet_result( TET_FAIL );
+ tet_printf("%s, angle not added\n", TEST_LOCATION);
+ tet_result(TET_FAIL);
}
- detector.AddAngle( PanGestureDetector::DIRECTION_RIGHT, Radian( Math::PI * 0.25 ) );
- DALI_TEST_EQUALS( detector.GetAngleCount(), 2u, TEST_LOCATION );
+ detector.AddAngle(PanGestureDetector::DIRECTION_RIGHT, Radian(Math::PI * 0.25));
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 2u, TEST_LOCATION);
// Remove something not in the container.
- detector.RemoveAngle( PanGestureDetector::DIRECTION_UP );
- DALI_TEST_EQUALS( detector.GetAngleCount(), 2u, TEST_LOCATION );
+ detector.RemoveAngle(PanGestureDetector::DIRECTION_UP);
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 2u, TEST_LOCATION);
- detector.RemoveAngle( PanGestureDetector::DIRECTION_RIGHT );
- DALI_TEST_EQUALS( detector.GetAngleCount(), 1u, TEST_LOCATION );
- for ( size_t i = 0; i < detector.GetAngleCount(); i++)
+ detector.RemoveAngle(PanGestureDetector::DIRECTION_RIGHT);
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 1u, TEST_LOCATION);
+ for(size_t i = 0; i < detector.GetAngleCount(); i++)
{
- if ( detector.GetAngle(i).first == PanGestureDetector::DIRECTION_RIGHT )
+ if(detector.GetAngle(i).first == PanGestureDetector::DIRECTION_RIGHT)
{
- tet_printf("%s, angle not removed\n", TEST_LOCATION );
- tet_result( TET_FAIL );
+ tet_printf("%s, angle not removed\n", TEST_LOCATION);
+ tet_result(TET_FAIL);
break;
}
}
detector.ClearAngles();
- DALI_TEST_EQUALS( detector.GetAngleCount(), 0u, TEST_LOCATION );
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 0u, TEST_LOCATION);
END_TEST;
}
TestApplication application;
PanGestureDetector detector = PanGestureDetector::New();
- DALI_TEST_EQUALS( detector.GetAngleCount(), 0, TEST_LOCATION );
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 0, TEST_LOCATION);
- detector.AddAngle( PanGestureDetector::DIRECTION_LEFT );
- DALI_TEST_EQUALS( detector.GetAngleCount(), 1, TEST_LOCATION );
+ detector.AddAngle(PanGestureDetector::DIRECTION_LEFT);
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 1, TEST_LOCATION);
- detector.AddAngle( PanGestureDetector::DIRECTION_RIGHT );
- DALI_TEST_EQUALS( detector.GetAngleCount(), 2, TEST_LOCATION );
+ detector.AddAngle(PanGestureDetector::DIRECTION_RIGHT);
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 2, TEST_LOCATION);
- detector.AddAngle( PanGestureDetector::DIRECTION_UP );
- DALI_TEST_EQUALS( detector.GetAngleCount(), 3, TEST_LOCATION );
+ detector.AddAngle(PanGestureDetector::DIRECTION_UP);
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 3, TEST_LOCATION);
- detector.AddAngle( PanGestureDetector::DIRECTION_DOWN );
- DALI_TEST_EQUALS( detector.GetAngleCount(), 4, TEST_LOCATION );
+ detector.AddAngle(PanGestureDetector::DIRECTION_DOWN);
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 4, TEST_LOCATION);
- DALI_TEST_EQUALS( detector.GetAngle(0).first, PanGestureDetector::DIRECTION_LEFT, TEST_LOCATION );
- DALI_TEST_EQUALS( detector.GetAngle(1).first, PanGestureDetector::DIRECTION_RIGHT, TEST_LOCATION );
- DALI_TEST_EQUALS( detector.GetAngle(2).first, PanGestureDetector::DIRECTION_UP, TEST_LOCATION );
- DALI_TEST_EQUALS( detector.GetAngle(3).first, PanGestureDetector::DIRECTION_DOWN, TEST_LOCATION );
+ DALI_TEST_EQUALS(detector.GetAngle(0).first, PanGestureDetector::DIRECTION_LEFT, TEST_LOCATION);
+ DALI_TEST_EQUALS(detector.GetAngle(1).first, PanGestureDetector::DIRECTION_RIGHT, TEST_LOCATION);
+ DALI_TEST_EQUALS(detector.GetAngle(2).first, PanGestureDetector::DIRECTION_UP, TEST_LOCATION);
+ DALI_TEST_EQUALS(detector.GetAngle(3).first, PanGestureDetector::DIRECTION_DOWN, TEST_LOCATION);
END_TEST;
}
-inline float RadiansToDegrees( float radian )
+inline float RadiansToDegrees(float radian)
{
return radian * 180.0f / Math::PI;
}
TestApplication application;
PanGestureDetector detector = PanGestureDetector::New();
- DALI_TEST_EQUALS( detector.GetAngleCount(), 0u, TEST_LOCATION );
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 0u, TEST_LOCATION);
//
// Angle
//
- detector.AddAngle( Degree(180.0f) );
- DALI_TEST_EQUALS( detector.GetAngle(0).first, Radian( Degree(-180.0f) ), 0.000001, TEST_LOCATION );
+ detector.AddAngle(Degree(180.0f));
+ DALI_TEST_EQUALS(detector.GetAngle(0).first, Radian(Degree(-180.0f)), 0.000001, TEST_LOCATION);
detector.ClearAngles();
- detector.AddAngle( Degree(190.0f) );
- DALI_TEST_EQUALS( detector.GetAngle(0).first, Radian( Degree(-170.0f) ), 0.000001, TEST_LOCATION );
+ detector.AddAngle(Degree(190.0f));
+ DALI_TEST_EQUALS(detector.GetAngle(0).first, Radian(Degree(-170.0f)), 0.000001, TEST_LOCATION);
detector.ClearAngles();
- detector.AddAngle( Degree(-190.0f) );
- DALI_TEST_EQUALS( detector.GetAngle(0).first, Radian( Degree(170.0f) ), 0.000001, TEST_LOCATION );
+ detector.AddAngle(Degree(-190.0f));
+ DALI_TEST_EQUALS(detector.GetAngle(0).first, Radian(Degree(170.0f)), 0.000001, TEST_LOCATION);
detector.ClearAngles();
- detector.AddAngle( Degree(350.0f) );
- DALI_TEST_EQUALS( detector.GetAngle(0).first, Radian( Degree(-10.0f) ), 0.000001, TEST_LOCATION );
+ detector.AddAngle(Degree(350.0f));
+ DALI_TEST_EQUALS(detector.GetAngle(0).first, Radian(Degree(-10.0f)), 0.000001, TEST_LOCATION);
detector.ClearAngles();
- detector.AddAngle( Degree(-350.0f) );
- DALI_TEST_EQUALS( detector.GetAngle(0).first, Radian( Degree(10.0f) ), 0.000001, TEST_LOCATION );
+ detector.AddAngle(Degree(-350.0f));
+ DALI_TEST_EQUALS(detector.GetAngle(0).first, Radian(Degree(10.0f)), 0.000001, TEST_LOCATION);
detector.ClearAngles();
- detector.AddAngle( Degree(370.0f) );
- DALI_TEST_EQUALS( detector.GetAngle(0).first, Radian( Degree(10.0f) ), 0.000001, TEST_LOCATION );
+ detector.AddAngle(Degree(370.0f));
+ DALI_TEST_EQUALS(detector.GetAngle(0).first, Radian(Degree(10.0f)), 0.000001, TEST_LOCATION);
detector.ClearAngles();
- detector.AddAngle( Degree(-370.0f) );
- DALI_TEST_EQUALS( detector.GetAngle(0).first, Radian( Degree(-10.0f) ), 0.000001, TEST_LOCATION );
+ detector.AddAngle(Degree(-370.0f));
+ DALI_TEST_EQUALS(detector.GetAngle(0).first, Radian(Degree(-10.0f)), 0.000001, TEST_LOCATION);
detector.ClearAngles();
//
// Threshold
//
- detector.AddAngle( PanGestureDetector::DIRECTION_RIGHT, Degree( 0.0f ) );
- DALI_TEST_EQUALS( detector.GetAngle(0).second, Radian( Degree(0.0f) ), 0.000001, TEST_LOCATION );
+ detector.AddAngle(PanGestureDetector::DIRECTION_RIGHT, Degree(0.0f));
+ DALI_TEST_EQUALS(detector.GetAngle(0).second, Radian(Degree(0.0f)), 0.000001, TEST_LOCATION);
detector.ClearAngles();
- detector.AddAngle( PanGestureDetector::DIRECTION_RIGHT, Degree( -10.0f ) );
- DALI_TEST_EQUALS( detector.GetAngle(0).second, Radian( Degree(10.0f) ), 0.000001, TEST_LOCATION );
+ detector.AddAngle(PanGestureDetector::DIRECTION_RIGHT, Degree(-10.0f));
+ DALI_TEST_EQUALS(detector.GetAngle(0).second, Radian(Degree(10.0f)), 0.000001, TEST_LOCATION);
detector.ClearAngles();
- detector.AddAngle( PanGestureDetector::DIRECTION_RIGHT, Degree( -181.0f ) );
- DALI_TEST_EQUALS( detector.GetAngle(0).second, Radian( Degree(180.0f) ), 0.000001, TEST_LOCATION );
+ detector.AddAngle(PanGestureDetector::DIRECTION_RIGHT, Degree(-181.0f));
+ DALI_TEST_EQUALS(detector.GetAngle(0).second, Radian(Degree(180.0f)), 0.000001, TEST_LOCATION);
detector.ClearAngles();
- detector.AddAngle( PanGestureDetector::DIRECTION_RIGHT, Degree( 181.0f ) );
- DALI_TEST_EQUALS( detector.GetAngle(0).second, Radian( Degree(180.0f) ), 0.000001, TEST_LOCATION );
+ detector.AddAngle(PanGestureDetector::DIRECTION_RIGHT, Degree(181.0f));
+ DALI_TEST_EQUALS(detector.GetAngle(0).second, Radian(Degree(180.0f)), 0.000001, TEST_LOCATION);
detector.ClearAngles();
END_TEST;
}
TestApplication application;
Actor parent = Actor::New();
- parent.SetSize(100.0f, 100.0f);
- parent.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(parent);
+ parent.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ parent.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(parent);
Actor child = Actor::New();
- child.SetSize(100.0f, 100.0f);
- child.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ child.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ child.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
parent.Add(child);
// Render and notify
// Parent detector only requires up pans
PanGestureDetector parentDetector = PanGestureDetector::New();
- parentDetector.Attach( parent );
- parentDetector.AddAngle( PanGestureDetector::DIRECTION_UP, Degree( 30.0f ) );
- SignalData parentData;
+ parentDetector.Attach(parent);
+ parentDetector.AddAngle(PanGestureDetector::DIRECTION_UP, Degree(30.0f));
+ SignalData parentData;
GestureReceivedFunctor parentFunctor(parentData);
parentDetector.DetectedSignal().Connect(&application, parentFunctor);
// Child detector only requires right pans
PanGestureDetector childDetector = PanGestureDetector::New();
- childDetector.Attach( child );
- childDetector.AddAngle( PanGestureDetector::DIRECTION_RIGHT, Degree( 30.0f ) );
- SignalData childData;
+ childDetector.Attach(child);
+ childDetector.AddAngle(PanGestureDetector::DIRECTION_RIGHT, Degree(30.0f));
+ SignalData childData;
GestureReceivedFunctor childFunctor(childData);
childDetector.DetectedSignal().Connect(&application, childFunctor);
// Generate an Up pan gesture, only parent should receive it.
- application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10 ) );
- DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION );
- application.ProcessEvent( GeneratePan( Gesture::Finished, Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(20.0f, 20.0f), Vector2(20.0f, 4.0f), time);
+
+ DALI_TEST_EQUALS(true, parentData.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(false, childData.functorCalled, TEST_LOCATION);
+
+ TestEndPan(application, Vector2(20.0f, 4.0f), time);
+ time += TestGetFrameInterval();
parentData.Reset();
childData.Reset();
// Generate a Right pan gesture, only child should receive it.
- application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, Vector2(20.0f, 20.0f), Vector2(30.0f, 20.0f), 10 ) );
- DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( true, childData.functorCalled, TEST_LOCATION );
- application.ProcessEvent( GeneratePan( Gesture::Finished, Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+ TestStartPan(application, Vector2(20.0f, 20.0f), Vector2(36.0f, 20.0f), time);
+
+ DALI_TEST_EQUALS(false, parentData.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(true, childData.functorCalled, TEST_LOCATION);
+
+ TestEndPan(application, Vector2(4.0f, 20.0f), time);
+ time += TestGetFrameInterval();
parentData.Reset();
childData.Reset();
// Generate a Down pan gesture, no one should receive it.
- application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, Vector2(20.0f, 20.0f), Vector2(20.0f, 30.0f), 10 ) );
- DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION );
- application.ProcessEvent( GeneratePan( Gesture::Finished, Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+ TestStartPan(application, Vector2(20.0f, 20.0f), Vector2(20.0f, 36.0f), time);
+
+ DALI_TEST_EQUALS(false, parentData.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(false, childData.functorCalled, TEST_LOCATION);
+
+ TestEndPan(application, Vector2(20.0f, 36.0f), time);
+ time += TestGetFrameInterval();
parentData.Reset();
childData.Reset();
// Generate a Left pan gesture, no one should receive it.
- application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10 ) );
- DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION );
- application.ProcessEvent( GeneratePan( Gesture::Finished, Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+ TestStartPan(application, Vector2(20.0f, 20.0f), Vector2(4.0f, 20.0f), time);
+
+ DALI_TEST_EQUALS(false, parentData.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(false, childData.functorCalled, TEST_LOCATION);
+
+ TestEndPan(application, Vector2(4.0f, 20.0f), time);
parentData.Reset();
childData.Reset();
END_TEST;
TestApplication application;
PanGestureDetector detector = PanGestureDetector::New();
- DALI_TEST_EQUALS( detector.GetAngleCount(), 0u, TEST_LOCATION );
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 0u, TEST_LOCATION);
- detector.AddDirection( PanGestureDetector::DIRECTION_LEFT, Radian( Math::PI * 0.25 ) );
- DALI_TEST_EQUALS( detector.GetAngleCount(), 2u, TEST_LOCATION );
+ detector.AddDirection(PanGestureDetector::DIRECTION_LEFT, Radian(Math::PI * 0.25));
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 2u, TEST_LOCATION);
bool found = false;
- for ( size_t i = 0; detector.GetAngleCount(); i++)
+ for(size_t i = 0; detector.GetAngleCount(); i++)
{
- if ( detector.GetAngle(i).first == PanGestureDetector::DIRECTION_LEFT )
+ if(detector.GetAngle(i).first == PanGestureDetector::DIRECTION_LEFT)
{
- tet_result( TET_PASS );
+ tet_result(TET_PASS);
found = true;
break;
}
-
}
- if (!found )
+ if(!found)
{
- tet_printf("%s, angle not added\n", TEST_LOCATION );
- tet_result( TET_FAIL );
+ tet_printf("%s, angle not added\n", TEST_LOCATION);
+ tet_result(TET_FAIL);
}
found = false;
- for( size_t i = 0; i < detector.GetAngleCount(); i++)
+ for(size_t i = 0; i < detector.GetAngleCount(); i++)
{
- if( detector.GetAngle(i).first == PanGestureDetector::DIRECTION_RIGHT )
+ if(detector.GetAngle(i).first == PanGestureDetector::DIRECTION_RIGHT)
{
- tet_result( TET_PASS );
+ tet_result(TET_PASS);
found = true;
break;
}
}
- if(!found )
+ if(!found)
{
- tet_printf("%s, angle not added\n", TEST_LOCATION );
- tet_result( TET_FAIL );
+ tet_printf("%s, angle not added\n", TEST_LOCATION);
+ tet_result(TET_FAIL);
}
// Remove something not in the container.
- detector.RemoveDirection( PanGestureDetector::DIRECTION_UP );
- DALI_TEST_EQUALS( detector.GetAngleCount(), 2u, TEST_LOCATION );
+ detector.RemoveDirection(PanGestureDetector::DIRECTION_UP);
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 2u, TEST_LOCATION);
- detector.RemoveDirection( PanGestureDetector::DIRECTION_RIGHT );
- DALI_TEST_EQUALS( detector.GetAngleCount(), 0u, TEST_LOCATION );
+ detector.RemoveDirection(PanGestureDetector::DIRECTION_RIGHT);
+ DALI_TEST_EQUALS(detector.GetAngleCount(), 0u, TEST_LOCATION);
END_TEST;
}
TestApplication application;
Actor parent = Actor::New();
- parent.SetSize(100.0f, 100.0f);
- parent.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(parent);
+ parent.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ parent.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(parent);
Actor child = Actor::New();
- child.SetSize(100.0f, 100.0f);
- child.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ child.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ child.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
parent.Add(child);
// Render and notify
// Parent detector only requires vertical panning
PanGestureDetector parentDetector = PanGestureDetector::New();
- parentDetector.Attach( parent );
- parentDetector.AddDirection( PanGestureDetector::DIRECTION_VERTICAL, Degree( 30.0f ) );
- SignalData parentData;
+ parentDetector.Attach(parent);
+ parentDetector.AddDirection(PanGestureDetector::DIRECTION_VERTICAL, Degree(30.0f));
+ SignalData parentData;
GestureReceivedFunctor parentFunctor(parentData);
parentDetector.DetectedSignal().Connect(&application, parentFunctor);
// Child detector only requires horizontal panning
PanGestureDetector childDetector = PanGestureDetector::New();
- childDetector.Attach( child );
- childDetector.AddDirection( PanGestureDetector::DIRECTION_HORIZONTAL, Degree( 30.0f ) );
- SignalData childData;
+ childDetector.Attach(child);
+ childDetector.AddDirection(PanGestureDetector::DIRECTION_HORIZONTAL, Degree(30.0f));
+ SignalData childData;
GestureReceivedFunctor childFunctor(childData);
childDetector.DetectedSignal().Connect(&application, childFunctor);
// Generate an Up pan gesture, only parent should receive it.
- application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, Vector2(20.0f, 20.0f), Vector2(20.0f, 10.0f), 10 ) );
- DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION );
- application.ProcessEvent( GeneratePan( Gesture::Finished, Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(20.0f, 20.0f), Vector2(20.0f, 4.0f), time);
+
+ DALI_TEST_EQUALS(true, parentData.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(false, childData.functorCalled, TEST_LOCATION);
+
+ TestEndPan(application, Vector2(20.0f, 20.0f), time);
+ time += TestGetFrameInterval();
parentData.Reset();
childData.Reset();
// Generate a Right pan gesture, only child should receive it.
- application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, Vector2(20.0f, 20.0f), Vector2(30.0f, 20.0f), 10 ) );
- DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( true, childData.functorCalled, TEST_LOCATION );
- application.ProcessEvent( GeneratePan( Gesture::Finished, Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+ TestStartPan(application, Vector2(20.0f, 20.0f), Vector2(36.0f, 20.0f), time);
+
+ DALI_TEST_EQUALS(false, parentData.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(true, childData.functorCalled, TEST_LOCATION);
+
+ TestEndPan(application, Vector2(20.0f, 20.0f), time);
+ time += TestGetFrameInterval();
parentData.Reset();
childData.Reset();
// Generate a Down pan gesture, only parent should receive it.
- application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, Vector2(20.0f, 20.0f), Vector2(20.0f, 30.0f), 10 ) );
- DALI_TEST_EQUALS( true, parentData.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION );
- application.ProcessEvent( GeneratePan( Gesture::Finished, Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+ TestStartPan(application, Vector2(20.0f, 20.0f), Vector2(20.0f, 36.0f), time);
+
+ DALI_TEST_EQUALS(true, parentData.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(false, childData.functorCalled, TEST_LOCATION);
+
+ TestEndPan(application, Vector2(20.0f, 20.0f), time);
+ time += TestGetFrameInterval();
parentData.Reset();
childData.Reset();
// Generate a Left pan gesture, only child should receive it.
- application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, Vector2(20.0f, 20.0f), Vector2(10.0f, 20.0f), 10 ) );
- DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( true, childData.functorCalled, TEST_LOCATION );
- application.ProcessEvent( GeneratePan( Gesture::Finished, Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+ TestStartPan(application, Vector2(20.0f, 20.0f), Vector2(4.0f, 20.0f), time);
+
+ DALI_TEST_EQUALS(false, parentData.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(true, childData.functorCalled, TEST_LOCATION);
+
+ TestEndPan(application, Vector2(20.0f, 20.0f), time);
+ time += TestGetFrameInterval();
parentData.Reset();
childData.Reset();
// Generate a pan at -45 degrees, no one should receive it.
- application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, Vector2(20.0f, 20.0f), Vector2(10.0f, 30.0f), 10 ) );
- DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION );
- application.ProcessEvent( GeneratePan( Gesture::Finished, Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+ TestStartPan(application, Vector2(20.0f, 20.0f), Vector2(9.0f, 31.0f), time);
+
+ DALI_TEST_EQUALS(false, parentData.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(false, childData.functorCalled, TEST_LOCATION);
+
+ TestEndPan(application, Vector2(20.0f, 20.0f), time);
+ time += TestGetFrameInterval();
parentData.Reset();
childData.Reset();
// Generate a pan at 45 degrees, no one should receive it.
- application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, Vector2(20.0f, 20.0f), Vector2(30.0f, 30.0f), 10 ) );
- DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION );
- application.ProcessEvent( GeneratePan( Gesture::Finished, Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
- parentData.Reset();
- childData.Reset();
+ TestStartPan(application, Vector2(20.0f, 20.0f), Vector2(31.0f, 31.0f), time);
+
+ DALI_TEST_EQUALS(false, parentData.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(false, childData.functorCalled, TEST_LOCATION);
- // Generate a pan at 135 degrees, no one should receive it.
- application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, Vector2(20.0f, 20.0f), Vector2(10.0f, 30.0f), 10 ) );
- DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION );
- application.ProcessEvent( GeneratePan( Gesture::Finished, Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+ TestEndPan(application, Vector2(20.0f, 20.0f), time);
+ time += TestGetFrameInterval();
parentData.Reset();
childData.Reset();
// Generate a pan at -135 degrees, no one should receive it.
- application.ProcessEvent( GeneratePan( Gesture::Possible, Vector2(20.0f, 20.0f), Vector2(20.0f, 20.0f), 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, Vector2(20.0f, 20.0f), Vector2(10.0f, 10.0f), 10 ) );
- DALI_TEST_EQUALS( false, parentData.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( false, childData.functorCalled, TEST_LOCATION );
- application.ProcessEvent( GeneratePan( Gesture::Finished, Vector2(20.0f, 30.0f), Vector2(20.0f, 20.0f), 10 ) );
+ TestStartPan(application, Vector2(20.0f, 20.0f), Vector2(4.0f, 4.0f), time);
+
+ DALI_TEST_EQUALS(false, parentData.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(false, childData.functorCalled, TEST_LOCATION);
+
+ TestEndPan(application, Vector2(20.0f, 20.0f), time);
parentData.Reset();
childData.Reset();
END_TEST;
Integration::SetPanGestureSmoothingMode(0);
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Add a pan detector
PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach( actor );
- SignalData data;
- GestureReceivedFunctor functor( data );
- detector.DetectedSignal().Connect( &application, functor );
+ detector.Attach(actor);
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ detector.DetectedSignal().Connect(&application, functor);
- Property::Index property = actor.RegisterProperty( "Dummy Property", Vector3::ZERO );
+ Property::Index property = actor.RegisterProperty("Dummy Property", Vector3::ZERO);
ConstraintData constraintData;
- Constraint constraint = Constraint::New<Vector3>( actor, property, PanConstraint( constraintData ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_POSITION ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_VELOCITY ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_POSITION ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_VELOCITY ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::PANNING ) );
+ Constraint constraint = Constraint::New<Vector3>(actor, property, PanConstraint(constraintData));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::PANNING));
constraint.Apply();
// Render and notify
application.SendNotification();
application.Render();
- Vector2 direction(Vector2::XAXIS * -5.0f);
- Vector2 startPosition( 1.0f, 1.0f );
- PerformSwipeGestureSwipe(application, startPosition, direction, PAN_GESTURE_UPDATE_COUNT, true);
- DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.called, true, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.screenPosition, startPosition + (direction * PAN_GESTURE_UPDATE_COUNT), 0.1f, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.localPosition, startPosition + (direction * PAN_GESTURE_UPDATE_COUNT), 0.1f, TEST_LOCATION );
+ Vector2 startPosition(1.0f, 1.0f);
+ Vector2 position(-14.0f, 1.0f);
+ Vector2 direction(Vector2::XAXIS * -5.0f);
+ uint32_t time = 100;
+
+ TestStartPan(application, startPosition, position, time);
+
+ for(int i = 0; i < 47; i++)
+ {
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ TestEndPan(application, position, time);
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.called, true, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.screenPosition, startPosition + (direction * PAN_GESTURE_UPDATE_COUNT), 0.1f, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.localPosition, startPosition + (direction * PAN_GESTURE_UPDATE_COUNT), 0.1f, TEST_LOCATION);
constraintData.Reset();
END_TEST;
Integration::SetPanGestureSmoothingMode(1);
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Add a pan detector
PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach( actor );
- SignalData data;
- GestureReceivedFunctor functor( data );
- detector.DetectedSignal().Connect( &application, functor );
+ detector.Attach(actor);
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ detector.DetectedSignal().Connect(&application, functor);
- Property::Index property = actor.RegisterProperty( "Dummy Property", Vector3::ZERO );
+ Property::Index property = actor.RegisterProperty("Dummy Property", Vector3::ZERO);
ConstraintData constraintData;
- Constraint constraint = Constraint::New<Vector3>( actor, property, PanConstraint( constraintData ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_POSITION ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_VELOCITY ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_POSITION ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_VELOCITY ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::PANNING ) );
+ Constraint constraint = Constraint::New<Vector3>(actor, property, PanConstraint(constraintData));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::PANNING));
constraint.Apply();
// Render and notify
application.SendNotification();
application.Render();
- Vector2 direction(Vector2::XAXIS * -5.0f);
- Vector2 previousPosition( 20.0f, 20.0f );
- Vector2 currentPosition( 20.0f, 10.0f );
- PerformSwipeGestureSwipe(application, Vector2(1.0f, 1.0f), direction, PAN_GESTURE_UPDATE_COUNT, true);
- DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.called, true, TEST_LOCATION );
+ Vector2 startPosition(1.0f, 1.0f);
+ Vector2 position(-14.0f, 1.0f);
+ Vector2 direction(Vector2::XAXIS * -5.0f);
+ uint32_t time = 100;
+
+ TestStartPan(application, startPosition, position, time);
+
+ for(int i = 0; i < 47; i++)
+ {
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ TestEndPan(application, position, time);
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.called, true, TEST_LOCATION);
// Take into account resampling done when prediction is off.
- DALI_TEST_EQUALS( constraintData.screenPosition, Vector2(1.0f, 1.0f) + (direction * (PAN_GESTURE_UPDATE_COUNT - 0.25f)), 0.15f, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.localPosition, Vector2(1.0f, 1.0f) + (direction * (PAN_GESTURE_UPDATE_COUNT - 0.25f)), 0.15f, TEST_LOCATION );
+ DALI_TEST_EQUALS(constraintData.screenPosition, startPosition + (direction * (PAN_GESTURE_UPDATE_COUNT - 0.25f)), 0.15f, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.localPosition, startPosition + (direction * (PAN_GESTURE_UPDATE_COUNT - 0.25f)), 0.15f, TEST_LOCATION);
constraintData.Reset();
END_TEST;
Integration::SetPanGestureSmoothingMode(0);
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Add a pan detector
PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach( actor );
- SignalData data;
- GestureReceivedFunctor functor( data );
- detector.DetectedSignal().Connect( &application, functor );
+ detector.Attach(actor);
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ detector.DetectedSignal().Connect(&application, functor);
- Property::Index property = actor.RegisterProperty( "Dummy Property", Vector3::ZERO );
+ Property::Index property = actor.RegisterProperty("Dummy Property", Vector3::ZERO);
ConstraintData constraintData;
- Constraint constraint = Constraint::New<Vector3>( actor, property, PanConstraint( constraintData ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_POSITION ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_VELOCITY ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_POSITION ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_VELOCITY ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::PANNING ) );
+ Constraint constraint = Constraint::New<Vector3>(actor, property, PanConstraint(constraintData));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::PANNING));
constraint.Apply();
// Render and notify
application.SendNotification();
application.Render();
- Vector2 direction(Vector2::XAXIS * -1.0f);
- Vector2 previousPosition( 20.0f, 20.0f );
- Vector2 currentPosition( 20.0f, 10.0f );
- PerformSwipeGestureSwipe(application, Vector2(1.0f, 1.0f), direction, PAN_GESTURE_UPDATE_COUNT, true);
- DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.called, true, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.screenPosition, Vector2(1.0f, 1.0f) + (direction * PAN_GESTURE_UPDATE_COUNT), 10.0f, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.localPosition, Vector2(1.0f, 1.0f) + (direction * PAN_GESTURE_UPDATE_COUNT), 10.0f, TEST_LOCATION );
+ Vector2 startPosition(1.0f, 1.0f);
+ Vector2 position(-1.0f, 1.0f);
+ Vector2 direction(Vector2::XAXIS * -1.0f);
+ uint32_t time = 100;
+
+ TestStartPan(application, startPosition, position, time);
+
+ for(int i = 0; i < 47; i++)
+ {
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ TestEndPan(application, position, time);
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.called, true, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.screenPosition, Vector2(1.0f, 1.0f) + (direction * PAN_GESTURE_UPDATE_COUNT), 10.0f, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.localPosition, Vector2(1.0f, 1.0f) + (direction * PAN_GESTURE_UPDATE_COUNT), 10.0f, TEST_LOCATION);
constraintData.Reset();
END_TEST;
}
-int UtcDaliPanGesturePredictionSmoothing(void)
+int UtcDaliPanGesturePredictionSmoothing01(void)
{
TestApplication application;
Integration::SetPanGesturePredictionMode(1);
Integration::SetPanGestureSmoothingMode(1);
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Add a pan detector
PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach( actor );
- SignalData data;
- GestureReceivedFunctor functor( data );
- detector.DetectedSignal().Connect( &application, functor );
+ detector.Attach(actor);
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ detector.DetectedSignal().Connect(&application, functor);
- Property::Index property = actor.RegisterProperty( "Dummy Property", Vector3::ZERO );
+ Property::Index property = actor.RegisterProperty("Dummy Property", Vector3::ZERO);
ConstraintData constraintData;
- Constraint constraint = Constraint::New<Vector3>( actor, property, PanConstraint( constraintData ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_POSITION ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_VELOCITY ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_POSITION ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_VELOCITY ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::PANNING ) );
+ Constraint constraint = Constraint::New<Vector3>(actor, property, PanConstraint(constraintData));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::PANNING));
constraint.Apply();
// Render and notify
application.SendNotification();
application.Render();
- Vector2 direction(Vector2::XAXIS * -1.0f);
- Vector2 previousPosition( 20.0f, 20.0f );
- Vector2 currentPosition( 20.0f, 10.0f );
- PerformSwipeGestureSwipe(application, Vector2(1.0f, 1.0f), direction, PAN_GESTURE_UPDATE_COUNT, true);
- DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.called, true, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.screenPosition, Vector2(1.0f, 1.0f) + (direction * PAN_GESTURE_UPDATE_COUNT), 10.0f, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.localPosition, Vector2(1.0f, 1.0f) + (direction * PAN_GESTURE_UPDATE_COUNT), 10.0f, TEST_LOCATION );
+ Vector2 startPosition(1.0f, 1.0f);
+ Vector2 position(-1.0f, 1.0f);
+ Vector2 direction(Vector2::XAXIS * -1.0f);
+ uint32_t time = 100;
+
+ TestStartPan(application, startPosition, position, time);
+
+ for(int i = 0; i < 47; i++)
+ {
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ TestEndPan(application, position, time);
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.called, true, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.screenPosition, Vector2(1.0f, 1.0f) + (direction * PAN_GESTURE_UPDATE_COUNT), 10.0f, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.localPosition, Vector2(1.0f, 1.0f) + (direction * PAN_GESTURE_UPDATE_COUNT), 10.0f, TEST_LOCATION);
constraintData.Reset();
END_TEST;
}
-int UtcDaliPanGestureSetProperties(void)
+int UtcDaliPanGesturePredictionSmoothing02(void)
+{
+ TestApplication application;
+ Integration::SetPanGesturePredictionMode(1);
+ Integration::SetPanGestureMaximumPredictionAmount(1);
+ Integration::SetPanGesturePredictionAmountAdjustment(2);
+ Integration::SetPanGestureSmoothingMode(1);
+ Integration::SetPanGestureSmoothingAmount(0.25f);
+
+ Actor actor = Actor::New();
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
+
+ // Add a pan detector
+ PanGestureDetector detector = PanGestureDetector::New();
+ detector.Attach(actor);
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ detector.DetectedSignal().Connect(&application, functor);
+
+ Property::Index property = actor.RegisterProperty("Dummy Property", Vector3::ZERO);
+
+ ConstraintData constraintData;
+ Constraint constraint = Constraint::New<Vector3>(actor, property, PanConstraint(constraintData));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::PANNING));
+ constraint.Apply();
+
+ // Render and notify
+ application.SendNotification();
+ application.Render();
+
+ Vector2 startPosition(2.0f, 2.0f);
+ Vector2 position(4.0f, 2.0f);
+ Vector2 directionX(Vector2::XAXIS);
+ Vector2 directionY(Vector2::YAXIS);
+ uint32_t time = 100;
+
+ TestStartPan(application, startPosition, position, time);
+
+ for(int i = 0; i < 7; i++)
+ {
+ position += directionX;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ position += directionX * 10.0f;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+
+ for(int i = 0; i < 2; i++)
+ {
+ position += (directionX * -1.0f);
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ for(int i = 0; i < 10; i++)
+ {
+ position += directionX;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ for(int i = 0; i < 10; i++)
+ {
+ position += directionY;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ TestEndPan(application, position, time);
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.called, true, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.screenPosition, Vector2(2.0f, 2.0f) + position, 10.0f, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.localPosition, Vector2(2.0f, 2.0f) + position, 10.0f, TEST_LOCATION);
+
+ constraintData.Reset();
+ END_TEST;
+}
+
+int UtcDaliPanGesturePrediction2SmoothingMultiTap01(void)
+{
+ TestApplication application;
+
+ Integration::SetPanGesturePredictionMode(2);
+ Integration::SetPanGesturePredictionAmount(57);
+ Integration::SetPanGestureSmoothingMode(2);
+ Integration::SetPanGestureUseActualTimes(false);
+ Integration::SetPanGestureInterpolationTimeRange(10);
+ Integration::SetPanGestureScalarOnlyPredictionEnabled(false);
+ Integration::SetPanGestureTwoPointPredictionEnabled(true);
+ Integration::SetPanGestureTwoPointInterpolatePastTime(42);
+ Integration::SetPanGestureTwoPointVelocityBias(0.35f);
+ Integration::SetPanGestureTwoPointAccelerationBias(0.10f);
+ Integration::SetPanGestureMultitapSmoothingRange(34);
+
+ Actor actor = Actor::New();
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
+
+ // Add a pan detector
+ PanGestureDetector detector = PanGestureDetector::New();
+ detector.Attach(actor);
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ detector.DetectedSignal().Connect(&application, functor);
+
+ Property::Index property = actor.RegisterProperty("Dummy Property", Vector3::ZERO);
+
+ ConstraintData constraintData;
+ Constraint constraint = Constraint::New<Vector3>(actor, property, PanConstraint(constraintData));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::PANNING));
+ constraint.Apply();
+
+ // Render and notify
+ application.SendNotification();
+ application.Render();
+
+ Vector2 startPosition(2.0f, 2.0f);
+ Vector2 position(-1.0f, 2.0f);
+ Vector2 direction(Vector2::XAXIS * -1.0f);
+ uint32_t time = 100;
+
+ TestStartPan(application, startPosition, position, time);
+
+ for(int i = 0; i < 27; i++)
+ {
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ TestEndPan(application, position, time);
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.called, true, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.screenPosition, Vector2(2.0f, 2.0f) + position, 10.0f, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.localPosition, Vector2(2.0f, 2.0f) + position, 10.0f, TEST_LOCATION);
+
+ constraintData.Reset();
+ END_TEST;
+}
+
+int UtcDaliPanGesturePrediction2SmoothingMultiTap02(void)
+{
+ TestApplication application;
+
+ Integration::SetPanGesturePredictionMode(2);
+ Integration::SetPanGestureSmoothingMode(2);
+ Integration::SetPanGestureUseActualTimes(true);
+ Integration::SetPanGestureInterpolationTimeRange(10);
+ Integration::SetPanGestureScalarOnlyPredictionEnabled(true);
+ Integration::SetPanGestureTwoPointPredictionEnabled(true);
+ Integration::SetPanGestureTwoPointInterpolatePastTime(42);
+ Integration::SetPanGestureTwoPointVelocityBias(0.35f);
+ Integration::SetPanGestureTwoPointAccelerationBias(0.10f);
+ Integration::SetPanGestureMultitapSmoothingRange(34);
+
+ Integration::EnableProfiling(Integration::PROFILING_TYPE_PAN_GESTURE);
+
+ Actor actor = Actor::New();
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
+
+ // Add a pan detector
+ PanGestureDetector detector = PanGestureDetector::New();
+ detector.Attach(actor);
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ detector.DetectedSignal().Connect(&application, functor);
+
+ Property::Index property = actor.RegisterProperty("Dummy Property", Vector3::ZERO);
+
+ ConstraintData constraintData;
+ Constraint constraint = Constraint::New<Vector3>(actor, property, PanConstraint(constraintData));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::PANNING));
+ constraint.Apply();
+
+ // Render and notify
+ application.SendNotification();
+ application.Render();
+
+ Vector2 startPosition(2.0f, 2.0f);
+ Vector2 position(17.0f, 2.0f);
+ Vector2 direction(Vector2::XAXIS * -1.0f);
+ uint32_t time = 100;
+
+ TestStartPan(application, startPosition, position, time);
+
+ for(int i = 0; i < 10; i++)
+ {
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ for(int i = 0; i < 10; i++)
+ {
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ for(int i = 0; i < 10; i++)
+ {
+ position += direction;
+ TestMovePan(application, position, time);
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ for(int i = 0; i < 10; i++)
+ {
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ TestEndPan(application, position, time);
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.called, true, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.screenPosition, Vector2(2.0f, 2.0f) + position, 10.0f, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.localPosition, Vector2(2.0f, 2.0f) + position, 10.0f, TEST_LOCATION);
+
+ constraintData.Reset();
+ END_TEST;
+}
+
+int UtcDaliPanGesturePrediction2Smoothing(void)
{
TestApplication application;
- TestRenderController& renderController( application.GetRenderController() );
+
+ Integration::SetPanGesturePredictionMode(2);
+ Integration::SetPanGesturePredictionAmount(57);
+ Integration::SetPanGestureSmoothingMode(1);
+ Integration::SetPanGestureUseActualTimes(false);
+ Integration::SetPanGestureInterpolationTimeRange(10);
+ Integration::SetPanGestureScalarOnlyPredictionEnabled(true);
+ Integration::SetPanGestureTwoPointPredictionEnabled(true);
+ Integration::SetPanGestureTwoPointInterpolatePastTime(42);
+ Integration::SetPanGestureTwoPointVelocityBias(0.35f);
+ Integration::SetPanGestureTwoPointAccelerationBias(0.10f);
+ Integration::SetPanGestureMultitapSmoothingRange(34);
+
+ Actor actor = Actor::New();
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
+
+ // Add a pan detector
+ PanGestureDetector detector = PanGestureDetector::New();
+ detector.Attach(actor);
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ detector.DetectedSignal().Connect(&application, functor);
+
+ Property::Index property = actor.RegisterProperty("Dummy Property", Vector3::ZERO);
+
+ ConstraintData constraintData;
+ Constraint constraint = Constraint::New<Vector3>(actor, property, PanConstraint(constraintData));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::PANNING));
+ constraint.Apply();
+
+ // Render and notify
+ application.SendNotification();
+ application.Render();
+
+ Vector2 startPosition(2.0f, 2.0f);
+ Vector2 position(17.0f, 2.0f);
+ Vector2 direction(Vector2::XAXIS * -1.0f);
+ uint32_t time = 100;
+
+ TestStartPan(application, startPosition, position, time);
+
+ for(int i = 0; i < 10; i++)
+ {
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+
+ for(int i = 0; i < 5; i++)
+ {
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ for(int i = 0; i < 10; i++)
+ {
+ position += direction;
+ TestMovePan(application, position, time);
+ time += TestGetFrameInterval();
+ application.SendNotification();
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+ }
+
+ TestEndPan(application, position, time);
+ application.Render(TestApplication::DEFAULT_RENDER_INTERVAL);
+
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.called, true, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.screenPosition, Vector2(2.0f, 2.0f) + position, 10.0f, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.localPosition, Vector2(2.0f, 2.0f) + position, 10.0f, TEST_LOCATION);
+
+ constraintData.Reset();
+ END_TEST;
+}
+
+int UtcDaliPanGestureSetProperties(void)
+{
+ TestApplication application;
+ TestRenderController& renderController(application.GetRenderController());
Integration::SetPanGesturePredictionMode(0);
Integration::SetPanGestureSmoothingMode(0);
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Add a pan detector
PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach( actor );
- SignalData data;
- GestureReceivedFunctor functor( data );
- detector.DetectedSignal().Connect( &application, functor );
+ detector.Attach(actor);
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ detector.DetectedSignal().Connect(&application, functor);
- Property::Index property = actor.RegisterProperty( "Dummy Property", Vector3::ZERO );
- Property::Index animatableGestureProperty = detector.RegisterProperty( "Dummy Property", Vector3::ZERO ); // For code coverage
+ Property::Index property = actor.RegisterProperty("Dummy Property", Vector3::ZERO);
+ Property::Index animatableGestureProperty = detector.RegisterProperty("Dummy Property", Vector3::ZERO); // For code coverage
ConstraintData constraintData;
- Constraint constraint = Constraint::New<Vector3>( actor, property, PanConstraint( constraintData ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_POSITION ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_VELOCITY ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_POSITION ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_VELOCITY ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::PANNING ) );
- constraint.AddSource( Source( detector, animatableGestureProperty ) );
+ Constraint constraint = Constraint::New<Vector3>(actor, property, PanConstraint(constraintData));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::PANNING));
+ constraint.AddSource(Source(detector, animatableGestureProperty));
constraint.Apply();
// Render and notify
application.Render();
renderController.Initialize();
- DALI_TEST_EQUALS( renderController.WasCalled( TestRenderController::RequestUpdateFunc ), false, TEST_LOCATION );
+ DALI_TEST_EQUALS(renderController.WasCalled(TestRenderController::RequestUpdateFunc), false, TEST_LOCATION);
- Vector2 screenPosition( 20.0f, 20.0f );
- Vector2 screenDisplacement( 1.0f, 1.0f );
- Vector2 screenVelocity( 1.3f, 4.0f );
- Vector2 localPosition( 21.0f, 21.0f );
- Vector2 localDisplacement( 0.5f, 0.5f );
- Vector2 localVelocity( 1.5f, 2.5f );
+ Vector2 screenPosition(20.0f, 20.0f);
+ Vector2 screenDisplacement(1.0f, 1.0f);
+ Vector2 screenVelocity(1.3f, 4.0f);
+ Vector2 localPosition(21.0f, 21.0f);
+ Vector2 localDisplacement(0.5f, 0.5f);
+ Vector2 localVelocity(1.5f, 2.5f);
- PanGestureDetector::SetPanGestureProperties( GeneratePan( 1u, Gesture::Started, screenPosition, localPosition, screenDisplacement, localDisplacement, screenVelocity, localVelocity ) );
- DALI_TEST_EQUALS( renderController.WasCalled( TestRenderController::RequestUpdateFunc ), true, TEST_LOCATION );
+ PanGestureDetector::SetPanGestureProperties(GeneratePan(1u, GestureState::STARTED, screenPosition, localPosition, screenDisplacement, localDisplacement, screenVelocity, localVelocity));
+ DALI_TEST_EQUALS(renderController.WasCalled(TestRenderController::RequestUpdateFunc), true, TEST_LOCATION);
// Render and notify
application.SendNotification();
application.Render();
- DALI_TEST_EQUALS( constraintData.called, true, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.screenPosition, screenPosition, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.localPosition, localPosition, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.screenDisplacement, screenDisplacement, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.localDisplacement, localDisplacement, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.screenVelocity, screenVelocity, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.localVelocity, localVelocity, TEST_LOCATION );
+ DALI_TEST_EQUALS(constraintData.called, true, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.screenPosition, screenPosition, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.localPosition, localPosition, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.screenDisplacement, screenDisplacement, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.localDisplacement, localDisplacement, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.screenVelocity, screenVelocity, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.localVelocity, localVelocity, TEST_LOCATION);
constraintData.Reset();
END_TEST;
}
Integration::SetPanGesturePredictionMode(0);
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Add a pan detector
PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach( actor );
- SignalData data;
- GestureReceivedFunctor functor( data );
- detector.DetectedSignal().Connect( &application, functor );
+ detector.Attach(actor);
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ detector.DetectedSignal().Connect(&application, functor);
- Property::Index property = actor.RegisterProperty( "Dummy Property", Vector3::ZERO );
+ Property::Index property = actor.RegisterProperty("Dummy Property", Vector3::ZERO);
ConstraintData constraintData;
- Constraint constraint = Constraint::New<Vector3>( actor, property, PanConstraint( constraintData ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_POSITION ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::SCREEN_VELOCITY ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_POSITION ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::LOCAL_VELOCITY ) );
- constraint.AddSource( Source( detector, PanGestureDetector::Property::PANNING ) );
+ Constraint constraint = Constraint::New<Vector3>(actor, property, PanConstraint(constraintData));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::SCREEN_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_POSITION));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_DISPLACEMENT));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::LOCAL_VELOCITY));
+ constraint.AddSource(Source(detector, PanGestureDetector::Property::PANNING));
constraint.Apply();
// Render and notify
application.SendNotification();
application.Render();
- Vector2 previousPosition( 20.0f, 20.0f );
- Vector2 currentPosition( 20.0f, 10.0f );
- application.ProcessEvent( GeneratePan( Gesture::Possible, previousPosition, previousPosition, 10 ) );
- application.ProcessEvent( GeneratePan( Gesture::Started, previousPosition, currentPosition, 10 ) );
- DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
+ Vector2 currentPosition(20.0f, 4.0f);
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(20.0f, 20.0f), currentPosition, time);
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- Vector2 screenPosition( 100.0f, 20.0f );
- Vector2 localPosition( 110.0f, 110.0f );
+ Vector2 screenPosition(100.0f, 20.0f);
+ Vector2 localPosition(110.0f, 110.0f);
- PanGestureDetector::SetPanGestureProperties( GeneratePan( 1u, Gesture::Started, screenPosition, localPosition ) );
+ PanGestureDetector::SetPanGestureProperties(GeneratePan(1u, GestureState::STARTED, screenPosition, localPosition));
// Render and notify
application.SendNotification();
application.Render();
- DALI_TEST_EQUALS( constraintData.called, true, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.screenPosition, currentPosition, 0.1, TEST_LOCATION );
- DALI_TEST_EQUALS( constraintData.localPosition, currentPosition, 0.1f, TEST_LOCATION );
+ DALI_TEST_EQUALS(constraintData.called, true, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.screenPosition, currentPosition, 0.1, TEST_LOCATION);
+ DALI_TEST_EQUALS(constraintData.localPosition, currentPosition, 0.1f, TEST_LOCATION);
constraintData.Reset();
END_TEST;
}
int UtcDaliPanGesturePropertyIndices(void)
{
- TestApplication application;
+ TestApplication application;
PanGestureDetector detector = PanGestureDetector::New();
Property::IndexContainer indices;
- detector.GetPropertyIndices( indices );
- DALI_TEST_CHECK( indices.Size() );
- DALI_TEST_EQUALS( indices.Size(), detector.GetPropertyCount(), TEST_LOCATION );
+ detector.GetPropertyIndices(indices);
+ DALI_TEST_CHECK(indices.Size());
+ DALI_TEST_EQUALS(indices.Size(), detector.GetPropertyCount(), TEST_LOCATION);
END_TEST;
}
{
struct PropertyStringIndex
{
- const char * const name;
+ const char* const name;
const Property::Index index;
- const Property::Type type;
+ const Property::Type type;
const Property::Value value;
};
const PropertyStringIndex PROPERTY_TABLE[] =
-{
- { "screenPosition", PanGestureDetector::Property::SCREEN_POSITION, Property::VECTOR2, Vector2::ZERO },
- { "screenDisplacement", PanGestureDetector::Property::SCREEN_DISPLACEMENT, Property::VECTOR2, Vector2::ZERO },
- { "screenVelocity", PanGestureDetector::Property::SCREEN_VELOCITY, Property::VECTOR2, Vector2::ZERO },
- { "localPosition", PanGestureDetector::Property::LOCAL_POSITION, Property::VECTOR2, Vector2::ZERO },
- { "localDisplacement", PanGestureDetector::Property::LOCAL_DISPLACEMENT, Property::VECTOR2, Vector2::ZERO },
- { "localVelocity", PanGestureDetector::Property::LOCAL_VELOCITY, Property::VECTOR2, Vector2::ZERO },
- { "panning", PanGestureDetector::Property::PANNING, Property::BOOLEAN, false },
+ {
+ {"screenPosition", PanGestureDetector::Property::SCREEN_POSITION, Property::VECTOR2, Vector2::ZERO},
+ {"screenDisplacement", PanGestureDetector::Property::SCREEN_DISPLACEMENT, Property::VECTOR2, Vector2::ZERO},
+ {"screenVelocity", PanGestureDetector::Property::SCREEN_VELOCITY, Property::VECTOR2, Vector2::ZERO},
+ {"localPosition", PanGestureDetector::Property::LOCAL_POSITION, Property::VECTOR2, Vector2::ZERO},
+ {"localDisplacement", PanGestureDetector::Property::LOCAL_DISPLACEMENT, Property::VECTOR2, Vector2::ZERO},
+ {"localVelocity", PanGestureDetector::Property::LOCAL_VELOCITY, Property::VECTOR2, Vector2::ZERO},
+ {"panning", PanGestureDetector::Property::PANNING, Property::BOOLEAN, false},
};
-const unsigned int PROPERTY_TABLE_COUNT = sizeof( PROPERTY_TABLE ) / sizeof( PROPERTY_TABLE[0] );
+const unsigned int PROPERTY_TABLE_COUNT = sizeof(PROPERTY_TABLE) / sizeof(PROPERTY_TABLE[0]);
} // unnamed namespace
-
int UtcDaliPanGestureProperties(void)
{
- TestApplication application;
+ TestApplication application;
PanGestureDetector detector = PanGestureDetector::New();
- for( unsigned int i = 0; i < PROPERTY_TABLE_COUNT; ++i )
+ for(unsigned int i = 0; i < PROPERTY_TABLE_COUNT; ++i)
{
- DALI_TEST_EQUALS( detector.GetPropertyName( PROPERTY_TABLE[ i ].index ), std::string( PROPERTY_TABLE[ i ].name ), TEST_LOCATION );
- DALI_TEST_EQUALS( detector.GetPropertyIndex( PROPERTY_TABLE[ i ].name ), PROPERTY_TABLE[ i ].index, TEST_LOCATION );
- DALI_TEST_EQUALS( detector.GetPropertyType( PROPERTY_TABLE[ i ].index ), PROPERTY_TABLE[ i ].type, TEST_LOCATION );
- DALI_TEST_EQUALS( detector.IsPropertyWritable( PROPERTY_TABLE[ i ].index ), false, TEST_LOCATION );
- DALI_TEST_EQUALS( detector.IsPropertyAnimatable( PROPERTY_TABLE[ i ].index ), false, TEST_LOCATION );
- DALI_TEST_EQUALS( detector.IsPropertyAConstraintInput( PROPERTY_TABLE[ i ].index ), true, TEST_LOCATION );
- detector.SetProperty( PROPERTY_TABLE[ i ].index, Property::Value() ); // Just for Coverage
+ DALI_TEST_EQUALS(detector.GetPropertyName(PROPERTY_TABLE[i].index), std::string(PROPERTY_TABLE[i].name), TEST_LOCATION);
+ DALI_TEST_EQUALS(detector.GetPropertyIndex(PROPERTY_TABLE[i].name), PROPERTY_TABLE[i].index, TEST_LOCATION);
+ DALI_TEST_EQUALS(detector.GetPropertyType(PROPERTY_TABLE[i].index), PROPERTY_TABLE[i].type, TEST_LOCATION);
+ DALI_TEST_EQUALS(detector.IsPropertyWritable(PROPERTY_TABLE[i].index), false, TEST_LOCATION);
+ DALI_TEST_EQUALS(detector.IsPropertyAnimatable(PROPERTY_TABLE[i].index), false, TEST_LOCATION);
+ DALI_TEST_EQUALS(detector.IsPropertyAConstraintInput(PROPERTY_TABLE[i].index), true, TEST_LOCATION);
+ detector.SetProperty(PROPERTY_TABLE[i].index, Property::Value()); // Just for Coverage
}
END_TEST;
int UtcDaliPanGestureGetProperty(void)
{
- TestApplication application;
+ TestApplication application;
PanGestureDetector detector = PanGestureDetector::New();
- for( unsigned int i = 0; i < PROPERTY_TABLE_COUNT; ++i )
+ for(unsigned int i = 0; i < PROPERTY_TABLE_COUNT; ++i)
{
- if( PROPERTY_TABLE[ i ].type == Property::VECTOR2 )
+ if(PROPERTY_TABLE[i].type == Property::VECTOR2)
{
- bool value = detector.GetProperty( PROPERTY_TABLE[ i ].index ).Get< bool >();
- DALI_TEST_EQUALS( PROPERTY_TABLE[ i ].value.Get< bool >(), value, TEST_LOCATION );
+ bool value = detector.GetProperty(PROPERTY_TABLE[i].index).Get<bool>();
+ DALI_TEST_EQUALS(PROPERTY_TABLE[i].value.Get<bool>(), value, TEST_LOCATION);
}
- else if( PROPERTY_TABLE[ i ].type == Property::BOOLEAN )
+ else if(PROPERTY_TABLE[i].type == Property::BOOLEAN)
{
- Vector2 value = detector.GetProperty( PROPERTY_TABLE[ i ].index ).Get< Vector2 >();
- DALI_TEST_EQUALS( PROPERTY_TABLE[ i ].value.Get< Vector2 >(), value, TEST_LOCATION );
+ Vector2 value = detector.GetProperty(PROPERTY_TABLE[i].index).Get<Vector2>();
+ DALI_TEST_EQUALS(PROPERTY_TABLE[i].value.Get<Vector2>(), value, TEST_LOCATION);
}
}
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Add a pan detector
PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach( actor );
+ detector.Attach(actor);
// Render and notify
application.SendNotification();
application.Render();
- for( unsigned int i = 0; i < PROPERTY_TABLE_COUNT; ++i )
+ for(unsigned int i = 0; i < PROPERTY_TABLE_COUNT; ++i)
{
- detector.SetProperty( PROPERTY_TABLE[ i ].index, Property::Value() ); // Just for Coverage
+ detector.SetProperty(PROPERTY_TABLE[i].index, Property::Value()); // Just for Coverage
- if( PROPERTY_TABLE[ i ].type == Property::VECTOR2 )
+ if(PROPERTY_TABLE[i].type == Property::VECTOR2)
{
- bool value = detector.GetProperty( PROPERTY_TABLE[ i ].index ).Get< bool >();
- DALI_TEST_EQUALS( PROPERTY_TABLE[ i ].value.Get< bool >(), value, TEST_LOCATION );
+ bool value = detector.GetProperty(PROPERTY_TABLE[i].index).Get<bool>();
+ DALI_TEST_EQUALS(PROPERTY_TABLE[i].value.Get<bool>(), value, TEST_LOCATION);
}
- else if( PROPERTY_TABLE[ i ].type == Property::BOOLEAN )
+ else if(PROPERTY_TABLE[i].type == Property::BOOLEAN)
{
- Vector2 value = detector.GetProperty( PROPERTY_TABLE[ i ].index ).Get< Vector2 >();
- DALI_TEST_EQUALS( PROPERTY_TABLE[ i ].value.Get< Vector2 >(), value, TEST_LOCATION );
+ Vector2 value = detector.GetProperty(PROPERTY_TABLE[i].index).Get<Vector2>();
+ DALI_TEST_EQUALS(PROPERTY_TABLE[i].value.Get<Vector2>(), value, TEST_LOCATION);
}
}
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Add a pan detector
PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach( actor );
- SignalData data;
- GestureReceivedFunctor functor( data );
- detector.DetectedSignal().Connect( &application, functor );
+ detector.Attach(actor);
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ detector.DetectedSignal().Connect(&application, functor);
// Add a layer to overlap the actor
Layer layer = Layer::New();
- layer.SetSize(100.0f, 100.0f);
- layer.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add( layer );
+ layer.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ layer.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(layer);
layer.RaiseToTop();
// Render and notify
application.Render();
// Emit signals, should receive
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+ TestEndPan(application, Vector2(26.0f, 20.0f), time);
+ time += TestGetFrameInterval();
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
data.Reset();
// Set layer to consume all touch
- layer.SetTouchConsumed( true );
+ layer.SetProperty(Layer::Property::CONSUMES_TOUCH, true);
// Render and notify
application.SendNotification();
application.Render();
// Emit the same signals again, should not receive
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 10));
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+ TestEndPan(application, Vector2(26.0f, 20.0f), time);
+
DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION);
data.Reset();
TestApplication application;
Actor actor = Actor::New();
- actor.SetSize(100.0f, 100.0f);
- actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(actor);
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
// Add a pan detector
PanGestureDetector detector = PanGestureDetector::New();
- detector.Attach( actor );
- SignalData data;
- GestureReceivedFunctor functor( data );
- detector.DetectedSignal().Connect( &application, functor );
+ detector.Attach(actor);
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+ detector.DetectedSignal().Connect(&application, functor);
// Render and notify
application.SendNotification();
application.Render();
- // Emit signals, should receive
- application.ProcessEvent(GeneratePan(Gesture::Possible, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 0));
- application.ProcessEvent(GeneratePan(Gesture::Started, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 0));
- application.ProcessEvent(GeneratePan(Gesture::Finished, Vector2(10.0f, 20.0f), Vector2(20.0f, 20.0f), 0));
+ // As normal helper function adds intervals between presses we must generate the sequence
+ // using other helper functions
+ TestStartLongPress(application, 10.0f, 20.0f, 100); // Used to send a down press event
+ TestMovePan(application, Vector2(26.0f, 20.0f), 100);
+ TestMovePan(application, Vector2(26.0f, 20.0f), 100); // 2 motions required to trigger
+ TestEndPan(application, Vector2(26.0f, 20.0f), 100);
+
DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
- DALI_TEST_CHECK( !std::isinf( data.receivedGesture.velocity.x ) );
- DALI_TEST_CHECK( !std::isinf( data.receivedGesture.velocity.y ) );
- DALI_TEST_CHECK( !std::isinf( data.receivedGesture.screenVelocity.x ) );
- DALI_TEST_CHECK( !std::isinf( data.receivedGesture.screenVelocity.y ) );
+ DALI_TEST_CHECK(!std::isinf(data.receivedGesture.GetVelocity().x));
+ DALI_TEST_CHECK(!std::isinf(data.receivedGesture.GetVelocity().y));
+ DALI_TEST_CHECK(!std::isinf(data.receivedGesture.GetScreenVelocity().x));
+ DALI_TEST_CHECK(!std::isinf(data.receivedGesture.GetScreenVelocity().y));
data.Reset();
data.Reset();
END_TEST;
}
+
+int UtcDaliPanGestureInterruptedWhenTouchConsumed(void)
+{
+ TestApplication application;
+
+ Actor actor = Actor::New();
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
+
+ bool consume = false;
+ TouchEventFunctorConsumeSetter touchFunctor(consume);
+ actor.TouchedSignal().Connect(&application, touchFunctor);
+
+ // Render and notify
+ application.SendNotification();
+ application.Render();
+
+ SignalData data;
+ GestureReceivedFunctor functor(data);
+
+ PanGestureDetector detector = PanGestureDetector::New();
+ detector.Attach(actor);
+ detector.DetectedSignal().Connect(&application, functor);
+
+ // Start gesture within the actor's area, we should receive the pan as the touch is NOT being consumed
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(GestureState::STARTED, data.receivedGesture.GetState(), TEST_LOCATION);
+ data.Reset();
+
+ // Continue the gesture within the actor's area, but now the touch consumes thus cancelling the gesture
+ consume = true;
+
+ TestMovePan(application, Vector2(26.0f, 4.0f), time);
+ time += TestGetFrameInterval();
+
+ DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION);
+ DALI_TEST_EQUALS(GestureState::CANCELLED, data.receivedGesture.GetState(), TEST_LOCATION);
+
+ END_TEST;
+}
+
+int UtcDaliPanGestureDisableDetectionDuringPanN(void)
+{
+ // Crash occurred when gesture-recognizer was deleted internally during a signal when the attached actor was detached
+
+ TestApplication application;
+
+ Actor actor = Actor::New();
+ actor.SetProperty(Actor::Property::SIZE, Vector2(100.0f, 100.0f));
+ actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(actor);
+
+ // Add a pan detector
+ PanGestureDetector detector = PanGestureDetector::New();
+ bool functorCalled = false;
+ detector.Attach(actor);
+ detector.DetectedSignal().Connect(
+ &application,
+ [&detector, &functorCalled](Actor actor, const PanGesture& pan) {
+ if(pan.GetState() == GestureState::FINISHED)
+ {
+ detector.Detach(actor);
+ functorCalled = true;
+ }
+ });
+
+ // Render and notify
+ application.SendNotification();
+ application.Render();
+
+ // Try the gesture, should not crash
+ try
+ {
+ uint32_t time = 100;
+ TestStartPan(application, Vector2(10.0f, 20.0f), Vector2(26.0f, 20.0f), time);
+ TestEndPan(application, Vector2(26.0f, 20.0f));
+
+ DALI_TEST_CHECK(true); // No crash, test has passed
+ DALI_TEST_EQUALS(functorCalled, true, TEST_LOCATION);
+ }
+ catch(...)
+ {
+ DALI_TEST_CHECK(false); // If we crash, the test has failed
+ }
+
+ END_TEST;
+}
projects / platform / core / uifw / dali-core.git / blobdiff