Implement the Layer::getLayersUnderPoint and Layer::hitTestPoint methods, and add related unit test cases. #282

shlzxjp · 2024-10-28T11:19:22Z

No description provided.

…under the specified point and only perform bounding box detection.

…more concise.

…under the specified point and only perform bounding box detection.

…more concise.

…nt/tgfx into feature/xjp_get_layers_under_point

domchen · 2024-10-29T02:47:43Z

src/layers/Layer.cpp

+  if (hasLayerUnderPoint) {
+    results->push_back(weakThis.lock());
+  } else {
+    Rect layerBoundsRect = getBounds();


不需要测量自身的bounds。子项只要存在一个碰撞，父级图层就已经成功了，加进result数组就行。你在这里调用getBounds，又重新触发了一次遍历所有子项的操作。

这里的逻辑是因为如果当前Layer的所有子项都未命中，但实际上(x,y)落在了所有子项形成的包围盒内，是否认定为命中了Layer图层。如果认为该Layer图层未被命中，那只需要使用LayerContent获取Bounds即可。

domchen · 2024-10-29T02:48:43Z

src/layers/Layer.cpp

+  }
+
+  bool hasLayerUnderPoint = false;
+  for (auto iter = _children.rbegin(); iter != _children.rend(); iter++) {


iter避免用缩写，或者使用child/item

已修改为item

domchen · 2024-10-29T02:49:26Z

src/layers/Layer.cpp

+    if (!childLayer->visible()) {
+      continue;
+    }
+


漏了处理scrollRect和mask的判断，如果存在遮罩应该要判定是否能点到。

是打算等mask逻辑合入后再添加，方便测试。先增加逻辑，后补测试用例。

mask的实现逻辑和你无关。它负责渲染。你的碰撞检测是独立的，只涉及了bounds计算。

domchen · 2024-10-29T02:52:42Z

src/layers/Layer.cpp

+
+  Rect bounds = Rect::MakeEmpty();
+  bounds.join(content->getBounds());
+  getGlobalMatrix().mapRect(&bounds);


不应该每次去获取一个全局矩阵，这样每个layer都在反复做矩阵计算，应该是实现个内部方法，向下遍历的时候把xy坐标转换到Layer本地。

已修改为使用相对于当前Layer的局部坐标去判断，不需要获取global Matrix

domchen · 2024-10-29T02:55:35Z

include/tgfx/layers/Layer.h

+  virtual bool hitTestByBounds(float x, float y);
+
+  virtual bool hitTestByPixel(float x, float y);


这两个方法不应该加在Layer上实现，你所有的碰撞都只需要获取Layer的LayerContent进行测试就行。只要存在一个Content命中或者子Layer的Content命中，那么这个Layer就算是命中的。所以这个方法应该加到LayerContent上实现。这样还能用多态来兼顾ImageContent只支持bounds检查的特例。只需要加一个LayerContent::hitTest(float x, float y, bool pixelHitest)

这两个方法已从Layer上迁移到LayerContent上

已合并为一个方法

… Comment相关问题。

domchen · 2024-10-31T03:47:54Z

src/layers/Layer.cpp

+}
+
+bool Layer::hitTestPointInternal(float localX, float localY, bool pixelHitTest) {
+  for (auto item = _children.rbegin(); item != _children.rend(); ++item) {


这个并没有顺序要求，可以不用倒过来遍历：for(auto& child : _children)就行了。

建议是先hitTest自身的LayerContent再去遍历子项。命中了就不用遍历子项了。

domchen · 2024-10-31T03:49:14Z

src/layers/Layer.cpp

+
+    Matrix inverseMatrix = Matrix::I();
+    Point pointInChildSpace = Point::Zero();
+    if (childLayer->matrix().invert(&inverseMatrix)) {


同样的要使用getMatrixWithSrollRect()

domchen · 2024-10-31T03:49:55Z

src/layers/Layer.cpp

+    }
+
+    if (nullptr != childLayer->_scrollRect) {
+      if (!childLayer->_scrollRect->contains(pointInChildSpace.x, pointInChildSpace.y)) {


同上对应修改，考虑偏移量。

domchen · 2024-10-31T03:51:33Z

src/layers/Layer.cpp

+      }
+    }
+
+    if (nullptr != childLayer->_mask) {


如果存在mask，并且需要精确碰撞的时候，也要精确碰撞这个mask。

domchen · 2024-10-31T04:25:18Z

src/layers/Layer.cpp

+
+    if (nullptr != childLayer->_mask) {
+      const auto maskBounds = childLayer->_mask->getBounds();
+      if (!maskBounds.contains(pointInChildSpace.x, pointInChildSpace.y)) {


这里同样，改成调用mask->hitTestPoint() 并且直接把pixelHitTest参数传递进去。

domchen · 2024-10-31T04:27:20Z

src/layers/contents/ImageContent.cpp

+    return imageBounds.contains(localX, localY);
+  }
+
+  const Rect imageBounds = Rect::MakeXYWH(0, 0, image->width(), image->height());


声明变量都尽可能用auto关键字，提高可读性。

domchen · 2024-10-31T04:31:14Z

src/layers/contents/ImageContent.cpp

+  if (pixelHitTest) {
+    // TODO: use bounding box judgment first, and then optimize it to pixel-level judgment.
+    const Rect imageBounds = Rect::MakeXYWH(0, 0, image->width(), image->height());
+    return imageBounds.contains(localX, localY);
+  }


这些可以直接删除了。应该加个注释说明：// The pixelHitTest flag is ignored because we cannot read pixels from images before they are drawn.

domchen · 2024-10-31T04:41:48Z

src/layers/contents/TextContent.cpp

+  return textBounds.contains(localX, localY);
+}
+
+Path TextContent::getTextContentPath() const {


给GlyphRunList加个精确碰撞的方法，深入到内部去逐个glyph进行检测，命中任何一个就返回，不需要遍历完整的所有字符。

…tTestPoint methods to global coordinate points.

…nt to return early when hitting any glyph or emoji.

domchen · 2024-10-31T12:13:40Z

src/layers/contents/ComposeContent.cpp

@@ -43,4 +43,14 @@ void ComposeContent::draw(Canvas* canvas, const Paint& paint) const {
    content->draw(canvas, paint);
  }
 }
+
+bool ComposeContent::hitTestPoint(float localX, float localY, bool pixelHitTest) {
+  for (auto item = contents.rbegin(); item != contents.rend(); ++item) {


这里也用for(auto&:)，正序就行了。

domchen · 2024-10-31T12:16:06Z

src/layers/contents/SolidContent.cpp

@@ -31,4 +31,8 @@ void SolidContent::draw(Canvas* canvas, const Paint& paint) const {
  canvas->drawRRect(_rRect, solidPaint);
 }

+bool SolidContent::hitTestPoint(float localX, float localY, bool /*pixelHitTest*/) {
+  return getBounds().contains(localX, localY);


这里_rRect.rect.contains()就行。

getBounds方法的实现就是 return _rRect.rect;

domchen · 2024-10-31T12:18:23Z

src/layers/contents/TextContent.cpp

+      } else {
+        Path glyphPath = {};
+        if (font.getPath(glyphID, &glyphPath)) {
+          auto offsetMatrix = Matrix::MakeTrans(position.x, position.y);


这里transform path的开销太高了，可以改成反向transform要测试的坐标点。

auto offsetMatrix = Matrix::MakeTrans(position.x, position.y);
auto inverseMatrix = Matrix::I();
if (offsetMatrix.invert(&inverseMatrix)) {
auto checkPoint = inverseMatrix.mapXY(localX, localY);
if (glyphPath.contains(checkPoint.x, checkPoint.y)) {
return true;
}
}

domchen · 2024-10-31T12:24:00Z

include/tgfx/layers/LayerContent.h

+  /**
+   * Checks if the given point P(localX, localY) is within the rendered content area of the layer.
+   * localX is the local x-coordinate relative to the current layer,
+   * and localY is the local y-coordinate relative to the current layer.
+   * If pixelHitTest is true, performs a pixel-level hit test.
+   * Note that this method is time-consuming and should only be used when precise checking is needed.
+   * If pixelHitTest is false, uses bounding box for hit testing.
+  */


/**

Checks if the layer content overlaps or intersects with the specified point (localX, localY).

The localX and localY coordinates are in the layer's local coordinate space. If the

pixelHitTest flag is true, it checks the actual pixels of the layer content; otherwise, it

checks the bounding box.
*/

…TestPointInternal method

include/tgfx/core/TextBlob.h

…al to remove the matrix calculation.

…nt/tgfx into feature/xjp_get_layers_under_point

shlzxjp added 10 commits October 25, 2024 18:53

Implement the Layer::getLayersUnderPoint method to obtain all layers …

088552c

…under the specified point and only perform bounding box detection.

Added unit test case for Layer::getLayersUnderPoint method

d3e706c

Simplify the implementation of Layer::getLayersUnderPoint to make it …

2e4e717

…more concise.

Implement a pixel-level accurate hitTest method.

453abd3

Implement the Layer::getLayersUnderPoint method to obtain all layers …

baa2c42

…under the specified point and only perform bounding box detection.

Added unit test case for Layer::getLayersUnderPoint method

bfbd536

Simplify the implementation of Layer::getLayersUnderPoint to make it …

17f86db

…more concise.

Implement a pixel-level accurate hitTest method.

2f75e5f

Merge branch 'feature/xjp_get_layers_under_point' of github.com:Tence…

35064d2

…nt/tgfx into feature/xjp_get_layers_under_point

Add Layer::getLayersUnderPoint and Layer::hitTestPoint test cases

1a8a7e0

shlzxjp requested review from kevingpqi123, domchen, Hparty and lvpengwei as code owners October 28, 2024 11:19

Fix the compilation issues caused by code formatting errors.

7a7ad52

shlzxjp closed this Oct 28, 2024

shlzxjp reopened this Oct 28, 2024

Use codeformat.sh to format the code.

3e48b5c

shlzxjp closed this Oct 28, 2024

shlzxjp reopened this Oct 28, 2024

Fix the Path.cpp compilation issues caused by code formatting errors.

e122232

shlzxjp closed this Oct 28, 2024

shlzxjp reopened this Oct 28, 2024

domchen reviewed Oct 29, 2024

View reviewed changes

shlzxjp added 2 commits October 29, 2024 11:32

Replace Layer::getBounds with LayerContent::getBounds.

960cb38

将Layer::hitTestByBounds和Layer::hitTestByPixel方法迁移到LayerContent上，并修改PR…

8ad1d39

… Comment相关问题。

domchen reviewed Oct 31, 2024

View reviewed changes

shlzxjp added 8 commits October 31, 2024 12:58

Remove -Wunused-parameter warning suppression.

49fd59e

Change the parameters of the Layer::getLayersUnderPoint and Layer::hi…

b5e777b

…tTestPoint methods to global coordinate points.

Delete test cases and resolve conflicts.

eb05993

Merge main branch code and resolve conflicts.

d4f3fc8

Optimize the implementation of pixel-precise hit testing in TextConte…

af4c70e

…nt to return early when hitting any glyph or emoji.

Merge branch 'main' into feature/xjp_get_layers_under_point

2b83b13

Merge branch 'main' into feature/xjp_get_layers_under_point

1172876

Format code and resolve pipeline code checking errors.

f717cd5

domchen reviewed Oct 31, 2024

View reviewed changes

Rollback invalid configuration in misc.xml

1c6e140

domchen reviewed Oct 31, 2024

View reviewed changes

shlzxjp added 2 commits October 31, 2024 20:45

Modify code comments and optimize the performance of TextContent::hit…

48517c8

…TestPointInternal method

Delete empty line breaks to resolve pipeline compilation check errors

d3663ad

domchen reviewed Oct 31, 2024

View reviewed changes

include/tgfx/core/TextBlob.h Outdated Show resolved Hide resolved

domchen and others added 3 commits October 31, 2024 20:54

Update include/tgfx/core/TextBlob.h

9c84117

Modify the internal implementation of TextContent::hitTestPointIntern…

7f61ea0

…al to remove the matrix calculation.

Merge branch 'feature/xjp_get_layers_under_point' of github.com:Tence…

6fb168f

…nt/tgfx into feature/xjp_get_layers_under_point

domchen approved these changes Oct 31, 2024

View reviewed changes

domchen merged commit bc64712 into main Oct 31, 2024
8 checks passed

domchen deleted the feature/xjp_get_layers_under_point branch October 31, 2024 13:14

		virtual bool hitTestByBounds(float x, float y);

		virtual bool hitTestByPixel(float x, float y);

Implement the Layer::getLayersUnderPoint and Layer::hitTestPoint methods, and add related unit test cases. #282

Implement the Layer::getLayersUnderPoint and Layer::hitTestPoint methods, and add related unit test cases. #282

Conversation

shlzxjp commented Oct 28, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

domchen Oct 31, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

domchen Oct 31, 2024 •

edited

Loading