Y axis grid coordinate rectangle width is more accurate
This commit is contained in:
parent
e9cb3d9e58
commit
041c50b107
1 changed files with 38 additions and 57 deletions
|
|
@ -334,18 +334,21 @@ void WorldGrid::draw_coordinates(SkCanvas* canvas, const DrawData& drawData, Wor
|
||||||
|
|
||||||
bool axisOnBounds = bounds.has_value() && !bounds.value().fully_contains_aabb(SCollision::AABB<WorldScalar>(drawData.cam.c.pos, worldWindowEndPos));
|
bool axisOnBounds = bounds.has_value() && !bounds.value().fully_contains_aabb(SCollision::AABB<WorldScalar>(drawData.cam.c.pos, worldWindowEndPos));
|
||||||
|
|
||||||
const WorldVec& worldWindowTopLeftPos = drawData.cam.c.pos;
|
const WorldVec& worldWindowTopLeftClipPos = axisOnBounds ? bounds.value().min : drawData.cam.c.pos;
|
||||||
|
SCollision::AABB<float> boundsCamSpace;
|
||||||
std::optional<SCollision::AABB<float>> boundsCamSpaceOpt;
|
|
||||||
|
|
||||||
float coordFontSize = drawData.main->toolbar.final_gui_scale() * drawData.main->toolbar.io->fontSize;
|
float coordFontSize = drawData.main->toolbar.final_gui_scale() * drawData.main->toolbar.io->fontSize;
|
||||||
|
|
||||||
|
if(axisOnBounds)
|
||||||
|
boundsCamSpace = SCollision::AABB<float>(drawData.cam.c.to_space(bounds.value().min), drawData.cam.c.to_space(bounds.value().max));
|
||||||
|
else {
|
||||||
|
float toolbarXLength = drawData.main->toolbar.final_gui_scale() * 80.0f;
|
||||||
|
boundsCamSpace = SCollision::AABB<float>({toolbarXLength, 0.0f}, drawData.cam.viewingArea);
|
||||||
|
}
|
||||||
|
|
||||||
if(axisOnBounds) {
|
if(axisOnBounds) {
|
||||||
boundsCamSpaceOpt = SCollision::AABB<float>(drawData.cam.c.to_space(bounds.value().min), drawData.cam.c.to_space(bounds.value().max));
|
|
||||||
auto& boundsCamSpace = boundsCamSpaceOpt.value();
|
|
||||||
float fontSizeBoundsMultiplier = std::min(std::min(boundsCamSpace.width() / drawData.cam.viewingArea.x(), boundsCamSpace.height() / drawData.cam.viewingArea.y()) * 4.0f, 1.0f);
|
float fontSizeBoundsMultiplier = std::min(std::min(boundsCamSpace.width() / drawData.cam.viewingArea.x(), boundsCamSpace.height() / drawData.cam.viewingArea.y()) * 4.0f, 1.0f);
|
||||||
coordFontSize *= fontSizeBoundsMultiplier;
|
coordFontSize *= fontSizeBoundsMultiplier;
|
||||||
if(coordFontSize <= 1.0f)
|
if(coordFontSize <= 3.0f)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -354,15 +357,13 @@ void WorldGrid::draw_coordinates(SkCanvas* canvas, const DrawData& drawData, Wor
|
||||||
f.getMetrics(&metrics);
|
f.getMetrics(&metrics);
|
||||||
float fontHeight = (-metrics.fAscent + metrics.fDescent);
|
float fontHeight = (-metrics.fAscent + metrics.fDescent);
|
||||||
|
|
||||||
float toolbarXLength = drawData.main->toolbar.final_gui_scale() * 80.0f;
|
|
||||||
WorldVec worldWindowBeginPos;
|
WorldVec worldWindowBeginPos;
|
||||||
WorldVec coordMultiplier;
|
WorldVec coordMultiplier;
|
||||||
|
|
||||||
|
|
||||||
auto calculateCoordMultipliers = [&]() {
|
auto calculateCoordMultipliers = [&]() {
|
||||||
coordMultiplier.x() = FixedPoint::trunc((worldWindowTopLeftPos.x() - offset.x()) / divWorldSize);
|
coordMultiplier.x() = FixedPoint::trunc((drawData.cam.c.pos.x() - offset.x()) / divWorldSize);
|
||||||
worldWindowBeginPos.x() = coordMultiplier.x() * divWorldSize + offset.x();
|
worldWindowBeginPos.x() = coordMultiplier.x() * divWorldSize + offset.x();
|
||||||
coordMultiplier.y() = -FixedPoint::trunc((offset.y() - worldWindowTopLeftPos.y() + divWorldSize) / divWorldSize);
|
coordMultiplier.y() = -FixedPoint::trunc((offset.y() - drawData.cam.c.pos.y() + divWorldSize) / divWorldSize);
|
||||||
worldWindowBeginPos.y() = coordMultiplier.y() * divWorldSize + offset.y();
|
worldWindowBeginPos.y() = coordMultiplier.y() * divWorldSize + offset.y();
|
||||||
};
|
};
|
||||||
calculateCoordMultipliers();
|
calculateCoordMultipliers();
|
||||||
|
|
@ -382,6 +383,8 @@ void WorldGrid::draw_coordinates(SkCanvas* canvas, const DrawData& drawData, Wor
|
||||||
std::vector<NumberTextData> xAxisLabels, yAxisLabels;
|
std::vector<NumberTextData> xAxisLabels, yAxisLabels;
|
||||||
bool exponentExistsInXAxis;
|
bool exponentExistsInXAxis;
|
||||||
|
|
||||||
|
float yAxisMaxXLength = 0.0f;
|
||||||
|
|
||||||
for(int maxRepeats = 0; maxRepeats < 3; maxRepeats++) {
|
for(int maxRepeats = 0; maxRepeats < 3; maxRepeats++) {
|
||||||
xAxisLabels.clear();
|
xAxisLabels.clear();
|
||||||
exponentExistsInXAxis = false;
|
exponentExistsInXAxis = false;
|
||||||
|
|
@ -406,6 +409,7 @@ void WorldGrid::draw_coordinates(SkCanvas* canvas, const DrawData& drawData, Wor
|
||||||
|
|
||||||
xGridCoord += gridCoordDivSize;
|
xGridCoord += gridCoordDivSize;
|
||||||
|
|
||||||
|
if(xWorldCoord > worldWindowTopLeftClipPos.x())
|
||||||
xAxisLabels.emplace_back(label);
|
xAxisLabels.emplace_back(label);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -423,7 +427,8 @@ void WorldGrid::draw_coordinates(SkCanvas* canvas, const DrawData& drawData, Wor
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
float yAxisMaxXLength = 0.0f;
|
float xAxisYPosRect = boundsCamSpace.max.y() - (exponentExistsInXAxis ? fontHeight * 1.25f : fontHeight);
|
||||||
|
|
||||||
{
|
{
|
||||||
WorldScalar yGridCoord = FixedPoint::trunc((offset.y() - drawData.cam.c.pos.y()) / divWorldSize) * gridCoordDivSize + gridCoordDivSize;
|
WorldScalar yGridCoord = FixedPoint::trunc((offset.y() - drawData.cam.c.pos.y()) / divWorldSize) * gridCoordDivSize + gridCoordDivSize;
|
||||||
|
|
||||||
|
|
@ -443,63 +448,39 @@ void WorldGrid::draw_coordinates(SkCanvas* canvas, const DrawData& drawData, Wor
|
||||||
|
|
||||||
yGridCoord -= gridCoordDivSize;
|
yGridCoord -= gridCoordDivSize;
|
||||||
|
|
||||||
|
if(yWorldCoord > worldWindowTopLeftClipPos.y() && label.mainPos < xAxisYPosRect && label.mainPos - fontHeight * 1.25f > boundsCamSpace.min.y()) {
|
||||||
yAxisMaxXLength = std::max(yAxisMaxXLength, label.totalLength);
|
yAxisMaxXLength = std::max(yAxisMaxXLength, label.totalLength);
|
||||||
|
|
||||||
yAxisLabels.emplace_back(label);
|
yAxisLabels.emplace_back(label);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
SkPaint labelColor(SkColor4f{color.x(), color.y(), color.z(), 1.0f});
|
SkPaint labelColor(SkColor4f{color.x(), color.y(), color.z(), 1.0f});
|
||||||
|
|
||||||
if(axisOnBounds) {
|
float xAxisYPosLabels = boundsCamSpace.max.y() - metrics.fDescent;
|
||||||
auto& boundsCamSpace = boundsCamSpaceOpt.value();
|
|
||||||
|
|
||||||
|
if(axisOnBounds) {
|
||||||
canvas->save();
|
canvas->save();
|
||||||
canvas->clipRect(SkRect::MakeLTRB(boundsCamSpace.min.x(), boundsCamSpace.min.y(), boundsCamSpace.max.x(), boundsCamSpace.max.y()));
|
canvas->clipRect(SkRect::MakeLTRB(boundsCamSpace.min.x(), boundsCamSpace.min.y(), boundsCamSpace.max.x(), boundsCamSpace.max.y()));
|
||||||
|
}
|
||||||
float xAxisYPosLabels = boundsCamSpace.max.y() - metrics.fDescent;
|
|
||||||
float xAxisYPosRect = boundsCamSpace.max.y() - (exponentExistsInXAxis ? fontHeight * 1.25f : fontHeight);
|
|
||||||
|
|
||||||
canvas->drawRect(SkRect::MakeXYWH(boundsCamSpace.min.x(), boundsCamSpace.min.y(), yAxisMaxXLength, boundsCamSpace.max.y() - boundsCamSpace.min.y()), SkPaint{color_mul_alpha(drawData.main->toolbar.io->theme->backColor1, 0.9f)});
|
canvas->drawRect(SkRect::MakeXYWH(boundsCamSpace.min.x(), boundsCamSpace.min.y(), yAxisMaxXLength, boundsCamSpace.max.y() - boundsCamSpace.min.y()), SkPaint{color_mul_alpha(drawData.main->toolbar.io->theme->backColor1, 0.9f)});
|
||||||
canvas->drawRect(SkRect::MakeLTRB(boundsCamSpace.min.x() + yAxisMaxXLength, xAxisYPosRect, boundsCamSpace.max.x(), boundsCamSpace.max.y()), SkPaint{color_mul_alpha(drawData.main->toolbar.io->theme->backColor1, 0.9f)});
|
canvas->drawRect(SkRect::MakeLTRB(boundsCamSpace.min.x() + yAxisMaxXLength, xAxisYPosRect, boundsCamSpace.max.x(), boundsCamSpace.max.y()), SkPaint{color_mul_alpha(drawData.main->toolbar.io->theme->backColor1, 0.9f)});
|
||||||
|
|
||||||
|
|
||||||
for(auto& l : xAxisLabels) {
|
for(auto& l : xAxisLabels) {
|
||||||
if(l.mainPos > boundsCamSpace.min.x() + yAxisMaxXLength) {
|
if(l.mainPos > boundsCamSpace.min.x() + yAxisMaxXLength && l.mainPos + l.totalLength < boundsCamSpace.max.x()) {
|
||||||
canvas->drawSimpleText(l.mainText.c_str(), l.mainText.length(), SkTextEncoding::kUTF8, l.mainPos, xAxisYPosLabels, f, labelColor);
|
canvas->drawSimpleText(l.mainText.c_str(), l.mainText.length(), SkTextEncoding::kUTF8, l.mainPos, xAxisYPosLabels, f, labelColor);
|
||||||
canvas->drawSimpleText(l.exponentText.c_str(), l.exponentText.length(), SkTextEncoding::kUTF8, l.exponentPos, xAxisYPosLabels - fontHeight * 0.25f, f, labelColor);
|
canvas->drawSimpleText(l.exponentText.c_str(), l.exponentText.length(), SkTextEncoding::kUTF8, l.exponentPos, xAxisYPosLabels - fontHeight * 0.25f, f, labelColor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for(auto& l : yAxisLabels) {
|
for(auto& l : yAxisLabels) {
|
||||||
if(l.mainPos < xAxisYPosRect) {
|
|
||||||
float mainTextXPos = boundsCamSpace.min.x() + yAxisMaxXLength * 0.5f - l.totalLength * 0.5f;
|
float mainTextXPos = boundsCamSpace.min.x() + yAxisMaxXLength * 0.5f - l.totalLength * 0.5f;
|
||||||
canvas->drawSimpleText(l.mainText.c_str(), l.mainText.length(), SkTextEncoding::kUTF8, mainTextXPos, l.mainPos, f, labelColor);
|
canvas->drawSimpleText(l.mainText.c_str(), l.mainText.length(), SkTextEncoding::kUTF8, mainTextXPos, l.mainPos, f, labelColor);
|
||||||
canvas->drawSimpleText(l.exponentText.c_str(), l.exponentText.length(), SkTextEncoding::kUTF8, mainTextXPos + l.mainLength, l.exponentPos, f, labelColor);
|
canvas->drawSimpleText(l.exponentText.c_str(), l.exponentText.length(), SkTextEncoding::kUTF8, mainTextXPos + l.mainLength, l.exponentPos, f, labelColor);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
if(axisOnBounds)
|
||||||
canvas->restore();
|
canvas->restore();
|
||||||
}
|
|
||||||
else {
|
|
||||||
float xAxisYPosLabels = drawData.cam.viewingArea.y() - metrics.fDescent;
|
|
||||||
float xAxisYPosRect = drawData.cam.viewingArea.y() - (exponentExistsInXAxis ? fontHeight * 1.25f : fontHeight);
|
|
||||||
|
|
||||||
canvas->drawRect(SkRect::MakeXYWH(toolbarXLength, 0.0f, yAxisMaxXLength, drawData.cam.viewingArea.y()), SkPaint{color_mul_alpha(drawData.main->toolbar.io->theme->backColor1, 0.9f)});
|
|
||||||
canvas->drawRect(SkRect::MakeLTRB(toolbarXLength + yAxisMaxXLength, xAxisYPosRect, drawData.cam.viewingArea.x(), drawData.cam.viewingArea.y()), SkPaint{color_mul_alpha(drawData.main->toolbar.io->theme->backColor1, 0.9f)});
|
|
||||||
|
|
||||||
for(auto& l : xAxisLabels) {
|
|
||||||
if(l.mainPos > toolbarXLength + yAxisMaxXLength) {
|
|
||||||
canvas->drawSimpleText(l.mainText.c_str(), l.mainText.length(), SkTextEncoding::kUTF8, l.mainPos, xAxisYPosLabels, f, labelColor);
|
|
||||||
canvas->drawSimpleText(l.exponentText.c_str(), l.exponentText.length(), SkTextEncoding::kUTF8, l.exponentPos, xAxisYPosLabels - fontHeight * 0.25f, f, labelColor);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for(auto& l : yAxisLabels) {
|
|
||||||
if(l.mainPos < xAxisYPosRect) {
|
|
||||||
float mainTextXPos = toolbarXLength + yAxisMaxXLength * 0.5f - l.totalLength * 0.5f;
|
|
||||||
canvas->drawSimpleText(l.mainText.c_str(), l.mainText.length(), SkTextEncoding::kUTF8, mainTextXPos, l.mainPos, f, labelColor);
|
|
||||||
canvas->drawSimpleText(l.exponentText.c_str(), l.exponentText.length(), SkTextEncoding::kUTF8, mainTextXPos + l.mainLength, l.exponentPos, f, labelColor);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue