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

Jump to bottom

Changing all the references from Flash to OpenFL. #2832

Merged
merged 3 commits into from
Jun 8, 2023
Merged

Changing all the references from Flash to OpenFL. #2832

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c1a97d
Changing all the references from flash to openfl
MAJigsaw77 Jun 7, 2023
110d1ac
This should be changed to openfl? Idk
MAJigsaw77 Jun 7, 2023
ea5ece7
openfl.ui.MouseCursorData -> flash.ui.MouseCursorData
MAJigsaw77 Jun 7, 2023
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
16 changes: 8 additions & 8 deletions flixel/FlxCamera.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package flixel;

import flash.display.Bitmap;
import flash.display.BitmapData;
import flash.display.DisplayObject;
import flash.display.Graphics;
import flash.display.Sprite;
import flash.geom.ColorTransform;
import flash.geom.Point;
import flash.geom.Rectangle;
import openfl.display.Bitmap;
import openfl.display.BitmapData;
import openfl.display.DisplayObject;
import openfl.display.Graphics;
import openfl.display.Sprite;
import openfl.geom.ColorTransform;
import openfl.geom.Point;
import openfl.geom.Rectangle;
import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxFrame;
import flixel.graphics.tile.FlxDrawBaseItem;
Expand Down
10 changes: 5 additions & 5 deletions flixel/FlxG.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package flixel;

import flash.Lib;
import flash.display.DisplayObject;
import flash.display.Stage;
import flash.display.StageDisplayState;
import flash.net.URLRequest;
import openfl.Lib;
import openfl.display.DisplayObject;
import openfl.display.Stage;
import openfl.display.StageDisplayState;
import openfl.net.URLRequest;
import flixel.effects.postprocess.PostProcess;
import flixel.math.FlxMath;
import flixel.math.FlxRandom;
Expand Down
12 changes: 6 additions & 6 deletions flixel/FlxGame.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package flixel;

import flash.Lib;
import flash.display.Sprite;
import flash.display.StageAlign;
import flash.display.StageScaleMode;
import flash.events.Event;
import openfl.Lib;
import openfl.display.Sprite;
import openfl.display.StageAlign;
import openfl.display.StageScaleMode;
import openfl.events.Event;
import flixel.graphics.tile.FlxDrawBaseItem;
import flixel.system.FlxSplash;
import flixel.util.FlxArrayUtil;
import openfl.Assets;
import openfl.filters.BitmapFilter;
#if desktop
import flash.events.FocusEvent;
import openfl.events.FocusEvent;
#end
#if FLX_POST_PROCESS
import flixel.effects.postprocess.PostProcess;
Expand Down
2 changes: 1 addition & 1 deletion flixel/FlxObject.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package flixel;

import flash.display.Graphics;
import openfl.display.Graphics;
import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.math.FlxPoint;
import flixel.math.FlxRect;
Expand Down
10 changes: 5 additions & 5 deletions flixel/FlxSprite.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package flixel;

import flash.display.BitmapData;
import flash.display.BlendMode;
import flash.geom.ColorTransform;
import flash.geom.Point;
import flash.geom.Rectangle;
import openfl.display.BitmapData;
import openfl.display.BlendMode;
import openfl.geom.ColorTransform;
import openfl.geom.Point;
import openfl.geom.Rectangle;
import flixel.FlxBasic.IFlxBasic;
import flixel.animation.FlxAnimationController;
import flixel.graphics.FlxGraphic;
Expand Down
2 changes: 1 addition & 1 deletion flixel/effects/particles/FlxEmitter.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package flixel.effects.particles;

import flash.display.BlendMode;
import openfl.display.BlendMode;
import flixel.FlxG;
import flixel.FlxObject;
import flixel.FlxSprite;
Expand Down
2 changes: 1 addition & 1 deletion flixel/effects/postprocess/PostProcess.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package flixel.effects.postprocess;

import flash.geom.Rectangle;
import openfl.geom.Rectangle;
#if FLX_POST_PROCESS
import flixel.FlxG;
import openfl.Assets;
Expand Down
2 changes: 1 addition & 1 deletion flixel/graphics/FlxGraphic.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package flixel.graphics;

import flash.display.BitmapData;
import openfl.display.BitmapData;
import flixel.FlxG;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.graphics.frames.FlxFrame;
Expand Down
4 changes: 2 additions & 2 deletions flixel/graphics/atlas/FlxAtlas.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flixel.graphics.atlas;

import flash.display.BitmapData;
import flash.geom.Point;
import openfl.display.BitmapData;
import openfl.geom.Point;
import flixel.FlxG;
import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxAtlasFrames;
Expand Down
2 changes: 1 addition & 1 deletion flixel/graphics/frames/FlxAtlasFrames.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package flixel.graphics.frames;

