Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid FlxBackdrop matrix leak #426

Merged
merged 3 commits into from
Apr 13, 2024
Merged

Avoid FlxBackdrop matrix leak #426

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8216425
Update FlxBackdrop.hx
MaybeMaru Apr 12, 2024
0b3fa64
whoops missed these
MaybeMaru Apr 12, 2024
902bff7
revert certain changes, add tileSize.put calls
Geokureli Apr 13, 2024
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
94 changes: 48 additions & 46 deletions flixel/addons/display/FlxBackdrop.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ class FlxBackdrop extends FlxSprite
*/
public var blitMode:BackdropBlitMode = AUTO;

var _tileSize:FlxPoint = FlxPoint.get();
var _tileMatrix:FlxMatrix = new FlxMatrix();
var _blitOffset:FlxPoint = FlxPoint.get();
var _blitGraphic:FlxGraphic = null;
var _prevDrawParams:BackdropDrawParams =
Expand Down Expand Up @@ -82,9 +84,11 @@ class FlxBackdrop extends FlxSprite

override function destroy():Void
{
spacing = FlxDestroyUtil.destroy(spacing);
_blitOffset = FlxDestroyUtil.destroy(_blitOffset);
spacing = FlxDestroyUtil.put(spacing);
_tileSize = FlxDestroyUtil.put(_tileSize);
_blitOffset = FlxDestroyUtil.put(_blitOffset);
_blitGraphic = FlxDestroyUtil.destroy(_blitGraphic);
_tileMatrix = null;

super.destroy();
}
Expand Down Expand Up @@ -200,9 +204,9 @@ class FlxBackdrop extends FlxSprite
final frame = drawBlit ? _blitGraphic.imageFrame.frame : _frame;

// The distance between repeated sprites, in screen space
var tileSize = FlxPoint.get(frame.frame.width, frame.frame.height);
_tileSize.set(frame.frame.width, frame.frame.height);
if (drawDirect)
tileSize.addPoint(spacing);
_tileSize.addPoint(spacing);

getScreenPosition(_point, camera).subtractPoint(offset);
var tilesX = 1;
Expand All @@ -212,18 +216,18 @@ class FlxBackdrop extends FlxSprite
final viewMargins = camera.getViewMarginRect();
if (repeatAxes.x)
{
final left = modMin(_point.x + frameWidth, tileSize.x, viewMargins.left) - frameWidth;
final right = modMax(_point.x, tileSize.x, viewMargins.right) + tileSize.x;
tilesX = Math.round((right - left) / tileSize.x);
final left = modMin(_point.x + frameWidth, _tileSize.x, viewMargins.left) - frameWidth;
final right = modMax(_point.x, _tileSize.x, viewMargins.right) + _tileSize.x;
tilesX = Math.round((right - left) / _tileSize.x);
final origTileSizeX = frameWidth + spacing.x;
_point.x = modMin(_point.x + frameWidth, origTileSizeX, viewMargins.left) - frameWidth;
}

