Merge the latest changes from upstream.

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        haxe-version: ["4.2.5", "4.3.3"]
+        haxe-version: ["4.2.5", "4.3.4"]
         target: [html5, hl, neko, flash, cpp]
       fail-fast: false
     runs-on: ubuntu-latest
@@ -29,9 +29,8 @@ jobs:
         haxelib install haxelib 4.0.3
         haxelib dev flixel-addons .
 
-    - uses: HaxeFlixel/setup-flixel@v1
+    - uses: HaxeFlixel/setup-flixel@master
       with:
-        haxe-version: current
         flixel-versions: dev
         target: ${{matrix.target}}
         run-tests: true

CHANGELOG.md

@@ -1,3 +1,39 @@
+# 4.0.0 (TBD)
+Removed deprecated classes
+- `FlxRayCastTilemap`: `FlxBaseTilemap` has an all-around better `ray()` method ([#455](https://github.com/HaxeFlixel/flixel-addons/pull/455))
+- `FlxMouseControl`: Use `FlxMouseEvent`, instead ([#455](https://github.com/HaxeFlixel/flixel-addons/pull/455))
+
+## 3.3.2 (January 31, 2025)
+------------------------------
+- Fix dox, attempt 2
+
+3.3.1 (January 31, 2025)
+------------------------------
+- Fix dox
+
+3.3.0 (December 10, 2024)
+------------------------------
+#### New Features:
+- `FlxRadialGauge`: Refactor `FlxPieDial` add replacement ([444](https://github.com/HaxeFlixel/flixel-addons/pull/444))
+  - `FlxRadialWipeShader`: Shader that masks sprite radially, can be applied to of any static sprite (doesn't work with animations, yet, but neither did FlxPieDial). Shaders only work on non-Flash targets
+  - `FlxRadialGauge`: Same as `FlxPieDial` but uses less memory, shows more percentages, and performs better
+  - `FlxPieDialUtils`: Moved all logic from `FlxPieDial` to a shared util
+
+#### Changes and improvements:
+- Compatibility with Flixel 5.9.0 ([431](https://github.com/HaxeFlixel/flixel-addons/pull/431))([432](https://github.com/HaxeFlixel/flixel-addons/pull/432))([433](https://github.com/HaxeFlixel/flixel-addons/pull/433))([436](https://github.com/HaxeFlixel/flixel-addons/pull/436))([437](https://github.com/HaxeFlixel/flixel-addons/pull/437))([440](https://github.com/HaxeFlixel/flixel-addons/pull/440))([441](https://github.com/HaxeFlixel/flixel-addons/pull/441))
+  - Deprecated `FlxRayCastTilemap`
+  - Minor upkeep for `FlxTilemapExt`, `FlxOgmo3Loader`, `FlxOgmo3Loader`, `FlxWeapon`, `FlxNapeTilemap`, `FlxTrail`, `FlxExtendedMouseSprite`, `FlxSlider`, `FlxTransitionSprite`
+- `FlxTiledSprite`: Honor `clipRect` ([435](https://github.com/HaxeFlixel/flixel-addons/pull/435))
+- `FlxRuntimeShader`: Refactor and improve readibility ([442](https://github.com/HaxeFlixel/flixel-addons/pull/442))
+- Assets: Ran oxipng on all images ([445](https://github.com/HaxeFlixel/flixel-addons/pull/445))
+- `FlxTrail`: Organize logic into various methods to allow overriding particular behavior ([447](https://github.com/HaxeFlixel/flixel-addons/pull/447))
+- `TiledObject`: Add `POINT` type ([448](https://github.com/HaxeFlixel/flixel-addons/pull/448))
+- `TiledLayer`: Add `parallaxX` and `parallaxY` ([449](https://github.com/HaxeFlixel/flixel-addons/pull/449))
+- Remove all implicit `Int` casts from/to `FlxDirectionFlags` ([451](https://github.com/HaxeFlixel/flixel-addons/pull/451))
+
+#### Bugfixes:
+- `FlxTypeText`: Honors `prefix` on `reset` calls ([395](https://github.com/HaxeFlixel/flixel-addons/pull/395))
+
 3.2.3 (May 15, 2024)
 ------------------------------
 

README.md

@@ -1,6 +1,6 @@
-![](https://raw.github.com/HaxeFlixel/haxeflixel.com/master/src/files/images/flixel-logos/flixel-addons.png)
+![](https://github.com/HaxeFlixel/haxeflixel.com/blob/dev/content/_static/images/flixel-logos/flixel-addons.png?raw=true)
 
-[flixel](https://github.com/HaxeFlixel/flixel) | [addons](https://github.com/HaxeFlixel/flixel-addons) | [ui](https://github.com/HaxeFlixel/flixel-ui) | [demos](https://github.com/HaxeFlixel/flixel-demos) | [tools](https://github.com/HaxeFlixel/flixel-tools) | [templates](https://github.com/HaxeFlixel/flixel-templates) | [docs](https://github.com/HaxeFlixel/flixel-docs) | [haxeflixel.com](https://github.com/HaxeFlixel/haxeflixel.com)
+[flixel](https://github.com/HaxeFlixel/flixel) | [addons](https://github.com/HaxeFlixel/flixel-addons) | [ui](https://github.com/HaxeFlixel/flixel-ui) | [demos](https://github.com/HaxeFlixel/flixel-demos) | [tools](https://github.com/HaxeFlixel/flixel-tools) | [templates](https://github.com/HaxeFlixel/flixel-templates) | [docs](https://github.com/HaxeFlixel/flixel-docs) | [haxeflixel.com](https://github.com/HaxeFlixel/haxeflixel.com) |  [türkçe](/README_TR.md)
 
 [![CI](https://img.shields.io/github/actions/workflow/status/HaxeFlixel/flixel-addons/main.yml?branch=dev&logo=github)](https://github.com/HaxeFlixel/flixel/actions?query=workflow%3ACI)
 [![Discord](https://img.shields.io/discord/162395145352904705.svg?logo=discord)](https://discordapp.com/invite/rqEBAgF)

README_TR.md

@@ -0,0 +1,28 @@
+![](https://raw.github.com/HaxeFlixel/haxeflixel.com/master/src/files/images/flixel-logos/flixel-addons.png)
+
+[flixel](https://github.com/HaxeFlixel/flixel) | [uzantılar](https://github.com/HaxeFlixel/flixel-addons) | [ui](https://github.com/HaxeFlixel/flixel-ui) | [demolar](https://github.com/HaxeFlixel/flixel-demos) | [araçlar](https://github.com/HaxeFlixel/flixel-tools) | [şablonlar](https://github.com/HaxeFlixel/flixel-templates) | [dökümanlar](https://github.com/HaxeFlixel/flixel-docs) | [haxeflixel.com](https://github.com/HaxeFlixel/haxeflixel.com) | [english](/README.md)
+
+[![CI](https://img.shields.io/github/actions/workflow/status/HaxeFlixel/flixel-addons/main.yml?branch=dev&logo=github)](https://github.com/HaxeFlixel/flixel/actions?query=workflow%3ACI)
+[![Discord](https://img.shields.io/discord/162395145352904705.svg?logo=discord)](https://discordapp.com/invite/rqEBAgF)
+[![Haxelib Version](https://badgen.net/haxelib/v/flixel-addons)](https://lib.haxe.org/p/flixel-addons)
+[![Haxelib Downloads](https://badgen.net/haxelib/d/flixel-addons?color=blue)](https://lib.haxe.org/p/flixel-addons)
+[![Haxelib License](https://badgen.net/haxelib/license/flixel-addons)](LICENSE.md)
+[![Patreon](https://img.shields.io/badge/donate-patreon-blue.svg)](https://www.patreon.com/haxeflixel) 
+
+
+
+## Hakkında
+
+[HaxeFlixel](https://github.com/HaxeFlixel/flixel) | [HaxeFlixel](https://github.com/HaxeFlixel/flixel) için kullanışlı ancak isteğe bağlı, topluluk tarafından oluşturulan bir takım sınıf seti.  [Flixel Power Tools](https://github.com/photonstorm/Flixel-Power-Tools)'tan bazı sınıflar dahildir.
+
+## Geliştiriciler için
+
+Eğer katkıda bulunmak isterseniz, aşağıdaki dökümanları inceleyin (İngilizce):
+
+- [Kod katkıları](http://haxeflixel.com/documentation/code-contributions)
+- [Kod Tarzı](http://haxeflixel.com/documentation/code-style)
+- [Geliştirici flixel'i indirin](http://haxeflixel.com/documentation/install-development-flixel/)
+
+Eğer bir sorunuz varsa veya daha önce hiç Github'dan katkıda bulunmadıysanız, toplulukta [forumlarda](http://haxeflixel.com/documentation/community/) yardım edecek arkadaş canlısı insanlar var.
+
+Git'i Github ile kullanmak için, değişikliklerinizi yönetebileceğiniz [SourceTree](http://www.sourcetreeapp.com/) gibi bir GUI kullanmanızı öneririz.

flixel/addons/display/FlxBackdrop.hx

@@ -115,7 +115,7 @@ class FlxBackdrop extends FlxSprite
 			drawToLargestCamera();
 		}
 
-		#if (flixel >= "5.7.0")
+		#if (flixel >= version("5.7.0"))
 		final cameras = getCamerasLegacy();
 		#end
 		for (camera in cameras)
@@ -161,7 +161,7 @@ class FlxBackdrop extends FlxSprite
 	{
 		var largest:FlxCamera = null;
 		var largestArea = 0.0;
-		#if (flixel >= "5.7.0")
+		#if (flixel >= version("5.7.0"))
 		final cameras = getCamerasLegacy(); // else use this.cameras
 		#end
 		for (camera in cameras)

flixel/addons/display/FlxExtendedMouseSprite.hx

@@ -183,6 +183,8 @@ class FlxExtendedMouseSprite extends FlxSprite
 	 * Returns how many vertical pixels the mouse pointer is inside this sprite from the top left corner. Returns -1 if outside.
 	 */
 	public var mouseY(get, never):Int;
+	var viewX(get, never):Int;
+	var viewY(get, never):Int;
 	#end
 
 	var _snapOnDrag:Bool = false;
@@ -453,11 +455,11 @@ class FlxExtendedMouseSprite extends FlxSprite
 			if (acceleration.x < 0)
 			{
 				//	Gravity is pulling them left
-				if ((touching & WALL) != 0)
+				if (touching.has(WALL))
 				{
 					drag.y = frictionY;
 
-					if ((wasTouching & WALL) == 0)
+					if (!wasTouching.has(WALL))
 					{
 						if (velocity.x < toleranceX)
 						{
@@ -473,12 +475,12 @@ class FlxExtendedMouseSprite extends FlxSprite
 			else if (acceleration.x > 0)
 			{
 				//	Gravity is pulling them right
-				if ((touching & WALL) != 0)
+				if (touching.has(WALL))
 				{
 					//	Stop them sliding like on ice
 					drag.y = frictionY;
 
-					if ((wasTouching & WALL) == 0)
+					if (!wasTouching.has(WALL))
 					{
 						if (velocity.x > -toleranceX)
 						{
@@ -499,11 +501,11 @@ class FlxExtendedMouseSprite extends FlxSprite
 			if (acceleration.y < 0)
 			{
 				//	Gravity is pulling them up (velocity is negative)
-				if ((touching & CEILING) != 0)
+				if (touching.has(CEILING))
 				{
 					drag.x = frictionX;
 
-					if ((wasTouching & CEILING) == 0)
+					if (!wasTouching.has(CEILING))
 					{
 						if (velocity.y < toleranceY)
 						{
@@ -519,12 +521,12 @@ class FlxExtendedMouseSprite extends FlxSprite
 			else if (acceleration.y > 0)
 			{
 				//	Gravity is pulling them down (velocity is positive)
-				if ((touching & FLOOR) != 0)
+				if (touching.has(FLOOR))
 				{
 					//	Stop them sliding like on ice
 					drag.x = frictionX;
 
-					if ((wasTouching & FLOOR) == 0)
+					if (!wasTouching.has(FLOOR))
 					{
 						if (velocity.y > -toleranceY)
 						{
@@ -549,14 +551,14 @@ class FlxExtendedMouseSprite extends FlxSprite
 		if (_allowHorizontalDrag)
 		{
 			#if FLX_MOUSE
-			x = Math.floor(FlxG.mouse.screenX + scrollFactor.x * (FlxG.mouse.x - FlxG.mouse.screenX)) - _dragOffsetX;
+			x = Math.floor(viewX + scrollFactor.x * (FlxG.mouse.x - viewX)) - _dragOffsetX;
 			#end
 		}
 
 		if (_allowVerticalDrag)
 		{
 			#if FLX_MOUSE
-			y = Math.floor(FlxG.mouse.screenY + scrollFactor.y * (FlxG.mouse.y - FlxG.mouse.screenY)) - _dragOffsetY;
+			y = Math.floor(viewY + scrollFactor.y * (FlxG.mouse.y - viewY)) - _dragOffsetY;
 			#end
 		}
 
@@ -657,8 +659,8 @@ class FlxExtendedMouseSprite extends FlxSprite
 		#if FLX_MOUSE
 		if (_dragFromPoint == false)
 		{
-			_dragOffsetX = Math.floor(FlxG.mouse.screenX + scrollFactor.x * (FlxG.mouse.x - FlxG.mouse.screenX) - x);
-			_dragOffsetY = Math.floor(FlxG.mouse.screenY + scrollFactor.y * (FlxG.mouse.y - FlxG.mouse.screenY) - y);
+			_dragOffsetX = Math.floor(viewX + scrollFactor.x * (FlxG.mouse.x - viewX) - x);
+			_dragOffsetY = Math.floor(viewY + scrollFactor.y * (FlxG.mouse.y - viewY) - y);
 		}
 		else
 		{
@@ -828,8 +830,8 @@ class FlxExtendedMouseSprite extends FlxSprite
 	#if FLX_MOUSE
 	function get_mouseOver():Bool
 	{
-		return FlxMath.pointInCoordinates(Math.floor(FlxG.mouse.screenX + scrollFactor.x * (FlxG.mouse.x - FlxG.mouse.screenX)),
-			Math.floor(FlxG.mouse.screenY + scrollFactor.y * (FlxG.mouse.y - FlxG.mouse.screenY)), Math.floor(x), Math.floor(y), Math.floor(width),
+		return FlxMath.pointInCoordinates(Math.floor(viewX + scrollFactor.x * (FlxG.mouse.x - viewX)),
+			Math.floor(viewY + scrollFactor.y * (FlxG.mouse.y - viewY)), Math.floor(x), Math.floor(y), Math.floor(width),
 			Math.floor(height));
 	}
 
@@ -852,6 +854,15 @@ class FlxExtendedMouseSprite extends FlxSprite
 
 		return -1;
 	}
+	inline function get_viewX():Int
+	{
+		return #if (flixel < version("5.9.0")) FlxG.mouse.screenX #else FlxG.mouse.viewX #end;
+	}
+
+	inline function get_viewY():Int
+	{
+		return #if (flixel < version("5.9.0")) FlxG.mouse.screenY #else FlxG.mouse.viewY #end;
+	}
 	#end
 
 	inline function get_rect():FlxRect

flixel/addons/display/FlxGridOverlay.hx

@@ -22,10 +22,10 @@ class FlxGridOverlay
 	 * If false each row will be the same colour, creating a striped-pattern effect.
 	 * So to create an 8x8 grid you'd call create(8,8)
 	 *
-	 * @param	CellWidth		The grid cell width
-	 * @param	CellHeight		The grid cell height
-	 * @param	Width			The width of the FlxSprite. If -1 it will be the size of the game (FlxG.width)
-	 * @param	Height			The height of the FlxSprite. If -1 it will be the size of the game (FlxG.height)
+	 * @param	CellWidth		The grid cell width. Must be greater than 0.
+	 * @param	CellHeight		The grid cell height. Must be greater than 0.
+	 * @param	Width			The width of the FlxSprite. If -1 it will be the size of the game (FlxG.width). This value cannot be smaller than the `CellWidth`
+	 * @param	Height			The height of the FlxSprite. If -1 it will be the size of the game (FlxG.height). This value cannot be smaller than the `CellHeight`
 	 * @param	Alternate		Should the pattern alternate on each new row? Default true = checkerboard effect. False = vertical stripes
 	 * @param	Color1			The first fill colour in 0xAARRGGBB format
 	 * @param	Color2			The second fill colour in 0xAARRGGBB format
@@ -45,9 +45,10 @@ class FlxGridOverlay
 		}
 
 		if (Width < CellWidth || Height < CellHeight)
-		{
-			return null;
-		}
+			throw "The width and height of a grid cannot be smaller than the cell's width and height!";
+
+		if (CellWidth <= 0 || CellHeight <= 0)
+			throw "Grid cell width/height cannot be less or equal to 0";
 
 		var grid:BitmapData = createGrid(CellWidth, CellHeight, Width, Height, Alternate, Color1, Color2);
 
@@ -67,10 +68,10 @@ class FlxGridOverlay
 	 * So to create an 8x8 grid you'd call create(8,8,
 	 *
 	 * @param	Sprite			The FlxSprite you wish to draw the grid on-top of. This updates its pixels value, not just the current frame (don't use animated sprites!)
-	 * @param	CellWidth		The grid cell width
-	 * @param	CellHeight		The grid cell height
-	 * @param	Width			The width of the FlxSprite. If -1 it will be the size of the game (FlxG.width)
-	 * @param	Height			The height of the FlxSprite. If -1 it will be the size of the game (FlxG.height)
+	 * @param	CellWidth		The grid cell width. Must be greater than 0.
+	 * @param	CellHeight		The grid cell height. Must be greater than 0.
+	 * @param	Width			The width of the FlxSprite. If -1 it will be the size of the game (FlxG.width). This value cannot be smaller than the `CellWidth`
+	 * @param	Height			The height of the FlxSprite. If -1 it will be the size of the game (FlxG.height). This value cannot be smaller than the `CellHeight`
 	 * @param	Alternate		Should the pattern alternate on each new row? Default true = checkerboard effect. False = vertical stripes
 	 * @param	Color1			The first fill colour in 0xAARRGGBB format
 	 * @param	Color2			The second fill colour in 0xAARRGGBB format
@@ -90,9 +91,10 @@ class FlxGridOverlay
 		}
 
 		if (Width < CellWidth || Height < CellHeight)
-		{
-			return null;
-		}
+			throw "The width and height of a grid cannot be smaller than the cell's width and height!";
+
+		if (CellWidth <= 0 || CellHeight <= 0)
+			throw "Grid cell width/height cannot be less or equal to 0";
 
 		var grid:BitmapData = createGrid(CellWidth, CellHeight, Width, Height, Alternate, Color1, Color2);
 		Sprite.pixels.copyPixels(grid, new Rectangle(0, 0, Width, Height), new Point(0, 0), null, null, true);