import flash.geom.Rectangle;
import openfl.geom.Rectangle;
import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.graphics.frames.FlxFrame;
Expand Down
6 changes: 3 additions & 3 deletions flixel/graphics/frames/FlxBitmapFont.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package flixel.graphics.frames;

import flash.display.BitmapData;
import flash.geom.Point;
import flash.geom.Rectangle;
import openfl.display.BitmapData;
import openfl.geom.Point;
import openfl.geom.Rectangle;
import flixel.FlxG;
import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxFrame.FlxFrameAngle;
Expand Down
6 changes: 3 additions & 3 deletions flixel/graphics/frames/FlxFilterFrames.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package flixel.graphics.frames;

import flash.display.BitmapData;
import flash.geom.Point;
import flash.geom.Rectangle;
import openfl.display.BitmapData;
import openfl.geom.Point;
import openfl.geom.Rectangle;
import flixel.FlxSprite;
import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxFramesCollection.FlxFrameCollectionType;
Expand Down
6 changes: 3 additions & 3 deletions flixel/graphics/frames/FlxFrame.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package flixel.graphics.frames;

import flash.display.BitmapData;
import flash.geom.Point;
import flash.geom.Rectangle;
import openfl.display.BitmapData;
import openfl.geom.Point;
import openfl.geom.Rectangle;
import flixel.graphics.FlxGraphic;
import flixel.math.FlxMatrix;
import flixel.math.FlxPoint;
Expand Down
4 changes: 2 additions & 2 deletions flixel/graphics/frames/FlxTileFrames.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flixel.graphics.frames;

import flash.display.BitmapData;
import flash.geom.Point;
import openfl.display.BitmapData;
import openfl.geom.Point;
import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxFramesCollection.FlxFrameCollectionType;
import flixel.math.FlxPoint;
Expand Down
4 changes: 2 additions & 2 deletions flixel/group/FlxSpriteGroup.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flixel.group;

import flash.display.BitmapData;
import flash.display.BlendMode;
import openfl.display.BitmapData;
import openfl.display.BlendMode;
import flixel.FlxCamera;
import flixel.FlxSprite;
import flixel.graphics.frames.FlxFrame;
Expand Down
4 changes: 2 additions & 2 deletions flixel/input/FlxAccelerometer.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package flixel.input;

#if FLX_ACCELEROMETER
import flash.events.AccelerometerEvent;
import flash.sensors.Accelerometer;
import openfl.events.AccelerometerEvent;
import openfl.sensors.Accelerometer;

