7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-02-18 09:10:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

working on finishing layouts

Browse source
This commit is contained in:
hjfod 2023-02-22 14:31:15 +02:00
parent bbbf3324eb
commit 5d9857f77d
1 changed files with 54 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
loader/src/cocos2d-ext/Layout.cpp
View file

@ -269,8 +269,9 @@ AxisLayout::Row* AxisLayout::fitInRow(
} }
} }
axisLength += pos.axisLength; axisLength += pos.axisLength;
if (pos.crossLength > crossLength) { // squishing doesn't affect cross length, that's done separately
crossLength = pos.crossLength; if (pos.crossLength / squish > crossLength) {
crossLength = pos.crossLength / squish;
} }
prev = opts; prev = opts;
ix++; ix++;
@ -303,7 +304,7 @@ AxisLayout::Row* AxisLayout::fitInRow(
available.axisLength / nextAxisLength * scale * squish, available.axisLength / nextAxisLength * scale * squish,
// how much should the nodes be squished to fit the next item in this // how much should the nodes be squished to fit the next item in this
// row // row
available.axisLength / nextAxisLength * scale * squish, available.axisLength / nextAxisLength,
axisLength, axisLength,
crossLength, crossLength,
axisEndsLength, axisEndsLength,
@ -322,6 +323,8 @@ void AxisLayout::tryFitLayout(
// like i genuinely have no clue fr why some of these work tho, // like i genuinely have no clue fr why some of these work tho,
// i just threw in random equations and numbers until it worked // i just threw in random equations and numbers until it worked
log::debug("tryFitLayout -> scale: {}, squish: {}, prio: {}", scale, squish, prio);
auto rows = CCArray::create(); auto rows = CCArray::create();
float totalRowCrossLength = 0.f; float totalRowCrossLength = 0.f;
float crossScaleDownFactor = 0.f; float crossScaleDownFactor = 0.f;
@ -358,16 +361,32 @@ void AxisLayout::tryFitLayout(
} }
newNodes->release(); newNodes->release();
if (!rows->count()) {
return;
}
log::debug("crossScaleDownFactor: {}, crossSquishFactor: {}", crossScaleDownFactor, crossSquishFactor);
auto available = nodeAxis(on, m_axis, 1.f); auto available = nodeAxis(on, m_axis, 1.f);
if (available.axisLength <= 0.f || available.crossLength <= 0.f) {
return;
}
// if cross axis overflow not allowed and it's overflowing, try to scale // if cross axis overflow not allowed and it's overflowing, try to scale
// down layout if there are any nodes with auto-scale enabled (or // down layout if there are any nodes with auto-scale enabled (or
// auto-scale is enabled by default) // auto-scale is enabled by default)
if ( if (
!m_allowCrossAxisOverflow && (
doAutoScale && !m_allowCrossAxisOverflow &&
totalRowCrossLength > available.crossLength doAutoScale &&
totalRowCrossLength > available.crossLength
) || (
!m_growCrossAxis &&
static_cast<Row*>(rows->firstObject())->axisLength > available.axisLength
)
) { ) {
log::debug("scaling");
bool attemptRescale = false; bool attemptRescale = false;
auto minScaleForPrio = this->minScaleForPrio(nodes, prio); auto minScaleForPrio = this->minScaleForPrio(nodes, prio);
if ( if (
@ -379,7 +398,9 @@ void AxisLayout::tryFitLayout(
crossScaleDownFactor == scale crossScaleDownFactor == scale
) { ) {
// is there still some lower priority nodes we could try scaling? // is there still some lower priority nodes we could try scaling?
log::debug("prio: {} :: scale: {}", prio, scale);
if (prio > minMaxPrios.first) { if (prio > minMaxPrios.first) {
log::debug("scale to max");
while (true) { while (true) {
prio -= 1; prio -= 1;
auto scale = this->maxScaleForPrio(nodes, prio); auto scale = this->maxScaleForPrio(nodes, prio);
@ -391,13 +412,17 @@ void AxisLayout::tryFitLayout(
} }
attemptRescale = true; attemptRescale = true;
} }
// otherwise we're just gonna squish // otherwise set scale to min and squish
else {
scale = minScaleForPrio;
}
} }
// otherwise scale as usual // otherwise scale as usual
else { else {
attemptRescale = true; attemptRescale = true;
} }
if (attemptRescale) { if (attemptRescale) {
log::debug("gonna try with scale {} from {}", crossScaleDownFactor, scale);
rows->release(); rows->release();
return this->tryFitLayout( return this->tryFitLayout(
on, nodes, on, nodes,
@ -408,10 +433,21 @@ void AxisLayout::tryFitLayout(
} }
// if we're still overflowing, squeeze nodes closer together // if we're still overflowing, squeeze nodes closer together
if (!m_allowCrossAxisOverflow && totalRowCrossLength > available.crossLength) { if (
(
!m_allowCrossAxisOverflow &&
totalRowCrossLength > available.crossLength
) || (
!m_growCrossAxis &&
static_cast<Row*>(rows->firstObject())->axisLength > available.axisLength
)
) {
log::debug("gonna try with squish {} from {}", crossSquishFactor, squish);
// if squishing rows would take less squishing that squishing columns, // if squishing rows would take less squishing that squishing columns,
// then squish rows // then squish rows
if (totalRowCrossLength / available.crossLength < crossSquishFactor) { if (
!m_growCrossAxis || totalRowCrossLength / available.crossLength < crossSquishFactor
) {
rows->release(); rows->release();
return this->tryFitLayout( return this->tryFitLayout(
on, nodes, on, nodes,
@ -489,25 +525,6 @@ void AxisLayout::tryFitLayout(
rowCrossPos -= row->crossLength * columnSquish; rowCrossPos -= row->crossLength * columnSquish;
} }
// scale down & squish row if it overflows main axis
float rowScale = scale;
float rowSquish = squish;
if (row->axisLength > available.axisLength) {
row->axisLength /= scale * squish;
if (m_autoScale) {
rowScale = available.axisLength / row->axisLength;
if (rowScale < AXISLAYOUT_DEFAULT_MIN_SCALE) {
rowScale = AXISLAYOUT_DEFAULT_MIN_SCALE;
}
row->axisLength *= rowScale;
}
// squishing needs to take into account the row ends
if (row->axisLength > available.axisLength) {
rowSquish = available.axisLength / row->axisLength;
}
row->axisLength *= rowSquish;
}
float rowAxisPos; float rowAxisPos;
switch (m_axisAlignment) { switch (m_axisAlignment) {
case AxisAlignment::Start: { case AxisAlignment::Start: {
@ -532,34 +549,33 @@ void AxisLayout::tryFitLayout(
size_t ix = 0; size_t ix = 0;
AxisLayoutOptions const* prev = nullptr; AxisLayoutOptions const* prev = nullptr;
for (auto& node : CCArrayExt<CCNode*>(row->nodes)) { for (auto& node : CCArrayExt<CCNode*>(row->nodes)) {
auto scale = rowScale;
auto opts = axisOpts(node); auto opts = axisOpts(node);
// rescale node if overflowing // rescale node if overflowing
if (this->shouldAutoScale(opts)) { if (this->shouldAutoScale(opts)) {
scale = scaleByOpts(opts, scale, prio); auto nodeScale = scaleByOpts(opts, scale, prio);
// CCMenuItemSpriteExtra is quirky af // CCMenuItemSpriteExtra is quirky af
if (auto btn = typeinfo_cast<CCMenuItemSpriteExtra*>(node)) { if (auto btn = typeinfo_cast<CCMenuItemSpriteExtra*>(node)) {
btn->m_baseScale = scale; btn->m_baseScale = nodeScale;
} }
node->setScale(scale); node->setScale(nodeScale);
} }
if (!ix) { if (!ix) {
rowAxisPos += row->axisEndsLength * scale / 2 * (1.f - rowSquish); rowAxisPos += row->axisEndsLength * scale / 2 * (1.f - squish);
} }
auto pos = nodeAxis(node, m_axis, rowSquish); auto pos = nodeAxis(node, m_axis, squish);
float axisPos; float axisPos;
if (m_axisAlignment == AxisAlignment::Even) { if (m_axisAlignment == AxisAlignment::Even) {
axisPos = rowAxisPos + evenSpace / 2 - pos.axisLength * (.5f - pos.axisAnchor); axisPos = rowAxisPos + evenSpace / 2 - pos.axisLength * (.5f - pos.axisAnchor);
rowAxisPos += evenSpace - rowAxisPos += evenSpace -
row->axisEndsLength * scale * (1.f - rowSquish) * 1.f / nodes->count(); row->axisEndsLength * scale * (1.f - squish) * 1.f / nodes->count();
} }
else { else {
if (ix) { if (ix) {
rowAxisPos += this->nextGap(prev, opts) * scale * rowSquish; rowAxisPos += this->nextGap(prev, opts) * scale * squish;
} }
axisPos = rowAxisPos + pos.axisLength * pos.axisAnchor; axisPos = rowAxisPos + pos.axisLength * pos.axisAnchor;
rowAxisPos += pos.axisLength - rowAxisPos += pos.axisLength -
row->axisEndsLength * scale * (1.f - rowSquish) * 1.f / nodes->count(); row->axisEndsLength * scale * (1.f - squish) * 1.f / nodes->count();
} }
float crossOffset; float crossOffset;
switch (m_crossAlignment) { switch (m_crossAlignment) {
@ -634,6 +650,7 @@ void AxisLayout::apply(CCNode* on) {
} }
} }
log::debug("applying");
this->tryFitLayout( this->tryFitLayout(
on, nodes, on, nodes,
minMaxPrio, doAutoScale, minMaxPrio, doAutoScale,