if (repeatAxes.y)
{
final top = modMin(_point.y + frameHeight, tileSize.y, viewMargins.top) - frameHeight;
final bottom = modMax(_point.y, tileSize.y, viewMargins.bottom) + tileSize.y;
tilesY = Math.round((bottom - top) / tileSize.y);
final top = modMin(_point.y + frameHeight, _tileSize.y, viewMargins.top) - frameHeight;
final bottom = modMax(_point.y, _tileSize.y, viewMargins.bottom) + _tileSize.y;
tilesY = Math.round((bottom - top) / _tileSize.y);
final origTileSizeY = frameHeight + spacing.y;
_point.y = modMin(_point.y + frameHeight, origTileSizeY, viewMargins.top) - frameHeight;
}
Expand All @@ -243,7 +247,7 @@ class FlxBackdrop extends FlxSprite
for (tileY in 0...tilesY)
{
// _point.copyToFlash(_flashPoint);
_flashPoint.setTo(_point.x + tileSize.x * tileX, _point.y + tileSize.y * tileY);
_flashPoint.setTo(_point.x + _tileSize.x * tileX, _point.y + _tileSize.y * tileY);

if (isPixelPerfectRender(camera))
{
Expand Down Expand Up @@ -273,14 +277,11 @@ class FlxBackdrop extends FlxSprite

frame.prepareMatrix(_matrix, FlxFrameAngle.ANGLE_0, checkFlipX(), checkFlipY());
_matrix.translate(-origin.x, -origin.y);

// The distance between repeated sprites, in screen space
var tileSize = FlxPoint.get(frame.frame.width, frame.frame.height);


if (drawDirect)
{
tileSize.set
(
// The distance between repeated sprites, in screen space
_tileSize.set(
(frame.frame.width + spacing.x) * scale.x,
(frame.frame.height + spacing.y) * scale.y
);
Expand All @@ -295,6 +296,10 @@ class FlxBackdrop extends FlxSprite
_matrix.rotateWithTrig(_cosAngle, _sinAngle);
}
}
else
{
_tileSize.set(frame.frame.width, frame.frame.height);
}

var drawItem = null;
if (FlxG.renderTile)
Expand All @@ -311,57 +316,54 @@ class FlxBackdrop extends FlxSprite
getScreenPosition(_point, camera).subtractPoint(offset);
var tilesX = 1;
var tilesY = 1;
if (repeatAxes != NONE)
Geokureli marked this conversation as resolved.
Show resolved Hide resolved
final viewMargins = camera.getViewMarginRect();
final bounds = getScreenBounds(camera);
if (repeatAxes.x)
{
final viewMargins = camera.getViewMarginRect();
final bounds = getScreenBounds(camera);
if (repeatAxes.x)
{
final origTileSizeX = (frameWidth + spacing.x) * scale.x;
final left = modMin(bounds.right, origTileSizeX, viewMargins.left) - bounds.width;
final right = modMax(bounds.left, origTileSizeX, viewMargins.right) + origTileSizeX;
tilesX = Math.round((right - left) / tileSize.x);
_point.x = left + _point.x - bounds.x;
}
final origTileSizeX = (frameWidth + spacing.x) * scale.x;
final left = modMin(bounds.right, origTileSizeX, viewMargins.left) - bounds.width;
final right = modMax(bounds.left, origTileSizeX, viewMargins.right) + origTileSizeX;
tilesX = Math.round((right - left) / _tileSize.x);
_point.x = left + _point.x - bounds.x;
}

if (repeatAxes.y)
{
final origTileSizeY = (frameHeight + spacing.y) * scale.y;
final top = modMin(bounds.bottom, origTileSizeY, viewMargins.top) - bounds.height;
final bottom = modMax(bounds.top, origTileSizeY, viewMargins.bottom) + origTileSizeY;
tilesY = Math.round((bottom - top) / tileSize.y);
_point.y = top + _point.y - bounds.y;
}
viewMargins.put();
bounds.put();
if (repeatAxes.y)
{
final origTileSizeY = (frameHeight + spacing.y) * scale.y;
final top = modMin(bounds.bottom, origTileSizeY, viewMargins.top) - bounds.height;
final bottom = modMax(bounds.top, origTileSizeY, viewMargins.bottom) + origTileSizeY;
tilesY = Math.round((bottom - top) / _tileSize.y);
_point.y = top + _point.y - bounds.y;
}
viewMargins.put();
bounds.put();

_point.addPoint(origin);
if (drawBlit)
_point.addPoint(_blitOffset);

final mat = new FlxMatrix();

for (tileX in 0...tilesX)
{
for (tileY in 0...tilesY)
{
mat.copyFrom(_matrix);
_tileMatrix.copyFrom(_matrix);

mat.translate(_point.x + (tileSize.x * tileX), _point.y + (tileSize.y * tileY));
_tileMatrix.translate(_point.x + (_tileSize.x * tileX), _point.y + (_tileSize.y * tileY));

if (isPixelPerfectRender(camera))
{
mat.tx = Math.floor(mat.tx);
mat.ty = Math.floor(mat.ty);
_tileMatrix.tx = Math.floor(_tileMatrix.tx);
_tileMatrix.ty = Math.floor(_tileMatrix.ty);
}

if (FlxG.renderBlit)
{
final pixels = drawBlit ? _blitGraphic.bitmap: framePixels;
camera.drawPixels(frame, pixels, mat, colorTransform, blend, antialiasing, shader);
camera.drawPixels(frame, pixels, _tileMatrix, colorTransform, blend, antialiasing, shader);
}
else
{
drawItem.addQuad(frame, mat, colorTransform);
drawItem.addQuad(frame, _tileMatrix, colorTransform);
}
}
}
Expand Down
Loading