Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ using namespace graphicsUtils;
namespace {
constexpr qreal wallFriction = 1.0f;
constexpr qreal wallRestituion = 0.8f;
constexpr qreal wallIntersectionEps = 1e-5;
}

WallItem::WallItem(graphicsUtils::AbstractCoordinateSystem *metricSystem,
Expand Down Expand Up @@ -304,10 +305,10 @@ QPolygonF WallItem::collidingPolygon() const
QLineF dc(abcdBoundingRect.bottomLeft(), abcdBoundingRect.bottomRight());
QLineF ad(abcdBoundingRect.topLeft(), abcdBoundingRect.bottomLeft());

QList<QPointF> abIntersection = mathUtils::Geometry::intersection(ab, mPath);
QList<QPointF> bcIntersection = mathUtils::Geometry::intersection(bc, mPath);
QList<QPointF> dcIntersection = mathUtils::Geometry::intersection(dc, mPath);
QList<QPointF> adIntersection = mathUtils::Geometry::intersection(ad, mPath);
QList<QPointF> abIntersection = mathUtils::Geometry::intersection(ab, mPath, wallIntersectionEps);
QList<QPointF> bcIntersection = mathUtils::Geometry::intersection(bc, mPath, wallIntersectionEps);
QList<QPointF> dcIntersection = mathUtils::Geometry::intersection(dc, mPath, wallIntersectionEps);
QList<QPointF> adIntersection = mathUtils::Geometry::intersection(ad, mPath, wallIntersectionEps);

Q_ASSERT(abIntersection.length() == 2);
Q_ASSERT(bcIntersection.length() == 2);
Expand Down
2 changes: 1 addition & 1 deletion qrtranslations/es/plugins/robots/common/twoDModel_es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@
<context>
<name>twoDModel::items::WallItem</name>
<message>
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp" line="68"/>
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp" line="69"/>
<source>Wall (W)</source>
<translation>Pared (W)</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion qrtranslations/fr/plugins/robots/common/twoDModel_fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@
<context>
<name>twoDModel::items::WallItem</name>
<message>
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp" line="+68"/>
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp" line="+69"/>
<source>Wall (W)</source>
<translation>Mur (W)</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion qrtranslations/ru/plugins/robots/common/twoDModel_ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@
<context>
<name>twoDModel::items::WallItem</name>
<message>
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp" line="+68"/>
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp" line="+69"/>
<source>Wall (W)</source>
<translation>Стена (W)</translation>
</message>
Expand Down
2 changes: 1 addition & 1 deletion qrtranslations/vi/plugins/robots/common/twoDModel_vi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@
<context>
<name>twoDModel::items::WallItem</name>
<message>
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp" line="68"/>
<location filename="../../../../../plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp" line="69"/>
<source>Wall (W)</source>
<translation>Tường (W)</translation>
</message>
Expand Down