gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleaned up some code

Browse Source
This commit is contained in:
NeeEoo
2023-03-20 20:34:50 +01:00
parent 7c091445c2
commit c95c1e2975
28 changed files with 1390 additions and 1361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2 -1
View File
@@ -2,5 +2,6 @@ export/
dump/ dump/
latest/windows/obj/ latest/windows/obj/
latest/windows/haxe/ latest/windows/haxe/
.vscode/ .vscode/*
!.vscode/settings.json
.haxelib/ .haxelib/
.vscode/settings.json
Vendored
+4
View File
@@ -0,0 +1,4 @@
{
"editor.detectIndentation": false,
"editor.insertSpaces": false
}
source/away3d/core/managers/Stage3DProxy.hx
+103 -103
View File
@@ -51,12 +51,12 @@ class Stage3DProxy extends EventDispatcher
public var bufferClear(get, set):Bool; public var bufferClear(get, set):Bool;
public var mouse3DManager(get, set):Mouse3DManager; public var mouse3DManager(get, set):Mouse3DManager;
public var touch3DManager(get, set):Touch3DManager; public var touch3DManager(get, set):Touch3DManager;
private static var _frameEventDriver:Shape = new Shape(); private static var _frameEventDriver:Shape = new Shape();
@:allow(away3d) private var _context3D:Context3D; @:allow(away3d) private var _context3D:Context3D;
@:allow(away3d) private var _stage3DIndex:Int = -1; @:allow(away3d) private var _stage3DIndex:Int = -1;
private var _usesSoftwareRendering:Bool; private var _usesSoftwareRendering:Bool;
private var _profile:String; private var _profile:String;
private var _stage3D:Stage3D; private var _stage3D:Stage3D;
@@ -83,46 +83,46 @@ class Stage3DProxy extends EventDispatcher
private var _bufferClear:Bool; private var _bufferClear:Bool;
private var _mouse3DManager:Mouse3DManager; private var _mouse3DManager:Mouse3DManager;
private var _touch3DManager:Touch3DManager; private var _touch3DManager:Touch3DManager;
private function notifyViewportUpdated():Void private function notifyViewportUpdated():Void
{ {
if (_viewportDirty) if (_viewportDirty)
return; return;
_viewportDirty = true; _viewportDirty = true;
if (!hasEventListener(Stage3DEvent.VIEWPORT_UPDATED)) if (!hasEventListener(Stage3DEvent.VIEWPORT_UPDATED))
return; return;
//TODO: investigate bug causing coercion error //TODO: investigate bug causing coercion error
//if (!_viewportUpdated) //if (!_viewportUpdated)
_viewportUpdated = new Stage3DEvent(Stage3DEvent.VIEWPORT_UPDATED); _viewportUpdated = new Stage3DEvent(Stage3DEvent.VIEWPORT_UPDATED);
dispatchEvent(_viewportUpdated); dispatchEvent(_viewportUpdated);
} }
private function notifyEnterFrame():Void private function notifyEnterFrame():Void
{ {
if (!hasEventListener(Event.ENTER_FRAME)) if (!hasEventListener(Event.ENTER_FRAME))
return; return;
if (_enterFrame == null) if (_enterFrame == null)
_enterFrame = new Event(Event.ENTER_FRAME); _enterFrame = new Event(Event.ENTER_FRAME);
dispatchEvent(_enterFrame); dispatchEvent(_enterFrame);
} }
private function notifyExitFrame():Void private function notifyExitFrame():Void
{ {
if (!hasEventListener(Event.EXIT_FRAME)) if (!hasEventListener(Event.EXIT_FRAME))
return; return;
if (_exitFrame == null) if (_exitFrame == null)
_exitFrame = new Event(Event.EXIT_FRAME); _exitFrame = new Event(Event.EXIT_FRAME);
dispatchEvent(_exitFrame); dispatchEvent(_exitFrame);
} }
/** /**
* Creates a Stage3DProxy object. This method should not be called directly. Creation of Stage3DProxy objects should * Creates a Stage3DProxy object. This method should not be called directly. Creation of Stage3DProxy objects should
* be handled by Stage3DManager. * be handled by Stage3DManager.
@@ -134,7 +134,7 @@ class Stage3DProxy extends EventDispatcher
public function new(stage3DIndex:Int, stage3D:Stage3D, stage3DManager:Stage3DManager, forceSoftware:Bool = false, profile:String = "baseline") public function new(stage3DIndex:Int, stage3D:Stage3D, stage3DManager:Stage3DManager, forceSoftware:Bool = false, profile:String = "baseline")
{ {
vertexBufferCount = indexBufferCount = drawTriangleCount = 0; vertexBufferCount = indexBufferCount = drawTriangleCount = 0;
_stage3DIndex = stage3DIndex; _stage3DIndex = stage3DIndex;
_stage3D = stage3D; _stage3D = stage3D;
_stage3D.x = 0; _stage3D.x = 0;
@@ -143,15 +143,15 @@ class Stage3DProxy extends EventDispatcher
_stage3DManager = stage3DManager; _stage3DManager = stage3DManager;
_viewPort = new Rectangle(); _viewPort = new Rectangle();
_enableDepthAndStencil = true; _enableDepthAndStencil = true;
super(); super();
// whatever happens, be sure this has highest priority // whatever happens, be sure this has highest priority
_stage3D.addEventListener(Event.CONTEXT3D_CREATE, onContext3DUpdate, false, 1000, false); _stage3D.addEventListener(Event.CONTEXT3D_CREATE, onContext3DUpdate, false, 1000, false);
this.forceSoftware = forceSoftware; this.forceSoftware = forceSoftware;
this._profile = profile; this._profile = profile;
if (_stage3D.context3D != null) { if (_stage3D.context3D != null) {
onContext3DUpdate(null); onContext3DUpdate(null);
} }
@@ -159,14 +159,14 @@ class Stage3DProxy extends EventDispatcher
requestContext(forceSoftware, _profile); requestContext(forceSoftware, _profile);
} }
} }
private var forceSoftware:Bool; private var forceSoftware:Bool;
private function get_profile():String private function get_profile():String
{ {
return _profile; return _profile;
} }
/** /**
* Disposes the Stage3DProxy object, freeing the Context3D attached to the Stage3D. * Disposes the Stage3DProxy object, freeing the Context3D attached to the Stage3D.
*/ */
@@ -193,22 +193,22 @@ class Stage3DProxy extends EventDispatcher
if(backBufferHeight<50) backBufferHeight = 50; if(backBufferHeight<50) backBufferHeight = 50;
var oldWidth:Int = _backBufferWidth; var oldWidth:Int = _backBufferWidth;
var oldHeight:Int = _backBufferHeight; var oldHeight:Int = _backBufferHeight;
_backBufferWidth = backBufferWidth; _backBufferWidth = backBufferWidth;
_backBufferHeight = backBufferHeight; _backBufferHeight = backBufferHeight;
_viewPort.width = backBufferWidth; _viewPort.width = backBufferWidth;
_viewPort.height = backBufferHeight; _viewPort.height = backBufferHeight;
if (oldWidth != _backBufferWidth || oldHeight != _backBufferHeight) if (oldWidth != _backBufferWidth || oldHeight != _backBufferHeight)
notifyViewportUpdated(); notifyViewportUpdated();
_antiAlias = antiAlias; _antiAlias = antiAlias;
_enableDepthAndStencil = enableDepthAndStencil; _enableDepthAndStencil = enableDepthAndStencil;
if (_context3D != null) if (_context3D != null)
_context3D.configureBackBuffer(backBufferWidth, backBufferHeight, antiAlias, enableDepthAndStencil, true, true); _context3D.configureBackBuffer(backBufferWidth, backBufferHeight, antiAlias, enableDepthAndStencil, true, true);
} }
/* /*
* Indicates whether the depth and stencil buffer is used * Indicates whether the depth and stencil buffer is used
*/ */
@@ -216,24 +216,24 @@ class Stage3DProxy extends EventDispatcher
{ {
return _enableDepthAndStencil; return _enableDepthAndStencil;
} }
private function set_enableDepthAndStencil(enableDepthAndStencil:Bool):Bool private function set_enableDepthAndStencil(enableDepthAndStencil:Bool):Bool
{ {
_enableDepthAndStencil = enableDepthAndStencil; _enableDepthAndStencil = enableDepthAndStencil;
_backBufferDirty = true; _backBufferDirty = true;
return enableDepthAndStencil; return enableDepthAndStencil;
} }
private function get_renderTarget():TextureBase private function get_renderTarget():TextureBase
{ {
return _renderTarget; return _renderTarget;
} }
private function get_renderSurfaceSelector():Int private function get_renderSurfaceSelector():Int
{ {
return _renderSurfaceSelector; return _renderSurfaceSelector;
} }
public function setRenderTarget(target:TextureBase, enableDepthAndStencil:Bool = false, surfaceSelector:Int = 0):Void public function setRenderTarget(target:TextureBase, enableDepthAndStencil:Bool = false, surfaceSelector:Int = 0):Void
{ {
if (_renderTarget == target && surfaceSelector == _renderSurfaceSelector && _enableDepthAndStencil == enableDepthAndStencil) if (_renderTarget == target && surfaceSelector == _renderSurfaceSelector && _enableDepthAndStencil == enableDepthAndStencil)
@@ -241,13 +241,13 @@ class Stage3DProxy extends EventDispatcher
_renderTarget = target; _renderTarget = target;
_renderSurfaceSelector = surfaceSelector; _renderSurfaceSelector = surfaceSelector;
_enableDepthAndStencil = enableDepthAndStencil; _enableDepthAndStencil = enableDepthAndStencil;
if (target != null) if (target != null)
_context3D.setRenderToTexture(target, enableDepthAndStencil, _antiAlias, surfaceSelector); _context3D.setRenderToTexture(target, enableDepthAndStencil, _antiAlias, surfaceSelector);
else else
_context3D.setRenderToBackBuffer(); _context3D.setRenderToBackBuffer();
} }
/* /*
* Clear and reset the back buffer when using a shared context * Clear and reset the back buffer when using a shared context
*/ */
@@ -255,21 +255,21 @@ class Stage3DProxy extends EventDispatcher
{ {
if (_context3D == null) if (_context3D == null)
return; return;
if (_backBufferDirty) { if (_backBufferDirty) {
configureBackBuffer(_backBufferWidth, _backBufferHeight, _antiAlias, _enableDepthAndStencil); configureBackBuffer(_backBufferWidth, _backBufferHeight, _antiAlias, _enableDepthAndStencil);
_backBufferDirty = false; _backBufferDirty = false;
} }
_context3D.clear( _context3D.clear(
((_color >> 16) & 0xff)/255.0, ((_color >> 16) & 0xff)/255.0,
((_color >> 8) & 0xff)/255.0, ((_color >> 8) & 0xff)/255.0,
(_color & 0xff)/255.0, (_color & 0xff)/255.0,
((_color >> 24) & 0xff)/255.0); ((_color >> 24) & 0xff)/255.0);
_bufferClear = true; _bufferClear = true;
} }
/* /*
* Display the back rendering buffer * Display the back rendering buffer
*/ */
@@ -277,15 +277,15 @@ class Stage3DProxy extends EventDispatcher
{ {
if (_context3D == null) if (_context3D == null)
return; return;
_context3D.present(); _context3D.present();
_activeProgram3D = null; _activeProgram3D = null;
if (_mouse3DManager != null) if (_mouse3DManager != null)
_mouse3DManager.fireMouseEvents(); _mouse3DManager.fireMouseEvents();
} }
/** /**
* Registers an event listener object with an EventDispatcher object so that the listener receives notification of an event. Special case for enterframe and exitframe events - will switch Stage3DProxy into automatic render mode. * Registers an event listener object with an EventDispatcher object so that the listener receives notification of an event. Special case for enterframe and exitframe events - will switch Stage3DProxy into automatic render mode.
* You can register event listeners on all nodes in the display list for a specific type of event, phase, and priority. * You can register event listeners on all nodes in the display list for a specific type of event, phase, and priority.
@@ -299,11 +299,11 @@ class Stage3DProxy extends EventDispatcher
override public function addEventListener(type:String, listener:Dynamic -> Void, useCapture:Bool = false, priority:Int = 0, useWeakReference:Bool = false):Void override public function addEventListener(type:String, listener:Dynamic -> Void, useCapture:Bool = false, priority:Int = 0, useWeakReference:Bool = false):Void
{ {
super.addEventListener(type, listener, useCapture, priority, useWeakReference); super.addEventListener(type, listener, useCapture, priority, useWeakReference);
if ((type == Event.ENTER_FRAME || type == Event.EXIT_FRAME) && !_frameEventDriver.hasEventListener(Event.ENTER_FRAME)) if ((type == Event.ENTER_FRAME || type == Event.EXIT_FRAME) && !_frameEventDriver.hasEventListener(Event.ENTER_FRAME))
_frameEventDriver.addEventListener(Event.ENTER_FRAME, onEnterFrame, useCapture, priority, useWeakReference); _frameEventDriver.addEventListener(Event.ENTER_FRAME, onEnterFrame, useCapture, priority, useWeakReference);
} }
/** /**
* Removes a listener from the EventDispatcher object. Special case for enterframe and exitframe events - will switch Stage3DProxy out of automatic render mode. * Removes a listener from the EventDispatcher object. Special case for enterframe and exitframe events - will switch Stage3DProxy out of automatic render mode.
* If there is no matching listener registered with the EventDispatcher object, a call to this method has no effect. * If there is no matching listener registered with the EventDispatcher object, a call to this method has no effect.
@@ -315,24 +315,24 @@ class Stage3DProxy extends EventDispatcher
override public function removeEventListener(type:String, listener:Dynamic -> Void, useCapture:Bool = false):Void override public function removeEventListener(type:String, listener:Dynamic -> Void, useCapture:Bool = false):Void
{ {
super.removeEventListener(type, listener, useCapture); super.removeEventListener(type, listener, useCapture);
// Remove the main rendering listener if no EnterFrame listeners remain // Remove the main rendering listener if no EnterFrame listeners remain
if (!hasEventListener(Event.ENTER_FRAME) && !hasEventListener(Event.EXIT_FRAME) && _frameEventDriver.hasEventListener(Event.ENTER_FRAME)) if (!hasEventListener(Event.ENTER_FRAME) && !hasEventListener(Event.EXIT_FRAME) && _frameEventDriver.hasEventListener(Event.ENTER_FRAME))
_frameEventDriver.removeEventListener(Event.ENTER_FRAME, onEnterFrame, useCapture); _frameEventDriver.removeEventListener(Event.ENTER_FRAME, onEnterFrame, useCapture);
} }
private function get_scissorRect():Rectangle private function get_scissorRect():Rectangle
{ {
return _scissorRect; return _scissorRect;
} }
private function set_scissorRect(value:Rectangle):Rectangle private function set_scissorRect(value:Rectangle):Rectangle
{ {
_scissorRect = value; _scissorRect = value;
_context3D.setScissorRectangle(_scissorRect); _context3D.setScissorRectangle(_scissorRect);
return value; return value;
} }
/** /**
* The index of the Stage3D which is managed by this instance of Stage3DProxy. * The index of the Stage3D which is managed by this instance of Stage3DProxy.
*/ */
@@ -340,7 +340,7 @@ class Stage3DProxy extends EventDispatcher
{ {
return _stage3DIndex; return _stage3DIndex;
} }
/** /**
* The base Stage3D object associated with this proxy. * The base Stage3D object associated with this proxy.
*/ */
@@ -348,7 +348,7 @@ class Stage3DProxy extends EventDispatcher
{ {
return _stage3D; return _stage3D;
} }
/** /**
* The Context3D object associated with the given Stage3D object. * The Context3D object associated with the given Stage3D object.
*/ */
@@ -356,7 +356,7 @@ class Stage3DProxy extends EventDispatcher
{ {
return _context3D; return _context3D;
} }
/** /**
* The driver information as reported by the Context3D object (if any) * The driver information as reported by the Context3D object (if any)
*/ */
@@ -364,7 +364,7 @@ class Stage3DProxy extends EventDispatcher
{ {
return (_context3D != null)? _context3D.driverInfo : null; return (_context3D != null)? _context3D.driverInfo : null;
} }
/** /**
* Indicates whether the Stage3D managed by this proxy is running in software mode. * Indicates whether the Stage3D managed by this proxy is running in software mode.
* Remember to wait for the CONTEXT3D_CREATED event before checking this property, * Remember to wait for the CONTEXT3D_CREATED event before checking this property,
@@ -374,7 +374,7 @@ class Stage3DProxy extends EventDispatcher
{ {
return _usesSoftwareRendering; return _usesSoftwareRendering;
} }
/** /**
* The x position of the Stage3D. * The x position of the Stage3D.
*/ */
@@ -382,18 +382,18 @@ class Stage3DProxy extends EventDispatcher
{ {
return _stage3D.x; return _stage3D.x;
} }
private function set_x(value:Float):Float private function set_x(value:Float):Float
{ {
if (_viewPort.x == value) if (_viewPort.x == value)
return value; return value;
_stage3D.x = _viewPort.x = value; _stage3D.x = _viewPort.x = value;
notifyViewportUpdated(); notifyViewportUpdated();
return value; return value;
} }
/** /**
* The y position of the Stage3D. * The y position of the Stage3D.
*/ */
@@ -401,18 +401,18 @@ class Stage3DProxy extends EventDispatcher
{ {
return _stage3D.y; return _stage3D.y;
} }
private function set_y(value:Float):Float private function set_y(value:Float):Float
{ {
if (_viewPort.y == value) if (_viewPort.y == value)
return value; return value;
_stage3D.y = _viewPort.y = value; _stage3D.y = _viewPort.y = value;
notifyViewportUpdated(); notifyViewportUpdated();
return value; return value;
} }
/** /**
* The width of the Stage3D. * The width of the Stage3D.
*/ */
@@ -420,7 +420,7 @@ class Stage3DProxy extends EventDispatcher
{ {
return _backBufferWidth; return _backBufferWidth;
} }
private function set_width(width:Int):Int private function set_width(width:Int):Int
{ {
if (_viewPort.width == width) if (_viewPort.width == width)
@@ -433,7 +433,7 @@ class Stage3DProxy extends EventDispatcher
notifyViewportUpdated(); notifyViewportUpdated();
return width; return width;
} }
/** /**
* The height of the Stage3D. * The height of the Stage3D.
*/ */
@@ -441,7 +441,7 @@ class Stage3DProxy extends EventDispatcher
{ {
return _backBufferHeight; return _backBufferHeight;
} }
private function set_height(height:Int):Int private function set_height(height:Int):Int
{ {
if (_viewPort.height == height) if (_viewPort.height == height)
@@ -450,11 +450,11 @@ class Stage3DProxy extends EventDispatcher
if(height<50) height = 50; if(height<50) height = 50;
_viewPort.height = _backBufferHeight = height; _viewPort.height = _backBufferHeight = height;
_backBufferDirty = true; _backBufferDirty = true;
notifyViewportUpdated(); notifyViewportUpdated();
return height; return height;
} }
/** /**
* The antiAliasing of the Stage3D. * The antiAliasing of the Stage3D.
*/ */
@@ -462,24 +462,24 @@ class Stage3DProxy extends EventDispatcher
{ {
return _antiAlias; return _antiAlias;
} }
private function set_antiAlias(antiAlias:Int):Int private function set_antiAlias(antiAlias:Int):Int
{ {
_antiAlias = antiAlias; _antiAlias = antiAlias;
_backBufferDirty = true; _backBufferDirty = true;
return antiAlias; return antiAlias;
} }
/** /**
* A viewPort rectangle equivalent of the Stage3D size and position. * A viewPort rectangle equivalent of the Stage3D size and position.
*/ */
private function get_viewPort():Rectangle private function get_viewPort():Rectangle
{ {
_viewportDirty = false; _viewportDirty = false;
return _viewPort; return _viewPort;
} }
/** /**
* The background color of the Stage3D. * The background color of the Stage3D.
*/ */
@@ -487,13 +487,13 @@ class Stage3DProxy extends EventDispatcher
{ {
return _color; return _color;
} }
private function set_color(color:Int):Int private function set_color(color:Int):Int
{ {
_color = color; _color = color;
return color; return color;
} }
/** /**
* The visibility of the Stage3D. * The visibility of the Stage3D.
*/ */
@@ -501,13 +501,13 @@ class Stage3DProxy extends EventDispatcher
{ {
return _stage3D.visible; return _stage3D.visible;
} }
private function set_visible(value:Bool):Bool private function set_visible(value:Bool):Bool
{ {
_stage3D.visible = value; _stage3D.visible = value;
return value; return value;
} }
/** /**
* The freshly cleared state of the backbuffer before any rendering * The freshly cleared state of the backbuffer before any rendering
*/ */
@@ -515,13 +515,13 @@ class Stage3DProxy extends EventDispatcher
{ {
return _bufferClear; return _bufferClear;
} }
private function set_bufferClear(newBufferClear:Bool):Bool private function set_bufferClear(newBufferClear:Bool):Bool
{ {
_bufferClear = newBufferClear; _bufferClear = newBufferClear;
return newBufferClear; return newBufferClear;
} }
/* /*
* Access to fire mouseevents across multiple layered view3D instances * Access to fire mouseevents across multiple layered view3D instances
*/ */
@@ -529,24 +529,24 @@ class Stage3DProxy extends EventDispatcher
{ {
return _mouse3DManager; return _mouse3DManager;
} }
private function set_mouse3DManager(value:Mouse3DManager):Mouse3DManager private function set_mouse3DManager(value:Mouse3DManager):Mouse3DManager
{ {
_mouse3DManager = value; _mouse3DManager = value;
return value; return value;
} }
private function get_touch3DManager():Touch3DManager private function get_touch3DManager():Touch3DManager
{ {
return _touch3DManager; return _touch3DManager;
} }
private function set_touch3DManager(value:Touch3DManager):Touch3DManager private function set_touch3DManager(value:Touch3DManager):Touch3DManager
{ {
_touch3DManager = value; _touch3DManager = value;
return value; return value;
} }
/** /**
* Frees the Context3D associated with this Stage3DProxy. * Frees the Context3D associated with this Stage3DProxy.
*/ */
@@ -554,11 +554,11 @@ class Stage3DProxy extends EventDispatcher
{ {
if (_context3D != null) { if (_context3D != null) {
dispatchEvent(new Stage3DEvent(Stage3DEvent.CONTEXT3D_DISPOSED)); dispatchEvent(new Stage3DEvent(Stage3DEvent.CONTEXT3D_DISPOSED));
_context3D.dispose(); _context3D.dispose();
} }
_context3D = null; _context3D = null;
} }
/* /*
* Called whenever the Context3D is retrieved or lost. * Called whenever the Context3D is retrieved or lost.
* @param event The event dispatched. * @param event The event dispatched.
@@ -569,7 +569,7 @@ class Stage3DProxy extends EventDispatcher
var hadContext:Bool = (_context3D != null); var hadContext:Bool = (_context3D != null);
_context3D = _stage3D.context3D; _context3D = _stage3D.context3D;
_context3D.enableErrorChecking = Debug.active; _context3D.enableErrorChecking = Debug.active;
_usesSoftwareRendering = (_context3D.driverInfo.indexOf('Software') == 0); _usesSoftwareRendering = (_context3D.driverInfo.indexOf('Software') == 0);
// Only configure back buffer if width and height have been set, // Only configure back buffer if width and height have been set,
@@ -577,15 +577,15 @@ class Stage3DProxy extends EventDispatcher
// invoked for the first time. // invoked for the first time.
if (_backBufferWidth > 0 && _backBufferHeight > 0) if (_backBufferWidth > 0 && _backBufferHeight > 0)
_context3D.configureBackBuffer(_backBufferWidth, _backBufferHeight, _antiAlias, _enableDepthAndStencil, true, true); _context3D.configureBackBuffer(_backBufferWidth, _backBufferHeight, _antiAlias, _enableDepthAndStencil, true, true);
// Dispatch the appropriate event depending on whether context was // Dispatch the appropriate event depending on whether context was
// created for the first time or recreated after a device loss. // created for the first time or recreated after a device loss.
dispatchEvent(new Stage3DEvent(hadContext? Stage3DEvent.CONTEXT3D_RECREATED : Stage3DEvent.CONTEXT3D_CREATED)); dispatchEvent(new Stage3DEvent(hadContext? Stage3DEvent.CONTEXT3D_RECREATED : Stage3DEvent.CONTEXT3D_CREATED));
} else } else
throw new Error("Rendering context lost!"); throw new Error("Rendering context lost!");
} }
/** /**
* Requests a Context3D object to attach to the managed Stage3D. * Requests a Context3D object to attach to the managed Stage3D.
*/ */
@@ -598,7 +598,7 @@ class Stage3DProxy extends EventDispatcher
if (!_usesSoftwareRendering) if (!_usesSoftwareRendering)
_usesSoftwareRendering = forceSoftware; _usesSoftwareRendering = forceSoftware;
_profile = profile; _profile = profile;
// ugly stuff for backward compatibility // ugly stuff for backward compatibility
var renderMode:Context3DRenderMode = forceSoftware? Context3DRenderMode.SOFTWARE : Context3DRenderMode.AUTO; var renderMode:Context3DRenderMode = forceSoftware? Context3DRenderMode.SOFTWARE : Context3DRenderMode.AUTO;
if (profile == "baseline") if (profile == "baseline")
@@ -610,10 +610,10 @@ class Stage3DProxy extends EventDispatcher
throw "An error occurred creating a context using the given profile. Profiles are not supported for the SDK this was compiled with."; throw "An error occurred creating a context using the given profile. Profiles are not supported for the SDK this was compiled with.";
} }
} }
_contextRequested = true; _contextRequested = true;
} }
/** /**
* The Enter_Frame handler for processing the proxy.ENTER_FRAME and proxy.EXIT_FRAME event handlers. * The Enter_Frame handler for processing the proxy.ENTER_FRAME and proxy.EXIT_FRAME event handlers.
* Typically the proxy.ENTER_FRAME listener would render the layers for this Stage3D instance. * Typically the proxy.ENTER_FRAME listener would render the layers for this Stage3D instance.
@@ -622,20 +622,20 @@ class Stage3DProxy extends EventDispatcher
{ {
if (_context3D == null) if (_context3D == null)
return; return;
// Clear the stage3D instance // Clear the stage3D instance
clear(); clear();
//notify the enterframe listeners //notify the enterframe listeners
notifyEnterFrame(); notifyEnterFrame();
// Call the present() to render the frame // Call the present() to render the frame
present(); present();
//notify the exitframe listeners //notify the exitframe listeners
notifyExitFrame(); notifyExitFrame();
} }
public function recoverFromDisposal():Bool public function recoverFromDisposal():Bool
{ {
if (_context3D == null) if (_context3D == null)
@@ -647,29 +647,29 @@ class Stage3DProxy extends EventDispatcher
} }
return true; return true;
} }
public function clearDepthBuffer():Void public function clearDepthBuffer():Void
{ {
if (_context3D == null) if (_context3D == null)
return; return;
_context3D.clear(0, 0, 0, 1, 1, 0, cast Context3DClearMask.DEPTH); _context3D.clear(0, 0, 0, 1, 1, 0, cast Context3DClearMask.DEPTH);
} }
/* /*
Moving all creation methods here, so we can trace the usages of vertexbuffers or indexbuffers. Moving all creation methods here, so we can trace the usages of vertexbuffers or indexbuffers.
Flash will throw the ERROR, when the vertexbuffer creation reached 4096.. Flash will throw the ERROR, when the vertexbuffer creation reached 4096..
*/ */
public static var vertexBufferCount(default, default) : UInt; public static var vertexBufferCount(default, default) : UInt;
public static var indexBufferCount(default, default) : UInt; public static var indexBufferCount(default, default) : UInt;
public static var drawTriangleCount(default, default) : UInt; public static var drawTriangleCount(default, default) : UInt;
private static var _vbUploadCount : UInt = 0; private static var _vbUploadCount : UInt = 0;
private static var _ibUploadCount : UInt = 0; private static var _ibUploadCount : UInt = 0;
private static var _bmpUploadCount : UInt = 0; private static var _bmpUploadCount : UInt = 0;
private static var _atfUploadCount : UInt = 0; private static var _atfUploadCount : UInt = 0;
public function createVertexBuffer(numVertices:Int, data32PerVertex:Int):VertexBuffer3D public function createVertexBuffer(numVertices:Int, data32PerVertex:Int):VertexBuffer3D
{ {
vertexBufferCount++; vertexBufferCount++;
@@ -681,31 +681,31 @@ class Stage3DProxy extends EventDispatcher
vb.dispose(); vb.dispose();
vertexBufferCount--; vertexBufferCount--;
} }
public function createIndexBuffer(numIndices:Int):IndexBuffer3D public function createIndexBuffer(numIndices:Int):IndexBuffer3D
{ {
indexBufferCount++; indexBufferCount++;
return _context3D.createIndexBuffer(numIndices); return _context3D.createIndexBuffer(numIndices);
} }
public static function disposeIndexBuffer(ib:IndexBuffer3D):Void public static function disposeIndexBuffer(ib:IndexBuffer3D):Void
{ {
ib.dispose(); ib.dispose();
indexBufferCount--; indexBufferCount--;
} }
public function drawTriangles(indexBuffer:IndexBuffer3D, firstIndex:Int = 0, numTriangles:Int = -1) public function drawTriangles(indexBuffer:IndexBuffer3D, firstIndex:Int = 0, numTriangles:Int = -1)
{ {
drawTriangleCount++; drawTriangleCount++;
_context3D.drawTriangles(indexBuffer, firstIndex, numTriangles); _context3D.drawTriangles(indexBuffer, firstIndex, numTriangles);
} }
public static function uploadVertexBufferFromVector(vb:VertexBuffer3D, data:Vector<Float>, startVertex:Int, numVertices:Int):Void public static function uploadVertexBufferFromVector(vb:VertexBuffer3D, data:Vector<Float>, startVertex:Int, numVertices:Int):Void
{ {
vb.uploadFromVector(data, startVertex, numVertices); vb.uploadFromVector(data, startVertex, numVertices);
_vbUploadCount++; _vbUploadCount++;
} }
public static function uploadIndexBufferFromVector(ib:IndexBuffer3D, data:Vector<UInt>, startOffset:Int, count:Int):Void public static function uploadIndexBufferFromVector(ib:IndexBuffer3D, data:Vector<UInt>, startOffset:Int, count:Int):Void
{ {
ib.uploadFromVector(data, startOffset, count); ib.uploadFromVector(data, startOffset, count);
source/flx3d/Flx3DCamera.hx
-1
View File
@@ -40,7 +40,6 @@ class Flx3DCamera extends FlxCamera {
super(X, Y, Width, Height, DefaultZoom); super(X, Y, Width, Height, DefaultZoom);
__cur3DStageID = __3DIDS++; __cur3DStageID = __3DIDS++;
view = new View3D(); view = new View3D();
view.width = this.width; view.width = this.width;
view.height = this.height; view.height = this.height;
source/flx3d/Flx3DUtil.hx
+1 -1
View File
@@ -7,7 +7,7 @@ import flixel.FlxG;
/** /**
* @author lunarclient * @author lunarclient
* @see https://twitter.com/lunarcleint * @see https://twitter.com/lunarcleint
* *
* Help from Ne_Eo * Help from Ne_Eo
* @see https://twitter.com/Ne_Eo_Twitch * @see https://twitter.com/Ne_Eo_Twitch
*/ */
source/flxanimate/frames/FlxAnimateFrames.hx
+28 -28
View File
@@ -38,14 +38,14 @@ class FlxAnimateFrames extends FlxAtlasFrames
public var parents:Array<FlxGraphic>; public var parents:Array<FlxGraphic>;
/** /**
* Parses the spritemaps into small sprites to use in the animation. * Parses the spritemaps into small sprites to use in the animation.
* *
* @param Path Where the Sprites are, normally you use it once when calling FlxAnimate already * @param Path Where the Sprites are, normally you use it once when calling FlxAnimate already
* @return new sliced limbs for you to use ;) * @return new sliced limbs for you to use ;)
*/ */
public static function fromTextureAtlas(Path:String):FlxAtlasFrames public static function fromTextureAtlas(Path:String):FlxAtlasFrames
{ {
var frames:FlxAnimateFrames = new FlxAnimateFrames(); var frames:FlxAnimateFrames = new FlxAnimateFrames();
if (zip != null || haxe.io.Path.extension(Path) == "zip") if (zip != null || haxe.io.Path.extension(Path) == "zip")
{ {
#if html5 #if html5
@@ -54,7 +54,7 @@ class FlxAnimateFrames extends FlxAtlasFrames
#end #end
var imagemap:Map<String, Bytes> = new Map(); var imagemap:Map<String, Bytes> = new Map();
var jsonMap:Map<String, AnimateAtlas> = new Map(); var jsonMap:Map<String, AnimateAtlas> = new Map();
var thing = (zip != null) ? zip : Zip.unzip(Zip.readZip(Assets.getBytes(Path))); var thing = (zip != null) ? zip : Zip.unzip(Zip.readZip(Assets.getBytes(Path)));
for (list in thing) for (list in thing)
{ {
if (haxe.io.Path.extension(list.fileName) == "json") if (haxe.io.Path.extension(list.fileName) == "json")
@@ -182,7 +182,7 @@ class FlxAnimateFrames extends FlxAtlasFrames
var rotated = (texture.has.rotated && texture.att.rotated == "true"); var rotated = (texture.has.rotated && texture.att.rotated == "true");
var flipX = (texture.has.flipX && texture.att.flipX == "true"); var flipX = (texture.has.flipX && texture.att.flipX == "true");
var flipY = (texture.has.flipY && texture.att.flipY == "true"); var flipY = (texture.has.flipY && texture.att.flipY == "true");
var rect = FlxRect.get(Std.parseFloat(texture.att.x), Std.parseFloat(texture.att.y), Std.parseFloat(width), var rect = FlxRect.get(Std.parseFloat(texture.att.x), Std.parseFloat(texture.att.y), Std.parseFloat(width),
Std.parseFloat(height)); Std.parseFloat(height));
@@ -203,7 +203,7 @@ class FlxAnimateFrames extends FlxAtlasFrames
return frames; return frames;
} }
/** /**
* *
* @param Path the Json in specific, can be the path of it or the actual json * @param Path the Json in specific, can be the path of it or the actual json
* @param Image the image which the file is referencing **WARNING:** if you set the path as a json, it's obligatory to set the image! * @param Image the image which the file is referencing **WARNING:** if you set the path as a json, it's obligatory to set the image!
* @return A new instance of `FlxAtlasFrames` * @return A new instance of `FlxAtlasFrames`
@@ -294,7 +294,7 @@ class FlxAnimateFrames extends FlxAtlasFrames
return null; return null;
} }
} }
var graphic:FlxGraphic = FlxG.bitmap.add(Image, false); var graphic:FlxGraphic = FlxG.bitmap.add(Image, false);
if (graphic == null) if (graphic == null)
@@ -438,7 +438,7 @@ class FlxAnimateFrames extends FlxAtlasFrames
Frames.addAtlasFrame(frameRect, sourceSize, offset, name, angle); Frames.addAtlasFrame(frameRect, sourceSize, offset, name, angle);
} }
static function starlingHelper(FrameName:String, FrameData:Dynamic, Frames:FlxAtlasFrames):Void static function starlingHelper(FrameName:String, FrameData:Dynamic, Frames:FlxAtlasFrames):Void
{ {
var rotated:Bool = FrameData.rotated; var rotated:Bool = FrameData.rotated;
@@ -474,7 +474,7 @@ class FlxAnimateFrames extends FlxAtlasFrames
matrix.translate(0, height); matrix.translate(0, height);
} }
sprite.draw(SpriteMap, matrix); sprite.draw(SpriteMap, matrix);
@:privateAccess @:privateAccess
var curFrame = new FlxFrame(FlxG.bitmap.add(sprite)); var curFrame = new FlxFrame(FlxG.bitmap.add(sprite));
curFrame.name = limb.name; curFrame.name = limb.name;
@@ -482,7 +482,7 @@ class FlxAnimateFrames extends FlxAtlasFrames
curFrame.frame = new FlxRect(0,0, width, height); curFrame.frame = new FlxRect(0,0, width, height);
return curFrame; return curFrame;
} }
static function texturePackerHelper(FrameName:String, FrameData:Dynamic, Frames:FlxAtlasFrames):Void static function texturePackerHelper(FrameName:String, FrameData:Dynamic, Frames:FlxAtlasFrames):Void
{ {
var rotated:Bool = FrameData.rotated; var rotated:Bool = FrameData.rotated;
@@ -508,7 +508,7 @@ class FlxAnimateFrames extends FlxAtlasFrames
return a < b ? b : a; return a < b ? b : a;
} }
// code made by noonat 11 years ago, not mine lol // code made by noonat 11 years ago, not mine lol
class PropertyList class PropertyList
{ {
static var _dateRegex:EReg = ~/(\d{4}-\d{2}-\d{2})(?:T(\d{2}:\d{2}:\d{2})Z)?/; static var _dateRegex:EReg = ~/(\d{4}-\d{2}-\d{2})(?:T(\d{2}:\d{2}:\d{2})Z)?/;
@@ -517,20 +517,20 @@ class PropertyList
* the property list is empty, an empty object will be returned. * the property list is empty, an empty object will be returned.
* @param text Text contents of the property list file. * @param text Text contents of the property list file.
*/ */
static public function parse(text:String):Dynamic static public function parse(text:String):Dynamic
{ {
var fast = new Access(Xml.parse(text).firstElement()); var fast = new Access(Xml.parse(text).firstElement());
return fast.hasNode.dict ? parseDict(fast.node.dict) : {}; return fast.hasNode.dict ? parseDict(fast.node.dict) : {};
} }
static function parseDate(text:String):Date static function parseDate(text:String):Date
{ {
if (!_dateRegex.match(text)) if (!_dateRegex.match(text))
{ {
throw 'Invalid date "' + text + '" (only yyyy-mm-dd and yyyy-mm-ddThh:mm:ssZ supported)'; throw 'Invalid date "' + text + '" (only yyyy-mm-dd and yyyy-mm-ddThh:mm:ssZ supported)';
} }
text = _dateRegex.matched(1); text = _dateRegex.matched(1);
if (_dateRegex.matched(2) != null) if (_dateRegex.matched(2) != null)
{ {
text += ' ' + _dateRegex.matched(2); text += ' ' + _dateRegex.matched(2);
} }
@@ -541,12 +541,12 @@ class PropertyList
{ {
var key:String = null; var key:String = null;
var result:Dynamic = {}; var result:Dynamic = {};
for (childNode in node.elements) for (childNode in node.elements)
{ {
if (childNode.name == 'key') if (childNode.name == 'key')
{ {
key = childNode.innerData; key = childNode.innerData;
} else if (key != null) } else if (key != null)
{ {
Reflect.setField(result, key, parseValue(childNode)); Reflect.setField(result, key, parseValue(childNode));
} }
@@ -557,21 +557,21 @@ class PropertyList
static function parseValue(node:Access):Dynamic static function parseValue(node:Access):Dynamic
{ {
var value:Dynamic = null; var value:Dynamic = null;
switch (node.name) switch (node.name)
{ {
case 'array': case 'array':
value = new Array<Dynamic>(); value = new Array<Dynamic>();
for (childNode in node.elements) for (childNode in node.elements)
{ {
value.push(parseValue(childNode)); value.push(parseValue(childNode));
} }
case 'dict': case 'dict':
value = parseDict(node); value = parseDict(node);
case 'date': case 'date':
value = parseDate(node.innerData); value = parseDate(node.innerData);
case 'string': case 'string':
var thing:Dynamic = node.innerData; var thing:Dynamic = node.innerData;
if (thing.charAt(0) == "{") if (thing.charAt(0) == "{")
@@ -583,16 +583,16 @@ class PropertyList
value = thing; value = thing;
case 'data': case 'data':
value = node.innerData; value = node.innerData;
case 'true': case 'true':
value = true; value = true;
case 'false': case 'false':
value = false; value = false;
case 'real': case 'real':
value = Std.parseFloat(node.innerData); value = Std.parseFloat(node.innerData);
case 'integer': case 'integer':
value = Std.parseInt(node.innerData); value = Std.parseInt(node.innerData);
} }
@@ -602,7 +602,7 @@ class PropertyList
typedef JSJson = typedef JSJson =
{ {
var images:Array<String>; var images:Array<String>;
var frames:Array<Array<Int>>; var frames:Array<Array<Int>>;
} }
typedef FlxSparrow = OneOfTwo<String, Xml>; typedef FlxSparrow = OneOfTwo<String, Xml>;
typedef FlxJson = OneOfTwo<String, JsonNormal>; typedef FlxJson = OneOfTwo<String, JsonNormal>;
@@ -612,7 +612,7 @@ typedef JsonNormal =
frames:Dynamic, frames:Dynamic,
meta:Meta meta:Meta
} }
typedef Plist = typedef Plist =
{ {
frames:Dynamic, frames:Dynamic,
metadata:Dynamic metadata:Dynamic
source/funkin/game/Highscore.hx
+1 -2
View File
@@ -85,14 +85,13 @@ class Highscore
{ {
songScores = CoolUtil.getDefault(FlxG.save.data.songScores, new Map<String, SongScore>()); songScores = CoolUtil.getDefault(FlxG.save.data.songScores, new Map<String, SongScore>());
weekScores = CoolUtil.getDefault(FlxG.save.data.weekScores, new Map<String, SongScore>()); weekScores = CoolUtil.getDefault(FlxG.save.data.weekScores, new Map<String, SongScore>());
for(k=>e in songScores) for(k=>e in songScores)
if (e is Int) if (e is Int)
songScores.remove(k); songScores.remove(k);
} }
} }
typedef SongScore = { typedef SongScore = {
@:optional var score:Int; @:optional var score:Int;
@:optional var accuracy:Float; @:optional var accuracy:Float;
source/funkin/macros/ScriptsMacro.hx
+1 -1
View File
@@ -27,7 +27,7 @@ class ScriptsMacro {
#if !web #if !web
Compiler.include("haxe.extern"); Compiler.include("haxe.extern");
#end #end
Compiler.include("scripting"); Compiler.include("scripting");
// FOR ABSTRACTS // FOR ABSTRACTS
source/funkin/options/Options.hx
+1 -1
View File
@@ -10,7 +10,7 @@ class Options
{ {
@:dox(hide) public static var __save:FlxSave; @:dox(hide) public static var __save:FlxSave;
@:dox(hide) private static var __eventAdded = false; @:dox(hide) private static var __eventAdded = false;
/** /**
* SETTINGS * SETTINGS
*/ */
source/funkin/shaders/CustomShader.hx
+18 -18
View File
@@ -6,28 +6,28 @@ import hscript.IHScriptCustomBehaviour;
/** /**
* Class for custom shaders. * Class for custom shaders.
* *
* To create one, create a `shaders` folder in your assets/mod folder, then add a file named `my-shader.frag` or/and `my-shader.vert`. * To create one, create a `shaders` folder in your assets/mod folder, then add a file named `my-shader.frag` or/and `my-shader.vert`.
* *
* Non-existent shaders will only load the default one, and throw a warning in the console. * Non-existent shaders will only load the default one, and throw a warning in the console.
* *
* To access the shader's uniform variables, use `shader.variable` * To access the shader's uniform variables, use `shader.variable`
*/ */
class CustomShader extends FunkinShader { class CustomShader extends FunkinShader {
/** /**
* Creates a new custom shader * Creates a new custom shader
* @param name Name of the frag and vert files. * @param name Name of the frag and vert files.
* @param glslVersion GLSL version to use. Defaults to `120`. * @param glslVersion GLSL version to use. Defaults to `120`.
*/ */
public function new(name:String, glslVersion:String = "120") { public function new(name:String, glslVersion:String = "120") {
var fragShaderPath = Paths.fragShader(name); var fragShaderPath = Paths.fragShader(name);
var vertShaderPath = Paths.vertShader(name); var vertShaderPath = Paths.vertShader(name);
var fragCode = Assets.exists(fragShaderPath) ? Assets.getText(fragShaderPath) : null; var fragCode = Assets.exists(fragShaderPath) ? Assets.getText(fragShaderPath) : null;
var vertCode = Assets.exists(vertShaderPath) ? Assets.getText(vertShaderPath) : null; var vertCode = Assets.exists(vertShaderPath) ? Assets.getText(vertShaderPath) : null;
if (fragCode == null && vertCode == null) if (fragCode == null && vertCode == null)
Logs.trace('Shader "$name" couldn\'t be found.', ERROR); Logs.trace('Shader "$name" couldn\'t be found.', ERROR);
super(fragCode, vertCode, glslVersion); super(fragCode, vertCode, glslVersion);
} }
} }
source/funkin/shaders/FunkinShader.hx
+452 -428
View File
File diff suppressed because it is too large Load Diff
source/funkin/shaders/OverlayShader.hx
+18 -18
View File
@@ -5,27 +5,27 @@ import flixel.system.FlxAssets.FlxShader;
class OverlayShader extends FlxShader class OverlayShader extends FlxShader
{ {
@:glFragmentSource(' @:glFragmentSource('
#pragma header #pragma header
uniform vec4 uBlendColor; uniform vec4 uBlendColor;
vec3 blendLighten(base:Vec3, blend:Vec3) : Vec3 { vec3 blendLighten(base:Vec3, blend:Vec3) : Vec3 {
return mix( return mix(
1.0 - 2.0 * (1.0 - base) * (1.0 - blend), 1.0 - 2.0 * (1.0 - base) * (1.0 - blend),
2.0 * base * blend, 2.0 * base * blend,
step( base, vec3(0.5) ) step( base, vec3(0.5) )
); );
} }
vec4 blendLighten(vec4 base, vec4 blend, float opacity) vec4 blendLighten(vec4 base, vec4 blend, float opacity)
{ {
return (blendLighten(base, blend) * opacity + base * (1.0 - opacity)); return (blendLighten(base, blend) * opacity + base * (1.0 - opacity));
} }
void main() void main()
{ {
vec4 base = texture2D(bitmap, openfl_TextureCoordv); vec4 base = texture2D(bitmap, openfl_TextureCoordv);
gl_FragColor = blendLighten(base, uBlendColor, uBlendColor.a); gl_FragColor = blendLighten(base, uBlendColor, uBlendColor.a);
}') }')
public function new() public function new()
{ {
super(); super();
source/funkin/shaders/WiggleEffect.hx
+62 -62
View File
@@ -62,70 +62,70 @@ class WiggleEffect
class WiggleShader extends FlxShader class WiggleShader extends FlxShader
{ {
@:glFragmentSource(' @:glFragmentSource('
#pragma header #pragma header
//uniform float tx, ty; // x,y waves phase //uniform float tx, ty; // x,y waves phase
uniform float uTime; uniform float uTime;
const int EFFECT_TYPE_DREAMY = 0;
const int EFFECT_TYPE_WAVY = 1;
const int EFFECT_TYPE_HEAT_WAVE_HORIZONTAL = 2;
const int EFFECT_TYPE_HEAT_WAVE_VERTICAL = 3;
const int EFFECT_TYPE_FLAG = 4;
uniform int effectType;
/**
* How fast the waves move over time
*/
uniform float uSpeed;
/**
* Number of waves over time
*/
uniform float uFrequency;
/**
* How much the pixels are going to stretch over the waves
*/
uniform float uWaveAmplitude;
vec2 sineWave(vec2 pt) const int EFFECT_TYPE_DREAMY = 0;
{ const int EFFECT_TYPE_WAVY = 1;
float x = 0.0; const int EFFECT_TYPE_HEAT_WAVE_HORIZONTAL = 2;
float y = 0.0; const int EFFECT_TYPE_HEAT_WAVE_VERTICAL = 3;
const int EFFECT_TYPE_FLAG = 4;
if (effectType == EFFECT_TYPE_DREAMY)
{
float offsetX = sin(pt.y * uFrequency + uTime * uSpeed) * uWaveAmplitude;
pt.x += offsetX; // * (pt.y - 1.0); // <- Uncomment to stop bottom part of the screen from moving
}
else if (effectType == EFFECT_TYPE_WAVY)
{
float offsetY = sin(pt.x * uFrequency + uTime * uSpeed) * uWaveAmplitude;
pt.y += offsetY; // * (pt.y - 1.0); // <- Uncomment to stop bottom part of the screen from moving
}
else if (effectType == EFFECT_TYPE_HEAT_WAVE_HORIZONTAL)
{
x = sin(pt.x * uFrequency + uTime * uSpeed) * uWaveAmplitude;
}
else if (effectType == EFFECT_TYPE_HEAT_WAVE_VERTICAL)
{
y = sin(pt.y * uFrequency + uTime * uSpeed) * uWaveAmplitude;
}
else if (effectType == EFFECT_TYPE_FLAG)
{
y = sin(pt.y * uFrequency + 10.0 * pt.x + uTime * uSpeed) * uWaveAmplitude;
x = sin(pt.x * uFrequency + 5.0 * pt.y + uTime * uSpeed) * uWaveAmplitude;
}
return vec2(pt.x + x, pt.y + y);
}
void main() uniform int effectType;
{
vec2 uv = sineWave(openfl_TextureCoordv); /**
gl_FragColor = texture2D(bitmap, uv); * How fast the waves move over time
}') */
uniform float uSpeed;
/**
* Number of waves over time
*/
uniform float uFrequency;
/**
* How much the pixels are going to stretch over the waves
*/
uniform float uWaveAmplitude;
vec2 sineWave(vec2 pt)
{
float x = 0.0;
float y = 0.0;
if (effectType == EFFECT_TYPE_DREAMY)
{
float offsetX = sin(pt.y * uFrequency + uTime * uSpeed) * uWaveAmplitude;
pt.x += offsetX; // * (pt.y - 1.0); // <- Uncomment to stop bottom part of the screen from moving
}
else if (effectType == EFFECT_TYPE_WAVY)
{
float offsetY = sin(pt.x * uFrequency + uTime * uSpeed) * uWaveAmplitude;
pt.y += offsetY; // * (pt.y - 1.0); // <- Uncomment to stop bottom part of the screen from moving
}
else if (effectType == EFFECT_TYPE_HEAT_WAVE_HORIZONTAL)
{
x = sin(pt.x * uFrequency + uTime * uSpeed) * uWaveAmplitude;
}
else if (effectType == EFFECT_TYPE_HEAT_WAVE_VERTICAL)
{
y = sin(pt.y * uFrequency + uTime * uSpeed) * uWaveAmplitude;
}
else if (effectType == EFFECT_TYPE_FLAG)
{
y = sin(pt.y * uFrequency + 10.0 * pt.x + uTime * uSpeed) * uWaveAmplitude;
x = sin(pt.x * uFrequency + 5.0 * pt.y + uTime * uSpeed) * uWaveAmplitude;
}
return vec2(pt.x + x, pt.y + y);
}
void main()
{
vec2 uv = sineWave(openfl_TextureCoordv);
gl_FragColor = texture2D(bitmap, uv);
}')
public function new() public function new()
{ {
super(); super();
source/funkin/system/Main.hx
+2
View File
@@ -107,6 +107,8 @@ class Main extends Sprite
// addChild(new FramerateField(10, 3, 0xFFFFFF)); // addChild(new FramerateField(10, 3, 0xFFFFFF));
addChild(new funkin.system.framerate.Framerate()); addChild(new funkin.system.framerate.Framerate());
#end #end
trace("Hello", "World");
} }
@:dox(hide) @:dox(hide)
source/funkin/ui/Alphabet.hx
+2 -2
View File
@@ -142,7 +142,7 @@ class Alphabet extends FlxSpriteGroup
letter.createLetter(character); letter.createLetter(character);
// anim not found // anim not found
if (!letter.visible) if (!letter.visible)
xPos += 40; xPos += 40;
letter.setColor(color, isBold); letter.setColor(color, isBold);
@@ -190,7 +190,7 @@ class Alphabet extends FlxSpriteGroup
override function update(elapsed:Float) override function update(elapsed:Float)
{ {
super.update(elapsed); super.update(elapsed);
if (isMenuItem) if (isMenuItem)
{ {
var scaledY = FlxMath.remapToRange(targetY, 0, 1, 0, 1.3); var scaledY = FlxMath.remapToRange(targetY, 0, 1, 0, 1.3);
source/funkin/ui/FunkinText.hx
+9 -9
View File
@@ -4,13 +4,13 @@ import flixel.util.FlxColor;
import flixel.text.FlxText; import flixel.text.FlxText;
class FunkinText extends FlxText { class FunkinText extends FlxText {
public function new(X:Float = 0, Y:Float = 0, FieldWidth:Float = 0, ?Text:String, Size:Int = 16, Border:Bool = true) { public function new(X:Float = 0, Y:Float = 0, FieldWidth:Float = 0, ?Text:String, Size:Int = 16, Border:Bool = true) {
super(X, Y, FieldWidth, Text, Size); super(X, Y, FieldWidth, Text, Size);
setFormat(Paths.font("vcr.ttf"), Size, FlxColor.WHITE); setFormat(Paths.font("vcr.ttf"), Size, FlxColor.WHITE);
if (Border) { if (Border) {
borderStyle = OUTLINE; borderStyle = OUTLINE;
borderSize = 1; borderSize = 1;
borderColor = 0xFF000000; borderColor = 0xFF000000;
} }
} }
} }
source/funkin/utils/BitmapUtil.hx
+58 -58
View File
@@ -4,66 +4,66 @@ import openfl.display.BitmapData;
import flixel.util.FlxColor; import flixel.util.FlxColor;
class BitmapUtil { class BitmapUtil {
/** /**
* Returns the most present color in a Bitmap. * Returns the most present color in a Bitmap.
* @param bmap Bitmap * @param bmap Bitmap
* @return FlxColor Color that is the most present. * @return FlxColor Color that is the most present.
*/ */
public static function getMostPresentColor(bmap:BitmapData):FlxColor { public static function getMostPresentColor(bmap:BitmapData):FlxColor {
// map containing all the colors and the number of times they've been assigned. // map containing all the colors and the number of times they've been assigned.
var colorMap:Map<FlxColor, Float> = []; var colorMap:Map<FlxColor, Float> = [];
var color:FlxColor = 0; var color:FlxColor = 0;
var fixedColor:FlxColor = 0; var fixedColor:FlxColor = 0;
for(y in 0...bmap.height) { for(y in 0...bmap.height) {
for(x in 0...bmap.width) { for(x in 0...bmap.width) {
color = bmap.getPixel32(x, y); color = bmap.getPixel32(x, y);
fixedColor = 0xFF000000 + (color % 0x1000000); fixedColor = 0xFF000000 + (color % 0x1000000);
if (colorMap[fixedColor] == null) if (colorMap[fixedColor] == null)
colorMap[fixedColor] = 0; colorMap[fixedColor] = 0;
colorMap[fixedColor] += color.alphaFloat; colorMap[fixedColor] += color.alphaFloat;
} }
} }
var mostPresentColor:FlxColor = 0; var mostPresentColor:FlxColor = 0;
var mostPresentColorCount:Float = -1; var mostPresentColorCount:Float = -1;
for(c=>n in colorMap) { for(c=>n in colorMap) {
if (n > mostPresentColorCount) { if (n > mostPresentColorCount) {
mostPresentColorCount = n; mostPresentColorCount = n;
mostPresentColor = c; mostPresentColor = c;
} }
} }
return mostPresentColor; return mostPresentColor;
} }
/** /**
* Returns the most present saturated color in a Bitmap. * Returns the most present saturated color in a Bitmap.
* @param bmap Bitmap * @param bmap Bitmap
* @return FlxColor Color that is the most present. * @return FlxColor Color that is the most present.
*/ */
public static function getMostPresentSaturatedColor(bmap:BitmapData):FlxColor { public static function getMostPresentSaturatedColor(bmap:BitmapData):FlxColor {
// map containing all the colors and the number of times they've been assigned. // map containing all the colors and the number of times they've been assigned.
var colorMap:Map<FlxColor, Float> = []; var colorMap:Map<FlxColor, Float> = [];
var color:FlxColor = 0; var color:FlxColor = 0;
var fixedColor:FlxColor = 0; var fixedColor:FlxColor = 0;
for(y in 0...bmap.height) { for(y in 0...bmap.height) {
for(x in 0...bmap.width) { for(x in 0...bmap.width) {
color = bmap.getPixel32(x, y); color = bmap.getPixel32(x, y);
fixedColor = 0xFF000000 + (color % 0x1000000); fixedColor = 0xFF000000 + (color % 0x1000000);
if (colorMap[fixedColor] == null) if (colorMap[fixedColor] == null)
colorMap[fixedColor] = 0; colorMap[fixedColor] = 0;
colorMap[fixedColor] += color.alphaFloat * 0.33 + (0.67 * (color.saturation * (2 * (color.lightness > 0.5 ? 0.5 - (color.lightness) : color.lightness)))); colorMap[fixedColor] += color.alphaFloat * 0.33 + (0.67 * (color.saturation * (2 * (color.lightness > 0.5 ? 0.5 - (color.lightness) : color.lightness))));
} }
} }
var mostPresentColor:FlxColor = 0; var mostPresentColor:FlxColor = 0;
var mostPresentColorCount:Float = -1; var mostPresentColorCount:Float = -1;
for(c=>n in colorMap) { for(c=>n in colorMap) {
if (n > mostPresentColorCount) { if (n > mostPresentColorCount) {
mostPresentColorCount = n; mostPresentColorCount = n;
mostPresentColor = c; mostPresentColor = c;
} }
} }
return mostPresentColor; return mostPresentColor;
} }
} }
source/funkin/utils/DiscordUtil.hx
+111 -111
View File
@@ -11,142 +11,142 @@ import lime.app.Application;
#end #end
class DiscordUtil { class DiscordUtil {
public static var currentID:String = null; public static var currentID:String = null;
public static var discordThread:#if DISCORD_RPC Thread #else Dynamic #end = null; public static var discordThread:#if DISCORD_RPC Thread #else Dynamic #end = null;
public static var ready:Bool = false; public static var ready:Bool = false;
public static var data:DiscordJson = null; public static var data:DiscordJson = null;
public static function init() {
#if DISCORD_RPC
reloadJsonData();
discordThread = Thread.create(function() {
while (true)
{
while(!ready) {
Sys.sleep(1/60);
}
trace("Processing Discord RPC...");
DiscordRpc.process();
Sys.sleep(2);
}
});
public static function init() {
#if DISCORD_RPC
reloadJsonData();
discordThread = Thread.create(function() {
while (true)
{
while(!ready) {
Sys.sleep(1/60);
}
trace("Processing Discord RPC...");
DiscordRpc.process();
Sys.sleep(2);
}
});
Application.current.onExit.add(function(exitCode) { Application.current.onExit.add(function(exitCode) {
shutdown(); shutdown();
}); });
#end #end
} }
public static function reloadJsonData() { public static function reloadJsonData() {
#if DISCORD_RPC #if DISCORD_RPC
data = {}; data = {};
var jsonPath = Paths.json("config/discord"); var jsonPath = Paths.json("config/discord");
if (Assets.exists(jsonPath)) { if (Assets.exists(jsonPath)) {
try { try {
data = Json.parse(Assets.getText(jsonPath)); data = Json.parse(Assets.getText(jsonPath));
} catch(e) { } catch(e) {
Logs.trace('Couldn\'t load Discord RPC configuration: ${e.toString()}', ERROR); Logs.trace('Couldn\'t load Discord RPC configuration: ${e.toString()}', ERROR);
} }
} }
trace(data); trace(data);
data.setFieldDefault("clientID", "1027994136193810442"); data.setFieldDefault("clientID", "1027994136193810442");
data.setFieldDefault("logoKey", "icon"); data.setFieldDefault("logoKey", "icon");
data.setFieldDefault("logoText", Application.current.meta.get('title')); data.setFieldDefault("logoText", Application.current.meta.get('title'));
changeClientID(data.clientID); changeClientID(data.clientID);
#end #end
} }
public static function changePresence(details:String, state:String, ?smallImageKey : String) { public static function changePresence(details:String, state:String, ?smallImageKey : String) {
#if DISCORD_RPC #if DISCORD_RPC
changePresenceAdvanced({ changePresenceAdvanced({
state: state, state: state,
details: details, details: details,
smallImageKey: smallImageKey smallImageKey: smallImageKey
}); });
#end #end
} }
public static function changeSongPresence(details:String, state:String, audio:FlxSound, ?smallImageKey : String) { public static function changeSongPresence(details:String, state:String, audio:FlxSound, ?smallImageKey : String) {
#if DISCORD_RPC #if DISCORD_RPC
var start:Float = 0; var start:Float = 0;
var end:Float = 0; var end:Float = 0;
if (audio != null && audio.playing) { if (audio != null && audio.playing) {
start = Date.now().getTime(); start = Date.now().getTime();
end = start + (audio.length - audio.time); end = start + (audio.length - audio.time);
} }
changePresenceAdvanced({ changePresenceAdvanced({
state: state, state: state,
details: details, details: details,
smallImageKey: smallImageKey, smallImageKey: smallImageKey,
startTimestamp: Std.int(start / 1000), startTimestamp: Std.int(start / 1000),
endTimestamp: Std.int(end / 1000) endTimestamp: Std.int(end / 1000)
}); });
#end #end
} }
public static function changePresenceAdvanced(data:#if DISCORD_RPC DiscordPresenceOptions #else Dynamic #end) { public static function changePresenceAdvanced(data:#if DISCORD_RPC DiscordPresenceOptions #else Dynamic #end) {
#if DISCORD_RPC #if DISCORD_RPC
if (data == null) return; if (data == null) return;
if (data.largeImageKey == null) if (data.largeImageKey == null)
data.largeImageKey = DiscordUtil.data.logoKey; data.largeImageKey = DiscordUtil.data.logoKey;
if (data.largeImageText == null) if (data.largeImageText == null)
data.largeImageText = DiscordUtil.data.logoText; data.largeImageText = DiscordUtil.data.logoText;
#if GLOBAL_SCRIPT
var event = funkin.scripting.GlobalScript.event("onDiscordPresenceUpdate", EventManager.get(DiscordPresenceUpdateEvent).recycle(data));
if (event.cancelled) return;
#end
DiscordRpc.presence(data);
#end
}
public static function changeClientID(id:String) {
#if DISCORD_RPC
if (currentID != null) {
DiscordRpc.shutdown();
}
ready = false; #if GLOBAL_SCRIPT
var event = funkin.scripting.GlobalScript.event("onDiscordPresenceUpdate", EventManager.get(DiscordPresenceUpdateEvent).recycle(data));
if (event.cancelled) return;
DiscordRpc.start({ #end
DiscordRpc.presence(data);
#end
}
public static function changeClientID(id:String) {
#if DISCORD_RPC
if (currentID != null) {
DiscordRpc.shutdown();
}
ready = false;
DiscordRpc.start({
clientID: id, clientID: id,
onReady: function() { onReady: function() {
Logs.trace('Discord RPC started'); Logs.trace('Discord RPC started');
ready = true; ready = true;
}, },
onError: onError, onError: onError,
onDisconnected: onDisconnected onDisconnected: onDisconnected
}); });
currentID = id; currentID = id;
#end #end
} }
public static function shutdown() { public static function shutdown() {
#if DISCORD_RPC #if DISCORD_RPC
DiscordRpc.shutdown(); DiscordRpc.shutdown();
#end #end
} }
// HANDLERS // HANDLERS
#if DISCORD_RPC #if DISCORD_RPC
static function onError(_code:Int, _message:String) { static function onError(_code:Int, _message:String) {
Logs.trace('Discord RPC Error: ${_message} (Code: $_code)', ERROR); Logs.trace('Discord RPC Error: ${_message} (Code: $_code)', ERROR);
} }
static function onDisconnected(_code:Int, _message:String) { static function onDisconnected(_code:Int, _message:String) {
Logs.trace('Discord RPC Disconnected: ${_message} (Code: $_code)', WARNING); Logs.trace('Discord RPC Disconnected: ${_message} (Code: $_code)', WARNING);
} }
#end #end
} }
typedef DiscordJson = { typedef DiscordJson = {
var ?clientID:String; var ?clientID:String;
var ?logoKey:String; var ?logoKey:String;
var ?logoText:String; var ?logoText:String;
} }
source/funkin/utils/EngineUtil.hx
+8 -8
View File
@@ -4,12 +4,12 @@ import funkin.scripting.Script;
import funkin.scripting.MultiThreadedScript; import funkin.scripting.MultiThreadedScript;
class EngineUtil { class EngineUtil {
/** /**
* Starts a new multithreaded script. * Starts a new multithreaded script.
* This script will share all the variables with the current one, which means already existing callbacks will be replaced by new ones on conflict. * This script will share all the variables with the current one, which means already existing callbacks will be replaced by new ones on conflict.
* @param path * @param path
*/ */
public static function startMultithreadedScript(path:String) { public static function startMultithreadedScript(path:String) {
return new MultiThreadedScript(path, Script.curScript); return new MultiThreadedScript(path, Script.curScript);
} }
} }
source/funkin/utils/FlxInterpolateColor.hx
+24 -24
View File
@@ -7,37 +7,37 @@ import flixel.util.FlxColor;
* Gets rid of precision issues with `FlxColor.interpolate` * Gets rid of precision issues with `FlxColor.interpolate`
*/ */
class FlxInterpolateColor { class FlxInterpolateColor {
public var red:Float = 0; public var red:Float = 0;
public var green:Float = 0; public var green:Float = 0;
public var blue:Float = 0; public var blue:Float = 0;
public var alpha:Float = 0; public var alpha:Float = 0;
public var color(get, set):FlxColor; public var color(get, set):FlxColor;
private inline function get_color() private inline function get_color()
return FlxColor.fromRGBFloat(red, green, blue, alpha); return FlxColor.fromRGBFloat(red, green, blue, alpha);
private inline function set_color(c:FlxColor):FlxColor { private inline function set_color(c:FlxColor):FlxColor {
red = c.redFloat; red = c.redFloat;
green = c.greenFloat; green = c.greenFloat;
blue = c.blueFloat; blue = c.blueFloat;
alpha = c.alphaFloat; alpha = c.alphaFloat;
return c; return c;
} }
public inline function toString() public inline function toString()
return '[FlxInterpolateColor - (R:${red} | G:${green} | B:${blue} | A:${alpha})]'; return '[FlxInterpolateColor - (R:${red} | G:${green} | B:${blue} | A:${alpha})]';
public function new(color:FlxColor) { public function new(color:FlxColor) {
this.color = color; this.color = color;
} }
public function lerpTo(color:FlxColor, ratio:Float) { public function lerpTo(color:FlxColor, ratio:Float) {
red = (color.redFloat - red) * ratio + red; red = (color.redFloat - red) * ratio + red;
green = (color.greenFloat - green) * ratio + green; green = (color.greenFloat - green) * ratio + green;
blue = (color.blueFloat - blue) * ratio + blue; blue = (color.blueFloat - blue) * ratio + blue;
alpha = (color.alphaFloat - alpha) * ratio + alpha; alpha = (color.alphaFloat - alpha) * ratio + alpha;
} }
public inline function fpsLerpTo(color:FlxColor, ratio:Float) public inline function fpsLerpTo(color:FlxColor, ratio:Float)
lerpTo(color, ratio * 60 * FlxG.elapsed); lerpTo(color, ratio * 60 * FlxG.elapsed);
} }
source/funkin/utils/IniUtil.hx
+27 -27
View File
@@ -5,36 +5,36 @@ package funkin.utils;
* DOESNT SUPPORT CATEGORIES YET!! * DOESNT SUPPORT CATEGORIES YET!!
*/ */
class IniUtil { class IniUtil {
public static inline function parseAsset(assetPath:String, ?defaultVariables:Map<String, String>) public static inline function parseAsset(assetPath:String, ?defaultVariables:Map<String, String>)
return parseString(Assets.getText(assetPath), defaultVariables); return parseString(Assets.getText(assetPath), defaultVariables);
public static function parseString(data:String, ?defaultVariables:Map<String, String>) { public static function parseString(data:String, ?defaultVariables:Map<String, String>) {
var trimmed:String; var trimmed:String;
var splitContent = [for(e in data.split("\n")) if ((trimmed = e.trim()) != "") trimmed]; var splitContent = [for(e in data.split("\n")) if ((trimmed = e.trim()) != "") trimmed];
var finalMap:Map<String, String> = [];
if (defaultVariables != null)
for(k=>e in defaultVariables)
finalMap[k] = e;
for(line in splitContent) { var finalMap:Map<String, String> = [];
// comment if (defaultVariables != null)
if (line.startsWith(";")) continue; for(k=>e in defaultVariables)
// categories; not supported yet finalMap[k] = e;
if (line.startsWith("[") && line.endsWith("]")) continue;
var index = line.indexOf("="); for(line in splitContent) {
var name = line.substr(0, index).trim(); // comment
var value = line.substr(index+1).trim(); if (line.startsWith(";")) continue;
// categories; not supported yet
if (line.startsWith("[") && line.endsWith("]")) continue;
if (value.startsWith("\"") && value.endsWith("\"")) var index = line.indexOf("=");
value = value.substr(1, value.length - 2); var name = line.substr(0, index).trim();
var value = line.substr(index+1).trim();
if (value.length == 0 || name.length == 0) if (value.startsWith("\"") && value.endsWith("\""))
continue; value = value.substr(1, value.length - 2);
finalMap[name] = value; if (value.length == 0 || name.length == 0)
} continue;
return finalMap;
} finalMap[name] = value;
}
return finalMap;
}
} }
source/funkin/utils/MarkdownUtil.hx
+75 -75
View File
@@ -4,84 +4,84 @@ import flixel.util.FlxColor;
import flixel.text.FlxText; import flixel.text.FlxText;
class MarkdownUtil { class MarkdownUtil {
public static function applyMarkdownText(text:FlxText, str:String) { public static function applyMarkdownText(text:FlxText, str:String) {
text.textField.htmlText = Markdown.markdownToHtml(prepareMarkdown(str)); text.textField.htmlText = Markdown.markdownToHtml(prepareMarkdown(str));
var changes:Array<FlxTextFormatMarkerPair> = [ var changes:Array<FlxTextFormatMarkerPair> = [
createAdvancedMarkerPair("{title}", 0xFFFFFFFF, text.size * 2, false, true, true), createAdvancedMarkerPair("{title}", 0xFFFFFFFF, text.size * 2, false, true, true),
createAdvancedMarkerPair("{subtitle}", 0xFFFFFFFF, text.size * 1.5, false, true, true), createAdvancedMarkerPair("{subtitle}", 0xFFFFFFFF, text.size * 1.5, false, true, true),
createAdvancedMarkerPair("{subsubtitle}", 0xFFFFFFFF, text.size * 1.25, false, true, true), createAdvancedMarkerPair("{subsubtitle}", 0xFFFFFFFF, text.size * 1.25, false, true, true),
createAdvancedMarkerPair("{ident1}", 0xFFFFFFFF, null, false, false, false, text.size * 2, true), createAdvancedMarkerPair("{ident1}", 0xFFFFFFFF, null, false, false, false, text.size * 2, true),
createAdvancedMarkerPair("{ident2}", 0xFFFFFFFF, null, false, false, false, text.size * 4, true), createAdvancedMarkerPair("{ident2}", 0xFFFFFFFF, null, false, false, false, text.size * 4, true),
createAdvancedMarkerPair("{ident3}", 0xFFFFFFFF, null, false, false, false, text.size * 6, true), createAdvancedMarkerPair("{ident3}", 0xFFFFFFFF, null, false, false, false, text.size * 6, true),
createAdvancedMarkerPair("{ident4}", 0xFFFFFFFF, null, false, false, false, text.size * 8, true), createAdvancedMarkerPair("{ident4}", 0xFFFFFFFF, null, false, false, false, text.size * 8, true),
new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFFFFF00, false, true), "{o}"), new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFFFFF00, false, true), "{o}"),
new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFFF0000, false, true), "{r}"), new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFFF0000, false, true), "{r}"),
new FlxTextFormatMarkerPair(new FlxTextFormat(0xFF00FF08, false, true), "{g}"), new FlxTextFormatMarkerPair(new FlxTextFormat(0xFF00FF08, false, true), "{g}"),
new FlxTextFormatMarkerPair(new FlxTextFormat(0xFF7D7D7D, false, true), "{gray}"), new FlxTextFormatMarkerPair(new FlxTextFormat(0xFF7D7D7D, false, true), "{gray}"),
new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFFFFFFF, false, true, 0xFF222222), "{italic}"), new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFFFFFFF, false, true, 0xFF222222), "{italic}"),
new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFFFFFFF, false, true, 0xFF666666), "{bold}"), new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFFFFFFF, false, true, 0xFF666666), "{bold}"),
new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFFFFFFF, false, true, 0xFF888888), "{bold-italic}"), new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFFFFFFF, false, true, 0xFF888888), "{bold-italic}"),
]; ];
text.applyMarkup( text.applyMarkup(
parseWarnings(text.textField.text), parseWarnings(text.textField.text),
changes changes
); );
@:privateAccess { @:privateAccess {
// hacky fix for the text cutting when bigger text formats are used // hacky fix for the text cutting when bigger text formats are used
text._regen = true; text._regen = true;
text.regenGraphic(); text.regenGraphic();
text._regen = true; text._regen = true;
text.regenGraphic(); text.regenGraphic();
} }
} }
public static function createAdvancedMarkerPair(marker:String, color:FlxColor, size:Null<Float>, bold:Bool = false, italic:Bool = false, ?underline:Bool = false, ?blockIndent:Int, ?bullet:Bool) { public static function createAdvancedMarkerPair(marker:String, color:FlxColor, size:Null<Float>, bold:Bool = false, italic:Bool = false, ?underline:Bool = false, ?blockIndent:Int, ?bullet:Bool) {
@:privateAccess { @:privateAccess {
var format = new FlxTextFormat(color, bold, italic); var format = new FlxTextFormat(color, bold, italic);
format.format.size = size == null ? null : Std.int(size); format.format.size = size == null ? null : Std.int(size);
format.format.underline = underline; format.format.underline = underline;
format.format.blockIndent = blockIndent; format.format.blockIndent = blockIndent;
format.format.bullet = bullet; format.format.bullet = bullet;
return new FlxTextFormatMarkerPair(format, marker); return new FlxTextFormatMarkerPair(format, marker);
} }
} }
public static function parseWarnings(text:String) { public static function parseWarnings(text:String) {
text = text.replace("&nbsp;", " "); text = text.replace("&nbsp;", " ");
text = parseEmote(text, "⚠", "{o}(!)", "{o}"); text = parseEmote(text, "⚠", "{o}(!)", "{o}");
text = parseEmote(text, "❌", "{r}(X)", "{r}"); text = parseEmote(text, "❌", "{r}(X)", "{r}");
text = parseEmote(text, "✔", "{g}(+)", "{g}"); text = parseEmote(text, "✔", "{g}(+)", "{g}");
return text; return text;
} }
public static function prepareMarkdown(text:String) { public static function prepareMarkdown(text:String) {
text = "\n" + text; text = "\n" + text;
text = parseEmote(text, "\n- ", "\n{ident1}&nbsp;&nbsp;• ", "{ident1}"); text = parseEmote(text, "\n- ", "\n{ident1}&nbsp;&nbsp;• ", "{ident1}");
text = parseEmote(text, "\n - ", "\n{ident2}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;• ", "{ident2}"); text = parseEmote(text, "\n - ", "\n{ident2}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;• ", "{ident2}");
text = parseEmote(text, "\n - ", "\n{ident3}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;• ", "{ident3}"); text = parseEmote(text, "\n - ", "\n{ident3}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;• ", "{ident3}");
text = parseEmote(text, "\n - ", "\n{ident4}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;• ", "{ident4}"); text = parseEmote(text, "\n - ", "\n{ident4}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;• ", "{ident4}");
text = parseEmote(text, "\n> ", "\n{gray}", "{gray}"); text = parseEmote(text, "\n> ", "\n{gray}", "{gray}");
text = parseEmote(text, "\n### ", "\n{subsubtitle}", "{subsubtitle}"); text = parseEmote(text, "\n### ", "\n{subsubtitle}", "{subsubtitle}");
text = parseEmote(text, "\n## ", "\n{subtitle}", "{subtitle}"); text = parseEmote(text, "\n## ", "\n{subtitle}", "{subtitle}");
text = parseEmote(text, "\n# ", "\n{title}", "{title}"); text = parseEmote(text, "\n# ", "\n{title}", "{title}");
text = parseEmote(text, "***", "{bold-italic}", "{bold-italic}", "***"); text = parseEmote(text, "***", "{bold-italic}", "{bold-italic}", "***");
text = parseEmote(text, "**", "{bold}", "{bold}", "**"); text = parseEmote(text, "**", "{bold}", "{bold}", "**");
text = parseEmote(text, "*", "{italic}", "{italic}", "*"); text = parseEmote(text, "*", "{italic}", "{italic}", "*");
text = parseEmote(text, "_", "{italic}", "{italic}", "*"); text = parseEmote(text, "_", "{italic}", "{italic}", "*");
text = parseEmote(text, "__", "{bold}", "{bold}", "*"); text = parseEmote(text, "__", "{bold}", "{bold}", "*");
text.substr("\n".length); text.substr("\n".length);
return text; return text;
} }
public static function parseEmote(text:String, emote:String, beginning:String, end:String, emoteEnd:String = "\n") { public static function parseEmote(text:String, emote:String, beginning:String, end:String, emoteEnd:String = "\n") {
var index:Int; var index:Int;
while((index = text.indexOf(emote)) >= 0) { while((index = text.indexOf(emote)) >= 0) {
var nextIndex = text.indexOf(emoteEnd, index + emote.length); var nextIndex = text.indexOf(emoteEnd, index + emote.length);
if (nextIndex < 0) if (nextIndex < 0)
nextIndex = text.length; nextIndex = text.length;
text = text.substr(0, index) + beginning + text.substring(index + emote.length, nextIndex) + end + (emote == emoteEnd ? "" : emoteEnd) + text.substring(nextIndex + emoteEnd.length); text = text.substr(0, index) + beginning + text.substring(index + emote.length, nextIndex) + end + (emote == emoteEnd ? "" : emoteEnd) + text.substring(nextIndex + emoteEnd.length);
} }
return text; return text;
} }
} }
source/funkin/utils/MemoryUtil.hx
+1 -1
View File
@@ -30,7 +30,7 @@ class MemoryUtil {
} }
public static function init() {} public static function init() {}
public static function clearMinor() { public static function clearMinor() {
#if (cpp || java || neko) #if (cpp || java || neko)
Gc.run(false); Gc.run(false);
source/funkin/utils/NdllUtil.hx
+45 -45
View File
@@ -4,12 +4,12 @@ import lime.app.Application;
/** /**
* Small util that allows you to load any function from ndlls via `getFunction`. * Small util that allows you to load any function from ndlls via `getFunction`.
* *
* NDLLs must be in your mod's "ndlls" folder, and must follow this name scheme: * NDLLs must be in your mod's "ndlls" folder, and must follow this name scheme:
* - `name-windows.ndll` for Windows targeted ndlls * - `name-windows.ndll` for Windows targeted ndlls
* - `name-linux.ndll` for Linux targeted ndlls * - `name-linux.ndll` for Linux targeted ndlls
* - `name-mac.ndll` for Mac targeted ndlls * - `name-mac.ndll` for Mac targeted ndlls
* *
* If: * If:
* - The platform does not support NDLLs * - The platform does not support NDLLs
* - The NDLL is not found * - The NDLL is not found
@@ -17,52 +17,52 @@ import lime.app.Application;
* then an empty function will be returned instead, and a message will be shown in logs. * then an empty function will be returned instead, and a message will be shown in logs.
*/ */
class NdllUtil { class NdllUtil {
#if NDLLS_SUPPORTED #if NDLLS_SUPPORTED
#if windows public static final os:String = "windows"; #end #if windows public static final os:String = "windows"; #end
#if linux public static final os:String = "linux"; #end #if linux public static final os:String = "linux"; #end
#if macos public static final os:String = "mac"; #end #if macos public static final os:String = "mac"; #end
#if android public static final os:String = "android"; #end #if android public static final os:String = "android"; #end
#end #end
/** /**
* Returns an function from a Haxe NDLL. * Returns an function from a Haxe NDLL.
* *
* @param ndll Name of the NDLL. * @param ndll Name of the NDLL.
* @param name Name of the function. * @param name Name of the function.
* @param args Number of arguments of that function. * @param args Number of arguments of that function.
*/ */
public static function getFunction(ndll:String, name:String, args:Int) { public static function getFunction(ndll:String, name:String, args:Int) {
#if NDLLS_SUPPORTED #if NDLLS_SUPPORTED
return getFunctionFromPath(Paths.ndll('$ndll-$os'), name, args); return getFunctionFromPath(Paths.ndll('$ndll-$os'), name, args);
#else #else
Logs.trace('NDLLs are not supported on this platform.', WARNING); Logs.trace('NDLLs are not supported on this platform.', WARNING);
return function() {}; return function() {};
#end #end
} }
/** /**
* Returns an function from a Haxe NDLL at specified path. * Returns an function from a Haxe NDLL at specified path.
* *
* @param ndll Asset path to the NDLL. * @param ndll Asset path to the NDLL.
* @param name Name of the function. * @param name Name of the function.
* @param args Number of arguments of that function. * @param args Number of arguments of that function.
*/ */
public static function getFunctionFromPath(ndll:String, name:String, args:Int) { public static function getFunctionFromPath(ndll:String, name:String, args:Int) {
#if NDLLS_SUPPORTED #if NDLLS_SUPPORTED
if (!Assets.exists(ndll)) { if (!Assets.exists(ndll)) {
Logs.trace('Couldn\'t find ndll at ${ndll}.', WARNING); Logs.trace('Couldn\'t find ndll at ${ndll}.', WARNING);
return function() {}; return function() {};
} }
var func = lime.system.CFFI.load(Assets.getPath(ndll), name, args); var func = lime.system.CFFI.load(Assets.getPath(ndll), name, args);
if (func == null) { if (func == null) {
Logs.trace('Method ${name} in ndll ${ndll} with ${args} args was not found.', ERROR); Logs.trace('Method ${name} in ndll ${ndll} with ${args} args was not found.', ERROR);
return function() {}; return function() {};
} }
return func; return func;
#else #else
Logs.trace('NDLLs are not supported on this platform.', WARNING); Logs.trace('NDLLs are not supported on this platform.', WARNING);
#end #end
return function() {}; return function() {};
} }
} }
source/funkin/utils/ThreadUtil.hx
+26 -26
View File
@@ -2,31 +2,31 @@ package funkin.utils;
#if ALLOW_MULTITHREADING #if ALLOW_MULTITHREADING
class ThreadUtil { class ThreadUtil {
/** /**
* Creates a new Thread with an error handler. * Creates a new Thread with an error handler.
* @param func Function to execute * @param func Function to execute
* @param autoRestart Whenever the thread should auto restart itself after crashing. * @param autoRestart Whenever the thread should auto restart itself after crashing.
*/ */
public static function createSafe(func:Void->Void, autoRestart:Bool = false) { public static function createSafe(func:Void->Void, autoRestart:Bool = false) {
if (autoRestart) { if (autoRestart) {
return sys.thread.Thread.create(function() { return sys.thread.Thread.create(function() {
while(true) { while(true) {
try { try {
func(); func();
} catch(e) { } catch(e) {
trace(e.details()); trace(e.details());
} }
} }
}); });
} else { } else {
return sys.thread.Thread.create(function() { return sys.thread.Thread.create(function() {
try { try {
func(); func();
} catch(e) { } catch(e) {
trace(e.details()); trace(e.details());
} }
}); });
} }
} }
} }
#end #end
source/funkin/utils/XMLUtil.hx
+32 -32
View File
@@ -13,34 +13,34 @@ using StringTools;
*/ */
class XMLUtil { class XMLUtil {
/** /**
* Applies a property XML node to an object. * Applies a property XML node to an object.
* @param object Object to which the xml property will be applied * @param object Object to which the xml property will be applied
* @param property `property` node. * @param property `property` node.
*/ */
public static function applyXMLProperty(object:Dynamic, property:Access):ErrorCode { public static function applyXMLProperty(object:Dynamic, property:Access):ErrorCode {
if (!property.has.name || !property.has.type || !property.has.value) { if (!property.has.name || !property.has.type || !property.has.value) {
Logs.trace('Failed to apply XML property: XML Element misses name, type, or value attributes.', WARNING); Logs.trace('Failed to apply XML property: XML Element misses name, type, or value attributes.', WARNING);
return MISSING_PROPERTY; return MISSING_PROPERTY;
} }
var value:Dynamic = switch(property.att.type.toLowerCase()) { var value:Dynamic = switch(property.att.type.toLowerCase()) {
case "float" | "number": Std.parseFloat(property.att.value); case "float" | "number": Std.parseFloat(property.att.value);
case "int" | "integer" | "color": Std.parseInt(property.att.value); case "int" | "integer" | "color": Std.parseInt(property.att.value);
case "string" | "str" | "text": property.att.value; case "string" | "str" | "text": property.att.value;
case "bool" | "boolean": property.att.value.toLowerCase() == "true"; case "bool" | "boolean": property.att.value.toLowerCase() == "true";
default: return TYPE_INCORRECT; default: return TYPE_INCORRECT;
} }
if (value == null) return VALUE_NULL; if (value == null) return VALUE_NULL;
try { try {
Reflect.setProperty(object, property.att.name, value); Reflect.setProperty(object, property.att.name, value);
} catch(e) { } catch(e) {
Logs.trace('Failed to apply XML property: $e on ${Type.getClass(object)}', WARNING); Logs.trace('Failed to apply XML property: $e on ${Type.getClass(object)}', WARNING);
return REFLECT_ERROR; return REFLECT_ERROR;
} }
return OK; return OK;
} }
/** /**
* Creates a new sprite based on a XML node. * Creates a new sprite based on a XML node.
@@ -69,11 +69,11 @@ class XMLUtil {
if (node.has.scrollx) { if (node.has.scrollx) {
var scroll:Null<Float> = Std.parseFloat(node.att.scrollx); var scroll:Null<Float> = Std.parseFloat(node.att.scrollx);
if (scroll != null) spr.scrollFactor.x = scroll; if (scroll != null) spr.scrollFactor.x = scroll;
} }
if (node.has.scrolly) { if (node.has.scrolly) {
var scroll:Null<Float> = Std.parseFloat(node.att.scrolly); var scroll:Null<Float> = Std.parseFloat(node.att.scrolly);
if (scroll != null) spr.scrollFactor.y = scroll; if (scroll != null) spr.scrollFactor.y = scroll;
} }
} }
if (node.has.antialiasing) spr.antialiasing = node.att.antialiasing == "true"; if (node.has.antialiasing) spr.antialiasing = node.att.antialiasing == "true";
if (node.has.scale) { if (node.has.scale) {
@@ -83,7 +83,7 @@ class XMLUtil {
if (node.has.updateHitbox && node.att.updateHitbox == "true") spr.updateHitbox(); if (node.has.updateHitbox && node.att.updateHitbox == "true") spr.updateHitbox();
spr.zoomFactor = Std.parseFloat(node.getAtt("zoomfactor")).getDefault(spr.zoomFactor); spr.zoomFactor = Std.parseFloat(node.getAtt("zoomfactor")).getDefault(spr.zoomFactor);
for(anim in node.nodes.anim) for(anim in node.nodes.anim)
addXMLAnimation(spr, anim); addXMLAnimation(spr, anim);
@@ -116,7 +116,7 @@ class XMLUtil {
if (i != null) if (i != null)
animData.indices.push(i); animData.indices.push(i);
} }
} }
return animData; return animData;
} }
@@ -164,9 +164,9 @@ class XMLUtil {
// nothing // nothing
} }
} }
return OK; return OK;
} }
return MISSING_PROPERTY; return MISSING_PROPERTY;
} }
public static inline function fixXMLText(text:String) { public static inline function fixXMLText(text:String) {
source/funkin/utils/ZipUtil.hx
+191 -191
View File
@@ -24,81 +24,81 @@ using StringTools;
// import ZipUtils; var e = ZipUtils.createZipFile("gjnsdghs.ycemod"); ZipUtils.writeFolderToZip(e, "./mods/Friday Night Funkin'/", "Friday Night Funkin'/"); e.flush(); e.close(); // import ZipUtils; var e = ZipUtils.createZipFile("gjnsdghs.ycemod"); ZipUtils.writeFolderToZip(e, "./mods/Friday Night Funkin'/", "Friday Night Funkin'/"); e.flush(); e.close();
class ZipUtil { class ZipUtil {
public static var bannedNames:Array<String> = [".git", ".gitignore", ".github", ".vscode", ".gitattributes", "readme.txt"]; public static var bannedNames:Array<String> = [".git", ".gitignore", ".github", ".vscode", ".gitattributes", "readme.txt"];
/** /**
* [Description] Uncompresses `zip` into the `destFolder` folder * [Description] Uncompresses `zip` into the `destFolder` folder
* @param zip * @param zip
* @param destFolder * @param destFolder
*/ */
public static function uncompressZip(zip:Reader, destFolder:String, ?prefix:String, ?prog:ZipProgress):ZipProgress { public static function uncompressZip(zip:Reader, destFolder:String, ?prefix:String, ?prog:ZipProgress):ZipProgress {
// we never know // we never know
FileSystem.createDirectory(destFolder); FileSystem.createDirectory(destFolder);
var fields = zip.read(); var fields = zip.read();
try { try {
if (prefix != null) { if (prefix != null) {
var f = fields; var f = fields;
fields = new List<Entry>(); fields = new List<Entry>();
for(field in f) { for(field in f) {
if (field.fileName.startsWith(prefix)) { if (field.fileName.startsWith(prefix)) {
fields.push(field); fields.push(field);
} }
} }
} }
if (prog == null) if (prog == null)
prog = new ZipProgress(); prog = new ZipProgress();
prog.fileCount = fields.length; prog.fileCount = fields.length;
for(k=>field in fields) { for(k=>field in fields) {
prog.curFile = k; prog.curFile = k;
var isFolder = field.fileName.endsWith("/") && field.fileSize == 0; var isFolder = field.fileName.endsWith("/") && field.fileSize == 0;
if (isFolder) { if (isFolder) {
FileSystem.createDirectory('${destFolder}/${field.fileName}'); FileSystem.createDirectory('${destFolder}/${field.fileName}');
} else { } else {
var split = [for(e in field.fileName.split("/")) e.trim()]; var split = [for(e in field.fileName.split("/")) e.trim()];
split.pop(); split.pop();
FileSystem.createDirectory('${destFolder}/${split.join("/")}'); FileSystem.createDirectory('${destFolder}/${split.join("/")}');
var data = unzip(field); var data = unzip(field);
File.saveBytes('${destFolder}/${field.fileName}', data); File.saveBytes('${destFolder}/${field.fileName}', data);
} }
} }
prog.curFile = fields.length; prog.curFile = fields.length;
prog.done = true; prog.done = true;
} catch(e) { } catch(e) {
prog.done = true; prog.done = true;
prog.error = e; prog.error = e;
} }
return prog; return prog;
} }
#if (!macro && sys) #if (!macro && sys)
public static function uncompressZipAsync(zip:Reader, destFolder:String, ?prog:ZipProgress, ?prefix:String):ZipProgress { public static function uncompressZipAsync(zip:Reader, destFolder:String, ?prog:ZipProgress, ?prefix:String):ZipProgress {
if (prog == null) if (prog == null)
prog = new ZipProgress(); prog = new ZipProgress();
Thread.create(function() { Thread.create(function() {
uncompressZip(zip, destFolder, prefix, prog); uncompressZip(zip, destFolder, prefix, prog);
}); });
return prog; return prog;
} }
#end #end
/** /**
* [Description] Returns a `zip.Reader` instance from path. * [Description] Returns a `zip.Reader` instance from path.
* @param zipPath * @param zipPath
* @return Reader * @return Reader
*/ */
public static function openZip(zipPath:String):Reader { public static function openZip(zipPath:String):Reader {
return new ZipReader(File.read(zipPath)); return new ZipReader(File.read(zipPath));
} }
/** /**
* [Description] Copy of haxe's Zip unzip function cause lime replaced it. * [Description] Copy of haxe's Zip unzip function cause lime replaced it.
* @param f Zip entry * @param f Zip entry
*/ */
public static function unzip(f:Entry) { public static function unzip(f:Entry) {
if (!f.compressed) if (!f.compressed)
return f.data; return f.data;
var c = new haxe.zip.Uncompress(-15); var c = new haxe.zip.Uncompress(-15);
@@ -113,156 +113,156 @@ class ZipUtil {
return f.data; return f.data;
} }
/** /**
* [Description] Creates a ZIP file at the specified location and returns the Writer. * [Description] Creates a ZIP file at the specified location and returns the Writer.
* @param path * @param path
* @return Writer * @return Writer
*/ */
public static function createZipFile(path:String):ZipWriter { public static function createZipFile(path:String):ZipWriter {
var output = File.write(path); var output = File.write(path);
return new ZipWriter(output); return new ZipWriter(output);
} }
/** /**
[Description] Writes the entirety of a folder to a zip file. [Description] Writes the entirety of a folder to a zip file.
@param zip ZIP file to write to @param zip ZIP file to write to
@param path Folder path @param path Folder path
@param prefix (Additional) allows you to set a prefix in the zip itself. @param prefix (Additional) allows you to set a prefix in the zip itself.
**/ **/
public static function writeFolderToZip(zip:ZipWriter, path:String, ?prefix:String, ?prog:ZipProgress, ?whitelist:Array<String>):ZipProgress { public static function writeFolderToZip(zip:ZipWriter, path:String, ?prefix:String, ?prog:ZipProgress, ?whitelist:Array<String>):ZipProgress {
if (prefix == null) prefix = ""; if (prefix == null) prefix = "";
if (whitelist == null) whitelist = []; if (whitelist == null) whitelist = [];
if (prog == null) prog = new ZipProgress(); if (prog == null) prog = new ZipProgress();
try { try {
var curPath:Array<String> = ['$path']; var curPath:Array<String> = ['$path'];
var destPath:Array<String> = []; var destPath:Array<String> = [];
if (prefix != "") { if (prefix != "") {
prefix = prefix.replace("\\", "/"); prefix = prefix.replace("\\", "/");
while(prefix.charAt(0) == "/") prefix = prefix.substr(1); while(prefix.charAt(0) == "/") prefix = prefix.substr(1);
while(prefix.charAt(prefix.length-1) == "/") prefix = prefix.substr(0, prefix.length-1); while(prefix.charAt(prefix.length-1) == "/") prefix = prefix.substr(0, prefix.length-1);
destPath.push(prefix); destPath.push(prefix);
} }
var files:Array<StrNameLabel> = [];
var doFolder:Void->Void = null;
(doFolder = function() {
var path = curPath.join("/");
var zipPath = destPath.join("/");
for(e in FileSystem.readDirectory(path)) {
if (bannedNames.contains(e.toLowerCase()) && !whitelist.contains(e.toLowerCase())) continue;
if (FileSystem.isDirectory('$path/$e')) {
// is directory, so loop into that function again
for(p in [curPath, destPath]) p.push(e);
doFolder();
for(p in [curPath, destPath]) p.pop();
} else {
// is file, put it in the list
var zipPath = '$zipPath/$e';
while(zipPath.charAt(0) == "/") zipPath = zipPath.substr(1);
files.push(new StrNameLabel('$path/$e', zipPath));
}
}
})();
prog.fileCount = files.length;
for(k=>file in files) {
prog.curFile = k;
var fileContent = File.getBytes(file.name);
var fileInfo = FileSystem.stat(file.name);
var entry:Entry = {
fileName: file.label,
fileSize: fileInfo.size,
fileTime: Date.now(),
dataSize: 0,
data: fileContent,
crc32: Crc32.make(fileContent),
compressed: false
};
Tools.compress(entry, 1);
zip.writeFile(entry);
}
zip.writeCDR();
} catch(e) {
prog.error = e;
}
prog.done = true;
return prog;
}
public static function writeFolderToZipAsync(zip:ZipWriter, path:String, ?prefix:String):ZipProgress { var files:Array<StrNameLabel> = [];
var zipProg = new ZipProgress();
Thread.create(function() {
writeFolderToZip(zip, path, prefix, zipProg);
});
return zipProg;
}
/** var doFolder:Void->Void = null;
* [Description] Converts an `Array<Entry>` to a `List<Entry>`. (doFolder = function() {
* @param array var path = curPath.join("/");
* @return List<Entry> var zipPath = destPath.join("/");
*/ for(e in FileSystem.readDirectory(path)) {
public static function arrayToList(array:Array<Entry>):List<Entry> { if (bannedNames.contains(e.toLowerCase()) && !whitelist.contains(e.toLowerCase())) continue;
var list = new List<Entry>(); if (FileSystem.isDirectory('$path/$e')) {
for(e in array) list.push(e); // is directory, so loop into that function again
return list; for(p in [curPath, destPath]) p.push(e);
} doFolder();
for(p in [curPath, destPath]) p.pop();
} else {
// is file, put it in the list
var zipPath = '$zipPath/$e';
while(zipPath.charAt(0) == "/") zipPath = zipPath.substr(1);
files.push(new StrNameLabel('$path/$e', zipPath));
}
}
})();
prog.fileCount = files.length;
for(k=>file in files) {
prog.curFile = k;
var fileContent = File.getBytes(file.name);
var fileInfo = FileSystem.stat(file.name);
var entry:Entry = {
fileName: file.label,
fileSize: fileInfo.size,
fileTime: Date.now(),
dataSize: 0,
data: fileContent,
crc32: Crc32.make(fileContent),
compressed: false
};
Tools.compress(entry, 1);
zip.writeFile(entry);
}
zip.writeCDR();
} catch(e) {
prog.error = e;
}
prog.done = true;
return prog;
}
public static function writeFolderToZipAsync(zip:ZipWriter, path:String, ?prefix:String):ZipProgress {
var zipProg = new ZipProgress();
Thread.create(function() {
writeFolderToZip(zip, path, prefix, zipProg);
});
return zipProg;
}
/**
* [Description] Converts an `Array<Entry>` to a `List<Entry>`.
* @param array
* @return List<Entry>
*/
public static function arrayToList(array:Array<Entry>):List<Entry> {
var list = new List<Entry>();
for(e in array) list.push(e);
return list;
}
} }
class ZipProgress { class ZipProgress {
public var error:Exception = null; public var error:Exception = null;
public var curFile:Int = 0;
public var fileCount:Int = 0;
public var done:Bool = false;
public var percentage(get, null):Float;
private function get_percentage() { public var curFile:Int = 0;
return fileCount <= 0 ? 0 : curFile / fileCount; public var fileCount:Int = 0;
} public var done:Bool = false;
public var percentage(get, null):Float;
public function new() {} private function get_percentage() {
return fileCount <= 0 ? 0 : curFile / fileCount;
}
public function new() {}
} }
class ZipReader extends Reader { class ZipReader extends Reader {
public var files:List<Entry>; public var files:List<Entry>;
public override function read() { public override function read() {
if (files != null) return files; if (files != null) return files;
try { try {
var files = super.read(); var files = super.read();
return this.files = files; return this.files = files;
} catch(e) { } catch(e) {
} }
return new List<Entry>(); return new List<Entry>();
} }
} }
class ZipWriter extends Writer { class ZipWriter extends Writer {
public function flush() { public function flush() {
o.flush(); o.flush();
} }
public function writeFile(entry:Entry) { public function writeFile(entry:Entry) {
writeEntryHeader(entry); writeEntryHeader(entry);
o.writeFullBytes(entry.data, 0, entry.data.length); o.writeFullBytes(entry.data, 0, entry.data.length);
} }
public function close() { public function close() {
o.close(); o.close();
} }
} }
class StrNameLabel { class StrNameLabel {
public var name:String; public var name:String;
public var label:String; public var label:String;
public function new(name:String, label:String) { public function new(name:String, label:String) {
this.name = name; this.name = name;
this.label = label; this.label = label;
} }
} }
#end #end
source/funkin/windows/WindowsAPI.hx
+88 -88
View File
@@ -7,103 +7,103 @@ package funkin.windows;
* Does not have any effect on other platforms. * Does not have any effect on other platforms.
*/ */
class WindowsAPI { class WindowsAPI {
@:dox(hide) public static function registerAudio() { @:dox(hide) public static function registerAudio() {
#if windows #if windows
native.WinAPI.registerAudio(); native.WinAPI.registerAudio();
#end #end
} }
@:dox(hide) public static function registerAsDPICompatible() { @:dox(hide) public static function registerAsDPICompatible() {
#if windows #if windows
native.WinAPI.registerAsDPICompatible(); native.WinAPI.registerAsDPICompatible();
#end #end
} }
/**
* Allocates a new console. The console will automatically be opened
*/
public static function allocConsole() {
#if windows
native.WinAPI.allocConsole();
native.WinAPI.clearScreen();
#end
}
/** /**
* Sets the window titlebar to dark mode (Windows 10 only) * Allocates a new console. The console will automatically be opened
*/ */
public static function setDarkMode(enable:Bool) { public static function allocConsole() {
#if windows #if windows
native.WinAPI.setDarkMode(enable); native.WinAPI.allocConsole();
#end native.WinAPI.clearScreen();
} #end
}
/** /**
* Shows a message box * Sets the window titlebar to dark mode (Windows 10 only)
*/ */
public static function showMessageBox(caption:String, message:String, icon:MessageBoxIcon = MSG_WARNING) { public static function setDarkMode(enable:Bool) {
#if windows #if windows
native.WinAPI.showMessageBox(caption, message, icon); native.WinAPI.setDarkMode(enable);
#else #end
lime.app.Application.current.window.alert(message, caption); }
#end
}
/** /**
* Sets the console colors * Shows a message box
*/ */
public static function setConsoleColors(foregroundColor:ConsoleColor = LIGHTGRAY, ?backgroundColor:ConsoleColor = BLACK) { public static function showMessageBox(caption:String, message:String, icon:MessageBoxIcon = MSG_WARNING) {
#if windows #if windows
var fg = cast(foregroundColor, Int); native.WinAPI.showMessageBox(caption, message, icon);
var bg = cast(backgroundColor, Int); #else
native.WinAPI.setConsoleColors((bg * 16) + fg); lime.app.Application.current.window.alert(message, caption);
#end #end
} }
public static function consoleColorToOpenFL(color:ConsoleColor) { /**
return switch(color) { * Sets the console colors
case BLACK: 0xFF000000; */
case DARKBLUE: 0xFF000088; public static function setConsoleColors(foregroundColor:ConsoleColor = LIGHTGRAY, ?backgroundColor:ConsoleColor = BLACK) {
case DARKGREEN: 0xFF008800; #if windows
case DARKCYAN: 0xFF008888; var fg = cast(foregroundColor, Int);
case DARKRED: 0xFF880000; var bg = cast(backgroundColor, Int);
case DARKMAGENTA: 0xFF880000; native.WinAPI.setConsoleColors((bg * 16) + fg);
case DARKYELLOW: 0xFF888800; #end
case LIGHTGRAY: 0xFFBBBBBB; }
case GRAY: 0xFF888888;
case BLUE: 0xFF0000FF; public static function consoleColorToOpenFL(color:ConsoleColor) {
case GREEN: 0xFF00FF00; return switch(color) {
case CYAN: 0xFF00FFFF; case BLACK: 0xFF000000;
case RED: 0xFFFF0000; case DARKBLUE: 0xFF000088;
case MAGENTA: 0xFFFF00FF; case DARKGREEN: 0xFF008800;
case YELLOW: 0xFFFFFF00; case DARKCYAN: 0xFF008888;
case WHITE | _: 0xFFFFFFFF; case DARKRED: 0xFF880000;
} case DARKMAGENTA: 0xFF880000;
} case DARKYELLOW: 0xFF888800;
case LIGHTGRAY: 0xFFBBBBBB;
case GRAY: 0xFF888888;
case BLUE: 0xFF0000FF;
case GREEN: 0xFF00FF00;
case CYAN: 0xFF00FFFF;
case RED: 0xFFFF0000;
case MAGENTA: 0xFFFF00FF;
case YELLOW: 0xFFFFFF00;
case WHITE | _: 0xFFFFFFFF;
}
}
} }
@:enum abstract ConsoleColor(Int) { @:enum abstract ConsoleColor(Int) {
var BLACK:ConsoleColor = 0; var BLACK:ConsoleColor = 0;
var DARKBLUE:ConsoleColor = 1; var DARKBLUE:ConsoleColor = 1;
var DARKGREEN:ConsoleColor = 2; var DARKGREEN:ConsoleColor = 2;
var DARKCYAN:ConsoleColor = 3; var DARKCYAN:ConsoleColor = 3;
var DARKRED:ConsoleColor = 4; var DARKRED:ConsoleColor = 4;
var DARKMAGENTA:ConsoleColor = 5; var DARKMAGENTA:ConsoleColor = 5;
var DARKYELLOW:ConsoleColor = 6; var DARKYELLOW:ConsoleColor = 6;
var LIGHTGRAY:ConsoleColor = 7; var LIGHTGRAY:ConsoleColor = 7;
var GRAY:ConsoleColor = 8; var GRAY:ConsoleColor = 8;
var BLUE:ConsoleColor = 9; var BLUE:ConsoleColor = 9;
var GREEN:ConsoleColor = 10; var GREEN:ConsoleColor = 10;
var CYAN:ConsoleColor = 11; var CYAN:ConsoleColor = 11;
var RED:ConsoleColor = 12; var RED:ConsoleColor = 12;
var MAGENTA:ConsoleColor = 13; var MAGENTA:ConsoleColor = 13;
var YELLOW:ConsoleColor = 14; var YELLOW:ConsoleColor = 14;
var WHITE:ConsoleColor = 15; var WHITE:ConsoleColor = 15;
} }
@:enum abstract MessageBoxIcon(Int) { @:enum abstract MessageBoxIcon(Int) {
var MSG_ERROR:MessageBoxIcon = 0x00000010; var MSG_ERROR:MessageBoxIcon = 0x00000010;
var MSG_QUESTION:MessageBoxIcon = 0x00000020; var MSG_QUESTION:MessageBoxIcon = 0x00000020;
var MSG_WARNING:MessageBoxIcon = 0x00000030; var MSG_WARNING:MessageBoxIcon = 0x00000030;
var MSG_INFORMATION:MessageBoxIcon = 0x00000040; var MSG_INFORMATION:MessageBoxIcon = 0x00000040;
} }