From 1c92c707ccd3d40fa4b9d3ac95e6f4d1549e6eaf Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Wed, 23 Mar 2022 14:02:39 -0700 Subject: [PATCH] Run Haxe formatter --- docs/build.hx | 27 +++- .../backend/native/NativeApplication.hx | 2 +- .../backend/native/NativeAudioSource.hx | 5 +- .../backend/native/NativeHTTPRequest.hx | 6 +- src/lime/_internal/graphics/ImageDataUtil.hx | 6 +- src/lime/graphics/opengl/GLShader.hx | 11 +- src/lime/net/URIParser.hx | 3 +- src/lime/tools/ApplicationData.hx | 21 ++-- src/lime/tools/AssetHelper.hx | 4 +- src/lime/tools/CSHelper.hx | 11 +- src/lime/tools/HXProject.hx | 15 ++- src/lime/tools/Library.hx | 4 +- src/lime/tools/MetaData.hx | 23 ++-- src/lime/tools/WindowData.hx | 65 +++++----- src/lime/ui/FileDialog.hx | 3 - src/lime/utils/Float32Array.hx | 4 +- src/lime/utils/Float64Array.hx | 4 +- src/lime/utils/Int16Array.hx | 4 +- src/lime/utils/Int32Array.hx | 5 +- src/lime/utils/Int8Array.hx | 4 +- src/lime/utils/Preloader.hx | 4 +- src/lime/utils/UInt16Array.hx | 5 +- src/lime/utils/UInt32Array.hx | 5 +- src/lime/utils/UInt8Array.hx | 5 +- src/lime/utils/UInt8ClampedArray.hx | 5 +- tools/CommandLineTools.hx | 4 +- tools/platforms/AIRPlatform.hx | 91 +++++++------- tools/platforms/AndroidPlatform.hx | 91 +++++++------- tools/platforms/EmscriptenPlatform.hx | 91 +++++++------- tools/platforms/FlashPlatform.hx | 91 +++++++------- tools/platforms/HTML5Platform.hx | 91 +++++++------- tools/platforms/IOSPlatform.hx | 118 ++++++++++-------- tools/platforms/LinuxPlatform.hx | 106 ++++++++-------- tools/platforms/MacPlatform.hx | 106 ++++++++-------- tools/platforms/TVOSPlatform.hx | 109 ++++++++-------- tools/platforms/TizenPlatform.hx | 95 +++++++------- tools/platforms/WindowsPlatform.hx | 106 ++++++++-------- 37 files changed, 733 insertions(+), 617 deletions(-) diff --git a/docs/build.hx b/docs/build.hx index 92e558a81..ddfd6829f 100644 --- a/docs/build.hx +++ b/docs/build.hx @@ -57,9 +57,30 @@ class Build extends Script html5.build(); System.runCommand("", "haxelib", [ - "run", "dox", "-i", "xml", "-in", "lime", "--title", "Lime API Reference", "-D", "source-path", - "https://github.com/haxelime/lime/tree/develop/src/", "-D", "website", "http://lime.software", "-D", "logo", "/images/logo.png", "-D", "textColor", - "0x777777", "-theme", "../assets/docs-theme", "--toplevel-package", "lime" + "run", + "dox", + "-i", + "xml", + "-in", + "lime", + "--title", + "Lime API Reference", + "-D", + "source-path", + "https://github.com/haxelime/lime/tree/develop/src/", + "-D", + "website", + "http://lime.software", + "-D", + "logo", + "/images/logo.png", + "-D", + "textColor", + "0x777777", + "-theme", + "../assets/docs-theme", + "--toplevel-package", + "lime" ]); } } diff --git a/src/lime/_internal/backend/native/NativeApplication.hx b/src/lime/_internal/backend/native/NativeApplication.hx index f8e506e99..c909e1f63 100644 --- a/src/lime/_internal/backend/native/NativeApplication.hx +++ b/src/lime/_internal/backend/native/NativeApplication.hx @@ -739,7 +739,7 @@ class NativeApplication @:keep /*private*/ class KeyEventInfo { - public var keyCode: #if neko Float #else Int #end; + public var keyCode:#if neko Float #else Int #end; public var modifier:Int; public var type:KeyEventType; public var windowID:Int; diff --git a/src/lime/_internal/backend/native/NativeAudioSource.hx b/src/lime/_internal/backend/native/NativeAudioSource.hx index 693625cab..e8d6234db 100644 --- a/src/lime/_internal/backend/native/NativeAudioSource.hx +++ b/src/lime/_internal/backend/native/NativeAudioSource.hx @@ -298,7 +298,8 @@ class NativeAudioSource // of data, which typically happens if an operation (such as // resizing a window) freezes the main thread. // If AL is supposed to be playing but isn't, restart it here. - if (playing && handle != null && AL.getSourcei(handle, AL.SOURCE_STATE) == AL.STOPPED){ + if (playing && handle != null && AL.getSourcei(handle, AL.SOURCE_STATE) == AL.STOPPED) + { AL.sourcePlay(handle); } } @@ -323,7 +324,7 @@ class NativeAudioSource { timer.stop(); } - + setCurrentTime(0); } diff --git a/src/lime/_internal/backend/native/NativeHTTPRequest.hx b/src/lime/_internal/backend/native/NativeHTTPRequest.hx index 962272802..8ea631f5e 100644 --- a/src/lime/_internal/backend/native/NativeHTTPRequest.hx +++ b/src/lime/_internal/backend/native/NativeHTTPRequest.hx @@ -241,8 +241,10 @@ class NativeHTTPRequest // an empty string means store cookies in memory // cookies are stored only for the current session curl.setOption(COOKIEFILE, ""); - if (cookieList != null) { - for(cookie in cookieList) { + if (cookieList != null) + { + for (cookie in cookieList) + { // pass in each stored cookie individually curl.setOption(COOKIELIST, cookie); } diff --git a/src/lime/_internal/graphics/ImageDataUtil.hx b/src/lime/_internal/graphics/ImageDataUtil.hx index 969dddcbd..c9885bec0 100644 --- a/src/lime/_internal/graphics/ImageDataUtil.hx +++ b/src/lime/_internal/graphics/ImageDataUtil.hx @@ -1347,8 +1347,8 @@ class ImageDataUtil var srcPosition, destPosition, - srcPixel:RGBA = 0, - destPixel:RGBA = 0, + srcPixel:RGBA = 0, + destPixel:RGBA = 0, pixelMask:UInt, test:Bool, value:Int; @@ -1414,7 +1414,7 @@ class ImageDataUtil { var format = image.buffer.format; var length = Std.int(data.length / 4); - var pixel:RGBA = 0; + var pixel:RGBA = 0; for (i in 0...length) { diff --git a/src/lime/graphics/opengl/GLShader.hx b/src/lime/graphics/opengl/GLShader.hx index 5488a9d1d..67cd0bb9d 100644 --- a/src/lime/graphics/opengl/GLShader.hx +++ b/src/lime/graphics/opengl/GLShader.hx @@ -33,8 +33,9 @@ public static function fromSource(gl:WebGLRenderContext, source:String, type:Int { var message; - if (compileStatus == 0) message = "Error "; - else message = "Info "; + if (compileStatus == 0) message = "Error "; + else + message = "Info "; if (type == gl.VERTEX_SHADER) message = "compiling vertex shader"; else if (type == gl.FRAGMENT_SHADER) message = "compiling fragment shader"; @@ -43,10 +44,8 @@ public static function fromSource(gl:WebGLRenderContext, source:String, type:Int message += "\n" + shaderInfoLog; - if(compileStatus == 0) - Log.error(message); - else if(shaderInfoLog != null) - Log.debug(message); + if (compileStatus == 0) Log.error(message); + else if (shaderInfoLog != null) Log.debug(message); } return shader; diff --git a/src/lime/net/URIParser.hx b/src/lime/net/URIParser.hx index e58ff9966..29a87ecce 100644 --- a/src/lime/net/URIParser.hx +++ b/src/lime/net/URIParser.hx @@ -1,6 +1,5 @@ package lime.net; - /** Class used for parsing URIs and URLs. Based on http://blog.stevenlevithan.com/archives/parseuri @@ -126,7 +125,7 @@ class URIParser var uri = new URIParser("https://example.com/index.php?action=upload&token=12345#header"); for( q in uri.queryArray ) trace( q.k + " = " + q.v); // action = upload - // token = 12345 + // token = 12345 ``` **/ public var queryArray:Array; diff --git a/src/lime/tools/ApplicationData.hx b/src/lime/tools/ApplicationData.hx index b5e43a674..27ebc759f 100644 --- a/src/lime/tools/ApplicationData.hx +++ b/src/lime/tools/ApplicationData.hx @@ -13,13 +13,14 @@ typedef ApplicationData = @:dox(hide) class _ApplicationDataType { - public static var fields:ApplicationData = { - file: "", - init: "", - main: "", - path: "", - preloader: "", - swfVersion: 0.0, - url: "" - } -} \ No newline at end of file + public static var fields:ApplicationData = + { + file: "", + init: "", + main: "", + path: "", + preloader: "", + swfVersion: 0.0, + url: "" + } +} diff --git a/src/lime/tools/AssetHelper.hx b/src/lime/tools/AssetHelper.hx index 20f9f4ae9..ec1d1ef31 100644 --- a/src/lime/tools/AssetHelper.hx +++ b/src/lime/tools/AssetHelper.hx @@ -297,8 +297,8 @@ class AssetHelper { if (output.tell() == 0) { - //write some dummy text at the start of the packed asset file just to prevent - //the file from beginning with a packed file header. + // write some dummy text at the start of the packed asset file just to prevent + // the file from beginning with a packed file header. output.writeString("lime-asset-pack"); } diff --git a/src/lime/tools/CSHelper.hx b/src/lime/tools/CSHelper.hx index bda86bfd1..4443a1f0d 100644 --- a/src/lime/tools/CSHelper.hx +++ b/src/lime/tools/CSHelper.hx @@ -221,7 +221,16 @@ class CSHelper noCompile:Bool = false) { var args = [ - "run", project.config.getString("cs.buildLibrary", "hxcs"), buildFile, "--arch", arch, "--platform", platform, "--out", outPath, "--unsafe" + "run", + project.config.getString("cs.buildLibrary", "hxcs"), + buildFile, + "--arch", + arch, + "--platform", + platform, + "--out", + outPath, + "--unsafe" ]; if (noCompile) args.push("--no-compile"); var code = Haxelib.runCommand(path, args); diff --git a/src/lime/tools/HXProject.hx b/src/lime/tools/HXProject.hx index 02d581e9a..78eab0213 100644 --- a/src/lime/tools/HXProject.hx +++ b/src/lime/tools/HXProject.hx @@ -382,8 +382,19 @@ class HXProject extends Script #if lime var args = [ - name, "-main", "lime.tools.HXProject", "-cp", tempDirectory, "-neko", nekoOutput, "-cp", Path.combine(Haxelib.getPath(new Haxelib("hxp")), "src"), - "-lib", "lime", "-lib", "hxp" + name, + "-main", + "lime.tools.HXProject", + "-cp", + tempDirectory, + "-neko", + nekoOutput, + "-cp", + Path.combine(Haxelib.getPath(new Haxelib("hxp")), "src"), + "-lib", + "lime", + "-lib", + "hxp" ]; #else var args = [ diff --git a/src/lime/tools/Library.hx b/src/lime/tools/Library.hx index 8b8497e78..c710b1671 100644 --- a/src/lime/tools/Library.hx +++ b/src/lime/tools/Library.hx @@ -12,8 +12,8 @@ class Library public var sourcePath:String; public var type:String; - public function new(sourcePath:String, name:String = "", type:String = null, embed:Null = null, preload:Null = null, generate:Null = null, - prefix:String = "") + public function new(sourcePath:String, name:String = "", type:String = null, embed:Null = null, preload:Null = null, + generate:Null = null, prefix:String = "") { this.sourcePath = sourcePath; diff --git a/src/lime/tools/MetaData.hx b/src/lime/tools/MetaData.hx index 674097a3b..0d890ec7f 100644 --- a/src/lime/tools/MetaData.hx +++ b/src/lime/tools/MetaData.hx @@ -14,14 +14,15 @@ typedef MetaData = @:dox(hide) class _MetaDataType { - public static var fields:MetaData = { - buildNumber: "", - company: "", - companyId: "", - companyUrl: "", - description: "", - packageName: "", - title: "", - version: "" - } -} \ No newline at end of file + public static var fields:MetaData = + { + buildNumber: "", + company: "", + companyId: "", + companyUrl: "", + description: "", + packageName: "", + title: "", + version: "" + } +} diff --git a/src/lime/tools/WindowData.hx b/src/lime/tools/WindowData.hx index 68dbfa490..843e9b0bb 100644 --- a/src/lime/tools/WindowData.hx +++ b/src/lime/tools/WindowData.hx @@ -35,35 +35,36 @@ typedef WindowData = @:dox(hide) class _WindowDataType { - public static var fields:WindowData = { - width: 0, - height: 0, - x: 0.0, - y: 0.0, - background: 0, - parameters: "", - fps: 0, - hardware: false, - display: 0, - resizable: false, - borderless: false, - vsync: false, - fullscreen: false, - allowHighDPI: false, - alwaysOnTop: false, - antialiasing: 0, - orientation: Orientation.AUTO, - allowShaders: false, - requireShaders: false, - depthBuffer: false, - stencilBuffer: false, - title: "", - #if (js && html5) - element: null, - #end - colorDepth: 0, - minimized: false, - maximized: false, - hidden: false - } -} \ No newline at end of file + public static var fields:WindowData = + { + width: 0, + height: 0, + x: 0.0, + y: 0.0, + background: 0, + parameters: "", + fps: 0, + hardware: false, + display: 0, + resizable: false, + borderless: false, + vsync: false, + fullscreen: false, + allowHighDPI: false, + alwaysOnTop: false, + antialiasing: 0, + orientation: Orientation.AUTO, + allowShaders: false, + requireShaders: false, + depthBuffer: false, + stencilBuffer: false, + title: "", + #if (js && html5) + element: null, + #end + colorDepth: 0, + minimized: false, + maximized: false, + hidden: false + } +} diff --git a/src/lime/ui/FileDialog.hx b/src/lime/ui/FileDialog.hx index 95d88e31f..ebdfb611a 100644 --- a/src/lime/ui/FileDialog.hx +++ b/src/lime/ui/FileDialog.hx @@ -41,7 +41,6 @@ import js.html.Blob; Availability note: most file dialog operations are only available on desktop targets, though `save()` is also available in HTML5. **/ - #if !lime_debug @:fileXml('tags="haxe,release"') @:noDebug @@ -50,7 +49,6 @@ import js.html.Blob; @:access(lime.graphics.Image) class FileDialog { - /** Triggers when the user clicks "Cancel" during any operation, or when a function is unsupported (such as `open()` on HTML5). @@ -80,7 +78,6 @@ class FileDialog **/ public var onSelectMultiple = new Event->Void>(); - public function new() {} /** diff --git a/src/lime/utils/Float32Array.hx b/src/lime/utils/Float32Array.hx index 1e267e4d4..bf3fe3e25 100644 --- a/src/lime/utils/Float32Array.hx +++ b/src/lime/utils/Float32Array.hx @@ -97,7 +97,9 @@ abstract Float32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView public var length(get, never):Int; - #if (haxe_ver < 4.2) @:generic #end + #if (haxe_ver < 4.2) + @:generic + #end public inline function new(?elements:Int, ?buffer:ArrayBuffer, ?array:Array, #if openfl ?vector:openfl.Vector, #end ?view:ArrayBufferView, ?byteoffset:Int = 0, ?len:Null) { diff --git a/src/lime/utils/Float64Array.hx b/src/lime/utils/Float64Array.hx index 5b9542bce..0db29a844 100644 --- a/src/lime/utils/Float64Array.hx +++ b/src/lime/utils/Float64Array.hx @@ -94,7 +94,9 @@ abstract Float64Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView public var length(get, never):Int; - #if (haxe_ver < 4.2) @:generic #end + #if (haxe_ver < 4.2) + @:generic + #end public inline function new(?elements:Int, ?buffer:ArrayBuffer, ?array:Array, #if openfl ?vector:openfl.Vector, #end ?view:ArrayBufferView, ?byteoffset:Int = 0, ?len:Null) { diff --git a/src/lime/utils/Int16Array.hx b/src/lime/utils/Int16Array.hx index 799a93ef0..3dc09461f 100644 --- a/src/lime/utils/Int16Array.hx +++ b/src/lime/utils/Int16Array.hx @@ -94,7 +94,9 @@ abstract Int16Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView public var length(get, never):Int; - #if (haxe_ver < 4.2) @:generic #end + #if (haxe_ver < 4.2) + @:generic + #end public inline function new(?elements:Int, ?buffer:ArrayBuffer, ?array:Array, #if openfl ?vector:openfl.Vector, #end ?view:ArrayBufferView, ?byteoffset:Int = 0, ?len:Null) { diff --git a/src/lime/utils/Int32Array.hx b/src/lime/utils/Int32Array.hx index 936edc8cb..3d780cfc8 100644 --- a/src/lime/utils/Int32Array.hx +++ b/src/lime/utils/Int32Array.hx @@ -85,6 +85,7 @@ abstract Int32Array(JSInt32Array) from JSInt32Array to JSInt32Array } #else import lime.utils.ArrayBufferView; + @:transitive @:forward abstract Int32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView @@ -93,7 +94,9 @@ abstract Int32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView public var length(get, never):Int; - #if (haxe_ver < 4.2) @:generic #end + #if (haxe_ver < 4.2) + @:generic + #end public inline function new(?elements:Int, ?buffer:ArrayBuffer, ?array:Array, #if openfl ?vector:openfl.Vector, #end ?view:ArrayBufferView, ?byteoffset:Int = 0, ?len:Null) { diff --git a/src/lime/utils/Int8Array.hx b/src/lime/utils/Int8Array.hx index edf9d32b3..80d8c5d22 100644 --- a/src/lime/utils/Int8Array.hx +++ b/src/lime/utils/Int8Array.hx @@ -92,7 +92,9 @@ abstract Int8Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView public var length(get, never):Int; - #if (haxe_ver < 4.2) @:generic #end + #if (haxe_ver < 4.2) + @:generic + #end public inline function new(?elements:Int, ?buffer:ArrayBuffer, ?array:Array, #if openfl ?vector:openfl.Vector, #end ?view:ArrayBufferView, ?byteoffset:Int = 0, ?len:Null) { diff --git a/src/lime/utils/Preloader.hx b/src/lime/utils/Preloader.hx index 78cde7d37..2e803203d 100644 --- a/src/lime/utils/Preloader.hx +++ b/src/lime/utils/Preloader.hx @@ -309,8 +309,8 @@ class Preloader #if flash extends Sprite #end } #end - if (!simulateProgress #if flash && loadedStage #end - #if !disable_preloader_assets && loadedLibraries == (libraries.length + libraryNames.length) #end) + if (!simulateProgress #if flash && loadedStage #end#if !disable_preloader_assets + && loadedLibraries == (libraries.length + libraryNames.length) #end) { if (!preloadComplete) { diff --git a/src/lime/utils/UInt16Array.hx b/src/lime/utils/UInt16Array.hx index 94db8aae7..a29817dc2 100644 --- a/src/lime/utils/UInt16Array.hx +++ b/src/lime/utils/UInt16Array.hx @@ -85,6 +85,7 @@ abstract UInt16Array(JSUInt16Array) from JSUInt16Array to JSUInt16Array } #else import lime.utils.ArrayBufferView; + @:transitive @:forward abstract UInt16Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView @@ -93,7 +94,9 @@ abstract UInt16Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView public var length(get, never):Int; - #if (haxe_ver < 4.2) @:generic #end + #if (haxe_ver < 4.2) + @:generic + #end public inline function new(?elements:Int, ?buffer:ArrayBuffer, ?array:Array, #if openfl ?vector:openfl.Vector, #end ?view:ArrayBufferView, ?byteoffset:Int = 0, ?len:Null) { diff --git a/src/lime/utils/UInt32Array.hx b/src/lime/utils/UInt32Array.hx index 4337896e3..60585167b 100644 --- a/src/lime/utils/UInt32Array.hx +++ b/src/lime/utils/UInt32Array.hx @@ -85,6 +85,7 @@ abstract UInt32Array(JSUInt32Array) from JSUInt32Array to JSUInt32Array } #else import lime.utils.ArrayBufferView; + @:transitive @:forward abstract UInt32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView @@ -93,7 +94,9 @@ abstract UInt32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView public var length(get, never):Int; - #if (haxe_ver < 4.2) @:generic #end + #if (haxe_ver < 4.2) + @:generic + #end public inline function new(?elements:Int, ?buffer:ArrayBuffer, ?array:Array, #if openfl ?vector:openfl.Vector, #end ?view:ArrayBufferView, ?byteoffset:Int = 0, ?len:Null) { diff --git a/src/lime/utils/UInt8Array.hx b/src/lime/utils/UInt8Array.hx index 83962b7ca..52d782f9d 100644 --- a/src/lime/utils/UInt8Array.hx +++ b/src/lime/utils/UInt8Array.hx @@ -83,6 +83,7 @@ abstract UInt8Array(JSUInt8Array) from JSUInt8Array to JSUInt8Array } #else import lime.utils.ArrayBufferView; + @:transitive @:forward abstract UInt8Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView @@ -91,7 +92,9 @@ abstract UInt8Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView public var length(get, never):Int; - #if (haxe_ver < 4.2) @:generic #end + #if (haxe_ver < 4.2) + @:generic + #end public inline function new(?elements:Int, ?buffer:ArrayBuffer, ?array:Array, #if openfl ?vector:openfl.Vector, #end ?view:ArrayBufferView, ?byteoffset:Int = 0, ?len:Null) { diff --git a/src/lime/utils/UInt8ClampedArray.hx b/src/lime/utils/UInt8ClampedArray.hx index 5e47168d4..b261af058 100644 --- a/src/lime/utils/UInt8ClampedArray.hx +++ b/src/lime/utils/UInt8ClampedArray.hx @@ -94,6 +94,7 @@ abstract UInt8ClampedArray(JSUInt8ClampedArray) from JSUInt8ClampedArray to JSUI } #else import lime.utils.ArrayBufferView; + @:transitive @:forward @:arrayAccess @@ -103,7 +104,9 @@ abstract UInt8ClampedArray(ArrayBufferView) from ArrayBufferView to ArrayBufferV public var length(get, never):Int; - #if (haxe_ver < 4.2) @:generic #end + #if (haxe_ver < 4.2) + @:generic + #end public inline function new(?elements:Int, ?buffer:ArrayBuffer, ?array:Array, #if openfl ?vector:openfl.Vector, #end ?view:ArrayBufferView, ?byteoffset:Int = 0, ?len:Null) { diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx index cb3bbc327..cd0a6d681 100644 --- a/tools/CommandLineTools.hx +++ b/tools/CommandLineTools.hx @@ -1858,7 +1858,7 @@ class CommandLineTools if (Reflect.hasField(project, field)) { var fieldValue = Reflect.field(project, field); - var typeValue:Dynamic = switch(field) + var typeValue:Dynamic = switch (field) { case "app": ApplicationData._ApplicationDataType.fields; case "meta": MetaData._MetaDataType.fields; @@ -2128,7 +2128,7 @@ class CommandLineTools if (field == "meta-build-number") property = "buildNumber"; var fieldReference = Reflect.field(overrides, fieldName); - var typeValue:Dynamic = switch(fieldName) + var typeValue:Dynamic = switch (fieldName) { case "app": ApplicationData._ApplicationDataType.fields; case "meta": MetaData._MetaDataType.fields; diff --git a/tools/platforms/AIRPlatform.hx b/tools/platforms/AIRPlatform.hx index 675eb8b0f..93d14d052 100644 --- a/tools/platforms/AIRPlatform.hx +++ b/tools/platforms/AIRPlatform.hx @@ -31,55 +31,56 @@ class AIRPlatform extends FlashPlatform var defaults = new HXProject(); - defaults.meta = { - title: "MyApplication", - description: "", - packageName: "com.example.myapp", - version: "1.0.0", - company: "", - companyUrl: "", - buildNumber: null, - companyId: "" - }; + defaults.meta = + { + title: "MyApplication", + description: "", + packageName: "com.example.myapp", + version: "1.0.0", + company: "", + companyUrl: "", + buildNumber: null, + companyId: "" + }; defaults.app = - { - main: "Main", - file: "MyApplication", - path: "bin", - preloader: "", - swfVersion: 17, - url: "", - init: null - }; + { + main: "Main", + file: "MyApplication", + path: "bin", + preloader: "", + swfVersion: 17, + url: "", + init: null + }; defaults.window = - { - width: 800, - height: 600, - parameters: "{}", - background: 0xFFFFFF, - fps: 30, - hardware: true, - display: 0, - resizable: true, - borderless: false, - orientation: Orientation.AUTO, - vsync: false, - fullscreen: false, - allowHighDPI: true, - alwaysOnTop: false, - antialiasing: 0, - allowShaders: true, - requireShaders: false, - depthBuffer: true, - stencilBuffer: true, - colorDepth: 32, - maximized: false, - minimized: false, - hidden: false, - title: "" - }; + { + width: 800, + height: 600, + parameters: "{}", + background: 0xFFFFFF, + fps: 30, + hardware: true, + display: 0, + resizable: true, + borderless: false, + orientation: Orientation.AUTO, + vsync: false, + fullscreen: false, + allowHighDPI: true, + alwaysOnTop: false, + antialiasing: 0, + allowShaders: true, + requireShaders: false, + depthBuffer: true, + stencilBuffer: true, + colorDepth: 32, + maximized: false, + minimized: false, + hidden: false, + title: "" + }; if (project.targetFlags.exists("ios") || project.targetFlags.exists("android")) { diff --git a/tools/platforms/AndroidPlatform.hx b/tools/platforms/AndroidPlatform.hx index 867338d18..6d4d5b9f9 100644 --- a/tools/platforms/AndroidPlatform.hx +++ b/tools/platforms/AndroidPlatform.hx @@ -31,55 +31,56 @@ class AndroidPlatform extends PlatformTarget var defaults = new HXProject(); - defaults.meta = { - title: "MyApplication", - description: "", - packageName: "com.example.myapp", - version: "1.0.0", - company: "", - companyUrl: "", - buildNumber: null, - companyId: "" - }; + defaults.meta = + { + title: "MyApplication", + description: "", + packageName: "com.example.myapp", + version: "1.0.0", + company: "", + companyUrl: "", + buildNumber: null, + companyId: "" + }; defaults.app = - { - main: "Main", - file: "MyApplication", - path: "bin", - preloader: "", - swfVersion: 17, - url: "", - init: null - }; + { + main: "Main", + file: "MyApplication", + path: "bin", + preloader: "", + swfVersion: 17, + url: "", + init: null + }; defaults.window = - { - width: 800, - height: 600, - parameters: "{}", - background: 0xFFFFFF, - fps: 30, - hardware: true, - display: 0, - resizable: true, - borderless: false, - orientation: Orientation.AUTO, - vsync: false, - fullscreen: false, - allowHighDPI: true, - alwaysOnTop: false, - antialiasing: 0, - allowShaders: true, - requireShaders: false, - depthBuffer: true, - stencilBuffer: true, - colorDepth: 32, - maximized: false, - minimized: false, - hidden: false, - title: "" - }; + { + width: 800, + height: 600, + parameters: "{}", + background: 0xFFFFFF, + fps: 30, + hardware: true, + display: 0, + resizable: true, + borderless: false, + orientation: Orientation.AUTO, + vsync: false, + fullscreen: false, + allowHighDPI: true, + alwaysOnTop: false, + antialiasing: 0, + allowShaders: true, + requireShaders: false, + depthBuffer: true, + stencilBuffer: true, + colorDepth: 32, + maximized: false, + minimized: false, + hidden: false, + title: "" + }; if (project.targetFlags.exists("simulator") || project.targetFlags.exists("emulator")) { diff --git a/tools/platforms/EmscriptenPlatform.hx b/tools/platforms/EmscriptenPlatform.hx index 6f8ddf9da..6760d8838 100644 --- a/tools/platforms/EmscriptenPlatform.hx +++ b/tools/platforms/EmscriptenPlatform.hx @@ -29,55 +29,56 @@ class EmscriptenPlatform extends PlatformTarget var defaults = new HXProject(); - defaults.meta = { - title: "MyApplication", - description: "", - packageName: "com.example.myapp", - version: "1.0.0", - company: "", - companyUrl: "", - buildNumber: null, - companyId: "" - }; + defaults.meta = + { + title: "MyApplication", + description: "", + packageName: "com.example.myapp", + version: "1.0.0", + company: "", + companyUrl: "", + buildNumber: null, + companyId: "" + }; defaults.app = - { - main: "Main", - file: "MyApplication", - path: "bin", - preloader: "", - swfVersion: 17, - url: "", - init: null - }; + { + main: "Main", + file: "MyApplication", + path: "bin", + preloader: "", + swfVersion: 17, + url: "", + init: null + }; defaults.window = - { - width: 800, - height: 600, - parameters: "{}", - background: 0xFFFFFF, - fps: 30, - hardware: true, - display: 0, - resizable: true, - borderless: false, - orientation: Orientation.AUTO, - vsync: false, - fullscreen: false, - allowHighDPI: true, - alwaysOnTop: false, - antialiasing: 0, - allowShaders: true, - requireShaders: false, - depthBuffer: true, - stencilBuffer: true, - colorDepth: 32, - maximized: false, - minimized: false, - hidden: false, - title: "" - }; + { + width: 800, + height: 600, + parameters: "{}", + background: 0xFFFFFF, + fps: 30, + hardware: true, + display: 0, + resizable: true, + borderless: false, + orientation: Orientation.AUTO, + vsync: false, + fullscreen: false, + allowHighDPI: true, + alwaysOnTop: false, + antialiasing: 0, + allowShaders: true, + requireShaders: false, + depthBuffer: true, + stencilBuffer: true, + colorDepth: 32, + maximized: false, + minimized: false, + hidden: false, + title: "" + }; defaults.window.fps = 60; defaults.window.allowHighDPI = false; diff --git a/tools/platforms/FlashPlatform.hx b/tools/platforms/FlashPlatform.hx index f832ccd8a..19b4812d5 100644 --- a/tools/platforms/FlashPlatform.hx +++ b/tools/platforms/FlashPlatform.hx @@ -36,55 +36,56 @@ class FlashPlatform extends PlatformTarget var defaults = new HXProject(); - defaults.meta = { - title: "MyApplication", - description: "", - packageName: "com.example.myapp", - version: "1.0.0", - company: "", - companyUrl: "", - buildNumber: null, - companyId: "" - }; + defaults.meta = + { + title: "MyApplication", + description: "", + packageName: "com.example.myapp", + version: "1.0.0", + company: "", + companyUrl: "", + buildNumber: null, + companyId: "" + }; defaults.app = - { - main: "Main", - file: "MyApplication", - path: "bin", - preloader: "", - swfVersion: 17, - url: "", - init: null - }; + { + main: "Main", + file: "MyApplication", + path: "bin", + preloader: "", + swfVersion: 17, + url: "", + init: null + }; defaults.window = - { - width: 800, - height: 600, - parameters: "{}", - background: 0xFFFFFF, - fps: 30, - hardware: true, - display: 0, - resizable: true, - borderless: false, - orientation: Orientation.AUTO, - vsync: false, - fullscreen: false, - allowHighDPI: true, - alwaysOnTop: false, - antialiasing: 0, - allowShaders: true, - requireShaders: false, - depthBuffer: true, - stencilBuffer: true, - colorDepth: 32, - maximized: false, - minimized: false, - hidden: false, - title: "" - }; + { + width: 800, + height: 600, + parameters: "{}", + background: 0xFFFFFF, + fps: 30, + hardware: true, + display: 0, + resizable: true, + borderless: false, + orientation: Orientation.AUTO, + vsync: false, + fullscreen: false, + allowHighDPI: true, + alwaysOnTop: false, + antialiasing: 0, + allowShaders: true, + requireShaders: false, + depthBuffer: true, + stencilBuffer: true, + colorDepth: 32, + maximized: false, + minimized: false, + hidden: false, + title: "" + }; for (i in 1...project.windows.length) { diff --git a/tools/platforms/HTML5Platform.hx b/tools/platforms/HTML5Platform.hx index 07ebb29c3..e982ff914 100644 --- a/tools/platforms/HTML5Platform.hx +++ b/tools/platforms/HTML5Platform.hx @@ -35,55 +35,56 @@ class HTML5Platform extends PlatformTarget var defaults = new HXProject(); - defaults.meta = { - title: "MyApplication", - description: "", - packageName: "com.example.myapp", - version: "1.0.0", - company: "", - companyUrl: "", - buildNumber: null, - companyId: "" - }; + defaults.meta = + { + title: "MyApplication", + description: "", + packageName: "com.example.myapp", + version: "1.0.0", + company: "", + companyUrl: "", + buildNumber: null, + companyId: "" + }; defaults.app = - { - main: "Main", - file: "MyApplication", - path: "bin", - preloader: "", - swfVersion: 17, - url: "", - init: null - }; + { + main: "Main", + file: "MyApplication", + path: "bin", + preloader: "", + swfVersion: 17, + url: "", + init: null + }; defaults.window = - { - width: 800, - height: 600, - parameters: "{}", - background: 0xFFFFFF, - fps: 30, - hardware: true, - display: 0, - resizable: true, - borderless: false, - orientation: Orientation.AUTO, - vsync: false, - fullscreen: false, - allowHighDPI: true, - alwaysOnTop: false, - antialiasing: 0, - allowShaders: true, - requireShaders: false, - depthBuffer: true, - stencilBuffer: true, - colorDepth: 32, - maximized: false, - minimized: false, - hidden: false, - title: "" - }; + { + width: 800, + height: 600, + parameters: "{}", + background: 0xFFFFFF, + fps: 30, + hardware: true, + display: 0, + resizable: true, + borderless: false, + orientation: Orientation.AUTO, + vsync: false, + fullscreen: false, + allowHighDPI: true, + alwaysOnTop: false, + antialiasing: 0, + allowShaders: true, + requireShaders: false, + depthBuffer: true, + stencilBuffer: true, + colorDepth: 32, + maximized: false, + minimized: false, + hidden: false, + title: "" + }; defaults.window.width = 0; defaults.window.height = 0; diff --git a/tools/platforms/IOSPlatform.hx b/tools/platforms/IOSPlatform.hx index e08a6db15..1f748546a 100644 --- a/tools/platforms/IOSPlatform.hx +++ b/tools/platforms/IOSPlatform.hx @@ -40,55 +40,56 @@ class IOSPlatform extends PlatformTarget var defaults = new HXProject(); - defaults.meta = { - title: "MyApplication", - description: "", - packageName: "com.example.myapp", - version: "1.0.0", - company: "", - companyUrl: "", - buildNumber: null, - companyId: "" - }; + defaults.meta = + { + title: "MyApplication", + description: "", + packageName: "com.example.myapp", + version: "1.0.0", + company: "", + companyUrl: "", + buildNumber: null, + companyId: "" + }; defaults.app = - { - main: "Main", - file: "MyApplication", - path: "bin", - preloader: "", - swfVersion: 17, - url: "", - init: null - }; + { + main: "Main", + file: "MyApplication", + path: "bin", + preloader: "", + swfVersion: 17, + url: "", + init: null + }; defaults.window = - { - width: 800, - height: 600, - parameters: "{}", - background: 0xFFFFFF, - fps: 30, - hardware: true, - display: 0, - resizable: true, - borderless: false, - orientation: Orientation.AUTO, - vsync: false, - fullscreen: false, - allowHighDPI: true, - alwaysOnTop: false, - antialiasing: 0, - allowShaders: true, - requireShaders: false, - depthBuffer: true, - stencilBuffer: true, - colorDepth: 32, - maximized: false, - minimized: false, - hidden: false, - title: "" - }; + { + width: 800, + height: 600, + parameters: "{}", + background: 0xFFFFFF, + fps: 30, + hardware: true, + display: 0, + resizable: true, + borderless: false, + orientation: Orientation.AUTO, + vsync: false, + fullscreen: false, + allowHighDPI: true, + alwaysOnTop: false, + antialiasing: 0, + allowShaders: true, + requireShaders: false, + depthBuffer: true, + stencilBuffer: true, + colorDepth: 32, + maximized: false, + minimized: false, + hidden: false, + title: "" + }; defaults.architectures = [Architecture.ARMV7, Architecture.ARM64]; defaults.window.width = 0; @@ -554,12 +555,27 @@ class IOSPlatform extends PlatformTarget System.mkdir(projectDirectory + "/haxe/lime/installer"); var iconSizes:Array = [ - {name: "Icon-20.png", size: 20}, {name: "Icon-Small.png", size: 29}, {name: "Icon-Small-40.png", size: 40}, {name: "Icon-20@2x.png", size: 40}, - {name: "Icon-Small-50.png", size: 50}, {name: "Icon.png", size: 57}, {name: "Icon-Small@2x.png", size: 58}, {name: "Icon-20@3x.png", size: 60}, - {name: "Icon-72.png", size: 72}, {name: "Icon-76.png", size: 76}, {name: "Icon-Small-40@2x.png", size: 80}, {name: "Icon-Small@3x.png", size: 87}, - {name: "Icon-Small-50@2x.png", size: 100}, {name: "Icon@2x.png", size: 114}, {name: "Icon-60@2x.png", size: 120}, - {name: "Icon-Small-40@3x.png", size: 120}, {name: "Icon-72@2x.png", size: 144}, {name: "Icon-76@2x.png", size: 152}, - {name: "Icon-83.5@2x.png", size: 167}, {name: "Icon-60@3x.png", size: 180}, {name: "Icon-Marketing.png", size: 1024} + {name: "Icon-20.png", size: 20}, + {name: "Icon-Small.png", size: 29}, + {name: "Icon-Small-40.png", size: 40}, + {name: "Icon-20@2x.png", size: 40}, + {name: "Icon-Small-50.png", size: 50}, + {name: "Icon.png", size: 57}, + {name: "Icon-Small@2x.png", size: 58}, + {name: "Icon-20@3x.png", size: 60}, + {name: "Icon-72.png", size: 72}, + {name: "Icon-76.png", size: 76}, + {name: "Icon-Small-40@2x.png", size: 80}, + {name: "Icon-Small@3x.png", size: 87}, + {name: "Icon-Small-50@2x.png", size: 100}, + {name: "Icon@2x.png", size: 114}, + {name: "Icon-60@2x.png", size: 120}, + {name: "Icon-Small-40@3x.png", size: 120}, + {name: "Icon-72@2x.png", size: 144}, + {name: "Icon-76@2x.png", size: 152}, + {name: "Icon-83.5@2x.png", size: 167}, + {name: "Icon-60@3x.png", size: 180}, + {name: "Icon-Marketing.png", size: 1024} ]; context.HAS_ICON = true; diff --git a/tools/platforms/LinuxPlatform.hx b/tools/platforms/LinuxPlatform.hx index 435545b34..fb7b3ec34 100644 --- a/tools/platforms/LinuxPlatform.hx +++ b/tools/platforms/LinuxPlatform.hx @@ -37,63 +37,69 @@ class LinuxPlatform extends PlatformTarget var defaults = new HXProject(); - defaults.meta = { - title: "MyApplication", - description: "", - packageName: "com.example.myapp", - version: "1.0.0", - company: "", - companyUrl: "", - buildNumber: null, - companyId: "" - }; + defaults.meta = + { + title: "MyApplication", + description: "", + packageName: "com.example.myapp", + version: "1.0.0", + company: "", + companyUrl: "", + buildNumber: null, + companyId: "" + }; defaults.app = - { - main: "Main", - file: "MyApplication", - path: "bin", - preloader: "", - swfVersion: 17, - url: "", - init: null - }; + { + main: "Main", + file: "MyApplication", + path: "bin", + preloader: "", + swfVersion: 17, + url: "", + init: null + }; defaults.window = - { - width: 800, - height: 600, - parameters: "{}", - background: 0xFFFFFF, - fps: 30, - hardware: true, - display: 0, - resizable: true, - borderless: false, - orientation: Orientation.AUTO, - vsync: false, - fullscreen: false, - allowHighDPI: true, - alwaysOnTop: false, - antialiasing: 0, - allowShaders: true, - requireShaders: false, - depthBuffer: true, - stencilBuffer: true, - colorDepth: 32, - maximized: false, - minimized: false, - hidden: false, - title: "" - }; + { + width: 800, + height: 600, + parameters: "{}", + background: 0xFFFFFF, + fps: 30, + hardware: true, + display: 0, + resizable: true, + borderless: false, + orientation: Orientation.AUTO, + vsync: false, + fullscreen: false, + allowHighDPI: true, + alwaysOnTop: false, + antialiasing: 0, + allowShaders: true, + requireShaders: false, + depthBuffer: true, + stencilBuffer: true, + colorDepth: 32, + maximized: false, + minimized: false, + hidden: false, + title: "" + }; switch (System.hostArchitecture) { - case ARMV6: defaults.architectures = [ARMV6]; - case ARMV7: defaults.architectures = [ARMV7]; - case X86: defaults.architectures = [X86]; - case X64: defaults.architectures = [X64]; - default: defaults.architectures = []; + case ARMV6: + defaults.architectures = [ARMV6]; + case ARMV7: + defaults.architectures = [ARMV7]; + case X86: + defaults.architectures = [X86]; + case X64: + defaults.architectures = [X64]; + default: + defaults.architectures = []; } defaults.window.allowHighDPI = false; diff --git a/tools/platforms/MacPlatform.hx b/tools/platforms/MacPlatform.hx index 5c26aa6c6..3882c9848 100644 --- a/tools/platforms/MacPlatform.hx +++ b/tools/platforms/MacPlatform.hx @@ -41,63 +41,69 @@ class MacPlatform extends PlatformTarget var defaults = new HXProject(); - defaults.meta = { - title: "MyApplication", - description: "", - packageName: "com.example.myapp", - version: "1.0.0", - company: "", - companyUrl: "", - buildNumber: null, - companyId: "" - }; + defaults.meta = + { + title: "MyApplication", + description: "", + packageName: "com.example.myapp", + version: "1.0.0", + company: "", + companyUrl: "", + buildNumber: null, + companyId: "" + }; defaults.app = - { - main: "Main", - file: "MyApplication", - path: "bin", - preloader: "", - swfVersion: 17, - url: "", - init: null - }; + { + main: "Main", + file: "MyApplication", + path: "bin", + preloader: "", + swfVersion: 17, + url: "", + init: null + }; defaults.window = - { - width: 800, - height: 600, - parameters: "{}", - background: 0xFFFFFF, - fps: 30, - hardware: true, - display: 0, - resizable: true, - borderless: false, - orientation: Orientation.AUTO, - vsync: false, - fullscreen: false, - allowHighDPI: true, - alwaysOnTop: false, - antialiasing: 0, - allowShaders: true, - requireShaders: false, - depthBuffer: true, - stencilBuffer: true, - colorDepth: 32, - maximized: false, - minimized: false, - hidden: false, - title: "" - }; + { + width: 800, + height: 600, + parameters: "{}", + background: 0xFFFFFF, + fps: 30, + hardware: true, + display: 0, + resizable: true, + borderless: false, + orientation: Orientation.AUTO, + vsync: false, + fullscreen: false, + allowHighDPI: true, + alwaysOnTop: false, + antialiasing: 0, + allowShaders: true, + requireShaders: false, + depthBuffer: true, + stencilBuffer: true, + colorDepth: 32, + maximized: false, + minimized: false, + hidden: false, + title: "" + }; switch (System.hostArchitecture) { - case ARMV6: defaults.architectures = [ARMV6]; - case ARMV7: defaults.architectures = [ARMV7]; - case X86: defaults.architectures = [X86]; - case X64: defaults.architectures = [X64]; - default: defaults.architectures = []; + case ARMV6: + defaults.architectures = [ARMV6]; + case ARMV7: + defaults.architectures = [ARMV7]; + case X86: + defaults.architectures = [X86]; + case X64: + defaults.architectures = [X64]; + default: + defaults.architectures = []; } defaults.window.allowHighDPI = false; diff --git a/tools/platforms/TVOSPlatform.hx b/tools/platforms/TVOSPlatform.hx index 6a04157d8..54aae23b7 100644 --- a/tools/platforms/TVOSPlatform.hx +++ b/tools/platforms/TVOSPlatform.hx @@ -38,55 +38,56 @@ class TVOSPlatform extends PlatformTarget var defaults = new HXProject(); - defaults.meta = { - title: "MyApplication", - description: "", - packageName: "com.example.myapp", - version: "1.0.0", - company: "", - companyUrl: "", - buildNumber: null, - companyId: "" - }; + defaults.meta = + { + title: "MyApplication", + description: "", + packageName: "com.example.myapp", + version: "1.0.0", + company: "", + companyUrl: "", + buildNumber: null, + companyId: "" + }; defaults.app = - { - main: "Main", - file: "MyApplication", - path: "bin", - preloader: "", - swfVersion: 17, - url: "", - init: null - }; + { + main: "Main", + file: "MyApplication", + path: "bin", + preloader: "", + swfVersion: 17, + url: "", + init: null + }; defaults.window = - { - width: 800, - height: 600, - parameters: "{}", - background: 0xFFFFFF, - fps: 30, - hardware: true, - display: 0, - resizable: true, - borderless: false, - orientation: Orientation.AUTO, - vsync: false, - fullscreen: false, - allowHighDPI: true, - alwaysOnTop: false, - antialiasing: 0, - allowShaders: true, - requireShaders: false, - depthBuffer: true, - stencilBuffer: true, - colorDepth: 32, - maximized: false, - minimized: false, - hidden: false, - title: "" - }; + { + width: 800, + height: 600, + parameters: "{}", + background: 0xFFFFFF, + fps: 30, + hardware: true, + display: 0, + resizable: true, + borderless: false, + orientation: Orientation.AUTO, + vsync: false, + fullscreen: false, + allowHighDPI: true, + alwaysOnTop: false, + antialiasing: 0, + allowShaders: true, + requireShaders: false, + depthBuffer: true, + stencilBuffer: true, + colorDepth: 32, + maximized: false, + minimized: false, + hidden: false, + title: "" + }; defaults.architectures = [Architecture.ARM64]; defaults.window.width = 0; @@ -467,10 +468,20 @@ class TVOSPlatform extends PlatformTarget System.mkdir(projectDirectory + "/haxe/lime/installer"); var iconSizes:Array = [ - {name: "Icon-Small.png", size: 29}, {name: "Icon-Small-40.png", size: 40}, {name: "Icon-Small-50.png", size: 50}, {name: "Icon.png", size: 57}, - {name: "Icon-Small@2x.png", size: 58}, {name: "Icon-72.png", size: 72}, {name: "Icon-76.png", size: 76}, {name: "Icon-Small-40@2x.png", size: 80}, - {name: "Icon-Small-50@2x.png", size: 100}, {name: "Icon@2x.png", size: 114}, {name: "Icon-60@2x.png", size: 120}, - {name: "Icon-72@2x.png", size: 144}, {name: "Icon-76@2x.png", size: 152}, {name: "Icon-60@3x.png", size: 180}, + {name: "Icon-Small.png", size: 29}, + {name: "Icon-Small-40.png", size: 40}, + {name: "Icon-Small-50.png", size: 50}, + {name: "Icon.png", size: 57}, + {name: "Icon-Small@2x.png", size: 58}, + {name: "Icon-72.png", size: 72}, + {name: "Icon-76.png", size: 76}, + {name: "Icon-Small-40@2x.png", size: 80}, + {name: "Icon-Small-50@2x.png", size: 100}, + {name: "Icon@2x.png", size: 114}, + {name: "Icon-60@2x.png", size: 120}, + {name: "Icon-72@2x.png", size: 144}, + {name: "Icon-76@2x.png", size: 152}, + {name: "Icon-60@3x.png", size: 180}, ]; context.HAS_ICON = true; diff --git a/tools/platforms/TizenPlatform.hx b/tools/platforms/TizenPlatform.hx index 78e616c38..0ad18008d 100644 --- a/tools/platforms/TizenPlatform.hx +++ b/tools/platforms/TizenPlatform.hx @@ -27,62 +27,63 @@ class TizenPlatform extends PlatformTarget var defaults = new HXProject(); - defaults.meta = { - title: "MyApplication", - description: "", - packageName: "com.example.myapp", - version: "1.0.0", - company: "", - companyUrl: "", - buildNumber: null, - companyId: "" - }; + defaults.meta = + { + title: "MyApplication", + description: "", + packageName: "com.example.myapp", + version: "1.0.0", + company: "", + companyUrl: "", + buildNumber: null, + companyId: "" + }; defaults.app = - { - main: "Main", - file: "MyApplication", - path: "bin", - preloader: "", - swfVersion: 17, - url: "", - init: null - }; + { + main: "Main", + file: "MyApplication", + path: "bin", + preloader: "", + swfVersion: 17, + url: "", + init: null + }; defaults.window = - { - width: 800, - height: 600, - parameters: "{}", - background: 0xFFFFFF, - fps: 30, - hardware: true, - display: 0, - resizable: true, - borderless: false, - orientation: Orientation.AUTO, - vsync: false, - fullscreen: false, - allowHighDPI: true, - alwaysOnTop: false, - antialiasing: 0, - allowShaders: true, - requireShaders: false, - depthBuffer: true, - stencilBuffer: true, - colorDepth: 32, - maximized: false, - minimized: false, - hidden: false, - title: "" - }; + { + width: 800, + height: 600, + parameters: "{}", + background: 0xFFFFFF, + fps: 30, + hardware: true, + display: 0, + resizable: true, + borderless: false, + orientation: Orientation.AUTO, + vsync: false, + fullscreen: false, + allowHighDPI: true, + alwaysOnTop: false, + antialiasing: 0, + allowShaders: true, + requireShaders: false, + depthBuffer: true, + stencilBuffer: true, + colorDepth: 32, + maximized: false, + minimized: false, + hidden: false, + title: "" + }; defaults.architectures = [Architecture.ARMV6]; defaults.window.width = 0; defaults.window.height = 0; defaults.window.fullscreen = true; - defaults.window.requireShaders = true;= - defaults.window.allowHighDPI = false; + defaults.window.requireShaders = true; + = defaults.window.allowHighDPI = false; for (i in 1...project.windows.length) { diff --git a/tools/platforms/WindowsPlatform.hx b/tools/platforms/WindowsPlatform.hx index 51f5b3b9d..23749996d 100644 --- a/tools/platforms/WindowsPlatform.hx +++ b/tools/platforms/WindowsPlatform.hx @@ -44,55 +44,56 @@ class WindowsPlatform extends PlatformTarget var defaults = new HXProject(); - defaults.meta = { - title: "MyApplication", - description: "", - packageName: "com.example.myapp", - version: "1.0.0", - company: "", - companyUrl: "", - buildNumber: null, - companyId: "" - }; + defaults.meta = + { + title: "MyApplication", + description: "", + packageName: "com.example.myapp", + version: "1.0.0", + company: "", + companyUrl: "", + buildNumber: null, + companyId: "" + }; defaults.app = - { - main: "Main", - file: "MyApplication", - path: "bin", - preloader: "", - swfVersion: 17, - url: "", - init: null - }; + { + main: "Main", + file: "MyApplication", + path: "bin", + preloader: "", + swfVersion: 17, + url: "", + init: null + }; defaults.window = - { - width: 800, - height: 600, - parameters: "{}", - background: 0xFFFFFF, - fps: 30, - hardware: true, - display: 0, - resizable: true, - borderless: false, - orientation: Orientation.AUTO, - vsync: false, - fullscreen: false, - allowHighDPI: true, - alwaysOnTop: false, - antialiasing: 0, - allowShaders: true, - requireShaders: false, - depthBuffer: true, - stencilBuffer: true, - colorDepth: 32, - maximized: false, - minimized: false, - hidden: false, - title: "" - }; + { + width: 800, + height: 600, + parameters: "{}", + background: 0xFFFFFF, + fps: 30, + hardware: true, + display: 0, + resizable: true, + borderless: false, + orientation: Orientation.AUTO, + vsync: false, + fullscreen: false, + allowHighDPI: true, + alwaysOnTop: false, + antialiasing: 0, + allowShaders: true, + requireShaders: false, + depthBuffer: true, + stencilBuffer: true, + colorDepth: 32, + maximized: false, + minimized: false, + hidden: false, + title: "" + }; if (project.targetFlags.exists("uwp") || project.targetFlags.exists("winjs")) { @@ -104,11 +105,16 @@ class WindowsPlatform extends PlatformTarget { switch (System.hostArchitecture) { - case ARMV6: defaults.architectures = [ARMV6]; - case ARMV7: defaults.architectures = [ARMV7]; - case X86: defaults.architectures = [X86]; - case X64: defaults.architectures = [X64]; - default: defaults.architectures = []; + case ARMV6: + defaults.architectures = [ARMV6]; + case ARMV7: + defaults.architectures = [ARMV7]; + case X86: + defaults.architectures = [X86]; + case X64: + defaults.architectures = [X64]; + default: + defaults.architectures = []; } }