From 5964d3477b17f34523d3d7f7eaaf284b463208d7 Mon Sep 17 00:00:00 2001 From: shmyga Date: Thu, 8 Oct 2026 23:31:16 +0300 Subject: [PATCH] style: format haxe sources --- src/app/haxe/ru/m/Device.hx | 6 ++++-- src/app/haxe/ru/m/ModernFileReference.hx | 3 ++- src/app/haxe/ru/m/api/PixabayApi.hx | 6 ++++-- src/app/haxe/ru/m/puzzlez/render/Render.hx | 10 ++++++++-- .../puzzlez/render/part/ClassicPartBuilder.hx | 9 ++++++--- .../puzzlez/render/part/SquarePartBuilder.hx | 9 ++++++--- .../m/puzzlez/view/popup/BackgroundPopup.hx | 19 +++++++++++++++++-- src/app/haxe/ru/m/update/Version.hx | 3 ++- .../haxe/ru/m/puzzlez/game/EventUtil.hx | 5 ++++- src/common/haxe/ru/m/puzzlez/game/Game.hx | 3 ++- .../haxe/ru/m/puzzlez/wrap/RectangleExt.hx | 3 ++- 11 files changed, 57 insertions(+), 19 deletions(-) diff --git a/src/app/haxe/ru/m/Device.hx b/src/app/haxe/ru/m/Device.hx index 5e927e4..e2ee68c 100644 --- a/src/app/haxe/ru/m/Device.hx +++ b/src/app/haxe/ru/m/Device.hx @@ -33,7 +33,8 @@ class Device { #end } - private static var MOBILES(default, never):Array = ["Android", "webOS", "iPhone", "iPad", "iPod", "BlackBerry", "Windows Phone",]; + private static var MOBILES(default, + never):Array = ["Android", "webOS", "iPhone", "iPad", "iPod", "BlackBerry", "Windows Phone",]; public static function isMobile():Bool { #if android @@ -56,7 +57,8 @@ class Device { private static function get_fullScreenSignal():Signal { if (fullScreenSignal == null) { fullScreenSignal = new Signal(); - Lib.current.stage.addEventListener(FullScreenEvent.FULL_SCREEN, (event:FullScreenEvent) -> fullScreenSignal.emit(event.fullScreen)); + Lib.current.stage.addEventListener(FullScreenEvent.FULL_SCREEN, + (event:FullScreenEvent) -> fullScreenSignal.emit(event.fullScreen)); } return fullScreenSignal; } diff --git a/src/app/haxe/ru/m/ModernFileReference.hx b/src/app/haxe/ru/m/ModernFileReference.hx index 1a44146..10ae971 100644 --- a/src/app/haxe/ru/m/ModernFileReference.hx +++ b/src/app/haxe/ru/m/ModernFileReference.hx @@ -24,7 +24,8 @@ class Callback { class ModernFileReference extends FileReference { #if android - private static var fileUtilBrowse = lime.system.JNI.createStaticMethod("ru.m.android.FileUtil", "browse", "(Lorg/haxe/lime/HaxeObject;)V"); + private static var fileUtilBrowse = lime.system.JNI.createStaticMethod("ru.m.android.FileUtil", "browse", + "(Lorg/haxe/lime/HaxeObject;)V"); #end override public function browse(?typeFilter:Array):Bool { diff --git a/src/app/haxe/ru/m/api/PixabayApi.hx b/src/app/haxe/ru/m/api/PixabayApi.hx index ccefbd7..57bdc34 100644 --- a/src/app/haxe/ru/m/api/PixabayApi.hx +++ b/src/app/haxe/ru/m/api/PixabayApi.hx @@ -60,7 +60,8 @@ class PixabayApi { return '${baseUrl}?${query}'; } - public function getPage(page:Int, perPage:Int, category:PixabayCategory = PixabayCategory.NATURE):Promise { + public function getPage(page:Int, perPage:Int, + category:PixabayCategory = PixabayCategory.NATURE):Promise { return new JsonLoader().GET(buildRequest([ "category" => category, "image_type" => PixabayImageType.PHOTO, @@ -71,6 +72,7 @@ class PixabayApi { } public function get(id:Int):Promise { - return new JsonLoader().GET(buildRequest(["id" => id])).then((response:PixabayResponse) -> response.hits[0]); + return new JsonLoader().GET(buildRequest(["id" => id])) + .then((response:PixabayResponse) -> response.hits[0]); } } diff --git a/src/app/haxe/ru/m/puzzlez/render/Render.hx b/src/app/haxe/ru/m/puzzlez/render/Render.hx index 54e9ca2..06ed1d5 100644 --- a/src/app/haxe/ru/m/puzzlez/render/Render.hx +++ b/src/app/haxe/ru/m/puzzlez/render/Render.hx @@ -208,14 +208,20 @@ class Render extends SpriteView implements IRender { private function onMouseMove(event:MouseEvent):Void { var newPoint:PointExt = tableView.globalToLocal(new FlashPoint(event.stageX, event.stageY)); var partPosition = cast(activePart.position, PointExt).add(newPoint).subtract(activePoint); - actions.emit(new GameAction().setAction(Action.MOVE).setPlayerId(playerId).setPartId(activePart.id).setPosition(partPosition)); + actions.emit(new GameAction().setAction(Action.MOVE) + .setPlayerId(playerId) + .setPartId(activePart.id) + .setPosition(partPosition)); activePoint = newPoint; } private function onMouseUp(event:MouseEvent):Void { var newPoint:PointExt = tableView.globalToLocal(new FlashPoint(event.stageX, event.stageY)); var partPosition = cast(activePart.position, PointExt).add(newPoint).subtract(activePoint); - actions.emit(new GameAction().setAction(Action.PUT).setPlayerId(playerId).setPartId(activePart.id).setPosition(partPosition)); + actions.emit(new GameAction().setAction(Action.PUT) + .setPlayerId(playerId) + .setPartId(activePart.id) + .setPosition(partPosition)); tableView.stage.removeEventListener(MouseEvent.MOUSE_MOVE, onMouseMove); tableView.stage.removeEventListener(MouseEvent.MOUSE_UP, onMouseUp); activePart = null; diff --git a/src/app/haxe/ru/m/puzzlez/render/part/ClassicPartBuilder.hx b/src/app/haxe/ru/m/puzzlez/render/part/ClassicPartBuilder.hx index 7da45d4..d650140 100644 --- a/src/app/haxe/ru/m/puzzlez/render/part/ClassicPartBuilder.hx +++ b/src/app/haxe/ru/m/puzzlez/render/part/ClassicPartBuilder.hx @@ -5,7 +5,8 @@ import ru.m.puzzlez.proto.game.BoundType; import ru.m.puzzlez.proto.game.PartBound; class ClassicPartBuilder extends BasePartBuilder { - override private function createBound(path:DrawPath, fromX:Float, fromY:Float, toX:Float, toY:Float, bound:PartBound):Void { + override private function createBound(path:DrawPath, fromX:Float, fromY:Float, toX:Float, toY:Float, + bound:PartBound):Void { var dx = toX == fromX ? 0 : (toX - fromX) / Math.abs(toX - fromX); var dy = toY == fromY ? 0 : (toY - fromY) / Math.abs(toY - fromY); var boundLength = Math.max(Math.abs(toX - fromX), Math.abs(toY - fromY)); @@ -23,7 +24,8 @@ class ClassicPartBuilder extends BasePartBuilder { } switch bound.spike { case BoundType.IN | BoundType.OUT: - path.commands.push(LINE_TO(fromX + spikeOffset * dx + spikeSideOffset * dy, fromY + spikeOffset * dy + spikeSideOffset * dx)); + path.commands.push(LINE_TO(fromX + spikeOffset * dx + spikeSideOffset * dy, + fromY + spikeOffset * dy + spikeSideOffset * dx)); path.commands.push(CURVE_TO(fromX + (spikeOffset * 0.7) * dx - spikeDepth * dy @@ -50,7 +52,8 @@ class ClassicPartBuilder extends BasePartBuilder { + spikeSideOffset * dx, fromX + (spikeOffset + spikeWidth) * dx - + spikeSideOffset * dy, fromY + + spikeSideOffset * dy, + fromY + (spikeOffset + spikeWidth) * dy + spikeSideOffset * dx)); case _: diff --git a/src/app/haxe/ru/m/puzzlez/render/part/SquarePartBuilder.hx b/src/app/haxe/ru/m/puzzlez/render/part/SquarePartBuilder.hx index 2426b75..c5c80fc 100644 --- a/src/app/haxe/ru/m/puzzlez/render/part/SquarePartBuilder.hx +++ b/src/app/haxe/ru/m/puzzlez/render/part/SquarePartBuilder.hx @@ -5,7 +5,8 @@ import ru.m.puzzlez.proto.game.BoundType; import ru.m.puzzlez.proto.game.PartBound; class SquarePartBuilder extends BasePartBuilder { - override private function createBound(path:DrawPath, fromX:Float, fromY:Float, toX:Float, toY:Float, bound:PartBound):Void { + override private function createBound(path:DrawPath, fromX:Float, fromY:Float, toX:Float, toY:Float, + bound:PartBound):Void { var dx = toX == fromX ? 0 : (toX - fromX) / Math.abs(toX - fromX); var dy = toY == fromY ? 0 : (toY - fromY) / Math.abs(toY - fromY); var boundLength = Math.max(Math.abs(toX - fromX), Math.abs(toY - fromY)); @@ -20,8 +21,10 @@ class SquarePartBuilder extends BasePartBuilder { case BoundType.NONE: case BoundType.IN | BoundType.OUT: path.commands.push(LINE_TO(fromX + spikeOffset * dx, - fromY + spikeOffset * dy)) path.commands.push(LINE_TO(fromX + spikeOffset * dx - spikeDepth * dy, fromY + spikeDepth * dx + spikeOffset * dy)); - path.commands.push(LINE_TO(fromX + (spikeOffset + spikeWidth) * dx - spikeDepth * dy, fromY + spikeDepth * dx + (spikeOffset + spikeWidth) * dy)); + fromY + spikeOffset * dy)) path.commands.push(LINE_TO(fromX + spikeOffset * dx - spikeDepth * dy, + fromY + spikeDepth * dx + spikeOffset * dy)); + path.commands.push(LINE_TO(fromX + (spikeOffset + spikeWidth) * dx - spikeDepth * dy, + fromY + spikeDepth * dx + (spikeOffset + spikeWidth) * dy)); path.commands.push(LINE_TO(fromX + (spikeOffset + spikeWidth) * dx, fromY + (spikeOffset + spikeWidth) * dy)); } } diff --git a/src/app/haxe/ru/m/puzzlez/view/popup/BackgroundPopup.hx b/src/app/haxe/ru/m/puzzlez/view/popup/BackgroundPopup.hx index 48d5b1c..24cff5f 100644 --- a/src/app/haxe/ru/m/puzzlez/view/popup/BackgroundPopup.hx +++ b/src/app/haxe/ru/m/puzzlez/view/popup/BackgroundPopup.hx @@ -16,8 +16,23 @@ import ru.m.puzzlez.render.Background; @:singleton @:template class BackgroundPopup extends PopupView { private static var colorsList:Array = [ - '#FFFFFF', '#001f3f', '#0074D9', '#7FDBFF', '#39CCCC', '#3D9970', '#2ECC40', '#01FF70', '#FFDC00', '#FF851B', '#FF4136', '#85144b', '#F012BE', '#B10DC9', - '#111111', '#AAAAAA', '#DDDDDD', + '#FFFFFF', + '#001f3f', + '#0074D9', + '#7FDBFF', + '#39CCCC', + '#3D9970', + '#2ECC40', + '#01FF70', + '#FFDC00', + '#FF851B', + '#FF4136', + '#85144b', + '#F012BE', + '#B10DC9', + '#111111', + '#AAAAAA', + '#DDDDDD', ]; @:view("selected") var selectedView:SpriteView; diff --git a/src/app/haxe/ru/m/update/Version.hx b/src/app/haxe/ru/m/update/Version.hx index 6ca4fc9..3e9428e 100644 --- a/src/app/haxe/ru/m/update/Version.hx +++ b/src/app/haxe/ru/m/update/Version.hx @@ -33,7 +33,8 @@ abstract Version(Array) { @:from public static function fromString(value:String):Version { var r = ~/(\d+)\.(\d+)\.(\d+)(-SNAPSHOT)?/; return if (r.match(value)) { - new Version(Std.parseInt(r.matched(1)), Std.parseInt(r.matched(2)), Std.parseInt(r.matched(3)), r.matched(4) != null); + new Version(Std.parseInt(r.matched(1)), Std.parseInt(r.matched(2)), Std.parseInt(r.matched(3)), + r.matched(4) != null); } else { new Version(0, 0, 0); } diff --git a/src/common/haxe/ru/m/puzzlez/game/EventUtil.hx b/src/common/haxe/ru/m/puzzlez/game/EventUtil.hx index 869053e..8634201 100644 --- a/src/common/haxe/ru/m/puzzlez/game/EventUtil.hx +++ b/src/common/haxe/ru/m/puzzlez/game/EventUtil.hx @@ -22,6 +22,9 @@ class EventUtil { } public static function change(part:Part):GameEvent { - return new GameEvent().setChange(new GameChange().setPartId(part.id).setLocation(part.location).setPosition(part.position).setPlayerId(part.playerId)); + return new GameEvent().setChange(new GameChange().setPartId(part.id) + .setLocation(part.location) + .setPosition(part.position) + .setPlayerId(part.playerId)); } } diff --git a/src/common/haxe/ru/m/puzzlez/game/Game.hx b/src/common/haxe/ru/m/puzzlez/game/Game.hx index a0e143e..d508845 100644 --- a/src/common/haxe/ru/m/puzzlez/game/Game.hx +++ b/src/common/haxe/ru/m/puzzlez/game/Game.hx @@ -94,7 +94,8 @@ class Game implements IGame { case Action.PUT: part.playerId = null; var target = new PointExt(state.preset.imageRect.x, - state.preset.imageRect.y).add(new PointExt(part.point.x * part.rect.width, part.point.y * part.rect.height)); + state.preset.imageRect.y).add(new PointExt(part.point.x * part.rect.width, + part.point.y * part.rect.height)); var d = distance(target, event.action.position); if (d < 70) { part.location = PartLocation.IMAGE; diff --git a/src/common/haxe/ru/m/puzzlez/wrap/RectangleExt.hx b/src/common/haxe/ru/m/puzzlez/wrap/RectangleExt.hx index 30b7b68..589bde0 100644 --- a/src/common/haxe/ru/m/puzzlez/wrap/RectangleExt.hx +++ b/src/common/haxe/ru/m/puzzlez/wrap/RectangleExt.hx @@ -41,7 +41,8 @@ abstract RectangleExt(Rectangle) from Rectangle to Rectangle { public function intersect(rect:Rectangle):Bool { var thisRect:RectangleExt = this; var otherRect:RectangleExt = rect; - return !(thisRect.left > otherRect.right || otherRect.left > thisRect.right || thisRect.top > otherRect.bottom || otherRect.top > thisRect.bottom); + return !(thisRect.left > otherRect.right || otherRect.left > thisRect.right || thisRect.top > otherRect.bottom + || otherRect.top > thisRect.bottom); } public function clone():Rectangle {