Numerical labels on grids are nicer and dont collide with each other
This commit is contained in:
parent
588425aa8b
commit
1da7cdce75
3 changed files with 122 additions and 19 deletions
|
|
@ -326,7 +326,7 @@ namespace FixedPoint {
|
||||||
val = T(str);
|
val = T(str);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string display_int_str(size_t scientificNotationDigits) const {
|
std::string display_int_str(size_t scientificNotationDigits, bool fancy = false) const {
|
||||||
if(scientificNotationDigits <= 0) {
|
if(scientificNotationDigits <= 0) {
|
||||||
T shiftedVal = val >> bitFractionCount;
|
T shiftedVal = val >> bitFractionCount;
|
||||||
return shiftedVal.str();
|
return shiftedVal.str();
|
||||||
|
|
@ -339,7 +339,58 @@ namespace FixedPoint {
|
||||||
size_t exponent = a.size() - (isNegative ? 2 : 1);
|
size_t exponent = a.size() - (isNegative ? 2 : 1);
|
||||||
a = a.substr(0, scientificNotationDigits + (isNegative ? 2 : 1));
|
a = a.substr(0, scientificNotationDigits + (isNegative ? 2 : 1));
|
||||||
a.insert(a.begin() + (isNegative ? 2 : 1), '.');
|
a.insert(a.begin() + (isNegative ? 2 : 1), '.');
|
||||||
a += "e" + std::to_string(exponent);
|
if(fancy) {
|
||||||
|
for(;;) {
|
||||||
|
if(a.back() == '0') {
|
||||||
|
a.pop_back();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else if(a.back() == '.')
|
||||||
|
a.pop_back();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
a += "×10";
|
||||||
|
std::string expStr = std::to_string(exponent);
|
||||||
|
for(char eChar : expStr) {
|
||||||
|
switch(eChar) {
|
||||||
|
case '0':
|
||||||
|
a += "⁰";
|
||||||
|
break;
|
||||||
|
case '1':
|
||||||
|
a += "¹";
|
||||||
|
break;
|
||||||
|
case '2':
|
||||||
|
a += "²";
|
||||||
|
break;
|
||||||
|
case '3':
|
||||||
|
a += "³";
|
||||||
|
break;
|
||||||
|
case '4':
|
||||||
|
a += "⁴";
|
||||||
|
break;
|
||||||
|
case '5':
|
||||||
|
a += "⁵";
|
||||||
|
break;
|
||||||
|
case '6':
|
||||||
|
a += "⁶";
|
||||||
|
break;
|
||||||
|
case '7':
|
||||||
|
a += "⁷";
|
||||||
|
break;
|
||||||
|
case '8':
|
||||||
|
a += "⁸";
|
||||||
|
break;
|
||||||
|
case '9':
|
||||||
|
a += "⁹";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
a.push_back(eChar);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
a += "e" + std::to_string(exponent);
|
||||||
}
|
}
|
||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -328,46 +328,97 @@ void WorldGrid::draw(GridManager& gMan, SkCanvas* canvas, const DrawData& drawDa
|
||||||
draw_coordinates(canvas, drawData, divSize, gridCoordDivSize);
|
draw_coordinates(canvas, drawData, divSize, gridCoordDivSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WorldGrid::draw_coordinates(SkCanvas* canvas, const DrawData& drawData, const WorldScalar& divWorldSize, const WorldScalar& gridCoordDivSize) {
|
void WorldGrid::draw_coordinates(SkCanvas* canvas, const DrawData& drawData, WorldScalar divWorldSize, WorldScalar gridCoordDivSize) {
|
||||||
SkFont f = drawData.main->toolbar.io->get_font(18.0f);
|
SkFont f = drawData.main->toolbar.io->get_font(drawData.main->toolbar.final_gui_scale() * drawData.main->toolbar.io->fontSize);
|
||||||
SkFontMetrics metrics;
|
SkFontMetrics metrics;
|
||||||
f.getMetrics(&metrics);
|
f.getMetrics(&metrics);
|
||||||
|
|
||||||
float toolbarXLength = drawData.main->toolbar.final_gui_scale() * 80.0f;
|
float toolbarXLength = drawData.main->toolbar.final_gui_scale() * 80.0f;
|
||||||
const WorldVec& worldWindowEndPos = drawData.cam.c.pos + drawData.cam.c.dir_from_space(drawData.cam.viewingArea);
|
const WorldVec& worldWindowEndPos = drawData.cam.c.pos + drawData.cam.c.dir_from_space(drawData.cam.viewingArea);
|
||||||
WorldVec worldWindowBeginPos;
|
WorldVec worldWindowBeginPos;
|
||||||
WorldScalar xCoordMultiplier = FixedPoint::trunc((drawData.cam.c.pos.x() - offset.x()) / divWorldSize);
|
WorldVec coordMultiplier;
|
||||||
worldWindowBeginPos.x() = xCoordMultiplier * divWorldSize + offset.x();
|
auto calculateCoordMultipliers = [&]() {
|
||||||
WorldScalar yCoordMultiplier = FixedPoint::trunc((drawData.cam.c.pos.y() - offset.y()) / divWorldSize);
|
coordMultiplier.x() = FixedPoint::trunc((drawData.cam.c.pos.x() - offset.x()) / divWorldSize);
|
||||||
worldWindowBeginPos.y() = yCoordMultiplier * divWorldSize + offset.y();
|
worldWindowBeginPos.x() = coordMultiplier.x() * divWorldSize + offset.x();
|
||||||
|
coordMultiplier.y() = FixedPoint::trunc((drawData.cam.c.pos.y() - offset.y()) / divWorldSize);
|
||||||
|
worldWindowBeginPos.y() = coordMultiplier.y() * divWorldSize + offset.y();
|
||||||
|
};
|
||||||
|
calculateCoordMultipliers();
|
||||||
|
|
||||||
{
|
struct NumberTextData {
|
||||||
WorldScalar xGridCoord = xCoordMultiplier * gridCoordDivSize;
|
std::string text;
|
||||||
|
float pos; // X or Y pos depending on axis
|
||||||
|
float length; // X length
|
||||||
|
};
|
||||||
|
|
||||||
|
std::vector<NumberTextData> xAxisLabels, yAxisLabels;
|
||||||
|
|
||||||
|
for(int maxRepeats = 0; maxRepeats < 3; maxRepeats++) {
|
||||||
|
xAxisLabels.clear();
|
||||||
|
|
||||||
|
WorldScalar xGridCoord = coordMultiplier.x() * gridCoordDivSize;
|
||||||
|
|
||||||
for(WorldScalar xWorldCoord = worldWindowBeginPos.x(); xWorldCoord < worldWindowEndPos.x(); xWorldCoord += divWorldSize) {
|
for(WorldScalar xWorldCoord = worldWindowBeginPos.x(); xWorldCoord < worldWindowEndPos.x(); xWorldCoord += divWorldSize) {
|
||||||
|
NumberTextData label;
|
||||||
|
|
||||||
Vector2f gridPointScreenPos = drawData.cam.c.to_space(WorldVec{xWorldCoord, worldWindowBeginPos.y()});
|
Vector2f gridPointScreenPos = drawData.cam.c.to_space(WorldVec{xWorldCoord, worldWindowBeginPos.y()});
|
||||||
|
|
||||||
std::string xGridCoordStr = xGridCoord.display_int_str(4);
|
label.text = xGridCoord.display_int_str(4, true);
|
||||||
float textXLength = f.measureText(xGridCoordStr.c_str(), xGridCoordStr.length(), SkTextEncoding::kUTF8, nullptr);
|
label.length = f.measureText(label.text.c_str(), label.text.length(), SkTextEncoding::kUTF8, nullptr);
|
||||||
SkPaint p2(SkColor4f{1.0f, 0.0f, 0.0f, 1.0f});
|
label.pos = gridPointScreenPos.x() - label.length * 0.5f;
|
||||||
canvas->drawSimpleText(xGridCoordStr.c_str(), xGridCoordStr.length(), SkTextEncoding::kUTF8, gridPointScreenPos.x() - textXLength * 0.5f, drawData.cam.viewingArea.y() - metrics.fDescent, f, p2);
|
|
||||||
|
|
||||||
xGridCoord += gridCoordDivSize;
|
xGridCoord += gridCoordDivSize;
|
||||||
|
|
||||||
|
xAxisLabels.emplace_back(label);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool labelsTooClose = false;
|
||||||
|
for(size_t i = 1; i < xAxisLabels.size(); i++) {
|
||||||
|
if(xAxisLabels[i - 1].pos + xAxisLabels[i - 1].length >= xAxisLabels[i].pos - 10.0f * drawData.main->toolbar.final_gui_scale()) {
|
||||||
|
divWorldSize *= WorldScalar(2);
|
||||||
|
gridCoordDivSize *= WorldScalar(2);
|
||||||
|
calculateCoordMultipliers();
|
||||||
|
labelsTooClose = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(!labelsTooClose)
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
float yAxisMaxXLength = 0.0f;
|
||||||
{
|
{
|
||||||
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;
|
||||||
|
|
||||||
for(WorldScalar yWorldCoord = worldWindowBeginPos.y(); yWorldCoord < worldWindowEndPos.y(); yWorldCoord += divWorldSize) {
|
for(WorldScalar yWorldCoord = worldWindowBeginPos.y(); yWorldCoord < worldWindowEndPos.y(); yWorldCoord += divWorldSize) {
|
||||||
|
NumberTextData label;
|
||||||
|
|
||||||
Vector2f gridPointScreenPos = drawData.cam.c.to_space(WorldVec{worldWindowBeginPos.x(), yWorldCoord});
|
Vector2f gridPointScreenPos = drawData.cam.c.to_space(WorldVec{worldWindowBeginPos.x(), yWorldCoord});
|
||||||
|
|
||||||
std::string yGridCoordStr = yGridCoord.display_int_str(4);
|
label.text = yGridCoord.display_int_str(4, true);
|
||||||
|
label.pos = gridPointScreenPos.y() + metrics.fDescent;
|
||||||
SkPaint p2(SkColor4f{1.0f, 0.0f, 0.0f, 1.0f});
|
label.length = f.measureText(label.text.c_str(), label.text.length(), SkTextEncoding::kUTF8, nullptr);
|
||||||
canvas->drawSimpleText(yGridCoordStr.c_str(), yGridCoordStr.length(), SkTextEncoding::kUTF8, toolbarXLength, gridPointScreenPos.y() + metrics.fDescent, f, p2);
|
|
||||||
|
|
||||||
yGridCoord -= gridCoordDivSize;
|
yGridCoord -= gridCoordDivSize;
|
||||||
|
|
||||||
|
yAxisMaxXLength = std::max(yAxisMaxXLength, label.length);
|
||||||
|
|
||||||
|
yAxisLabels.emplace_back(label);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SkPaint labelColor(SkColor4f{color.x(), color.y(), color.z(), 1.0f});
|
||||||
|
|
||||||
|
float xAxisYPos = drawData.cam.viewingArea.y() - metrics.fDescent;
|
||||||
|
|
||||||
|
canvas->drawRect(SkRect::MakeXYWH(toolbarXLength, 0.0f, yAxisMaxXLength, drawData.cam.viewingArea.y()), SkPaint{color_mul_alpha(drawData.main->toolbar.io->theme->backColor1, 0.5f)});
|
||||||
|
canvas->drawRect(SkRect::MakeLTRB(toolbarXLength + yAxisMaxXLength, drawData.cam.viewingArea.y() - (-metrics.fAscent + metrics.fDescent), drawData.cam.viewingArea.x(), drawData.cam.viewingArea.y()), SkPaint{color_mul_alpha(drawData.main->toolbar.io->theme->backColor1, 0.5f)});
|
||||||
|
|
||||||
|
for(auto& l : xAxisLabels) {
|
||||||
|
if(l.pos > toolbarXLength + yAxisMaxXLength)
|
||||||
|
canvas->drawSimpleText(l.text.c_str(), l.text.length(), SkTextEncoding::kUTF8, l.pos, xAxisYPos, f, labelColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
for(auto& l : yAxisLabels)
|
||||||
|
canvas->drawSimpleText(l.text.c_str(), l.text.length(), SkTextEncoding::kUTF8, toolbarXLength + yAxisMaxXLength * 0.5f - l.length * 0.5f, l.pos, f, labelColor);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,8 @@ class WorldGrid {
|
||||||
Vector2f divGridClosestPoint;
|
Vector2f divGridClosestPoint;
|
||||||
float divGridPointSize;
|
float divGridPointSize;
|
||||||
};
|
};
|
||||||
void draw_coordinates(SkCanvas* canvas, const DrawData& drawData, const WorldScalar& divWorldSize, const WorldScalar& gridCoordDivSize);
|
|
||||||
|
void draw_coordinates(SkCanvas* canvas, const DrawData& drawData, WorldScalar divWorldSize, WorldScalar gridCoordDivSize);
|
||||||
static Vector2f get_closest_grid_point(const WorldVec& gridOffset, const WorldScalar& gridSize, const DrawData& drawData);
|
static Vector2f get_closest_grid_point(const WorldVec& gridOffset, const WorldScalar& gridSize, const DrawData& drawData);
|
||||||
static sk_sp<SkShader> get_shader(GridType gType, const ShaderData& shaderData);
|
static sk_sp<SkShader> get_shader(GridType gType, const ShaderData& shaderData);
|
||||||
static sk_sp<SkRuntimeEffect> compile_effect_shader_init(const char* shaderName, const char* shaderCode);
|
static sk_sp<SkRuntimeEffect> compile_effect_shader_init(const char* shaderName, const char* shaderCode);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue