merge upstream develop with funkin local

.github/workflows/main.yml

@@ -98,7 +98,7 @@ jobs:
           haxelib install hxcpp --quiet
           haxelib install format --quiet
           haxelib install hxp --quiet
-          haxelib install lime 8.1.3 --quiet
+          haxelib install lime --quiet
           haxelib install utest --quiet
 
       - name: Setup environment

src/openfl/display/BitmapData.hx

@@ -112,6 +112,10 @@ import openfl.display._internal.stats.DrawCallContext;
 	@see `openfl.display.Graphics.beginBitmapFill()`
 	@see `openfl.display.Graphics.lineBitmapStyle()`
 **/
+#if !openfl_debug
+@:fileXml('tags="haxe,release"')
+@:noDebug
+#end
 @:access(lime.graphics.opengl.GL)
 @:access(lime.graphics.Image)
 @:access(lime.graphics.ImageBuffer)
@@ -127,9 +131,6 @@ import openfl.display._internal.stats.DrawCallContext;
 @:access(openfl.geom.Matrix)
 @:access(openfl.geom.Point)
 @:access(openfl.geom.Rectangle)
-#if !openfl_debug
-@:fileXml('tags="haxe,release"') @:noDebug
-#end
 @:autoBuild(openfl.utils._internal.AssetsMacro.embedBitmap())
 class BitmapData implements IBitmapDrawable
 {
@@ -618,16 +619,16 @@ class BitmapData implements IBitmapDrawable
 								the new channel data is placed. To copy only
 								channel data from one area to a different area in
 								the destination image, specify a point other than
-							   (0,0).
+								(0,0).
 		@param sourceChannel    The source channel. Use a value from the
 								BitmapDataChannel class
-							   (`BitmapDataChannel.RED`,
+								(`BitmapDataChannel.RED`,
 								`BitmapDataChannel.BLUE`,
 								`BitmapDataChannel.GREEN`,
 								`BitmapDataChannel.ALPHA`).
 		@param destChannel      The destination channel. Use a value from the
 								BitmapDataChannel class
-							   (`BitmapDataChannel.RED`,
+								(`BitmapDataChannel.RED`,
 								`BitmapDataChannel.BLUE`,
 								`BitmapDataChannel.GREEN`,
 								`BitmapDataChannel.ALPHA`).

src/openfl/display/Graphics.hx

@@ -140,10 +140,10 @@ import js.html.CanvasRenderingContext2D;
 					  example, you can use the following matrix to rotate a bitmap
 					  by 45 degrees(pi/4 radians):
 
-		```haxe
-		matrix = new openfl.geom.Matrix();
-			 	matrix.rotate(Math.PI / 4);
-			 	```
+					  ```haxe
+					  matrix = new openfl.geom.Matrix();
+					  matrix.rotate(Math.PI / 4);
+					  ```
 
 		@param repeat If `true`, the bitmap image repeats in a tiled
 					  pattern. If `false`, the bitmap image does not
@@ -605,7 +605,7 @@ import js.html.CanvasRenderingContext2D;
 	/**
 		Draws an ellipse. Set the line style, fill, or both before you call the
 		`drawEllipse()` method, by calling the
-		`linestyle()`, `lineGradientStyle()`,
+		`lineStyle()`, `lineGradientStyle()`,
 		`beginFill()`, `beginGradientFill()`, or
 		`beginBitmapFill()` method.
 
@@ -943,7 +943,7 @@ import js.html.CanvasRenderingContext2D;
 
 	/**
 		Draws a rectangle. Set the line style, fill, or both before you call the
-		`drawRect()` method, by calling the `linestyle()`,
+		`drawRect()` method, by calling the `lineStyle()`,
 		`lineGradientStyle()`, `beginFill()`,
 		`beginGradientFill()`, or `beginBitmapFill()`
 		method.
@@ -956,7 +956,7 @@ import js.html.CanvasRenderingContext2D;
 		@param height The height of the rectangle (in pixels).
 		@throws ArgumentError If the `width` or `height`
 							  parameters are not a number
-							 (`Number.NaN`).
+							  (`Number.NaN`).
 
 		@see [Drawing shapes using built-in methods](https://books.openfl.org/openfl-developers-guide/using-the-drawing-api/drawing-shapes-using-built-in-methods.html)
 	**/
@@ -978,7 +978,7 @@ import js.html.CanvasRenderingContext2D;
 	/**
 		Draws a rounded rectangle. Set the line style, fill, or both before you
 		call the `drawRoundRect()` method, by calling the
-		`linestyle()`, `lineGradientStyle()`,
+		`lineStyle()`, `lineGradientStyle()`,
 		`beginFill()`, `beginGradientFill()`, or
 		`beginBitmapFill()` method.
 
@@ -987,7 +987,7 @@ import js.html.CanvasRenderingContext2D;
 							 object(in pixels).
 		@param y             A number indicating the vertical position relative to
 							 the registration point of the parent display object
-							(in pixels).
+							 (in pixels).
 		@param width         The width of the round rectangle (in pixels).
 		@param height        The height of the round rectangle (in pixels).
 		@param ellipseWidth  The width of the ellipse used to draw the rounded
@@ -1341,7 +1341,7 @@ import js.html.CanvasRenderingContext2D;
 		@param color        A hexadecimal color value of the line; for example,
 							red is 0xFF0000, blue is 0x0000FF, and so on. If a
 							value is not indicated, the default is 0x000000
-						   (black). Optional.
+							(black). Optional.
 		@param alpha        A number that indicates the alpha value of the color
 							of the line; valid values are 0 to 1. If a value is
 							not indicated, the default is 1 (solid). If the value
@@ -1360,7 +1360,7 @@ import js.html.CanvasRenderingContext2D;
 							rectangles that are identical, except that the
 							`pixelHinting` parameter used in the
 							`lineStyle()` method is set differently
-						   (the images are scaled by 200%, to emphasize the
+							(the images are scaled by 200%, to emphasize the
 							difference):
 
 							![pixelHinting false and pixelHinting true](/images/lineStyle_pixelHinting.jpg)
@@ -1373,7 +1373,7 @@ import js.html.CanvasRenderingContext2D;
 
 							 *  `LineScaleMode.NORMAL` - Always
 							scale the line thickness when the object is scaled
-						   (the default).
+							(the default).
 							 *  `LineScaleMode.NONE` - Never scale
 							the line thickness.
 							 *  `LineScaleMode.VERTICAL` - Do not

src/openfl/display/GraphicsStroke.hx

@@ -99,24 +99,23 @@ import openfl.display._internal.GraphicsDataType;
 	/**
 		Specifies the stroke thickness scaling. Valid values are:
 
-		* `LineScaleMode.NORMAL` - Always scale the line thickness
+		*  `LineScaleMode.NORMAL` - Always scale the line thickness
 		when the object is scaled (the default).
-		* `LineScaleMode.NONE` - Never scale the line thickness.
+		*  `LineScaleMode.NONE` - Never scale the line thickness.
 
-		* `LineScaleMode.VERTICAL` - Do not scale the line
+		*  `LineScaleMode.VERTICAL` - Do not scale the line
 		thickness if the object is scaled vertically _only_. For example,
 		consider the following circles, drawn with a one-pixel line, and each with
 		the `scaleMode` parameter set to
 		`LineScaleMode.VERTICAL`. The circle on the left is scaled
 		vertically only, and the circle on the right is scaled both vertically and
 		horizontally:
-		* `LineScaleMode.HORIZONTAL` - Do not scale the line
+		*  `LineScaleMode.HORIZONTAL` - Do not scale the line
 		thickness if the object is scaled horizontally _only_. For example,
 		consider the following circles, drawn with a one-pixel line, and each with
-		the `scaleMode` parameter set to
-		`LineScaleMode.HORIZONTAL`. The circle on the left is scaled
-		horizontally only, and the circle on the right is scaled both vertically
-		and horizontally:
+		the `scaleMode` parameter set to `LineScaleMode.HORIZONTAL`. The circle
+		on the left is scaled horizontally only, and the circle on the right is
+		scaled both vertically and horizontally:
 
 	**/
 	public var scaleMode:LineScaleMode;
@@ -147,7 +146,7 @@ import openfl.display._internal.GraphicsDataType;
 							rounded rectangles that are identical, except that the
 							`pixelHinting` parameter used in the
 							`lineStyle()` method is set differently
-						   (the images are scaled by 200%, to emphasize the
+							(the images are scaled by 200%, to emphasize the
 							difference):
 
 							If a value is not supplied, the line does not use
@@ -157,7 +156,7 @@ import openfl.display._internal.GraphicsDataType;
 
 							 *  `LineScaleMode.NORMAL` - Always
 							scale the line thickness when the object is scaled
-						   (the default).
+							(the default).
 							 *  `LineScaleMode.NONE` - Never scale
 							the line thickness.
 							 *  `LineScaleMode.VERTICAL` - Do not

src/openfl/display/MovieClip.hx

@@ -32,7 +32,7 @@ import openfl.events.MouseEvent;
 	stop the playhead in any child MovieClip objects of that MovieClip
 	object.
 
-	**Note:**Flash Lite 4 supports the MovieClip.opaqueBackground
+	**Note:** Flash Lite 4 supports the MovieClip.opaqueBackground
 	property only if FEATURE_BITMAPCACHE is defined. The default configuration
 	of Flash Lite 4 does not define FEATURE_BITMAPCACHE. To enable the
 	MovieClip.opaqueBackground property for a suitable device, define

src/openfl/display/OpenGLRenderer.hx

@@ -991,17 +991,18 @@ class OpenGLRenderer extends DisplayObjectRenderer
 	{
 		if (clipRect != null)
 		{
-			var x = Math.floor(clipRect.x);
-			var y = Math.floor(clipRect.y);
-			var width = (clipRect.width > 0 ? Math.ceil(clipRect.right) - x : 0);
-			var height = (clipRect.height > 0 ? Math.ceil(clipRect.bottom) - y : 0);
+			var x = Math.ffloor(clipRect.x);
+			var y = Math.ffloor(clipRect.y);
+			var width = (clipRect.width > 0 ? Math.fceil(clipRect.right) - x : 0);
+			var height = (clipRect.height > 0 ? Math.fceil(clipRect.bottom) - y : 0);
 			#if !openfl_dpi_aware
 			if (__context3D.__backBufferWantsBestResolution)
 			{
-				x = Math.floor(clipRect.x / __pixelRatio);
-				y = Math.floor(clipRect.y / __pixelRatio);
-				width = (clipRect.width > 0 ? Math.ceil(clipRect.right / __pixelRatio) - x : 0);
-				height = (clipRect.height > 0 ? Math.ceil(clipRect.bottom / __pixelRatio) - y : 0);
+				var uv = 1.5 / __pixelRatio;
+				x = clipRect.x / __pixelRatio;
+				y = clipRect.y / __pixelRatio;
+				width = (clipRect.width > 0 ? (clipRect.right / __pixelRatio) - x + uv : 0);
+				height = (clipRect.height > 0 ? (clipRect.bottom / __pixelRatio) - y + uv : 0);
 			}
 			#end
 

src/openfl/display/Stage.hx

@@ -2162,7 +2162,11 @@ class Stage extends DisplayObjectContainer #if lime implements IModule #end
 		Telemetry.__endTiming(TelemetryCommandName.RENDER);
 		Telemetry.__rewindStack(stack);
 		#end
-
+
+		#if HXCPP_TRACY
+		cpp.vm.tracy.TracyProfiler.frameMark();
+		#end
+
 		return cancelled;
 	}
 

src/openfl/display/_internal/CairoGraphics.hx

@@ -136,7 +136,7 @@ class CairoGraphics
 
 			ratio = ratios[i] / 0xFF;
 			if (ratio < 0) ratio = 0;
-			if (ratio > 1) ratio = 1;
+			else if (ratio > 1) ratio = 1;
 
 			pattern.addColorStopRGBA(ratio, r, g, b, alpha);
 		}
@@ -533,11 +533,17 @@ class CairoGraphics
 						c.anchorY
 						- offsetY);
 
+					positionX = c.anchorX;
+					positionY = c.anchorY;
+
 				case CURVE_TO:
 					var c = data.readCurveTo();
 					hasPath = true;
 					quadraticCurveTo(c.controlX - offsetX, c.controlY - offsetY, c.anchorX - offsetX, c.anchorY - offsetY);
 
+					positionX = c.anchorX;
+					positionY = c.anchorY;
+
 				case DRAW_CIRCLE:
 					var c = data.readDrawCircle();
 					hasPath = true;

src/openfl/display/_internal/CanvasGraphics.hx

@@ -137,34 +137,53 @@ class CanvasGraphics
 				{
 					ratio = ratios[i] / 0xFF;
 					if (ratio < 0) ratio = 0;
-					if (ratio > 1) ratio = 1;
+					else if (ratio > 1) ratio = 1;
 
 					gradientFill.addColorStop(ratio, getRGBA(colors[i], alphas[i]));
 				}
 
-			case LINEAR:
-				var gradientScale:Float = spreadMethod == PAD ? 1.0 : 25.0;
-				var dx = 0.5 * (gradientScale - 1.0) * 1638.4;
-				var canvas:CanvasElement = cast Browser.document.createElement("canvas");
-				var context2 = canvas.getContext("2d");
+				if (point != null) Point.__pool.release(point);
+				if (point2 != null) Point.__pool.release(point2);
+				if (releaseMatrix) Matrix.__pool.release(matrix);
 
-				var dimensions:Dynamic = getDimensions(matrix);
+				return cast(gradientFill);
 
-				canvas.width = context.canvas.width;
-				canvas.height = context.canvas.height;
-				gradientFill = context.createLinearGradient(-819.2 - dx, 0, 819.2 + dx, 0);
+			case LINEAR:
 				if (spreadMethod == PAD)
 				{
+					gradientFill = context.createLinearGradient(-819.2, 0, 819.2, 0);
+
+					pendingMatrix = matrix.clone();
+					inversePendingMatrix = matrix.clone();
+					inversePendingMatrix.invert();
+
 					for (i in 0...colors.length)
 					{
 						ratio = ratios[i] / 0xFF;
 						if (ratio < 0) ratio = 0;
-						if (ratio > 1) ratio = 1;
+						else if (ratio > 1) ratio = 1;
 
 						gradientFill.addColorStop(ratio, getRGBA(colors[i], alphas[i]));
 					}
+
+					if (point != null) Point.__pool.release(point);
+					if (point2 != null) Point.__pool.release(point2);
+					if (releaseMatrix) Matrix.__pool.release(matrix);
+
+					return cast(gradientFill);
 				}
-				else if (spreadMethod == REFLECT)
+
+				var gradientScale:Float = spreadMethod == PAD ? 1.0 : 25.0;
+				var dx = 0.5 * (gradientScale - 1.0) * 1638.4;
+				var canvas:CanvasElement = cast Browser.document.createElement("canvas");
+				var context2 = canvas.getContext("2d");
+
+				var dimensions:Dynamic = getDimensions(matrix);
+
+				canvas.width = context.canvas.width;
+				canvas.height = context.canvas.height;
+				gradientFill = context.createLinearGradient(-819.2 - dx, 0, 819.2 + dx, 0);
+				if (spreadMethod == REFLECT)
 				{
 					var t:Float = 0;
 					var step:Float = 1 / 25;
@@ -176,7 +195,7 @@ class CanvasGraphics
 							ratio = ratios[i] / 0xFF;
 							ratio = t + ratio * step;
 							if (ratio < 0) ratio = 0;
-							if (ratio > 1) ratio = 1;
+							else if (ratio > 1) ratio = 1;
 
 							gradientFill.addColorStop(ratio, getRGBA(colors[i], alphas[i]));
 						}
@@ -187,7 +206,7 @@ class CanvasGraphics
 							ratio = ratios[a] / 0xFF;
 							ratio = t + (1.0 - ratio) * step;
 							if (ratio < 0) ratio = 0;
-							if (ratio > 1) ratio = 1;
+							else if (ratio > 1) ratio = 1;
 							gradientFill.addColorStop(ratio, getRGBA(colors[a], alphas[a]));
 							a--;
 						}
@@ -206,14 +225,14 @@ class CanvasGraphics
 							ratio = ratios[i] / 0xFF;
 							ratio = t + ratio * step;
 							if (ratio < 0) ratio = 0;
-							if (ratio > 1) ratio = 1 - 0.001;
+							else if (ratio > 1) ratio = 1 - 0.001;
 
 							gradientFill.addColorStop(ratio, getRGBA(colors[i], alphas[i]));
 						}
 
 						ratio = t + 0.001;
 						if (ratio < 0) ratio = 0;
-						if (ratio > 1) ratio = 1;
+						else if (ratio > 1) ratio = 1;
 						gradientFill.addColorStop(ratio - 0.001, getRGBA(colors[colors.length - 1], alphas[alphas.length - 1]));
 						gradientFill.addColorStop(ratio, getRGBA(colors[0], alphas[0]));
 
@@ -686,11 +705,17 @@ class CanvasGraphics
 						c.anchorY
 						- offsetY);
 
+					positionX = c.anchorX;
+					positionY = c.anchorY;
+
 				case CURVE_TO:
 					var c = data.readCurveTo();
 					hasPath = true;
 					context.quadraticCurveTo(c.controlX - offsetX, c.controlY - offsetY, c.anchorX - offsetX, c.anchorY - offsetY);
 
+					positionX = c.anchorX;
+					positionY = c.anchorY;
+
 				case DRAW_CIRCLE:
 					var c = data.readDrawCircle();
 					hasPath = true;

src/openfl/media/Sound.hx

@@ -196,9 +196,7 @@ class Sound extends EventDispatcher
 		these security limitations.
 
 		For more information related to security, see the Flash Player
-		Developer Center Topic: <a
-		href="http://www.adobe.com/go/devnet_security_en"
-		scope="external">Security</a>.
+		Developer Center Topic: [Security](http://www.adobe.com/go/devnet_security_en).
 	**/
 	public var id3(get, never):ID3Info;