tidy&format(all): all files formatted and relevant warnings resolved
C++ / build (pull_request) Failing after 15s
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 28s
Python / lint-format (pull_request) Successful in 45s
Python / test (pull_request) Successful in 38s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m45s
C++ / build (pull_request) Failing after 15s
Lint & Format (JS/TS) / lint-format (pull_request) Successful in 28s
Python / lint-format (pull_request) Successful in 45s
Python / test (pull_request) Successful in 38s
Lint & Format (Rust) / lint-format (pull_request) Successful in 1m45s
This commit is contained in:
@@ -2,9 +2,7 @@
|
||||
#include "blobinvertedrect.hpp"
|
||||
#include "blobshape.hpp"
|
||||
|
||||
BlobGroup::BlobGroup(QObject* parent)
|
||||
: QObject(parent) {
|
||||
}
|
||||
BlobGroup::BlobGroup(QObject* parent) : QObject(parent) {}
|
||||
|
||||
BlobGroup::~BlobGroup() {
|
||||
for (auto* shape : std::as_const(m_shapes))
|
||||
@@ -14,24 +12,21 @@ BlobGroup::~BlobGroup() {
|
||||
}
|
||||
|
||||
void BlobGroup::setSmoothing(qreal s) {
|
||||
if (qFuzzyCompare(m_smoothing, s))
|
||||
return;
|
||||
if (qFuzzyCompare(m_smoothing, s)) return;
|
||||
m_smoothing = s;
|
||||
emit smoothingChanged();
|
||||
markDirty();
|
||||
}
|
||||
|
||||
void BlobGroup::setColor(const QColor& c) {
|
||||
if (m_color == c)
|
||||
return;
|
||||
if (m_color == c) return;
|
||||
m_color = c;
|
||||
emit colorChanged();
|
||||
markDirty();
|
||||
}
|
||||
|
||||
void BlobGroup::addShape(BlobShape* shape) {
|
||||
if (!shape || m_shapes.contains(shape))
|
||||
return;
|
||||
if (!shape || m_shapes.contains(shape)) return;
|
||||
m_shapes.append(shape);
|
||||
markDirty();
|
||||
}
|
||||
@@ -42,15 +37,13 @@ void BlobGroup::removeShape(BlobShape* shape) {
|
||||
}
|
||||
|
||||
void BlobGroup::setInvertedRect(BlobInvertedRect* rect) {
|
||||
if (m_invertedRect == rect)
|
||||
return;
|
||||
if (m_invertedRect == rect) return;
|
||||
m_invertedRect = rect;
|
||||
markDirty();
|
||||
}
|
||||
|
||||
void BlobGroup::clearInvertedRect(BlobInvertedRect* rect) {
|
||||
if (m_invertedRect != rect)
|
||||
return;
|
||||
if (m_invertedRect != rect) return;
|
||||
m_invertedRect = nullptr;
|
||||
markDirty();
|
||||
}
|
||||
@@ -75,15 +68,19 @@ void BlobGroup::markShapeDirty(BlobShape* source) {
|
||||
|
||||
// Use cached padded rects to find spatial neighbors
|
||||
const float pad = static_cast<float>(m_smoothing) * 2.0f;
|
||||
const QRectF srcRect(static_cast<double>(source->m_cachedPaddedX - pad),
|
||||
static_cast<double>(source->m_cachedPaddedY - pad), static_cast<double>(source->m_cachedPaddedW + pad * 2.0f),
|
||||
static_cast<double>(source->m_cachedPaddedH + pad * 2.0f));
|
||||
const QRectF srcRect(
|
||||
static_cast<double>(source->m_cachedPaddedX - pad),
|
||||
static_cast<double>(source->m_cachedPaddedY - pad),
|
||||
static_cast<double>(source->m_cachedPaddedW + pad * 2.0f),
|
||||
static_cast<double>(source->m_cachedPaddedH + pad * 2.0f));
|
||||
|
||||
for (auto* shape : std::as_const(m_shapes)) {
|
||||
if (shape == source)
|
||||
continue;
|
||||
const QRectF otherRect(static_cast<double>(shape->m_cachedPaddedX), static_cast<double>(shape->m_cachedPaddedY),
|
||||
static_cast<double>(shape->m_cachedPaddedW), static_cast<double>(shape->m_cachedPaddedH));
|
||||
if (shape == source) continue;
|
||||
const QRectF otherRect(
|
||||
static_cast<double>(shape->m_cachedPaddedX),
|
||||
static_cast<double>(shape->m_cachedPaddedY),
|
||||
static_cast<double>(shape->m_cachedPaddedW),
|
||||
static_cast<double>(shape->m_cachedPaddedH));
|
||||
if (srcRect.intersects(otherRect)) {
|
||||
shape->polish();
|
||||
shape->update();
|
||||
@@ -97,8 +94,7 @@ void BlobGroup::markShapeDirty(BlobShape* source) {
|
||||
}
|
||||
|
||||
void BlobGroup::ensurePhysicsUpdated() {
|
||||
if (m_physicsUpdated)
|
||||
return;
|
||||
if (m_physicsUpdated) return;
|
||||
m_physicsUpdated = true;
|
||||
for (auto* shape : std::as_const(m_shapes))
|
||||
shape->updatePhysics();
|
||||
|
||||
Reference in New Issue
Block a user