/**
* A class providing access to the accelerometer data of the mobile device.
Expand Down
2 changes: 1 addition & 1 deletion flixel/input/FlxKeyManager.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package flixel.input;

import flash.events.KeyboardEvent;
import openfl.events.KeyboardEvent;
import flixel.FlxG;
import flixel.input.FlxInput.FlxInputState;
import flixel.input.keyboard.FlxKey;
Expand Down
4 changes: 2 additions & 2 deletions flixel/input/gamepad/FlxGamepad.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import flixel.math.FlxPoint;
import flixel.util.FlxDestroyUtil;
import flixel.util.FlxStringUtil;
#if FLX_GAMEINPUT_API
import flash.ui.GameInputControl;
import flash.ui.GameInputDevice;
import openfl.ui.GameInputControl;
import openfl.ui.GameInputDevice;
import flixel.math.FlxMath;
#elseif FLX_JOYSTICK_API
import flixel.math.FlxPoint;
Expand Down
6 changes: 3 additions & 3 deletions flixel/input/gamepad/FlxGamepadManager.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import flixel.FlxG;
import flixel.math.FlxPoint;
import openfl.events.JoystickEvent;
#elseif FLX_GAMEINPUT_API
import flash.ui.GameInput;
import flash.ui.GameInputDevice;
import flash.events.GameInputEvent;
import openfl.ui.GameInput;
import openfl.ui.GameInputDevice;
import openfl.events.GameInputEvent;

using flixel.util.FlxStringUtil;
#end
Expand Down
2 changes: 1 addition & 1 deletion flixel/input/keyboard/FlxKeyboard.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flixel.input.keyboard;

#if FLX_KEYBOARD
import flash.events.KeyboardEvent;
import openfl.events.KeyboardEvent;
import flixel.FlxG;
import flixel.input.FlxInput;
import flixel.system.replay.CodeValuePair;
Expand Down
26 changes: 13 additions & 13 deletions flixel/input/mouse/FlxMouse.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package flixel.input.mouse;

#if FLX_MOUSE
import flash.display.Bitmap;
import flash.display.BitmapData;
import flash.display.Sprite;
import flash.display.Stage;
import flash.events.Event;
import flash.events.MouseEvent;
import flash.Lib;
import flash.ui.Mouse;
import openfl.display.Bitmap;
import openfl.display.BitmapData;
import openfl.display.Sprite;
import openfl.display.Stage;
import openfl.events.Event;
import openfl.events.MouseEvent;
import openfl.Lib;
import openfl.ui.Mouse;
import flixel.FlxG;
import flixel.input.IFlxInputManager;
import flixel.input.FlxInput.FlxInputState;
Expand All @@ -17,11 +17,11 @@ import flixel.system.FlxAssets;
import flixel.system.replay.MouseRecord;
import flixel.util.FlxDestroyUtil;
#if FLX_NATIVE_CURSOR
import flash.Vector;
import flash.geom.Matrix;
import flash.geom.Point;
import flash.ui.MouseCursor;
import flash.ui.MouseCursorData;
import openfl.Vector;
import openfl.geom.Matrix;
import openfl.geom.Point;
import openfl.ui.MouseCursor;
import openfl.ui.MouseCursorData;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like flash is failing here because there is no openfl.ui.MouseCursorData

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think openfl doesn't have support for that classes but we can find a workaround ig?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/HaxeFlixel/flixel/blob/dev/flixel/system/macros/FlxDefines.hx#L144
I think FLX_NATIVE_CURSOR is only used with flash, so lets just use flash.ui.MouseCursorData

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is that a question?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah

#end

@:bitmap("assets/images/ui/cursor.png")
Expand Down
2 changes: 1 addition & 1 deletion flixel/input/mouse/FlxMouseEventManager.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flixel.input.mouse;

import haxe.ds.ArraySort;
import flash.errors.Error;
import openfl.errors.Error;
import flixel.FlxBasic;
import flixel.FlxCamera;
import flixel.FlxG;
Expand Down
2 changes: 1 addition & 1 deletion flixel/input/touch/FlxTouch.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flixel.input.touch;

#if FLX_TOUCH
import flash.geom.Point;
import openfl.geom.Point;
import flixel.FlxG;
import flixel.input.FlxInput;
import flixel.input.FlxSwipe;
Expand Down
8 changes: 4 additions & 4 deletions flixel/input/touch/FlxTouchManager.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package flixel.input.touch;

#if FLX_TOUCH
import flash.Lib;
import flash.events.TouchEvent;
import flash.ui.Multitouch;
import flash.ui.MultitouchInputMode;
import openfl.Lib;
import openfl.events.TouchEvent;
import openfl.ui.Multitouch;
import openfl.ui.MultitouchInputMode;

/**
* @author Zaphod
Expand Down
2 changes: 1 addition & 1 deletion flixel/math/FlxMath.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package flixel.math;

import flash.geom.Rectangle;
import openfl.geom.Rectangle;
import flixel.FlxG;
import flixel.FlxSprite;
#if FLX_TOUCH
Expand Down
2 changes: 1 addition & 1 deletion flixel/math/FlxMatrix.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package flixel.math;

import flash.geom.Matrix;
import openfl.geom.Matrix;

/**
* Helper class for making fast matrix calculations for rendering.
Expand Down
2 changes: 1 addition & 1 deletion flixel/math/FlxRect.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package flixel.math;

import flash.geom.Rectangle;
import openfl.geom.Rectangle;
import flixel.util.FlxPool;
import flixel.util.FlxPool.IFlxPooled;
import flixel.util.FlxStringUtil;
Expand Down
2 changes: 1 addition & 1 deletion flixel/path/FlxPath.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package flixel.path;

import flash.display.Graphics;
import openfl.display.Graphics;
import flixel.FlxG;
import flixel.FlxObject;
import flixel.math.FlxPoint;
Expand Down
14 changes: 7 additions & 7 deletions flixel/sound/FlxSound.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package flixel.sound;

import flash.events.IEventDispatcher;
import flash.events.Event;
import flash.media.Sound;
import flash.media.SoundChannel;
import flash.media.SoundTransform;
import flash.net.URLRequest;
import openfl.events.IEventDispatcher;
import openfl.events.Event;
import openfl.media.Sound;
import openfl.media.SoundChannel;
import openfl.media.SoundTransform;
import openfl.net.URLRequest;
import flixel.FlxBasic;
import flixel.FlxG;
import flixel.math.FlxMath;
Expand All @@ -15,7 +15,7 @@ import flixel.tweens.FlxTween;
import flixel.util.FlxStringUtil;
import openfl.Assets;
#if flash11
import flash.utils.ByteArray;
import openfl.utils.ByteArray;
#end
#if (openfl >= "8.0.0")
import openfl.utils.AssetType;
Expand Down
6 changes: 3 additions & 3 deletions flixel/system/FlxAssets.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package flixel.system;

import haxe.macro.Expr;
#if !macro
import flash.display.BitmapData;
import flash.display.Graphics;
import flash.media.Sound;
import openfl.display.BitmapData;
import openfl.display.Graphics;
import openfl.media.Sound;
import flixel.FlxG;
import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxAtlasFrames;
Expand Down
Loading