X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fevents%2Fhit-test-algorithm-impl.cpp;h=f6858379e505356f1d82cb039747cdb938547b43;hb=c1df908470fc3dd242fef202248e56009727bca4;hp=6c8c8af2b9e936e1c391dbab811f244a57f4aca8;hpb=cd0ce6e412df8961b1a5e28b496369fa49fd72d7;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/events/hit-test-algorithm-impl.cpp b/dali/internal/event/events/hit-test-algorithm-impl.cpp index 6c8c8af..f685837 100644 --- a/dali/internal/event/events/hit-test-algorithm-impl.cpp +++ b/dali/internal/event/events/hit-test-algorithm-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -19,7 +19,6 @@ #include // INTERNAL INCLUDES -#include #include #include #include @@ -28,8 +27,6 @@ #include #include #include -#include -#include #include #include #include @@ -127,14 +124,14 @@ struct ActorTouchableCheck : public HitTestInterface */ bool IsActorExclusiveToAnotherRenderTask( const Actor& actor, const RenderTask& renderTask, - const Vector< RenderTaskList::Exclusive >& exclusives ) + const RenderTaskList::ExclusivesContainer& exclusives ) { - if( exclusives.Size() ) + if( exclusives.size() ) { - for( Vector< RenderTaskList::Exclusive >::Iterator exclusiveIt = exclusives.Begin(); exclusives.End() != exclusiveIt; ++exclusiveIt ) + for( const auto& exclusive : exclusives ) { - if( ( exclusiveIt->renderTaskPtr != &renderTask ) && ( exclusiveIt->actorPtr == &actor ) ) + if( ( exclusive.renderTaskPtr != &renderTask ) && ( exclusive.actor.GetActor() == &actor ) ) { return true; } @@ -154,7 +151,7 @@ bool IsActorExclusiveToAnotherRenderTask( const Actor& actor, */ HitActor HitTestWithinLayer( Actor& actor, const RenderTask& renderTask, - const Vector< RenderTaskList::Exclusive >& exclusives, + const RenderTaskList::ExclusivesContainer& exclusives, const Vector4& rayOrigin, const Vector4& rayDir, float& nearClippingPlane, @@ -404,8 +401,8 @@ void GetCameraClippingPlane( RenderTask& renderTask, float& nearClippingPlane, f /** * Hit test a RenderTask */ -bool HitTestRenderTask( const Vector< RenderTaskList::Exclusive >& exclusives, - Stage& stage, +bool HitTestRenderTask( const RenderTaskList::ExclusivesContainer& exclusives, + const Vector2& sceneSize, LayerList& layers, RenderTask& renderTask, Vector2 screenCoordinates, @@ -452,7 +449,6 @@ bool HitTestRenderTask( const Vector< RenderTaskList::Exclusive >& exclusives, HitActor hit; bool overlayHit = false; bool layerConsumesHit = false; - const Vector2& stageSize = stage.GetSize(); for( int32_t i = layers.GetLayerCount() - 1; i >= 0 && !( hit.actor ); --i ) { @@ -460,7 +456,7 @@ bool HitTestRenderTask( const Vector< RenderTaskList::Exclusive >& exclusives, overlayHit = false; // Ensure layer is touchable (also checks whether ancestors are also touchable) - if( IsActuallyHittable( *layer, screenCoordinates, stageSize, hitCheck ) ) + if( IsActuallyHittable( *layer, screenCoordinates, sceneSize, hitCheck ) ) { // Always hit-test the source actor; otherwise test whether the layer is below the source actor in the hierarchy if( sourceActorDepth == static_cast( i ) ) @@ -507,7 +503,7 @@ bool HitTestRenderTask( const Vector< RenderTaskList::Exclusive >& exclusives, if( hit.actor ) { - results.renderTask = Dali::RenderTask( &renderTask ); + results.renderTask = RenderTaskPtr( &renderTask ); results.actor = Dali::Actor( hit.actor ); results.actorCoordinates = hit.hitPosition; @@ -527,7 +523,7 @@ bool HitTestRenderTask( const Vector< RenderTaskList::Exclusive >& exclusives, /** * Iterate through the RenderTaskList and perform hit testing. * - * @param[in] stage The stage the tests will be performed in + * @param[in] sceneSize The scene size the tests will be performed in * @param[in] layers The list of layers to test * @param[in] taskList The list of render tasks * @param[out] results Ray information calculated by the camera @@ -535,7 +531,7 @@ bool HitTestRenderTask( const Vector< RenderTaskList::Exclusive >& exclusives, * @param[in] onScreen True to test on-screen, false to test off-screen * @return True if we have a hit, false otherwise */ -bool HitTestRenderTaskList( Stage& stage, +bool HitTestRenderTaskList( const Vector2& sceneSize, LayerList& layers, RenderTaskList& taskList, const Vector2& screenCoordinates, @@ -545,19 +541,19 @@ bool HitTestRenderTaskList( Stage& stage, { RenderTaskList::RenderTaskContainer& tasks = taskList.GetTasks(); RenderTaskList::RenderTaskContainer::reverse_iterator endIter = tasks.rend(); - const Vector< RenderTaskList::Exclusive >& exclusives = taskList.GetExclusivesList(); + const auto& exclusives = taskList.GetExclusivesList(); for( RenderTaskList::RenderTaskContainer::reverse_iterator iter = tasks.rbegin(); endIter != iter; ++iter ) { - RenderTask& renderTask = GetImplementation( *iter ); - bool isOffscreenRenderTask = ( iter->GetTargetFrameBuffer() || iter->GetFrameBuffer() ); + RenderTask& renderTask = *iter->Get(); + bool isOffscreenRenderTask = ( renderTask.GetTargetFrameBuffer() || renderTask.GetFrameBuffer() ); if( (onScreen && isOffscreenRenderTask) || (!onScreen && !isOffscreenRenderTask) ) { // Skip to next task continue; } - if( HitTestRenderTask( exclusives, stage, layers, renderTask, screenCoordinates, results, hitCheck ) ) + if( HitTestRenderTask( exclusives, sceneSize, layers, renderTask, screenCoordinates, results, hitCheck ) ) { // Return true when an actor is hit (or layer in our render-task consumes the hit) return true; // don't bother checking off screen tasks @@ -570,7 +566,7 @@ bool HitTestRenderTaskList( Stage& stage, /** * Iterate through the RenderTaskList and perform hit testing for both on-screen and off-screen. * - * @param[in] stage The stage the tests will be performed in + * @param[in] sceneSize The scene size the tests will be performed in * @param[in] layers The list of layers to test * @param[in] taskList The list of render tasks * @param[out] results Ray information calculated by the camera @@ -578,7 +574,7 @@ bool HitTestRenderTaskList( Stage& stage, * @param[in] onScreen True to test on-screen, false to test off-screen * @return True if we have a hit, false otherwise */ -bool HitTestForEachRenderTask( Stage& stage, +bool HitTestForEachRenderTask( const Vector2& sceneSize, LayerList& layers, RenderTaskList& taskList, const Vector2& screenCoordinates, @@ -589,8 +585,8 @@ bool HitTestForEachRenderTask( Stage& stage, // Check on-screen tasks before off-screen ones. // Hit test order should be reverse of draw order (see ProcessRenderTasks() where off-screen tasks are drawn first). - if( HitTestRenderTaskList( stage, layers, taskList, screenCoordinates, results, hitCheck, true ) || - HitTestRenderTaskList( stage, layers, taskList, screenCoordinates, results, hitCheck, false ) ) + if( HitTestRenderTaskList( sceneSize, layers, taskList, screenCoordinates, results, hitCheck, true ) || + HitTestRenderTaskList( sceneSize, layers, taskList, screenCoordinates, results, hitCheck, false ) ) { // Found hit. result = true; @@ -605,16 +601,13 @@ HitTestInterface::~HitTestInterface() { } -bool HitTest( Stage& stage, const Vector2& screenCoordinates, Dali::HitTestAlgorithm::Results& results, Dali::HitTestAlgorithm::HitTestFunction func ) +bool HitTest( const Vector2& sceneSize, RenderTaskList& taskList, LayerList& layerList, const Vector2& screenCoordinates, Dali::HitTestAlgorithm::Results& results, Dali::HitTestAlgorithm::HitTestFunction func ) { bool wasHit( false ); - // Hit-test the regular on-stage actors - RenderTaskList& taskList = stage.GetRenderTaskList(); - LayerList& layerList = stage.GetLayerList(); - + // Hit-test the regular on-scene actors Results hitTestResults; HitTestFunctionWrapper hitTestFunctionWrapper( func ); - if( HitTestForEachRenderTask( stage, layerList, taskList, screenCoordinates, hitTestResults, hitTestFunctionWrapper ) ) + if( HitTestForEachRenderTask( sceneSize, layerList, taskList, screenCoordinates, hitTestResults, hitTestFunctionWrapper ) ) { results.actor = hitTestResults.actor; results.actorCoordinates = hitTestResults.actorCoordinates; @@ -623,56 +616,24 @@ bool HitTest( Stage& stage, const Vector2& screenCoordinates, Dali::HitTestAlgor return wasHit; } -bool HitTest( Stage& stage, const Vector2& screenCoordinates, Results& results, HitTestInterface& hitTestInterface ) +bool HitTest( const Vector2& sceneSize, RenderTaskList& renderTaskList, LayerList& layerList, const Vector2& screenCoordinates, Results& results, HitTestInterface& hitTestInterface ) { bool wasHit( false ); - // Hit-test the system-overlay actors first - SystemOverlay* systemOverlay = stage.GetSystemOverlayInternal(); - - if( systemOverlay ) - { - RenderTaskList& overlayTaskList = systemOverlay->GetOverlayRenderTasks(); - LayerList& overlayLayerList = systemOverlay->GetLayerList(); - - wasHit = HitTestForEachRenderTask( stage, overlayLayerList, overlayTaskList, screenCoordinates, results, hitTestInterface ); - } - - // Hit-test the regular on-stage actors + // Hit-test the regular on-scene actors if( !wasHit ) { - RenderTaskList& taskList = stage.GetRenderTaskList(); - LayerList& layerList = stage.GetLayerList(); - - wasHit = HitTestForEachRenderTask( stage, layerList, taskList, screenCoordinates, results, hitTestInterface ); + wasHit = HitTestForEachRenderTask( sceneSize, layerList, renderTaskList, screenCoordinates, results, hitTestInterface ); } return wasHit; } -bool HitTest( Stage& stage, const Vector2& screenCoordinates, Results& results ) +bool HitTest( const Vector2& sceneSize, RenderTaskList& renderTaskList, LayerList& layerList, const Vector2& screenCoordinates, Results& results ) { ActorTouchableCheck actorTouchableCheck; - return HitTest( stage, screenCoordinates, results, actorTouchableCheck ); + return HitTest( sceneSize, renderTaskList, layerList, screenCoordinates, results, actorTouchableCheck ); } -bool HitTest( Stage& stage, RenderTask& renderTask, const Vector2& screenCoordinates, - Dali::HitTestAlgorithm::Results& results, Dali::HitTestAlgorithm::HitTestFunction func ) -{ - bool wasHit( false ); - Results hitTestResults; - - const Vector< RenderTaskList::Exclusive >& exclusives = stage.GetRenderTaskList().GetExclusivesList(); - HitTestFunctionWrapper hitTestFunctionWrapper( func ); - if( HitTestRenderTask( exclusives, stage, stage.GetLayerList(), renderTask, screenCoordinates, hitTestResults, hitTestFunctionWrapper ) ) - { - results.actor = hitTestResults.actor; - results.actorCoordinates = hitTestResults.actorCoordinates; - wasHit = true; - } - return wasHit; -} - - } // namespace HitTestAlgorithm } // namespace Internal