Skip to content

Commit 29cc58f

Browse files
GeokureliGeokureli
authored
Fix deprecation warnings with 6.1.2 (#471)
* Fix deprecation warnings with 6.1.2 * fix haxe 4.2.5 CI * fix rgb deprecation warnings
1 parent a6ad905 commit 29cc58f

File tree

6 files changed

+38
-23
lines changed

6 files changed

+38
-23
lines changed

‎flixel/addons/display/FlxBackdrop.hx‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package flixel.addons.display;
22

33
import flixel.FlxBasic;
4+
import flixel.FlxCamera;
45
import flixel.FlxG;
56
import flixel.FlxSprite;
6-
import flixel.FlxCamera;
77
import flixel.graphics.FlxGraphic;
88
import flixel.graphics.frames.FlxFrame;
99
import flixel.math.FlxMatrix;
@@ -204,9 +204,10 @@ class FlxBackdrop extends FlxSprite
204204
// The distance between repeated sprites, in screen space
205205
final tileSize = FlxPoint.get(frame.frame.width, frame.frame.height);
206206
if (drawDirect)
207-
tileSize.addPoint(spacing);
207+
tileSize.add(spacing.x, spacing.y);
208208

209-
getScreenPosition(_point, camera).subtractPoint(offset);
209+
getScreenPosition(_point, camera);
210+
_point -= offset;
210211
var tilesX = 1;
211212
var tilesY = 1;
212213
if (repeatAxes != NONE)
@@ -233,7 +234,7 @@ class FlxBackdrop extends FlxSprite
233234
}
234235

235236
if (drawBlit)
236-
_point.addPoint(_blitOffset);
237+
_point += _blitOffset;
237238

238239
if (FlxG.renderBlit)
239240
calcFrame(true);
@@ -311,7 +312,8 @@ class FlxBackdrop extends FlxSprite
311312
camera.buffer.lock();
312313
}
313314

314-
getScreenPosition(_point, camera).subtractPoint(offset);
315+
getScreenPosition(_point, camera);
316+
_point -= offset;
315317
var tilesX = 1;
316318
var tilesY = 1;
317319
if (repeatAxes != NONE)
@@ -338,9 +340,9 @@ class FlxBackdrop extends FlxSprite
338340
viewMargins.put();
339341
bounds.put();
340342
}
341-
_point.addPoint(origin);
343+
_point += origin;
342344
if (drawBlit)
343-
_point.addPoint(_blitOffset);
345+
_point += _blitOffset;
344346

345347
for (tileX in 0...tilesX)
346348
{

‎flixel/addons/display/FlxNestedSprite.hx‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package flixel.addons.display;
22

3-
import flixel.util.FlxDirectionFlags;
4-
import openfl.geom.ColorTransform;
53
import flixel.FlxBasic;
64
import flixel.FlxG;
75
import flixel.FlxSprite;
@@ -12,6 +10,8 @@ import flixel.math.FlxVelocity;
1210
import flixel.system.FlxAssets.FlxGraphicAsset;
1311
import flixel.util.FlxColor;
1412
import flixel.util.FlxDestroyUtil;
13+
import flixel.util.FlxDirectionFlags;
14+
import openfl.geom.ColorTransform;
1515

1616
using flixel.util.FlxArrayUtil;
1717

@@ -308,7 +308,9 @@ class FlxNestedSprite extends FlxSprite
308308
colorTransform.blueMultiplier = blue;
309309
colorTransform.alphaMultiplier = alpha;
310310
}
311+
#if (flixel < version("6.1.0"))
311312
useColorTransform = true;
313+
#end
312314
}
313315
else
314316
{
@@ -319,7 +321,9 @@ class FlxNestedSprite extends FlxSprite
319321
colorTransform.blueMultiplier = 1;
320322
colorTransform.alphaMultiplier = 1;
321323
}
324+
#if (flixel < version("6.1.0"))
322325
useColorTransform = false;
326+
#end
323327
}
324328
dirty = true;
325329

@@ -334,7 +338,7 @@ class FlxNestedSprite extends FlxSprite
334338

335339
override function set_color(Color:FlxColor):FlxColor
336340
{
337-
Color = Color.to24Bit();
341+
Color = Color.rgb;
338342

339343
var combinedRed:Float = (Color >> 16) * _parentRed / 255;
340344
var combinedGreen:Float = (Color >> 8 & 0xff) * _parentGreen / 255;
@@ -359,7 +363,9 @@ class FlxNestedSprite extends FlxSprite
359363
colorTransform.blueMultiplier = combinedBlue;
360364
colorTransform.alphaMultiplier = alpha;
361365
}
366+
#if (flixel < version("6.1.0"))
362367
useColorTransform = true;
368+
#end
363369
}
364370
else
365371
{
@@ -370,7 +376,9 @@ class FlxNestedSprite extends FlxSprite
370376
colorTransform.blueMultiplier = 1;
371377
colorTransform.alphaMultiplier = 1;
372378
}
379+
#if (flixel < version("6.1.0"))
373380
useColorTransform = false;
381+
#end
374382
}
375383

376384
dirty = true;

‎flixel/addons/display/FlxPieDial.hx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,17 +289,17 @@ class FlxPieDialUtils
289289
// draw the interesting quadrant
290290
if (Math.abs(degrees % 90) < 45)
291291
{
292-
p[1].setPolarDegrees(radius, -90 + Std.int(degrees / 90) * 90).addPoint(center);
293-
p[2].setPolarDegrees(cornerLength, -90 + degrees).addPoint(center);
292+
p[1].setPolarDegrees(radius, -90 + Std.int(degrees / 90) * 90).add(center.x, center.y);
293+
p[2].setPolarDegrees(cornerLength, -90 + degrees).add(center.x, center.y);
294294
p[3].copyFrom(center);
295295
}
296296
else
297297
{
298298
final quadDegreesStart = Std.int(degrees / 90) * 90;
299299
final cornerDegrees = quadDegreesStart + (degrees < 0 ? -45 : 45);
300-
p[1].setPolarDegrees(radius, -90 + quadDegreesStart).addPoint(center);
301-
p[2].setPolarDegrees(cornerLength, -90 + cornerDegrees).addPoint(center);
302-
p[3].setPolarDegrees(cornerLength, -90 + degrees).addPoint(center);
300+
p[1].setPolarDegrees(radius, -90 + quadDegreesStart).add(center.x, center.y);
301+
p[2].setPolarDegrees(cornerLength, -90 + cornerDegrees).add(center.x, center.y);
302+
p[3].setPolarDegrees(cornerLength, -90 + degrees).add(center.x, center.y);
303303
}
304304

305305
drawPolygon(dest, p, color);

‎flixel/addons/display/FlxShaderMaskCamera.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class FlxShaderMaskCamera extends FlxCamera
111111
{
112112
// clear our duplicate canvas
113113
shaderCanvas.graphics.clear();
114-
super.fill(bgColor.to24Bit(), useBgAlphaBlending, bgColor.alphaFloat, shaderCanvas.graphics);
114+
super.fill(bgColor.rgb, useBgAlphaBlending, bgColor.alphaFloat, shaderCanvas.graphics);
115115
// iterate over draw items, but draw them to both canvases
116116
var currItem:FlxDrawBaseItem<Dynamic> = _headOfDrawStack;
117117
var oldCanvas:Sprite = canvas;

‎flixel/addons/effects/FlxClothSprite.hx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package flixel.addons.effects;
22

3-
import openfl.geom.Rectangle;
43
import flixel.FlxCamera;
54
import flixel.FlxSprite;
65
import flixel.graphics.FlxGraphic;
@@ -16,6 +15,7 @@ import flixel.util.FlxSpriteUtil;
1615
import openfl.display.BitmapData;
1716
import openfl.display.Graphics;
1817
import openfl.geom.Point;
18+
import openfl.geom.Rectangle;
1919

2020
/**
2121
* A FlxSprite that draw it's frame in a mesh and behave like a cloth.
@@ -170,10 +170,12 @@ class FlxClothSprite extends FlxSprite
170170
calcImage();
171171
drawImage();
172172

173+
getScreenPosition(_point, camera);
174+
_point -= offset;
173175
if (isPixelPerfectRender(camera))
174176
_point.floor();
175177

176-
_point.addPoint(_drawOffset).copyToFlash(_flashPoint);
178+
_flashPoint.setTo(_point.x + _drawOffset.x, _point.y + _drawOffset.y);
177179
camera.copyPixels(_frame, meshPixels, meshPixels.rect, _flashPoint, colorTransform, blend, antialiasing);
178180
}
179181

@@ -194,14 +196,16 @@ class FlxClothSprite extends FlxSprite
194196
_matrix.rotateWithTrig(_cosAngle, _sinAngle);
195197
}
196198

197-
getScreenPosition(_point, camera).subtractPoint(offset);
199+
getScreenPosition(_point, camera);
200+
_point -= offset;
198201
if (isPixelPerfectRender(camera))
199202
_point.floor();
200203

201204
if (_frameGraphic == null)
202205
_frameGraphic = FlxGraphic.fromBitmapData(framePixels, false, null, false);
203206

204-
camera.drawTriangles(_frameGraphic, _vertices, _indices, _uvtData, colors, _point.addPoint(_drawOffset), blend, false, antialiasing);
207+
_point += _drawOffset;
208+
camera.drawTriangles(_frameGraphic, _vertices, _indices, _uvtData, colors, _point, blend, false, antialiasing);
205209
}
206210

207211
#if FLX_DEBUG

‎flixel/addons/effects/FlxSkewedSprite.hx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package flixel.addons.effects;
22

3-
import openfl.geom.Matrix;
43
import flixel.FlxCamera;
54
import flixel.FlxG;
65
import flixel.FlxSprite;
76
import flixel.graphics.frames.FlxFrame.FlxFrameAngle;
87
import flixel.math.FlxAngle;
98
import flixel.math.FlxPoint;
109
import flixel.util.FlxDestroyUtil;
10+
import openfl.geom.Matrix;
1111

1212
/**
1313
* @author Zaphod
@@ -71,8 +71,9 @@ class FlxSkewedSprite extends FlxSprite
7171
_matrix.concat(_skewMatrix);
7272
}
7373

74-
getScreenPosition(_point, camera).subtractPoint(offset);
75-
_point.addPoint(origin);
74+
getScreenPosition(_point, camera);
75+
_point -= offset;
76+
_point += origin;
7677
if (isPixelPerfectRender(camera))
7778
_point.floor();
7879

0 commit comments

Comments
 (0)