From 2857016a525b487f5a1155eb9fb891feefe6816c Mon Sep 17 00:00:00 2001 From: Joseph Cloutier Date: Sun, 7 May 2023 15:09:19 -0400 Subject: [PATCH 01/18] Begin to fix `WebGL2RenderContext` formatting. Not removing any tabs yet, to help Git generate diffs. --- src/lime/graphics/WebGL2RenderContext.hx | 148 +++++++++++------------ 1 file changed, 73 insertions(+), 75 deletions(-) diff --git a/src/lime/graphics/WebGL2RenderContext.hx b/src/lime/graphics/WebGL2RenderContext.hx index 5ca2effa3..3be01bf8b 100644 --- a/src/lime/graphics/WebGL2RenderContext.hx +++ b/src/lime/graphics/WebGL2RenderContext.hx @@ -3761,12 +3761,10 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic #if !lime_webgl public function bufferData(target:Int, srcData:ArrayBufferView, usage:Int, srcOffset:Int = 0, length:Int = 0):Void - { #else public inline function bufferData(target:Int, srcData:Dynamic, usage:Int, ?srcOffset:Int, ?length:Int):Void - { #end - + { var size = (srcData != null) ? srcData.byteLength : 0; __tempPointer.set(srcData, srcOffset); @@ -3774,17 +3772,17 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic } #if !lime_webgl public inline function bufferSubData(target:Int, offset:Int, srcData:ArrayBufferView, srcOffset:Int = 0, ?length:Int):Void - { #else public inline function bufferSubData(target:Int, offset:Int, srcData:Dynamic, ?srcOffset:Int, ?length:Int):Void - { #end - + { var size = (length != null) ? length : (srcData != null) ? srcData.byteLength : 0; __tempPointer.set(srcData, srcOffset); this.bufferSubData(target, offset, size, __tempPointer); - } public inline function checkFramebufferStatus(target:Int):Int + } + + public inline function checkFramebufferStatus(target:Int):Int { return this.checkFramebufferStatus(target); } @@ -3851,19 +3849,19 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic public function compressedTexImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, srcData:ArrayBufferView, srcOffset:Int = 0, ?srcLengthOverride:Int):Void - { #else public inline function compressedTexImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, srcData:Dynamic, ?srcOffset:Int, ?srcLengthOverride:Int):Void - { #end - + { var imageSize = (srcLengthOverride != null) ? srcLengthOverride : (srcData != null) ? srcData.byteLength : 0; __tempPointer.set(srcData, srcOffset); this.compressedTexImage2D(target, level, internalformat, width, height, border, imageSize, __tempPointer); - } public function compressedTexImage3D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, depth:Int, border:Int, + } + + public function compressedTexImage3D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, depth:Int, border:Int, srcData:ArrayBufferView, srcOffset:Int = 0, ?srcLengthOverride:Int):Void { @@ -3876,19 +3874,19 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic public inline function compressedTexSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, srcData:ArrayBufferView, srcOffset:Int = 0, ?srcLengthOverride:Int):Void - { #else public inline function compressedTexSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, srcData:Dynamic, ?srcOffset:Int, ?srcLengthOverride:Int):Void - { #end - + { var imageSize = (srcLengthOverride != null) ? srcLengthOverride : (srcData != null) ? srcData.byteLength : 0; __tempPointer.set(srcData, srcOffset); this.compressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, __tempPointer); - } public inline function compressedTexSubImage3D(target:Int, level:Int, xoffset:Int, yoffset:Int, zoffset:Int, width:Int, height:Int, + } + + public inline function compressedTexSubImage3D(target:Int, level:Int, xoffset:Int, yoffset:Int, zoffset:Int, width:Int, height:Int, depth:Int, format:Int, srcData:ArrayBufferView, srcOffset:Int = 0, ?srcLengthOverride:Int):Void { @@ -4190,18 +4188,18 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic #if !lime_webgl public inline function getBufferSubData(target:Int, srcByteOffset:DataPointer, dstData:ArrayBuffer, srcOffset:Int = 0, ?length:Int):Void - { #else public inline function getBufferSubData(target:Int, srcByteOffset:DataPointer, dstData:Dynamic, ?srcOffset:Dynamic, ?length:Int):Void - { #end - + { #if !js var size = (length != null) ? length : (dstData != null) ? dstData.length : 0; this.getBufferSubData(target, srcByteOffset + srcOffset, size, dstData); #end - } public inline function getContextAttributes():GLContextAttributes + } + + public inline function getContextAttributes():GLContextAttributes { return this.getContextAttributes(); } @@ -4454,15 +4452,15 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic #if !lime_webgl public inline function readPixels(x:Int, y:Int, width:Int, height:Int, format:Int, type:Int, pixels:ArrayBufferView, dstOffset:Int = 0):Void - { #else public inline function readPixels(x:Int, y:Int, width:Int, height:Int, format:Int, type:Int, pixels:Dynamic, ?dstOffset:Int):Void - { #end - + { __tempPointer.set(pixels, dstOffset); this.readPixels(x, y, width, height, format, type, __tempPointer); - } public inline function renderbufferStorage(target:Int, internalformat:Int, width:Int, height:Int):Void + } + + public inline function renderbufferStorage(target:Int, internalformat:Int, width:Int, height:Int):Void { this.renderbufferStorage(target, internalformat, width, height); } @@ -4536,19 +4534,19 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic public inline function texImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, format:Int, type:Int, srcData:ArrayBufferView, srcOffset:Int = 0):Void - { #else public inline function texImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Dynamic, ?format:Int, ?type:Int, ?srcData:Dynamic, ?srcOffset:Int):Void - { #end - + { #if !lime_webgl __tempPointer.set(srcData, srcOffset); this.texImage2D(target, level, internalformat, width, height, border, format, type, __tempPointer); #end - } public inline function texImage3D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, depth:Int, border:Int, + } + + public inline function texImage3D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, depth:Int, border:Int, format:Int, type:Int, srcData:ArrayBufferView, srcOffset:Int = 0):Void { @@ -4580,17 +4578,17 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic public inline function texSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, type:Int, srcData:ArrayBufferView, srcOffset:Int = 0):Void - { #else public inline function texSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Dynamic, ?type:Int, ?srcData:Dynamic, ?srcOffset:Int):Void - { #end - + { __tempPointer.set(srcData, srcOffset); this.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, __tempPointer); - } public inline function texSubImage3D(target:Int, level:Int, xoffset:Int, yoffset:Int, zoffset:Int, width:Int, height:Int, + } + + public inline function texSubImage3D(target:Int, level:Int, xoffset:Int, yoffset:Int, zoffset:Int, width:Int, height:Int, depth:Int, format:Int, type:Int, srcData:ArrayBufferView, srcOffset:Int = 0):Void { @@ -4610,28 +4608,28 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic #if !lime_webgl public inline function uniform1fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, ?srcLength:Int):Void - { #else public inline function uniform1fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - { #end - + { this.uniform1fv(location, v != null ? v.length : 0, v); - } public inline function uniform1i(location:GLUniformLocation, v0:Int):Void + } + + public inline function uniform1i(location:GLUniformLocation, v0:Int):Void { this.uniform1i(location, v0); } #if !lime_webgl public inline function uniform1iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void - { #else public inline function uniform1iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - { #end - + { this.uniform1iv(location, v != null ? v.length : 0, v); - } public inline function uniform1ui(location:GLUniformLocation, v0:Int):Void + } + + public inline function uniform1ui(location:GLUniformLocation, v0:Int):Void { this.uniform1ui(location, v0); } @@ -4648,28 +4646,28 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic #if !lime_webgl public inline function uniform2fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, ?srcLength:Int):Void - { #else public function uniform2fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - { #end - + { this.uniform2fv(location, v != null ? v.length >> 1 : 0, v); - } public inline function uniform2i(location:GLUniformLocation, v0:Int, v1:Int):Void + } + + public inline function uniform2i(location:GLUniformLocation, v0:Int, v1:Int):Void { this.uniform2i(location, v0, v1); } #if !lime_webgl public inline function uniform2iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void - { #else public inline function uniform2iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - { #end - + { this.uniform2iv(location, v != null ? v.length >> 1 : 0, v); - } public inline function uniform2ui(location:GLUniformLocation, v0:Int, v1:Int):Void + } + + public inline function uniform2ui(location:GLUniformLocation, v0:Int, v1:Int):Void { this.uniform2ui(location, v0, v1); } @@ -4688,15 +4686,15 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic #if !lime_webgl public inline function uniform3fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, ?srcLength:Int):Void - { #else public inline function uniform3fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - { #end - + { this.uniform3fv(location, v != null ? Std.int(v.length / 3) : 0, v); - } public inline function uniform3i(location:GLUniformLocation, v0:Int, v1:Int, v2:Int):Void + } + + public inline function uniform3i(location:GLUniformLocation, v0:Int, v1:Int, v2:Int):Void { this.uniform3i(location, v0, v1, v2); } @@ -4704,15 +4702,15 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic #if !lime_webgl public inline function uniform3iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void - { #else public inline function uniform3iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - { #end - + { this.uniform3iv(location, v != null ? Std.int(v.length / 3) : 0, v); - } public inline function uniform3ui(location:GLUniformLocation, v0:Int, v1:Int, v2:Int):Void + } + + public inline function uniform3ui(location:GLUniformLocation, v0:Int, v1:Int, v2:Int):Void { this.uniform3ui(location, v0, v1, v2); } @@ -4732,15 +4730,15 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic #if !lime_webgl public inline function uniform4fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, ?srcLength:Int):Void - { #else public inline function uniform4fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - { #end - + { this.uniform4fv(location, v != null ? v.length >> 2 : 0, v); - } public inline function uniform4i(location:GLUniformLocation, v0:Int, v1:Int, v2:Int, + } + + public inline function uniform4i(location:GLUniformLocation, v0:Int, v1:Int, v2:Int, v3:Int):Void { this.uniform4i(location, v0, v1, v2, v3); @@ -4749,15 +4747,15 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic #if !lime_webgl public inline function uniform4iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void - { #else public inline function uniform4iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - { #end - + { this.uniform4iv(location, v != null ? v.length >> 2 : 0, v); - } public inline function uniform4ui(location:GLUniformLocation, v0:Int, v1:Int, v2:Int, + } + + public inline function uniform4ui(location:GLUniformLocation, v0:Int, v1:Int, v2:Int, v3:Int):Void { this.uniform4ui(location, v0, v1, v2, v3); @@ -4778,20 +4776,20 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic #if !lime_webgl public function uniformMatrix2fv(location:GLUniformLocation, transpose:Bool, v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void - { #else public inline function uniformMatrix2fv(location:GLUniformLocation, transpose:Bool, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - { #end - + { var count = 0; if (srcLength != null) count = srcLength; else if (v != null) count = v.length >> 2; __tempPointer.set(v, srcOffset); this.uniformMatrix2fv(location, count, transpose, __tempPointer); - } public function uniformMatrix2x3fv(location:GLUniformLocation, transpose:Bool, + } + + public function uniformMatrix2x3fv(location:GLUniformLocation, transpose:Bool, v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void { var count = 0; @@ -4818,20 +4816,20 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic #if !lime_webgl public function uniformMatrix3fv(location:GLUniformLocation, transpose:Bool, v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void - { #else public inline function uniformMatrix3fv(location:GLUniformLocation, transpose:Bool, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - { #end - + { var count = 0; if (srcLength != null) count = srcLength; else if (v != null) count = Std.int(v.length / 9); __tempPointer.set(v, srcOffset); this.uniformMatrix3fv(location, count, transpose, __tempPointer); - } public function uniformMatrix3x2fv(location:GLUniformLocation, transpose:Bool, + } + + public function uniformMatrix3x2fv(location:GLUniformLocation, transpose:Bool, v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void { var count = 0; @@ -4858,20 +4856,20 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic #if !lime_webgl public function uniformMatrix4fv(location:GLUniformLocation, transpose:Bool, v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void - { #else public inline function uniformMatrix4fv(location:GLUniformLocation, transpose:Bool, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - { #end - + { var count = 0; if (srcLength != null) count = srcLength; else if (v != null) count = v.length >> 4; __tempPointer.set(v, srcOffset); this.uniformMatrix4fv(location, count, transpose, __tempPointer); - } public function uniformMatrix4x2fv(location:GLUniformLocation, + } + + public function uniformMatrix4x2fv(location:GLUniformLocation, transpose:Bool, v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void { var count = 0; From ec20e46dca69e80d264c45e997ed8c1694aaefcb Mon Sep 17 00:00:00 2001 From: Joseph Cloutier Date: Sun, 7 May 2023 15:24:04 -0400 Subject: [PATCH 02/18] `WebGl2RenderContext`: fix some indentation. If we fix all the indentation at once, it will permanently mess up the diff. Git will see that the new line 4544 matches the old line 3773, and conclude that it got moved 800 lines down. --- src/lime/graphics/WebGL2RenderContext.hx | 121 ++++++++++++----------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/src/lime/graphics/WebGL2RenderContext.hx b/src/lime/graphics/WebGL2RenderContext.hx index 3be01bf8b..7668ff4f2 100644 --- a/src/lime/graphics/WebGL2RenderContext.hx +++ b/src/lime/graphics/WebGL2RenderContext.hx @@ -3770,11 +3770,12 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic __tempPointer.set(srcData, srcOffset); this.bufferData(target, size, __tempPointer, usage); } - #if !lime_webgl + + #if !lime_webgl public inline function bufferSubData(target:Int, offset:Int, srcData:ArrayBufferView, srcOffset:Int = 0, ?length:Int):Void - #else + #else public inline function bufferSubData(target:Int, offset:Int, srcData:Dynamic, ?srcOffset:Int, ?length:Int):Void - #end + #end { var size = (length != null) ? length : (srcData != null) ? srcData.byteLength : 0; @@ -3845,15 +3846,15 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.compileShader(shader); } - #if !lime_webgl + #if !lime_webgl public function compressedTexImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, srcData:ArrayBufferView, srcOffset:Int = 0, ?srcLengthOverride:Int):Void - #else + #else public inline function compressedTexImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, srcData:Dynamic, ?srcOffset:Int, ?srcLengthOverride:Int):Void - #end + #end { var imageSize = (srcLengthOverride != null) ? srcLengthOverride : (srcData != null) ? srcData.byteLength : 0; @@ -3870,15 +3871,15 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.compressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, __tempPointer); } - #if !lime_webgl + #if !lime_webgl public inline function compressedTexSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, srcData:ArrayBufferView, srcOffset:Int = 0, ?srcLengthOverride:Int):Void - #else + #else public inline function compressedTexSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, srcData:Dynamic, ?srcOffset:Int, ?srcLengthOverride:Int):Void - #end + #end { var imageSize = (srcLengthOverride != null) ? srcLengthOverride : (srcData != null) ? srcData.byteLength : 0; @@ -4186,17 +4187,17 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic return this.getBufferParameter(target, pname); } - #if !lime_webgl + #if !lime_webgl public inline function getBufferSubData(target:Int, srcByteOffset:DataPointer, dstData:ArrayBuffer, srcOffset:Int = 0, ?length:Int):Void - #else + #else public inline function getBufferSubData(target:Int, srcByteOffset:DataPointer, dstData:Dynamic, ?srcOffset:Dynamic, ?length:Int):Void - #end + #end { - #if !js + #if !js var size = (length != null) ? length : (dstData != null) ? dstData.length : 0; this.getBufferSubData(target, srcByteOffset + srcOffset, size, dstData); - #end + #end } public inline function getContextAttributes():GLContextAttributes @@ -4449,12 +4450,12 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.readBuffer(src); } - #if !lime_webgl + #if !lime_webgl public inline function readPixels(x:Int, y:Int, width:Int, height:Int, format:Int, type:Int, pixels:ArrayBufferView, dstOffset:Int = 0):Void - #else + #else public inline function readPixels(x:Int, y:Int, width:Int, height:Int, format:Int, type:Int, pixels:Dynamic, ?dstOffset:Int):Void - #end + #end { __tempPointer.set(pixels, dstOffset); this.readPixels(x, y, width, height, format, type, __tempPointer); @@ -4530,20 +4531,20 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.stencilOpSeparate(face, fail, zfail, zpass); } - #if !lime_webgl + #if !lime_webgl public inline function texImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, format:Int, type:Int, srcData:ArrayBufferView, srcOffset:Int = 0):Void - #else + #else public inline function texImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Dynamic, ?format:Int, ?type:Int, ?srcData:Dynamic, ?srcOffset:Int):Void - #end + #end { - #if !lime_webgl + #if !lime_webgl __tempPointer.set(srcData, srcOffset); this.texImage2D(target, level, internalformat, width, height, border, format, type, __tempPointer); - #end + #end } public inline function texImage3D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, depth:Int, border:Int, @@ -4574,15 +4575,15 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.texParameteri(target, pname, param); } - #if !lime_webgl + #if !lime_webgl public inline function texSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, type:Int, srcData:ArrayBufferView, srcOffset:Int = 0):Void - #else + #else public inline function texSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Dynamic, ?type:Int, ?srcData:Dynamic, ?srcOffset:Int):Void - #end + #end { __tempPointer.set(srcData, srcOffset); this.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, __tempPointer); @@ -4606,11 +4607,11 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.uniform1f(location, v0); } - #if !lime_webgl + #if !lime_webgl public inline function uniform1fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, ?srcLength:Int):Void - #else + #else public inline function uniform1fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - #end + #end { this.uniform1fv(location, v != null ? v.length : 0, v); } @@ -4620,11 +4621,11 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.uniform1i(location, v0); } - #if !lime_webgl + #if !lime_webgl public inline function uniform1iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void - #else + #else public inline function uniform1iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - #end + #end { this.uniform1iv(location, v != null ? v.length : 0, v); } @@ -4644,11 +4645,11 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.uniform2f(location, v0, v1); } - #if !lime_webgl + #if !lime_webgl public inline function uniform2fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, ?srcLength:Int):Void - #else + #else public function uniform2fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - #end + #end { this.uniform2fv(location, v != null ? v.length >> 1 : 0, v); } @@ -4658,11 +4659,11 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.uniform2i(location, v0, v1); } - #if !lime_webgl + #if !lime_webgl public inline function uniform2iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void - #else + #else public inline function uniform2iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - #end + #end { this.uniform2iv(location, v != null ? v.length >> 1 : 0, v); } @@ -4683,13 +4684,13 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.uniform3f(location, v0, v1, v2); } - #if !lime_webgl + #if !lime_webgl public inline function uniform3fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, ?srcLength:Int):Void - #else + #else public inline function uniform3fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - #end + #end { this.uniform3fv(location, v != null ? Std.int(v.length / 3) : 0, v); } @@ -4699,13 +4700,13 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.uniform3i(location, v0, v1, v2); } - #if !lime_webgl + #if !lime_webgl public inline function uniform3iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void - #else + #else public inline function uniform3iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - #end + #end { this.uniform3iv(location, v != null ? Std.int(v.length / 3) : 0, v); } @@ -4727,13 +4728,13 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.uniform4f(location, v0, v1, v2, v3); } - #if !lime_webgl + #if !lime_webgl public inline function uniform4fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, ?srcLength:Int):Void - #else + #else public inline function uniform4fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - #end + #end { this.uniform4fv(location, v != null ? v.length >> 2 : 0, v); } @@ -4744,13 +4745,13 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.uniform4i(location, v0, v1, v2, v3); } - #if !lime_webgl + #if !lime_webgl public inline function uniform4iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void - #else + #else public inline function uniform4iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - #end + #end { this.uniform4iv(location, v != null ? v.length >> 2 : 0, v); } @@ -4773,13 +4774,13 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.uniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding); } - #if !lime_webgl + #if !lime_webgl public function uniformMatrix2fv(location:GLUniformLocation, transpose:Bool, v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void - #else + #else public inline function uniformMatrix2fv(location:GLUniformLocation, transpose:Bool, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - #end + #end { var count = 0; @@ -4813,13 +4814,13 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.uniformMatrix2x4fv(location, count, transpose, __tempPointer); } - #if !lime_webgl + #if !lime_webgl public function uniformMatrix3fv(location:GLUniformLocation, transpose:Bool, v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void - #else + #else public inline function uniformMatrix3fv(location:GLUniformLocation, transpose:Bool, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - #end + #end { var count = 0; @@ -4853,13 +4854,13 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic this.uniformMatrix3x4fv(location, count, transpose, __tempPointer); } - #if !lime_webgl + #if !lime_webgl public function uniformMatrix4fv(location:GLUniformLocation, transpose:Bool, v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void - #else + #else public inline function uniformMatrix4fv(location:GLUniformLocation, transpose:Bool, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void - #end + #end { var count = 0; @@ -5004,12 +5005,12 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic return context.webgl2; } - #if (!doc_gen && (lime_opengl || lime_opengles)) + #if (!doc_gen && (lime_opengl || lime_opengles)) @:from private static function fromOpenGLES3RenderContext(gl:OpenGLES3RenderContext):WebGL2RenderContext { return cast gl; } - #end + #end @:from private static function fromGL(gl:Class):WebGL2RenderContext { From 3aec2c6a494d9fc1aa3684d040ccce58bb57bdd1 Mon Sep 17 00:00:00 2001 From: Joseph Cloutier Date: Sun, 7 May 2023 15:32:36 -0400 Subject: [PATCH 03/18] Fix `WebGL2RenderContext` indentation up to line 3847. Perhaps going a few lines at a time will help Git manage. --- src/lime/graphics/WebGL2RenderContext.hx | 116 +++++++++++------------ 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/src/lime/graphics/WebGL2RenderContext.hx b/src/lime/graphics/WebGL2RenderContext.hx index 7668ff4f2..078f2fea1 100644 --- a/src/lime/graphics/WebGL2RenderContext.hx +++ b/src/lime/graphics/WebGL2RenderContext.hx @@ -3772,79 +3772,79 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic } #if !lime_webgl - public inline function bufferSubData(target:Int, offset:Int, srcData:ArrayBufferView, srcOffset:Int = 0, ?length:Int):Void + public inline function bufferSubData(target:Int, offset:Int, srcData:ArrayBufferView, srcOffset:Int = 0, ?length:Int):Void #else - public inline function bufferSubData(target:Int, offset:Int, srcData:Dynamic, ?srcOffset:Int, ?length:Int):Void + public inline function bufferSubData(target:Int, offset:Int, srcData:Dynamic, ?srcOffset:Int, ?length:Int):Void #end - { - var size = (length != null) ? length : (srcData != null) ? srcData.byteLength : 0; + { + var size = (length != null) ? length : (srcData != null) ? srcData.byteLength : 0; - __tempPointer.set(srcData, srcOffset); - this.bufferSubData(target, offset, size, __tempPointer); - } + __tempPointer.set(srcData, srcOffset); + this.bufferSubData(target, offset, size, __tempPointer); + } - public inline function checkFramebufferStatus(target:Int):Int - { - return this.checkFramebufferStatus(target); - } + public inline function checkFramebufferStatus(target:Int):Int + { + return this.checkFramebufferStatus(target); + } - public inline function clear(mask:Int):Void - { - this.clear(mask); - } + public inline function clear(mask:Int):Void + { + this.clear(mask); + } - public inline function clearBufferfi(buffer:Int, drawbuffer:Int, depth:Float, stencil:Int):Void - { - this.clearBufferfi(buffer, drawbuffer, depth, stencil); - } + public inline function clearBufferfi(buffer:Int, drawbuffer:Int, depth:Float, stencil:Int):Void + { + this.clearBufferfi(buffer, drawbuffer, depth, stencil); + } - public function clearBufferfv(buffer:Int, drawbuffer:Int, values:ArrayBufferView, srcOffset:Int = 0):Void - { - __tempPointer.set(values, srcOffset); - this.clearBufferfv(buffer, drawbuffer, __tempPointer); - } + public function clearBufferfv(buffer:Int, drawbuffer:Int, values:ArrayBufferView, srcOffset:Int = 0):Void + { + __tempPointer.set(values, srcOffset); + this.clearBufferfv(buffer, drawbuffer, __tempPointer); + } - public function clearBufferiv(buffer:Int, drawbuffer:Int, values:ArrayBufferView, ?srcOffset:Int):Void - { - __tempPointer.set(values, srcOffset); - this.clearBufferiv(buffer, drawbuffer, __tempPointer); - } + public function clearBufferiv(buffer:Int, drawbuffer:Int, values:ArrayBufferView, ?srcOffset:Int):Void + { + __tempPointer.set(values, srcOffset); + this.clearBufferiv(buffer, drawbuffer, __tempPointer); + } - public function clearBufferuiv(buffer:Int, drawbuffer:Int, values:ArrayBufferView, ?srcOffset:Int):Void - { - __tempPointer.set(values, srcOffset); - this.clearBufferuiv(buffer, drawbuffer, __tempPointer); - } + public function clearBufferuiv(buffer:Int, drawbuffer:Int, values:ArrayBufferView, ?srcOffset:Int):Void + { + __tempPointer.set(values, srcOffset); + this.clearBufferuiv(buffer, drawbuffer, __tempPointer); + } - public inline function clearColor(red:Float, green:Float, blue:Float, alpha:Float):Void - { - this.clearColor(red, green, blue, alpha); - } + public inline function clearColor(red:Float, green:Float, blue:Float, alpha:Float):Void + { + this.clearColor(red, green, blue, alpha); + } - public inline function clearDepth(depth:Float):Void - { - this.clearDepthf(depth); - } + public inline function clearDepth(depth:Float):Void + { + this.clearDepthf(depth); + } - public inline function clearStencil(s:Int):Void - { - this.clearStencil(s); - } + public inline function clearStencil(s:Int):Void + { + this.clearStencil(s); + } - public inline function clientWaitSync(sync:GLSync, flags:Int, timeout:Int64):Int - { - return this.clientWaitSync(sync, flags, timeout); - } + public inline function clientWaitSync(sync:GLSync, flags:Int, timeout:Int64):Int + { + return this.clientWaitSync(sync, flags, timeout); + } - public inline function colorMask(red:Bool, green:Bool, blue:Bool, alpha:Bool):Void - { - this.colorMask(red, green, blue, alpha); - } + public inline function colorMask(red:Bool, green:Bool, blue:Bool, alpha:Bool):Void + { + this.colorMask(red, green, blue, alpha); + } - public inline function compileShader(shader:GLShader):Void - { - this.compileShader(shader); - } + public inline function compileShader(shader:GLShader):Void + { + this.compileShader(shader); + } #if !lime_webgl public function compressedTexImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, srcData:ArrayBufferView, From 087660f7a70bc2d1d190bb2bc09a51e62f331a68 Mon Sep 17 00:00:00 2001 From: Joseph Cloutier Date: Sun, 7 May 2023 15:33:56 -0400 Subject: [PATCH 04/18] Fix `WebGL2RenderContext` indentation up to line 4189. --- src/lime/graphics/WebGL2RenderContext.hx | 542 +++++++++++------------ 1 file changed, 271 insertions(+), 271 deletions(-) diff --git a/src/lime/graphics/WebGL2RenderContext.hx b/src/lime/graphics/WebGL2RenderContext.hx index 078f2fea1..03c51e669 100644 --- a/src/lime/graphics/WebGL2RenderContext.hx +++ b/src/lime/graphics/WebGL2RenderContext.hx @@ -3847,345 +3847,345 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic } #if !lime_webgl - public function compressedTexImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, srcData:ArrayBufferView, - srcOffset:Int = 0, - ?srcLengthOverride:Int):Void + public function compressedTexImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, srcData:ArrayBufferView, + srcOffset:Int = 0, + ?srcLengthOverride:Int):Void #else - public inline function compressedTexImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, srcData:Dynamic, - ?srcOffset:Int, - ?srcLengthOverride:Int):Void + public inline function compressedTexImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, srcData:Dynamic, + ?srcOffset:Int, + ?srcLengthOverride:Int):Void #end - { - var imageSize = (srcLengthOverride != null) ? srcLengthOverride : (srcData != null) ? srcData.byteLength : 0; + { + var imageSize = (srcLengthOverride != null) ? srcLengthOverride : (srcData != null) ? srcData.byteLength : 0; - __tempPointer.set(srcData, srcOffset); - this.compressedTexImage2D(target, level, internalformat, width, height, border, imageSize, __tempPointer); - } + __tempPointer.set(srcData, srcOffset); + this.compressedTexImage2D(target, level, internalformat, width, height, border, imageSize, __tempPointer); + } - public function compressedTexImage3D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, depth:Int, border:Int, - srcData:ArrayBufferView, - srcOffset:Int = 0, ?srcLengthOverride:Int):Void - { - var imageSize = (srcLengthOverride != null) ? srcLengthOverride : (srcData != null) ? srcData.byteLength : 0; - __tempPointer.set(srcData, srcOffset); - this.compressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, __tempPointer); - } + public function compressedTexImage3D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, depth:Int, border:Int, + srcData:ArrayBufferView, + srcOffset:Int = 0, ?srcLengthOverride:Int):Void + { + var imageSize = (srcLengthOverride != null) ? srcLengthOverride : (srcData != null) ? srcData.byteLength : 0; + __tempPointer.set(srcData, srcOffset); + this.compressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, __tempPointer); + } #if !lime_webgl - public inline function compressedTexSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, - srcData:ArrayBufferView, - srcOffset:Int = 0, ?srcLengthOverride:Int):Void + public inline function compressedTexSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, + srcData:ArrayBufferView, + srcOffset:Int = 0, ?srcLengthOverride:Int):Void #else - public inline function compressedTexSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, - srcData:Dynamic, - ?srcOffset:Int, ?srcLengthOverride:Int):Void + public inline function compressedTexSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, + srcData:Dynamic, + ?srcOffset:Int, ?srcLengthOverride:Int):Void #end - { - var imageSize = (srcLengthOverride != null) ? srcLengthOverride : (srcData != null) ? srcData.byteLength : 0; + { + var imageSize = (srcLengthOverride != null) ? srcLengthOverride : (srcData != null) ? srcData.byteLength : 0; - __tempPointer.set(srcData, srcOffset); - this.compressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, __tempPointer); - } + __tempPointer.set(srcData, srcOffset); + this.compressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, __tempPointer); + } - public inline function compressedTexSubImage3D(target:Int, level:Int, xoffset:Int, yoffset:Int, zoffset:Int, width:Int, height:Int, - depth:Int, format:Int, - srcData:ArrayBufferView, srcOffset:Int = 0, ?srcLengthOverride:Int):Void - { - var imageSize = (srcLengthOverride != null) ? srcLengthOverride : (srcData != null) ? srcData.byteLength : 0; - __tempPointer.set(srcData, srcOffset); - this.compressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, __tempPointer); - } + public inline function compressedTexSubImage3D(target:Int, level:Int, xoffset:Int, yoffset:Int, zoffset:Int, width:Int, height:Int, + depth:Int, format:Int, + srcData:ArrayBufferView, srcOffset:Int = 0, ?srcLengthOverride:Int):Void + { + var imageSize = (srcLengthOverride != null) ? srcLengthOverride : (srcData != null) ? srcData.byteLength : 0; + __tempPointer.set(srcData, srcOffset); + this.compressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, __tempPointer); + } - public inline function copyBufferSubData(readTarget:Int, writeTarget:Int, readOffset:DataPointer, writeOffset:DataPointer, size:Int):Void - { - this.copyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size); - } + public inline function copyBufferSubData(readTarget:Int, writeTarget:Int, readOffset:DataPointer, writeOffset:DataPointer, size:Int):Void + { + this.copyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size); + } - public inline function copyTexImage2D(target:Int, level:Int, internalformat:Int, x:Int, y:Int, width:Int, height:Int, border:Int):Void - { - this.copyTexImage2D(target, level, internalformat, x, y, width, height, border); - } + public inline function copyTexImage2D(target:Int, level:Int, internalformat:Int, x:Int, y:Int, width:Int, height:Int, border:Int):Void + { + this.copyTexImage2D(target, level, internalformat, x, y, width, height, border); + } - public inline function copyTexSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, x:Int, y:Int, width:Int, height:Int):Void - { - this.copyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height); - } + public inline function copyTexSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, x:Int, y:Int, width:Int, height:Int):Void + { + this.copyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height); + } - public inline function copyTexSubImage3D(target:Int, level:Int, xoffset:Int, yoffset:Int, zoffset:Int, x:Int, y:Int, width:Int, - height:Int):Void - { - this.copyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height); - } + public inline function copyTexSubImage3D(target:Int, level:Int, xoffset:Int, yoffset:Int, zoffset:Int, x:Int, y:Int, width:Int, + height:Int):Void + { + this.copyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height); + } - public inline function createBuffer():GLBuffer - { - return this.createBuffer(); - } + public inline function createBuffer():GLBuffer + { + return this.createBuffer(); + } - public inline function createFramebuffer():GLFramebuffer - { - return this.createFramebuffer(); - } + public inline function createFramebuffer():GLFramebuffer + { + return this.createFramebuffer(); + } - public inline function createProgram():GLProgram - { - return this.createProgram(); - } + public inline function createProgram():GLProgram + { + return this.createProgram(); + } - public inline function createQuery():GLQuery - { - return this.createQuery(); - } + public inline function createQuery():GLQuery + { + return this.createQuery(); + } - public inline function createRenderbuffer():GLRenderbuffer - { - return this.createRenderbuffer(); - } + public inline function createRenderbuffer():GLRenderbuffer + { + return this.createRenderbuffer(); + } - public inline function createSampler():GLSampler - { - return this.createSampler(); - } + public inline function createSampler():GLSampler + { + return this.createSampler(); + } - public inline function createShader(type:Int):GLShader - { - return this.createShader(type); - } + public inline function createShader(type:Int):GLShader + { + return this.createShader(type); + } - public inline function createTexture():GLTexture - { - return this.createTexture(); - } + public inline function createTexture():GLTexture + { + return this.createTexture(); + } - public inline function createTransformFeedback():GLTransformFeedback - { - return this.createTransformFeedback(); - } + public inline function createTransformFeedback():GLTransformFeedback + { + return this.createTransformFeedback(); + } - public inline function createVertexArray():GLVertexArrayObject - { - return this.createVertexArray(); - } + public inline function createVertexArray():GLVertexArrayObject + { + return this.createVertexArray(); + } - public inline function cullFace(mode:Int):Void - { - this.cullFace(mode); - } + public inline function cullFace(mode:Int):Void + { + this.cullFace(mode); + } - public inline function deleteBuffer(buffer:GLBuffer):Void - { - this.deleteBuffer(buffer); - } + public inline function deleteBuffer(buffer:GLBuffer):Void + { + this.deleteBuffer(buffer); + } - public inline function deleteFramebuffer(framebuffer:GLFramebuffer):Void - { - this.deleteFramebuffer(framebuffer); - } + public inline function deleteFramebuffer(framebuffer:GLFramebuffer):Void + { + this.deleteFramebuffer(framebuffer); + } - public inline function deleteProgram(program:GLProgram):Void - { - this.deleteProgram(program); - } + public inline function deleteProgram(program:GLProgram):Void + { + this.deleteProgram(program); + } - public inline function deleteQuery(query:GLQuery):Void - { - this.deleteQuery(query); - } + public inline function deleteQuery(query:GLQuery):Void + { + this.deleteQuery(query); + } - public inline function deleteRenderbuffer(renderbuffer:GLRenderbuffer):Void - { - this.deleteRenderbuffer(renderbuffer); - } + public inline function deleteRenderbuffer(renderbuffer:GLRenderbuffer):Void + { + this.deleteRenderbuffer(renderbuffer); + } - public inline function deleteSampler(sampler:GLSampler):Void - { - this.deleteSampler(sampler); - } + public inline function deleteSampler(sampler:GLSampler):Void + { + this.deleteSampler(sampler); + } - public inline function deleteShader(shader:GLShader):Void - { - this.deleteShader(shader); - } + public inline function deleteShader(shader:GLShader):Void + { + this.deleteShader(shader); + } - public inline function deleteSync(sync:GLSync):Void - { - this.deleteSync(sync); - } + public inline function deleteSync(sync:GLSync):Void + { + this.deleteSync(sync); + } - public inline function deleteTexture(texture:GLTexture):Void - { - this.deleteTexture(texture); - } + public inline function deleteTexture(texture:GLTexture):Void + { + this.deleteTexture(texture); + } - public inline function deleteTransformFeedback(transformFeedback:GLTransformFeedback):Void - { - this.deleteTransformFeedback(transformFeedback); - } + public inline function deleteTransformFeedback(transformFeedback:GLTransformFeedback):Void + { + this.deleteTransformFeedback(transformFeedback); + } - public inline function deleteVertexArray(vertexArray:GLVertexArrayObject):Void - { - this.deleteVertexArray(vertexArray); - } + public inline function deleteVertexArray(vertexArray:GLVertexArrayObject):Void + { + this.deleteVertexArray(vertexArray); + } - public inline function depthFunc(func:Int):Void - { - this.depthFunc(func); - } + public inline function depthFunc(func:Int):Void + { + this.depthFunc(func); + } - public inline function depthMask(flag:Bool):Void - { - this.depthMask(flag); - } + public inline function depthMask(flag:Bool):Void + { + this.depthMask(flag); + } - public inline function depthRange(zNear:Float, zFar:Float):Void - { - this.depthRangef(zNear, zFar); - } + public inline function depthRange(zNear:Float, zFar:Float):Void + { + this.depthRangef(zNear, zFar); + } - public inline function detachShader(program:GLProgram, shader:GLShader):Void - { - this.detachShader(program, shader); - } + public inline function detachShader(program:GLProgram, shader:GLShader):Void + { + this.detachShader(program, shader); + } - public inline function disable(cap:Int):Void - { - this.disable(cap); - } + public inline function disable(cap:Int):Void + { + this.disable(cap); + } - public inline function disableVertexAttribArray(index:Int):Void - { - this.disableVertexAttribArray(index); - } + public inline function disableVertexAttribArray(index:Int):Void + { + this.disableVertexAttribArray(index); + } - public inline function drawArrays(mode:Int, first:Int, count:Int):Void - { - this.drawArrays(mode, first, count); - } + public inline function drawArrays(mode:Int, first:Int, count:Int):Void + { + this.drawArrays(mode, first, count); + } - public inline function drawArraysInstanced(mode:Int, first:Int, count:Int, instanceCount:Int):Void - { - this.drawArraysInstanced(mode, first, count, instanceCount); - } + public inline function drawArraysInstanced(mode:Int, first:Int, count:Int, instanceCount:Int):Void + { + this.drawArraysInstanced(mode, first, count, instanceCount); + } - public inline function drawBuffers(buffers:Array):Void - { - this.drawBuffers(buffers); - } + public inline function drawBuffers(buffers:Array):Void + { + this.drawBuffers(buffers); + } - public inline function drawElements(mode:Int, count:Int, type:Int, offset:DataPointer):Void - { - this.drawElements(mode, count, type, offset); - } + public inline function drawElements(mode:Int, count:Int, type:Int, offset:DataPointer):Void + { + this.drawElements(mode, count, type, offset); + } - public inline function drawElementsInstanced(mode:Int, count:Int, type:Int, offset:DataPointer, instanceCount:Int):Void - { - this.drawElementsInstanced(mode, count, type, offset, instanceCount); - } + public inline function drawElementsInstanced(mode:Int, count:Int, type:Int, offset:DataPointer, instanceCount:Int):Void + { + this.drawElementsInstanced(mode, count, type, offset, instanceCount); + } - public inline function drawRangeElements(mode:Int, start:Int, end:Int, count:Int, type:Int, offset:DataPointer):Void - { - this.drawRangeElements(mode, start, end, count, type, offset); - } + public inline function drawRangeElements(mode:Int, start:Int, end:Int, count:Int, type:Int, offset:DataPointer):Void + { + this.drawRangeElements(mode, start, end, count, type, offset); + } - public inline function enable(cap:Int):Void - { - this.enable(cap); - } + public inline function enable(cap:Int):Void + { + this.enable(cap); + } - public inline function enableVertexAttribArray(index:Int):Void - { - this.enableVertexAttribArray(index); - } + public inline function enableVertexAttribArray(index:Int):Void + { + this.enableVertexAttribArray(index); + } - public inline function endQuery(target:Int):Void - { - this.endQuery(target); - } + public inline function endQuery(target:Int):Void + { + this.endQuery(target); + } - public inline function endTransformFeedback():Void - { - this.endTransformFeedback(); - } + public inline function endTransformFeedback():Void + { + this.endTransformFeedback(); + } - public inline function fenceSync(condition:Int, flags:Int):GLSync - { - return this.fenceSync(condition, flags); - } + public inline function fenceSync(condition:Int, flags:Int):GLSync + { + return this.fenceSync(condition, flags); + } - public inline function finish():Void - { - this.finish(); - } + public inline function finish():Void + { + this.finish(); + } - public inline function flush():Void - { - this.flush(); - } + public inline function flush():Void + { + this.flush(); + } - public inline function framebufferRenderbuffer(target:Int, attachment:Int, renderbuffertarget:Int, renderbuffer:GLRenderbuffer):Void - { - this.framebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer); - } + public inline function framebufferRenderbuffer(target:Int, attachment:Int, renderbuffertarget:Int, renderbuffer:GLRenderbuffer):Void + { + this.framebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer); + } - public inline function framebufferTexture2D(target:Int, attachment:Int, textarget:Int, texture:GLTexture, level:Int):Void - { - this.framebufferTexture2D(target, attachment, textarget, texture, level); - } + public inline function framebufferTexture2D(target:Int, attachment:Int, textarget:Int, texture:GLTexture, level:Int):Void + { + this.framebufferTexture2D(target, attachment, textarget, texture, level); + } - public inline function framebufferTextureLayer(target:Int, attachment:Int, texture:GLTexture, level:Int, layer:Int):Void - { - this.framebufferTextureLayer(target, attachment, texture, level, layer); - } + public inline function framebufferTextureLayer(target:Int, attachment:Int, texture:GLTexture, level:Int, layer:Int):Void + { + this.framebufferTextureLayer(target, attachment, texture, level, layer); + } - public inline function frontFace(mode:Int):Void - { - this.frontFace(mode); - } + public inline function frontFace(mode:Int):Void + { + this.frontFace(mode); + } - public inline function generateMipmap(target:Int):Void - { - this.generateMipmap(target); - } + public inline function generateMipmap(target:Int):Void + { + this.generateMipmap(target); + } - public inline function getActiveAttrib(program:GLProgram, index:Int):GLActiveInfo - { - return this.getActiveAttrib(program, index); - } + public inline function getActiveAttrib(program:GLProgram, index:Int):GLActiveInfo + { + return this.getActiveAttrib(program, index); + } - public inline function getActiveUniform(program:GLProgram, index:Int):GLActiveInfo - { - return this.getActiveUniform(program, index); - } + public inline function getActiveUniform(program:GLProgram, index:Int):GLActiveInfo + { + return this.getActiveUniform(program, index); + } - public inline function getActiveUniformBlockName(program:GLProgram, uniformBlockIndex:Int):String - { - return this.getActiveUniformBlockName(program, uniformBlockIndex); - } + public inline function getActiveUniformBlockName(program:GLProgram, uniformBlockIndex:Int):String + { + return this.getActiveUniformBlockName(program, uniformBlockIndex); + } - public inline function getActiveUniformBlockParameter(program:GLProgram, uniformBlockIndex:Int, pname:Int):Dynamic - { - return this.getActiveUniformBlockParameter(program, uniformBlockIndex, pname); - } + public inline function getActiveUniformBlockParameter(program:GLProgram, uniformBlockIndex:Int, pname:Int):Dynamic + { + return this.getActiveUniformBlockParameter(program, uniformBlockIndex, pname); + } - public inline function getActiveUniforms(program:GLProgram, uniformIndices:Array, pname:Int):Dynamic - { - return this.getActiveUniforms(program, uniformIndices, pname); - } + public inline function getActiveUniforms(program:GLProgram, uniformIndices:Array, pname:Int):Dynamic + { + return this.getActiveUniforms(program, uniformIndices, pname); + } - public inline function getAttachedShaders(program:GLProgram):Array - { - return this.getAttachedShaders(program); - } + public inline function getAttachedShaders(program:GLProgram):Array + { + return this.getAttachedShaders(program); + } - public inline function getAttribLocation(program:GLProgram, name:String):Int - { - return this.getAttribLocation(program, name); - } + public inline function getAttribLocation(program:GLProgram, name:String):Int + { + return this.getAttribLocation(program, name); + } - public inline function getBufferParameter(target:Int, pname:Int):Dynamic - { - return this.getBufferParameter(target, pname); - } + public inline function getBufferParameter(target:Int, pname:Int):Dynamic + { + return this.getBufferParameter(target, pname); + } #if !lime_webgl public inline function getBufferSubData(target:Int, srcByteOffset:DataPointer, dstData:ArrayBuffer, srcOffset:Int = 0, ?length:Int):Void From 5f7d3170ac6dfe5b586644bb17ccb7d1869deb5e Mon Sep 17 00:00:00 2001 From: Joseph Cloutier Date: Sun, 7 May 2023 15:34:52 -0400 Subject: [PATCH 05/18] Fix `WebGL2RenderContext` indentation up to line 4533. --- src/lime/graphics/WebGL2RenderContext.hx | 542 +++++++++++------------ 1 file changed, 271 insertions(+), 271 deletions(-) diff --git a/src/lime/graphics/WebGL2RenderContext.hx b/src/lime/graphics/WebGL2RenderContext.hx index 03c51e669..7595dddca 100644 --- a/src/lime/graphics/WebGL2RenderContext.hx +++ b/src/lime/graphics/WebGL2RenderContext.hx @@ -4188,348 +4188,348 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic } #if !lime_webgl - public inline function getBufferSubData(target:Int, srcByteOffset:DataPointer, dstData:ArrayBuffer, srcOffset:Int = 0, ?length:Int):Void + public inline function getBufferSubData(target:Int, srcByteOffset:DataPointer, dstData:ArrayBuffer, srcOffset:Int = 0, ?length:Int):Void #else - public inline function getBufferSubData(target:Int, srcByteOffset:DataPointer, dstData:Dynamic, ?srcOffset:Dynamic, ?length:Int):Void + public inline function getBufferSubData(target:Int, srcByteOffset:DataPointer, dstData:Dynamic, ?srcOffset:Dynamic, ?length:Int):Void #end - { - #if !js - var size = (length != null) ? length : (dstData != null) ? dstData.length : 0; + { + #if !js + var size = (length != null) ? length : (dstData != null) ? dstData.length : 0; - this.getBufferSubData(target, srcByteOffset + srcOffset, size, dstData); - #end - } + this.getBufferSubData(target, srcByteOffset + srcOffset, size, dstData); + #end + } - public inline function getContextAttributes():GLContextAttributes - { - return this.getContextAttributes(); - } + public inline function getContextAttributes():GLContextAttributes + { + return this.getContextAttributes(); + } - public inline function getError():Int - { - return this.getError(); - } + public inline function getError():Int + { + return this.getError(); + } - public inline function getExtension(name:String):Dynamic - { - return this.getExtension(name); - } + public inline function getExtension(name:String):Dynamic + { + return this.getExtension(name); + } - public inline function getFragDataLocation(program:GLProgram, name:String):Int - { - return this.getFragDataLocation(program, name); - } + public inline function getFragDataLocation(program:GLProgram, name:String):Int + { + return this.getFragDataLocation(program, name); + } - public inline function getFramebufferAttachmentParameter(target:Int, attachment:Int, pname:Int):Dynamic - { - return this.getFramebufferAttachmentParameter(target, attachment, pname); - } + public inline function getFramebufferAttachmentParameter(target:Int, attachment:Int, pname:Int):Dynamic + { + return this.getFramebufferAttachmentParameter(target, attachment, pname); + } - public inline function getIndexedParameter(target:Int, index:Int):Dynamic - { - return this.getIndexedParameter(target, index); - } + public inline function getIndexedParameter(target:Int, index:Int):Dynamic + { + return this.getIndexedParameter(target, index); + } - public inline function getInternalformatParameter(target:Int, internalformat:Int, pname:Int):Dynamic - { - return this.getInternalformatParameter(target, internalformat, pname); - } + public inline function getInternalformatParameter(target:Int, internalformat:Int, pname:Int):Dynamic + { + return this.getInternalformatParameter(target, internalformat, pname); + } - public inline function getParameter(pname:Int):Dynamic - { - return this.getParameter(pname); - } + public inline function getParameter(pname:Int):Dynamic + { + return this.getParameter(pname); + } - public inline function getProgramInfoLog(program:GLProgram):String - { - return this.getProgramInfoLog(program); - } + public inline function getProgramInfoLog(program:GLProgram):String + { + return this.getProgramInfoLog(program); + } - public inline function getProgramParameter(program:GLProgram, pname:Int):Dynamic - { - return this.getProgramParameter(program, pname); - } + public inline function getProgramParameter(program:GLProgram, pname:Int):Dynamic + { + return this.getProgramParameter(program, pname); + } - public inline function getQuery(target:Int, pname:Int):GLQuery - { - return this.getQuery(target, pname); - } + public inline function getQuery(target:Int, pname:Int):GLQuery + { + return this.getQuery(target, pname); + } - public inline function getQueryParameter(query:GLQuery, pname:Int):Dynamic - { - return this.getQueryParameter(query, pname); - } + public inline function getQueryParameter(query:GLQuery, pname:Int):Dynamic + { + return this.getQueryParameter(query, pname); + } - public inline function getRenderbufferParameter(target:Int, pname:Int):Dynamic - { - return this.getRenderbufferParameter(target, pname); - } + public inline function getRenderbufferParameter(target:Int, pname:Int):Dynamic + { + return this.getRenderbufferParameter(target, pname); + } - public inline function getSamplerParameter(sampler:GLSampler, pname:Int):Dynamic - { - return this.getSamplerParameter(sampler, pname); - } + public inline function getSamplerParameter(sampler:GLSampler, pname:Int):Dynamic + { + return this.getSamplerParameter(sampler, pname); + } - public inline function getShaderInfoLog(shader:GLShader):String - { - return this.getShaderInfoLog(shader); - } + public inline function getShaderInfoLog(shader:GLShader):String + { + return this.getShaderInfoLog(shader); + } - public inline function getShaderParameter(shader:GLShader, pname:Int):Dynamic - { - return this.getShaderParameter(shader, pname); - } + public inline function getShaderParameter(shader:GLShader, pname:Int):Dynamic + { + return this.getShaderParameter(shader, pname); + } - public inline function getShaderPrecisionFormat(shadertype:Int, precisiontype:Int):GLShaderPrecisionFormat - { - return this.getShaderPrecisionFormat(shadertype, precisiontype); - } + public inline function getShaderPrecisionFormat(shadertype:Int, precisiontype:Int):GLShaderPrecisionFormat + { + return this.getShaderPrecisionFormat(shadertype, precisiontype); + } - public inline function getShaderSource(shader:GLShader):String - { - return this.getShaderSource(shader); - } + public inline function getShaderSource(shader:GLShader):String + { + return this.getShaderSource(shader); + } - public inline function getSupportedExtensions():Array - { - return this.getSupportedExtensions(); - } + public inline function getSupportedExtensions():Array + { + return this.getSupportedExtensions(); + } - public inline function getSyncParameter(sync:GLSync, pname:Int):Dynamic - { - return this.getSyncParameter(sync, pname); - } + public inline function getSyncParameter(sync:GLSync, pname:Int):Dynamic + { + return this.getSyncParameter(sync, pname); + } - public inline function getTexParameter(target:Int, pname:Int):Dynamic - { - return this.getTexParameter(target, pname); - } + public inline function getTexParameter(target:Int, pname:Int):Dynamic + { + return this.getTexParameter(target, pname); + } - public inline function getTransformFeedbackVarying(program:GLProgram, index:Int):GLActiveInfo - { - return this.getTransformFeedbackVarying(program, index); - } + public inline function getTransformFeedbackVarying(program:GLProgram, index:Int):GLActiveInfo + { + return this.getTransformFeedbackVarying(program, index); + } - public inline function getUniform(program:GLProgram, location:GLUniformLocation):Dynamic - { - return this.getUniform(program, location); - } + public inline function getUniform(program:GLProgram, location:GLUniformLocation):Dynamic + { + return this.getUniform(program, location); + } - public inline function getUniformBlockIndex(program:GLProgram, uniformBlockName:String):Int - { - return this.getUniformBlockIndex(program, uniformBlockName); - } + public inline function getUniformBlockIndex(program:GLProgram, uniformBlockName:String):Int + { + return this.getUniformBlockIndex(program, uniformBlockName); + } - public inline function getUniformIndices(program:GLProgram, uniformNames:Array):Array - { - return this.getUniformIndices(program, uniformNames); - } + public inline function getUniformIndices(program:GLProgram, uniformNames:Array):Array + { + return this.getUniformIndices(program, uniformNames); + } - public inline function getUniformLocation(program:GLProgram, name:String):GLUniformLocation - { - return this.getUniformLocation(program, name); - } + public inline function getUniformLocation(program:GLProgram, name:String):GLUniformLocation + { + return this.getUniformLocation(program, name); + } - public inline function getVertexAttrib(index:Int, pname:Int):Dynamic - { - return this.getVertexAttrib(index, pname); - } + public inline function getVertexAttrib(index:Int, pname:Int):Dynamic + { + return this.getVertexAttrib(index, pname); + } - public inline function getVertexAttribOffset(index:Int, pname:Int):DataPointer - { - return this.getVertexAttribPointerv(index, pname); - } + public inline function getVertexAttribOffset(index:Int, pname:Int):DataPointer + { + return this.getVertexAttribPointerv(index, pname); + } - public inline function hint(target:Int, mode:Int):Void - { - this.hint(target, mode); - } + public inline function hint(target:Int, mode:Int):Void + { + this.hint(target, mode); + } - public inline function invalidateFramebuffer(target:Int, attachments:Array):Void - { - this.invalidateFramebuffer(target, attachments); - } + public inline function invalidateFramebuffer(target:Int, attachments:Array):Void + { + this.invalidateFramebuffer(target, attachments); + } - public inline function invalidateSubFramebuffer(target:Int, attachments:Array, x:Int, y:Int, width:Int, height:Int):Void - { - this.invalidateSubFramebuffer(target, attachments, x, y, width, height); - } + public inline function invalidateSubFramebuffer(target:Int, attachments:Array, x:Int, y:Int, width:Int, height:Int):Void + { + this.invalidateSubFramebuffer(target, attachments, x, y, width, height); + } - public inline function isBuffer(buffer:GLBuffer):Bool - { - return this.isBuffer(buffer); - } + public inline function isBuffer(buffer:GLBuffer):Bool + { + return this.isBuffer(buffer); + } - public inline function isContextLost():Bool - { - return this.isContextLost(); - } + public inline function isContextLost():Bool + { + return this.isContextLost(); + } - public inline function isEnabled(cap:Int):Bool - { - return this.isEnabled(cap); - } + public inline function isEnabled(cap:Int):Bool + { + return this.isEnabled(cap); + } - public inline function isFramebuffer(framebuffer:GLFramebuffer):Bool - { - return this.isFramebuffer(framebuffer); - } + public inline function isFramebuffer(framebuffer:GLFramebuffer):Bool + { + return this.isFramebuffer(framebuffer); + } - public inline function isProgram(program:GLProgram):Bool - { - return this.isProgram(program); - } + public inline function isProgram(program:GLProgram):Bool + { + return this.isProgram(program); + } - public inline function isQuery(query:GLQuery):Bool - { - return this.isQuery(query); - } + public inline function isQuery(query:GLQuery):Bool + { + return this.isQuery(query); + } - public inline function isRenderbuffer(renderbuffer:GLRenderbuffer):Bool - { - return this.isRenderbuffer(renderbuffer); - } + public inline function isRenderbuffer(renderbuffer:GLRenderbuffer):Bool + { + return this.isRenderbuffer(renderbuffer); + } - public inline function isSampler(sampler:GLSampler):Bool - { - return this.isSampler(sampler); - } + public inline function isSampler(sampler:GLSampler):Bool + { + return this.isSampler(sampler); + } - public inline function isShader(shader:GLShader):Bool - { - return this.isShader(shader); - } + public inline function isShader(shader:GLShader):Bool + { + return this.isShader(shader); + } - public inline function isSync(sync:GLSync):Bool - { - return this.isSync(sync); - } + public inline function isSync(sync:GLSync):Bool + { + return this.isSync(sync); + } - public inline function isTexture(texture:GLTexture):Bool - { - return this.isTexture(texture); - } + public inline function isTexture(texture:GLTexture):Bool + { + return this.isTexture(texture); + } - public inline function isTransformFeedback(transformFeedback:GLTransformFeedback):Bool - { - return this.isTransformFeedback(transformFeedback); - } + public inline function isTransformFeedback(transformFeedback:GLTransformFeedback):Bool + { + return this.isTransformFeedback(transformFeedback); + } - public inline function isVertexArray(vertexArray:GLVertexArrayObject):Bool - { - return this.isVertexArray(vertexArray); - } + public inline function isVertexArray(vertexArray:GLVertexArrayObject):Bool + { + return this.isVertexArray(vertexArray); + } - public inline function lineWidth(width:Float):Void - { - this.lineWidth(width); - } + public inline function lineWidth(width:Float):Void + { + this.lineWidth(width); + } - public inline function linkProgram(program:GLProgram):Void - { - this.linkProgram(program); - } + public inline function linkProgram(program:GLProgram):Void + { + this.linkProgram(program); + } - public inline function pauseTransformFeedback():Void - { - this.pauseTransformFeedback(); - } + public inline function pauseTransformFeedback():Void + { + this.pauseTransformFeedback(); + } - public inline function pixelStorei(pname:Int, param:Int):Void - { - this.pixelStorei(pname, param); - } + public inline function pixelStorei(pname:Int, param:Int):Void + { + this.pixelStorei(pname, param); + } - public inline function polygonOffset(factor:Float, units:Float):Void - { - this.polygonOffset(factor, units); - } + public inline function polygonOffset(factor:Float, units:Float):Void + { + this.polygonOffset(factor, units); + } - public inline function readBuffer(src:Int):Void - { - this.readBuffer(src); - } + public inline function readBuffer(src:Int):Void + { + this.readBuffer(src); + } #if !lime_webgl - public inline function readPixels(x:Int, y:Int, width:Int, height:Int, format:Int, type:Int, pixels:ArrayBufferView, - dstOffset:Int = 0):Void + public inline function readPixels(x:Int, y:Int, width:Int, height:Int, format:Int, type:Int, pixels:ArrayBufferView, + dstOffset:Int = 0):Void #else - public inline function readPixels(x:Int, y:Int, width:Int, height:Int, format:Int, type:Int, pixels:Dynamic, ?dstOffset:Int):Void + public inline function readPixels(x:Int, y:Int, width:Int, height:Int, format:Int, type:Int, pixels:Dynamic, ?dstOffset:Int):Void #end - { - __tempPointer.set(pixels, dstOffset); - this.readPixels(x, y, width, height, format, type, __tempPointer); - } + { + __tempPointer.set(pixels, dstOffset); + this.readPixels(x, y, width, height, format, type, __tempPointer); + } - public inline function renderbufferStorage(target:Int, internalformat:Int, width:Int, height:Int):Void - { - this.renderbufferStorage(target, internalformat, width, height); - } + public inline function renderbufferStorage(target:Int, internalformat:Int, width:Int, height:Int):Void + { + this.renderbufferStorage(target, internalformat, width, height); + } - public inline function renderbufferStorageMultisample(target:Int, samples:Int, internalformat:Int, width:Int, height:Int):Void - { - this.renderbufferStorageMultisample(target, samples, internalformat, width, height); - } + public inline function renderbufferStorageMultisample(target:Int, samples:Int, internalformat:Int, width:Int, height:Int):Void + { + this.renderbufferStorageMultisample(target, samples, internalformat, width, height); + } - public inline function resumeTransformFeedback():Void - { - this.resumeTransformFeedback(); - } + public inline function resumeTransformFeedback():Void + { + this.resumeTransformFeedback(); + } - public inline function sampleCoverage(value:Float, invert:Bool):Void - { - this.sampleCoverage(value, invert); - } + public inline function sampleCoverage(value:Float, invert:Bool):Void + { + this.sampleCoverage(value, invert); + } - public inline function samplerParameterf(sampler:GLSampler, pname:Int, param:Float):Void - { - this.samplerParameterf(sampler, pname, param); - } + public inline function samplerParameterf(sampler:GLSampler, pname:Int, param:Float):Void + { + this.samplerParameterf(sampler, pname, param); + } - public inline function samplerParameteri(sampler:GLSampler, pname:Int, param:Int):Void - { - this.samplerParameteri(sampler, pname, param); - } + public inline function samplerParameteri(sampler:GLSampler, pname:Int, param:Int):Void + { + this.samplerParameteri(sampler, pname, param); + } - public inline function scissor(x:Int, y:Int, width:Int, height:Int):Void - { - this.scissor(x, y, width, height); - } + public inline function scissor(x:Int, y:Int, width:Int, height:Int):Void + { + this.scissor(x, y, width, height); + } - public inline function shaderSource(shader:GLShader, source:String):Void - { - this.shaderSource(shader, source); - } + public inline function shaderSource(shader:GLShader, source:String):Void + { + this.shaderSource(shader, source); + } - public inline function stencilFunc(func:Int, ref:Int, mask:Int):Void - { - this.stencilFunc(func, ref, mask); - } + public inline function stencilFunc(func:Int, ref:Int, mask:Int):Void + { + this.stencilFunc(func, ref, mask); + } - public inline function stencilFuncSeparate(face:Int, func:Int, ref:Int, mask:Int):Void - { - this.stencilFuncSeparate(face, func, ref, mask); - } + public inline function stencilFuncSeparate(face:Int, func:Int, ref:Int, mask:Int):Void + { + this.stencilFuncSeparate(face, func, ref, mask); + } - public inline function stencilMask(mask:Int):Void - { - this.stencilMask(mask); - } + public inline function stencilMask(mask:Int):Void + { + this.stencilMask(mask); + } - public inline function stencilMaskSeparate(face:Int, mask:Int):Void - { - this.stencilMaskSeparate(face, mask); - } + public inline function stencilMaskSeparate(face:Int, mask:Int):Void + { + this.stencilMaskSeparate(face, mask); + } - public inline function stencilOp(fail:Int, zfail:Int, zpass:Int):Void - { - this.stencilOp(fail, zfail, zpass); - } + public inline function stencilOp(fail:Int, zfail:Int, zpass:Int):Void + { + this.stencilOp(fail, zfail, zpass); + } - public inline function stencilOpSeparate(face:Int, fail:Int, zfail:Int, zpass:Int):Void - { - this.stencilOpSeparate(face, fail, zfail, zpass); - } + public inline function stencilOpSeparate(face:Int, fail:Int, zfail:Int, zpass:Int):Void + { + this.stencilOpSeparate(face, fail, zfail, zpass); + } #if !lime_webgl public inline function texImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, format:Int, From 9c63387e5f42078663f4efb86747b5e7b61ef36a Mon Sep 17 00:00:00 2001 From: Joseph Cloutier Date: Sun, 7 May 2023 15:35:39 -0400 Subject: [PATCH 06/18] Fix `WebGL2RenderContext` indentation up to line 4661. --- src/lime/graphics/WebGL2RenderContext.hx | 186 +++++++++++------------ 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/src/lime/graphics/WebGL2RenderContext.hx b/src/lime/graphics/WebGL2RenderContext.hx index 7595dddca..1f8a1e1c3 100644 --- a/src/lime/graphics/WebGL2RenderContext.hx +++ b/src/lime/graphics/WebGL2RenderContext.hx @@ -4532,132 +4532,132 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic } #if !lime_webgl - public inline function texImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, format:Int, - type:Int, srcData:ArrayBufferView, - srcOffset:Int = 0):Void + public inline function texImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, format:Int, + type:Int, srcData:ArrayBufferView, + srcOffset:Int = 0):Void #else - public inline function texImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Dynamic, ?format:Int, - ?type:Int, ?srcData:Dynamic, - ?srcOffset:Int):Void + public inline function texImage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Dynamic, ?format:Int, + ?type:Int, ?srcData:Dynamic, + ?srcOffset:Int):Void #end - { + { #if !lime_webgl - __tempPointer.set(srcData, srcOffset); - this.texImage2D(target, level, internalformat, width, height, border, format, type, __tempPointer); + __tempPointer.set(srcData, srcOffset); + this.texImage2D(target, level, internalformat, width, height, border, format, type, __tempPointer); #end - } + } - public inline function texImage3D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, depth:Int, border:Int, - format:Int, type:Int, - srcData:ArrayBufferView, srcOffset:Int = 0):Void - { - __tempPointer.set(srcData, srcOffset); - this.texImage3D(target, level, internalformat, width, height, depth, border, format, type, __tempPointer); - } + public inline function texImage3D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, depth:Int, border:Int, + format:Int, type:Int, + srcData:ArrayBufferView, srcOffset:Int = 0):Void + { + __tempPointer.set(srcData, srcOffset); + this.texImage3D(target, level, internalformat, width, height, depth, border, format, type, __tempPointer); + } - public inline function texStorage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int):Void - { - this.texStorage2D(target, level, internalformat, width, height); - } + public inline function texStorage2D(target:Int, level:Int, internalformat:Int, width:Int, height:Int):Void + { + this.texStorage2D(target, level, internalformat, width, height); + } - public inline function texStorage3D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, depth:Int):Void - { - this.texStorage3D(target, level, internalformat, width, height, depth); - } + public inline function texStorage3D(target:Int, level:Int, internalformat:Int, width:Int, height:Int, depth:Int):Void + { + this.texStorage3D(target, level, internalformat, width, height, depth); + } - public inline function texParameterf(target:Int, pname:Int, param:Float):Void - { - this.texParameterf(target, pname, param); - } + public inline function texParameterf(target:Int, pname:Int, param:Float):Void + { + this.texParameterf(target, pname, param); + } - public inline function texParameteri(target:Int, pname:Int, param:Int):Void - { - this.texParameteri(target, pname, param); - } + public inline function texParameteri(target:Int, pname:Int, param:Int):Void + { + this.texParameteri(target, pname, param); + } #if !lime_webgl - public inline function texSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, - type:Int, srcData:ArrayBufferView, - srcOffset:Int = 0):Void + public inline function texSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, + type:Int, srcData:ArrayBufferView, + srcOffset:Int = 0):Void #else - public inline function texSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Dynamic, - ?type:Int, ?srcData:Dynamic, - ?srcOffset:Int):Void + public inline function texSubImage2D(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Dynamic, + ?type:Int, ?srcData:Dynamic, + ?srcOffset:Int):Void #end - { - __tempPointer.set(srcData, srcOffset); - this.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, __tempPointer); - } + { + __tempPointer.set(srcData, srcOffset); + this.texSubImage2D(target, level, xoffset, yoffset, width, height, format, type, __tempPointer); + } - public inline function texSubImage3D(target:Int, level:Int, xoffset:Int, yoffset:Int, zoffset:Int, width:Int, height:Int, - depth:Int, format:Int, type:Int, - srcData:ArrayBufferView, srcOffset:Int = 0):Void - { - __tempPointer.set(srcData, srcOffset); - this.texSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, __tempPointer); - } + public inline function texSubImage3D(target:Int, level:Int, xoffset:Int, yoffset:Int, zoffset:Int, width:Int, height:Int, + depth:Int, format:Int, type:Int, + srcData:ArrayBufferView, srcOffset:Int = 0):Void + { + __tempPointer.set(srcData, srcOffset); + this.texSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, __tempPointer); + } - public inline function transformFeedbackVaryings(program:GLProgram, varyings:Array, bufferMode:Int):Void - { - this.transformFeedbackVaryings(program, varyings, bufferMode); - } + public inline function transformFeedbackVaryings(program:GLProgram, varyings:Array, bufferMode:Int):Void + { + this.transformFeedbackVaryings(program, varyings, bufferMode); + } - public inline function uniform1f(location:GLUniformLocation, v0:Float):Void - { - this.uniform1f(location, v0); - } + public inline function uniform1f(location:GLUniformLocation, v0:Float):Void + { + this.uniform1f(location, v0); + } #if !lime_webgl - public inline function uniform1fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, ?srcLength:Int):Void + public inline function uniform1fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, ?srcLength:Int):Void #else - public inline function uniform1fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void + public inline function uniform1fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void #end - { - this.uniform1fv(location, v != null ? v.length : 0, v); - } + { + this.uniform1fv(location, v != null ? v.length : 0, v); + } - public inline function uniform1i(location:GLUniformLocation, v0:Int):Void - { - this.uniform1i(location, v0); - } + public inline function uniform1i(location:GLUniformLocation, v0:Int):Void + { + this.uniform1i(location, v0); + } #if !lime_webgl - public inline function uniform1iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void + public inline function uniform1iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void #else - public inline function uniform1iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void + public inline function uniform1iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void #end - { - this.uniform1iv(location, v != null ? v.length : 0, v); - } + { + this.uniform1iv(location, v != null ? v.length : 0, v); + } - public inline function uniform1ui(location:GLUniformLocation, v0:Int):Void - { - this.uniform1ui(location, v0); - } + public inline function uniform1ui(location:GLUniformLocation, v0:Int):Void + { + this.uniform1ui(location, v0); + } - public inline function uniform1uiv(location:GLUniformLocation, v:UInt32Array, ?srcOffset:Int, ?srcLength:Int):Void - { - this.uniform1uiv(location, v != null ? v.length : 0, v); - } + public inline function uniform1uiv(location:GLUniformLocation, v:UInt32Array, ?srcOffset:Int, ?srcLength:Int):Void + { + this.uniform1uiv(location, v != null ? v.length : 0, v); + } - public inline function uniform2f(location:GLUniformLocation, v0:Float, v1:Float):Void - { - this.uniform2f(location, v0, v1); - } + public inline function uniform2f(location:GLUniformLocation, v0:Float, v1:Float):Void + { + this.uniform2f(location, v0, v1); + } #if !lime_webgl - public inline function uniform2fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, ?srcLength:Int):Void + public inline function uniform2fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, ?srcLength:Int):Void #else - public function uniform2fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void + public function uniform2fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void #end - { - this.uniform2fv(location, v != null ? v.length >> 1 : 0, v); - } + { + this.uniform2fv(location, v != null ? v.length >> 1 : 0, v); + } - public inline function uniform2i(location:GLUniformLocation, v0:Int, v1:Int):Void - { - this.uniform2i(location, v0, v1); - } + public inline function uniform2i(location:GLUniformLocation, v0:Int, v1:Int):Void + { + this.uniform2i(location, v0, v1); + } #if !lime_webgl public inline function uniform2iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void From 542007680da8d44ec0b957665f8aa8ee43879f6d Mon Sep 17 00:00:00 2001 From: Joseph Cloutier Date: Sun, 7 May 2023 15:36:20 -0400 Subject: [PATCH 07/18] Fix `WebGL2RenderContext` indentation up to line 4816. --- src/lime/graphics/WebGL2RenderContext.hx | 226 +++++++++++------------ 1 file changed, 113 insertions(+), 113 deletions(-) diff --git a/src/lime/graphics/WebGL2RenderContext.hx b/src/lime/graphics/WebGL2RenderContext.hx index 1f8a1e1c3..0590c3984 100644 --- a/src/lime/graphics/WebGL2RenderContext.hx +++ b/src/lime/graphics/WebGL2RenderContext.hx @@ -4660,159 +4660,159 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic } #if !lime_webgl - public inline function uniform2iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void + public inline function uniform2iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, ?srcLength:Int):Void #else - public inline function uniform2iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void + public inline function uniform2iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void #end - { - this.uniform2iv(location, v != null ? v.length >> 1 : 0, v); - } + { + this.uniform2iv(location, v != null ? v.length >> 1 : 0, v); + } - public inline function uniform2ui(location:GLUniformLocation, v0:Int, v1:Int):Void - { - this.uniform2ui(location, v0, v1); - } + public inline function uniform2ui(location:GLUniformLocation, v0:Int, v1:Int):Void + { + this.uniform2ui(location, v0, v1); + } - public inline function uniform2uiv(location:GLUniformLocation, v:UInt32Array, ?srcOffset:Int, - ?srcLength:Int):Void - { - this.uniform2uiv(location, v != null ? v.length >> 1 : 0, v); - } + public inline function uniform2uiv(location:GLUniformLocation, v:UInt32Array, ?srcOffset:Int, + ?srcLength:Int):Void + { + this.uniform2uiv(location, v != null ? v.length >> 1 : 0, v); + } - public inline function uniform3f(location:GLUniformLocation, v0:Float, v1:Float, v2:Float):Void - { - this.uniform3f(location, v0, v1, v2); - } + public inline function uniform3f(location:GLUniformLocation, v0:Float, v1:Float, v2:Float):Void + { + this.uniform3f(location, v0, v1, v2); + } #if !lime_webgl - public inline function uniform3fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, - ?srcLength:Int):Void + public inline function uniform3fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, + ?srcLength:Int):Void #else - public inline function uniform3fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, - ?srcLength:Int):Void + public inline function uniform3fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, + ?srcLength:Int):Void #end - { - this.uniform3fv(location, v != null ? Std.int(v.length / 3) : 0, v); - } + { + this.uniform3fv(location, v != null ? Std.int(v.length / 3) : 0, v); + } - public inline function uniform3i(location:GLUniformLocation, v0:Int, v1:Int, v2:Int):Void - { - this.uniform3i(location, v0, v1, v2); - } + public inline function uniform3i(location:GLUniformLocation, v0:Int, v1:Int, v2:Int):Void + { + this.uniform3i(location, v0, v1, v2); + } #if !lime_webgl - public inline function uniform3iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, - ?srcLength:Int):Void + public inline function uniform3iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, + ?srcLength:Int):Void #else - public inline function uniform3iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, - ?srcLength:Int):Void + public inline function uniform3iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, + ?srcLength:Int):Void #end - { - this.uniform3iv(location, v != null ? Std.int(v.length / 3) : 0, v); - } + { + this.uniform3iv(location, v != null ? Std.int(v.length / 3) : 0, v); + } - public inline function uniform3ui(location:GLUniformLocation, v0:Int, v1:Int, v2:Int):Void - { - this.uniform3ui(location, v0, v1, v2); - } + public inline function uniform3ui(location:GLUniformLocation, v0:Int, v1:Int, v2:Int):Void + { + this.uniform3ui(location, v0, v1, v2); + } - public inline function uniform3uiv(location:GLUniformLocation, v:UInt32Array, ?srcOffset:Int, - ?srcLength:Int):Void - { - this.uniform3uiv(location, v != null ? Std.int(v.length / 3) : 0, v); - } + public inline function uniform3uiv(location:GLUniformLocation, v:UInt32Array, ?srcOffset:Int, + ?srcLength:Int):Void + { + this.uniform3uiv(location, v != null ? Std.int(v.length / 3) : 0, v); + } - public inline function uniform4f(location:GLUniformLocation, v0:Float, v1:Float, v2:Float, - v3:Float):Void - { - this.uniform4f(location, v0, v1, v2, v3); - } + public inline function uniform4f(location:GLUniformLocation, v0:Float, v1:Float, v2:Float, + v3:Float):Void + { + this.uniform4f(location, v0, v1, v2, v3); + } #if !lime_webgl - public inline function uniform4fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, - ?srcLength:Int):Void + public inline function uniform4fv(location:GLUniformLocation, v:Float32Array, ?srcOffset:Int, + ?srcLength:Int):Void #else - public inline function uniform4fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, - ?srcLength:Int):Void + public inline function uniform4fv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, + ?srcLength:Int):Void #end - { - this.uniform4fv(location, v != null ? v.length >> 2 : 0, v); - } + { + this.uniform4fv(location, v != null ? v.length >> 2 : 0, v); + } - public inline function uniform4i(location:GLUniformLocation, v0:Int, v1:Int, v2:Int, - v3:Int):Void - { - this.uniform4i(location, v0, v1, v2, v3); - } + public inline function uniform4i(location:GLUniformLocation, v0:Int, v1:Int, v2:Int, + v3:Int):Void + { + this.uniform4i(location, v0, v1, v2, v3); + } #if !lime_webgl - public inline function uniform4iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, - ?srcLength:Int):Void + public inline function uniform4iv(location:GLUniformLocation, v:Int32Array, ?srcOffset:Int, + ?srcLength:Int):Void #else - public inline function uniform4iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, - ?srcLength:Int):Void + public inline function uniform4iv(location:GLUniformLocation, v:Dynamic, ?srcOffset:Int, + ?srcLength:Int):Void #end - { - this.uniform4iv(location, v != null ? v.length >> 2 : 0, v); - } + { + this.uniform4iv(location, v != null ? v.length >> 2 : 0, v); + } - public inline function uniform4ui(location:GLUniformLocation, v0:Int, v1:Int, v2:Int, - v3:Int):Void - { - this.uniform4ui(location, v0, v1, v2, v3); - } + public inline function uniform4ui(location:GLUniformLocation, v0:Int, v1:Int, v2:Int, + v3:Int):Void + { + this.uniform4ui(location, v0, v1, v2, v3); + } - public inline function uniform4uiv(location:GLUniformLocation, v:UInt32Array, - ?srcOffset:Int, ?srcLength:Int):Void - { - this.uniform4uiv(location, v != null ? v.length >> 2 : 0, v); - } + public inline function uniform4uiv(location:GLUniformLocation, v:UInt32Array, + ?srcOffset:Int, ?srcLength:Int):Void + { + this.uniform4uiv(location, v != null ? v.length >> 2 : 0, v); + } - public inline function uniformBlockBinding(program:GLProgram, uniformBlockIndex:Int, - uniformBlockBinding:Int):Void - { - this.uniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding); - } + public inline function uniformBlockBinding(program:GLProgram, uniformBlockIndex:Int, + uniformBlockBinding:Int):Void + { + this.uniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding); + } #if !lime_webgl - public function uniformMatrix2fv(location:GLUniformLocation, transpose:Bool, - v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void + public function uniformMatrix2fv(location:GLUniformLocation, transpose:Bool, + v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void #else - public inline function uniformMatrix2fv(location:GLUniformLocation, transpose:Bool, - v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void + public inline function uniformMatrix2fv(location:GLUniformLocation, transpose:Bool, + v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void #end - { - var count = 0; + { + var count = 0; - if (srcLength != null) count = srcLength; - else if (v != null) count = v.length >> 2; - __tempPointer.set(v, srcOffset); - this.uniformMatrix2fv(location, count, transpose, __tempPointer); - } + if (srcLength != null) count = srcLength; + else if (v != null) count = v.length >> 2; + __tempPointer.set(v, srcOffset); + this.uniformMatrix2fv(location, count, transpose, __tempPointer); + } - public function uniformMatrix2x3fv(location:GLUniformLocation, transpose:Bool, - v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void - { - var count = 0; - if (srcLength != null) count = srcLength; - else if (v != null) count = Std.int(v.length / 6); + public function uniformMatrix2x3fv(location:GLUniformLocation, transpose:Bool, + v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void + { + var count = 0; + if (srcLength != null) count = srcLength; + else if (v != null) count = Std.int(v.length / 6); - __tempPointer.set(v, srcOffset); + __tempPointer.set(v, srcOffset); - this.uniformMatrix2x3fv(location, count, transpose, __tempPointer); - } + this.uniformMatrix2x3fv(location, count, transpose, __tempPointer); + } - public function uniformMatrix2x4fv(location:GLUniformLocation, transpose:Bool, - v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void - { - var count = 0; - if (srcLength != null) count = srcLength; - else if (v != null) count = Std.int(v.length / 8); + public function uniformMatrix2x4fv(location:GLUniformLocation, transpose:Bool, + v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void + { + var count = 0; + if (srcLength != null) count = srcLength; + else if (v != null) count = Std.int(v.length / 8); - __tempPointer.set(v, srcOffset); + __tempPointer.set(v, srcOffset); - this.uniformMatrix2x4fv(location, count, transpose, __tempPointer); - } + this.uniformMatrix2x4fv(location, count, transpose, __tempPointer); + } #if !lime_webgl public function uniformMatrix3fv(location:GLUniformLocation, transpose:Bool, From d43eab44aff7d7543ff51ac15ae8fa869724901a Mon Sep 17 00:00:00 2001 From: Joseph Cloutier Date: Sun, 7 May 2023 15:39:50 -0400 Subject: [PATCH 08/18] Fix rest of `WebGL2RenderContext` indentation. This all could have been one big change, but the diff view would be very hard to read. Breaking it up like this allows Git to highlight the whitespace changes for you. Otherwise, it would show that 1245 lines were removed and replaced by 1245 new lines, not recognizing that any of those lines match. --- src/lime/graphics/WebGL2RenderContext.hx | 316 +++++++++++------------ 1 file changed, 158 insertions(+), 158 deletions(-) diff --git a/src/lime/graphics/WebGL2RenderContext.hx b/src/lime/graphics/WebGL2RenderContext.hx index 0590c3984..3fdc91364 100644 --- a/src/lime/graphics/WebGL2RenderContext.hx +++ b/src/lime/graphics/WebGL2RenderContext.hx @@ -4815,206 +4815,206 @@ abstract WebGL2RenderContext(Dynamic) from Dynamic to Dynamic } #if !lime_webgl - public function uniformMatrix3fv(location:GLUniformLocation, transpose:Bool, - v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void + public function uniformMatrix3fv(location:GLUniformLocation, transpose:Bool, + v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void #else - public inline function uniformMatrix3fv(location:GLUniformLocation, transpose:Bool, - v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void + public inline function uniformMatrix3fv(location:GLUniformLocation, transpose:Bool, + v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void #end - { - var count = 0; + { + var count = 0; - if (srcLength != null) count = srcLength; - else if (v != null) count = Std.int(v.length / 9); - __tempPointer.set(v, srcOffset); - this.uniformMatrix3fv(location, count, transpose, __tempPointer); - } + if (srcLength != null) count = srcLength; + else if (v != null) count = Std.int(v.length / 9); + __tempPointer.set(v, srcOffset); + this.uniformMatrix3fv(location, count, transpose, __tempPointer); + } - public function uniformMatrix3x2fv(location:GLUniformLocation, transpose:Bool, - v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void - { - var count = 0; - if (srcLength != null) count = srcLength; - else if (v != null) count = Std.int(v.length / 6); + public function uniformMatrix3x2fv(location:GLUniformLocation, transpose:Bool, + v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void + { + var count = 0; + if (srcLength != null) count = srcLength; + else if (v != null) count = Std.int(v.length / 6); - __tempPointer.set(v, srcOffset); + __tempPointer.set(v, srcOffset); - this.uniformMatrix3x2fv(location, count, transpose, __tempPointer); - } + this.uniformMatrix3x2fv(location, count, transpose, __tempPointer); + } - public function uniformMatrix3x4fv(location:GLUniformLocation, transpose:Bool, - v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void - { - var count = 0; - if (srcLength != null) count = srcLength; - else if (v != null) count = Std.int(v.length / 12); + public function uniformMatrix3x4fv(location:GLUniformLocation, transpose:Bool, + v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void + { + var count = 0; + if (srcLength != null) count = srcLength; + else if (v != null) count = Std.int(v.length / 12); - __tempPointer.set(v, srcOffset); + __tempPointer.set(v, srcOffset); - this.uniformMatrix3x4fv(location, count, transpose, __tempPointer); - } + this.uniformMatrix3x4fv(location, count, transpose, __tempPointer); + } #if !lime_webgl - public function uniformMatrix4fv(location:GLUniformLocation, transpose:Bool, - v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void + public function uniformMatrix4fv(location:GLUniformLocation, transpose:Bool, + v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void #else - public inline function uniformMatrix4fv(location:GLUniformLocation, transpose:Bool, - v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void + public inline function uniformMatrix4fv(location:GLUniformLocation, transpose:Bool, + v:Dynamic, ?srcOffset:Int, ?srcLength:Int):Void #end - { - var count = 0; + { + var count = 0; - if (srcLength != null) count = srcLength; - else if (v != null) count = v.length >> 4; - __tempPointer.set(v, srcOffset); - this.uniformMatrix4fv(location, count, transpose, __tempPointer); - } + if (srcLength != null) count = srcLength; + else if (v != null) count = v.length >> 4; + __tempPointer.set(v, srcOffset); + this.uniformMatrix4fv(location, count, transpose, __tempPointer); + } - public function uniformMatrix4x2fv(location:GLUniformLocation, - transpose:Bool, v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void - { - var count = 0; - if (srcLength != null) count = srcLength; - else if (v != null) count = Std.int(v.length / 8); + public function uniformMatrix4x2fv(location:GLUniformLocation, + transpose:Bool, v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void + { + var count = 0; + if (srcLength != null) count = srcLength; + else if (v != null) count = Std.int(v.length / 8); - __tempPointer.set(v, srcOffset); + __tempPointer.set(v, srcOffset); - this.uniformMatrix4x2fv(location, count, transpose, __tempPointer); - } + this.uniformMatrix4x2fv(location, count, transpose, __tempPointer); + } - public function uniformMatrix4x3fv(location:GLUniformLocation, transpose:Bool, - v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void - { - var count = 0; - if (srcLength != null) count = srcLength; - else if (v != null) count = Std.int(v.length / 12); + public function uniformMatrix4x3fv(location:GLUniformLocation, transpose:Bool, + v:Float32Array, srcOffset:Int = 0, ?srcLength:Int):Void + { + var count = 0; + if (srcLength != null) count = srcLength; + else if (v != null) count = Std.int(v.length / 12); - __tempPointer.set(v, srcOffset); + __tempPointer.set(v, srcOffset); - this.uniformMatrix4x3fv(location, count, transpose, __tempPointer); - } + this.uniformMatrix4x3fv(location, count, transpose, __tempPointer); + } - public inline function useProgram(program:GLProgram):Void - { - this.useProgram(program); - } + public inline function useProgram(program:GLProgram):Void + { + this.useProgram(program); + } - public inline function validateProgram(program:GLProgram):Void - { - this.validateProgram(program); - } + public inline function validateProgram(program:GLProgram):Void + { + this.validateProgram(program); + } - public inline function vertexAttrib1f(indx:Int, x:Float):Void - { - this.vertexAttrib1f(indx, x); - } + public inline function vertexAttrib1f(indx:Int, x:Float):Void + { + this.vertexAttrib1f(indx, x); + } - public inline function vertexAttrib1fv(indx:Int, - values:#if (!lime_webgl && !doc_gen) DataPointer #else Float32Array #end):Void - { - this.vertexAttrib1fv(indx, values); - } + public inline function vertexAttrib1fv(indx:Int, + values:#if (!lime_webgl && !doc_gen) DataPointer #else Float32Array #end):Void + { + this.vertexAttrib1fv(indx, values); + } - public inline function vertexAttrib2f(indx:Int, x:Float, y:Float):Void - { - this.vertexAttrib2f(indx, x, y); - } + public inline function vertexAttrib2f(indx:Int, x:Float, y:Float):Void + { + this.vertexAttrib2f(indx, x, y); + } - public inline function vertexAttrib2fv(indx:Int, - values:#if (!lime_webgl && !doc_gen) DataPointer #else Float32Array #end):Void - { - this.vertexAttrib2fv(indx, values); - } + public inline function vertexAttrib2fv(indx:Int, + values:#if (!lime_webgl && !doc_gen) DataPointer #else Float32Array #end):Void + { + this.vertexAttrib2fv(indx, values); + } - public inline function vertexAttrib3f(indx:Int, x:Float, y:Float, z:Float):Void - { - this.vertexAttrib3f(indx, x, y, z); - } + public inline function vertexAttrib3f(indx:Int, x:Float, y:Float, z:Float):Void + { + this.vertexAttrib3f(indx, x, y, z); + } - public inline function vertexAttrib3fv(indx:Int, - values:#if (!lime_webgl && !doc_gen) DataPointer #else Float32Array #end):Void - { - this.vertexAttrib3fv(indx, values); - } + public inline function vertexAttrib3fv(indx:Int, + values:#if (!lime_webgl && !doc_gen) DataPointer #else Float32Array #end):Void + { + this.vertexAttrib3fv(indx, values); + } - public inline function vertexAttrib4f(indx:Int, x:Float, y:Float, z:Float, - w:Float):Void - { - this.vertexAttrib4f(indx, x, y, z, w); - } + public inline function vertexAttrib4f(indx:Int, x:Float, y:Float, z:Float, + w:Float):Void + { + this.vertexAttrib4f(indx, x, y, z, w); + } - public inline function vertexAttrib4fv(indx:Int, - values:#if (!lime_webgl && !doc_gen) DataPointer #else Float32Array #end):Void - { - this.vertexAttrib4fv(indx, values); - } + public inline function vertexAttrib4fv(indx:Int, + values:#if (!lime_webgl && !doc_gen) DataPointer #else Float32Array #end):Void + { + this.vertexAttrib4fv(indx, values); + } - public inline function vertexAttribDivisor(index:Int, divisor:Int):Void - { - this.vertexAttribDivisor(index, divisor); - } + public inline function vertexAttribDivisor(index:Int, divisor:Int):Void + { + this.vertexAttribDivisor(index, divisor); + } - public inline function vertexAttribI4i(indx:Int, x:Int, y:Int, z:Int, - w:Int):Void - { - this.vertexAttribI4i(indx, x, y, z, w); - } + public inline function vertexAttribI4i(indx:Int, x:Int, y:Int, z:Int, + w:Int):Void + { + this.vertexAttribI4i(indx, x, y, z, w); + } - public inline function vertexAttribI4iv(indx:Int, - values:#if (!lime_webgl && !doc_gen) DataPointer #else Float32Array #end):Void - { - this.vertexAttribI4iv(indx, values); - } + public inline function vertexAttribI4iv(indx:Int, + values:#if (!lime_webgl && !doc_gen) DataPointer #else Float32Array #end):Void + { + this.vertexAttribI4iv(indx, values); + } - public inline function vertexAttribI4ui(indx:Int, x:Int, y:Int, z:Int, - w:Int):Void - { - this.vertexAttribI4ui(indx, x, y, z, w); - } + public inline function vertexAttribI4ui(indx:Int, x:Int, y:Int, z:Int, + w:Int):Void + { + this.vertexAttribI4ui(indx, x, y, z, w); + } - public inline function vertexAttribI4uiv(indx:Int, - values:#if (!lime_webgl && !doc_gen) DataPointer #else Float32Array #end):Void - { - this.vertexAttribI4uiv(indx, values); - } + public inline function vertexAttribI4uiv(indx:Int, + values:#if (!lime_webgl && !doc_gen) DataPointer #else Float32Array #end):Void + { + this.vertexAttribI4uiv(indx, values); + } - public inline function vertexAttribIPointer(index:Int, size:Int, type:Int, - stride:Int, offset:DataPointer):Void - { - this.vertexAttribIPointer(index, size, type, stride, offset); - } + public inline function vertexAttribIPointer(index:Int, size:Int, type:Int, + stride:Int, offset:DataPointer):Void + { + this.vertexAttribIPointer(index, size, type, stride, offset); + } - public inline function vertexAttribPointer(indx:Int, size:Int, type:Int, - normalized:Bool, stride:Int, offset:DataPointer):Void - { - this.vertexAttribPointer(indx, size, type, normalized, stride, offset); - } + public inline function vertexAttribPointer(indx:Int, size:Int, type:Int, + normalized:Bool, stride:Int, offset:DataPointer):Void + { + this.vertexAttribPointer(indx, size, type, normalized, stride, offset); + } - public inline function viewport(x:Int, y:Int, width:Int, height:Int):Void - { - this.viewport(x, y, width, height); - } + public inline function viewport(x:Int, y:Int, width:Int, height:Int):Void + { + this.viewport(x, y, width, height); + } - public inline function waitSync(sync:GLSync, flags:Int, timeout:Int64):Void - { - this.waitSync(sync, flags, timeout); - } + public inline function waitSync(sync:GLSync, flags:Int, timeout:Int64):Void + { + this.waitSync(sync, flags, timeout); + } - @:from private static function fromRenderContext(context:RenderContext):WebGL2RenderContext - { - return context.webgl2; - } + @:from private static function fromRenderContext(context:RenderContext):WebGL2RenderContext + { + return context.webgl2; + } #if (!doc_gen && (lime_opengl || lime_opengles)) - @:from private static function fromOpenGLES3RenderContext(gl:OpenGLES3RenderContext):WebGL2RenderContext - { - return cast gl; - } + @:from private static function fromOpenGLES3RenderContext(gl:OpenGLES3RenderContext):WebGL2RenderContext + { + return cast gl; + } #end - @:from private static function fromGL(gl:Class):WebGL2RenderContext - { - return cast GL.context; - } - } + @:from private static function fromGL(gl:Class):WebGL2RenderContext + { + return cast GL.context; + } +} #end From 76c76652cc9725d467a6dcad8a2afda172caea03 Mon Sep 17 00:00:00 2001 From: Ludovic Bas Date: Tue, 6 Jun 2023 15:51:01 +0200 Subject: [PATCH 09/18] I don't know why the unload method was empty but now it clears all cached files when calling Assets.unloadLibrary(""); --- src/lime/utils/AssetLibrary.hx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lime/utils/AssetLibrary.hx b/src/lime/utils/AssetLibrary.hx index 673b0d476..c94b0aecc 100644 --- a/src/lime/utils/AssetLibrary.hx +++ b/src/lime/utils/AssetLibrary.hx @@ -611,7 +611,13 @@ class AssetLibrary } } - public function unload():Void {} + public function unload():Void { + cachedBytes.clear(); + cachedFonts.clear(); + cachedImages.clear(); + cachedAudioBuffers.clear(); + cachedText.clear(); + } @:noCompletion private function __assetLoaded(id:String):Void { From 71c18547790c4b93c25653a9554d219ddd2aaa58 Mon Sep 17 00:00:00 2001 From: player-03 Date: Tue, 6 Jun 2023 21:55:37 -0400 Subject: [PATCH 10/18] Don't call `Map.clear()` in Haxe 3. --- src/lime/utils/AssetLibrary.hx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/lime/utils/AssetLibrary.hx b/src/lime/utils/AssetLibrary.hx index c94b0aecc..3c40d9768 100644 --- a/src/lime/utils/AssetLibrary.hx +++ b/src/lime/utils/AssetLibrary.hx @@ -612,11 +612,19 @@ class AssetLibrary } public function unload():Void { + #if haxe4 cachedBytes.clear(); cachedFonts.clear(); cachedImages.clear(); cachedAudioBuffers.clear(); cachedText.clear(); + #else + cachedBytes = new Map(); + cachedFonts = new Map(); + cachedImages = new Map(); + cachedText = new Map(); + classTypes = new Map>(); + #end } @:noCompletion private function __assetLoaded(id:String):Void From 26247f4f4172a4f79c3d938232bc671d38b9e2b4 Mon Sep 17 00:00:00 2001 From: Zeta <53486764+Apprentice-Alchemist@users.noreply.github.com> Date: Sun, 11 Jun 2023 13:42:40 +0200 Subject: [PATCH 11/18] Fix string conversion in hl_window_alert. --- project/src/ExternalInterface.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/project/src/ExternalInterface.cpp b/project/src/ExternalInterface.cpp index 989d1e798..ca2995af7 100644 --- a/project/src/ExternalInterface.cpp +++ b/project/src/ExternalInterface.cpp @@ -3142,7 +3142,9 @@ namespace lime { HL_PRIM void HL_NAME(hl_window_alert) (HL_CFFIPointer* window, hl_vstring* message, hl_vstring* title) { Window* targetWindow = (Window*)window->ptr; - targetWindow->Alert (message ? (const char*)hl_to_utf8 ((const uchar*)message) : NULL, title ? (const char*)hl_to_utf8 ((const uchar*)title) : NULL); + const char *cmessage = message ? hl_to_utf8(message->bytes) : NULL; + const char *ctitle = title ? hl_to_utf8(title->bytes) : NULL; + targetWindow->Alert (cmessage, ctitle); } From b6ebe15d1583bf244ce95141b251c30c60e933f2 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Thu, 29 Jun 2023 10:23:03 -0700 Subject: [PATCH 12/18] Replace Adobe AIR debug certificate because it expired --- templates/air/debug.pfx | Bin 2402 -> 2558 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/templates/air/debug.pfx b/templates/air/debug.pfx index 521eae49770742b85a003c24c76e7cc62351d94f..cc3866275005e473e0dd0dde173a789e6d0d63f7 100644 GIT binary patch literal 2558 zcma);X*d*&7RQZQ%-Hv3!dS{4Lu0QnhQ_|{vNl4p(F!oew%^0kZwqwe_BqY zGDwiyBxzP#xGp4bzh_e^&Hhvo>is2FR(W1lfE1Dw0{yomD-6tnlz_l|lCc0B5Cl*H z@jkmiwymfVfRCjHnf_G4O@j!aVVrVhndP5NQ%q?wM=$k4cUvd5JksMmm2MH2mKA>9 z%1q11$H}MXJq}DF4C!_eSs^F8ugWZ9NV_roX#TRu1h*ke+}XyT%kG`=Rg=s()4d|@ z4XH=OkI{8Y#ibOkOiyDFZ zMTVhNN;FY=40m|olN$- zW?5QQoVa{hJ0rrkI;=+EEefaS`Ow_ACr2QP8mgRP(p=ih!S-X&z-syJBh~P64An>KE~)}Mt7vM#(2AWo@)D&RD>kk=Ecu^7RT<~ zE=fU5-$)}Isbd2z?gX4N_~PZt+ISl*yi;$;)Dr4>1xvZwT5uTHQ}0YYjz7W1YsZqv1^$2zCr|3{ zi0_a!=U?QzNj?#xC1vPW>t0AZD(nu}NawLxsl#0j5P}y*TDmYemuJ)`#ui0|VpJsD z>!Zt{%S>j@>kVowbyA!OG!`axJ>ICd;_No)z>GX+@!4)1;CN)esfdNlX+YIVpEVX= zFwjWS(Mf#)#2|*9{zRXqIdb+!(0WvqJg^(p!CDW|{Z{E+e>^m~`0Dz8?KSJh9Gtzj2v#&)|tGDG*xxhoFfKt27+KzYGeFKKtV zX4t6j^je0rEN|&eU!0m%z$<_2*_6;4IH&n1r`K=gY zyCq(DI(dVqD8FuHy|-u8ZTp1E`Qzpvddv%P=-T_YR=;!gX4&%wG+0b}w1~J)=(f`a ztFVQmON0<76nU?bJ{qRI5(aQ-HGPL*nGZ~6dX#h~$~rn%0BVZr=bfZqE10R9HgPT( z1|Y-tai1(Or25wG4KcWAg8!BMeN#8++!N#DB$Q~NiFlm_jyz#3;QzH$;@qdjxpI^m zA(oDisMT5-Zw-AfyyCOF-zGyANDc8FZjKZ75kIr+YZYc#45U4(NE}9GWxFn#rxtF; zX^9%&7HI$D#kC>JNFqbwFavX)!5ib4FM}fqMVIucoH2ucIeWgX#}1*2jF9SVYo(Ll z>rQtqh?X?$*TmD6JWqTas{F8eQogN^m~U#9jMuDEZ8-Iizzr1c!-S#Vlw*9lHC9U<~*W#nsvNx(>Bh7{f=4#qiHJ_?qF){T`(x=IIC00 z)MruGLh}8NOPHWKNRpLB9Vz{fB&03~;&%+XjFVE=($PU`>S}0dYH4aB3BY&1hu9!x z1mNf|iOvdO`BkX@5WxQmXGUOwszfm4+7wiI)?p<0rh%eu&i@n6a?@fP-a%o#U>6Ge zT|t#+2?U_6%~5H5v?e*zx9%y1J_BJJ2=`wbIM^uP>56DR@`$Luceq293`J7_dKS`k zBE^@IP%X8PSSjNmn|sQo4R0v#zV?neHPPaEqWH0?e|FRw^>%GNGpL^@J=g-)$XSP1 z_>X2f@~#?VZrLgvyRLt8rri5REZTXeF7Wf*FsV}Va72yb8av&YLIbI8Ur70W*%nnB z{72(<%Jxy%4>V-SOM+ceyevPv%NstwYn%21!SZ28Sn^ir@^;|koTBh`Mb`HRA+t`x z{3~as47P*CJS0w5Raw$pqtD1-MXcH%GO==Ef4$Be%hw*>O>A6M+d9ukH3~iHY)B(p z{UC90-IhIoQBnp9%+B%c!zKMNrRN{OJIs}aDtL^_iv_|4lJ=fDhVHa6&ap6hADE_; z7!**y&99!+hRUwkPsFZ9T2ZRIpJ1I**jT3e@ih%is-aA(EJI$_S{|J7*}puz+^YA% zbuUVIMwNykVZJ_oRM?Fb>)hV{*4*0LZ@hF|X3d!nM_k}YOE4gJ$^xzTa_8uQN`Y@R z`bFDG%(L9YXkYB>7}^B*nyRl$5$IImN)*`@O4XmH?Cx3Sq^t~!FD73s8I+Uir^*=l zEd%!49R?Mkp7*C#rsNSfWBM9l-~3JQ(oKq!7$X1?wf)S1Kk~wBIeckUT`!2B`{T)ByfcD}lV~ajMxoEDw z_2yojl>caO(hhHE{>1i2grmv_sII33%4A$R4$>{}s^}hH5=Uynw|LG*RH~8-d}`;a zBVHLuH+Vv>z=&~tpjn%^x$$Doj%F9rJ#JHj#8qtkG(h--hwC5dc&{5q%Ujud8vr>a|=ol{pm#a+J3V_c@8fBiY-_I2q0(1 zcX895&Ixa)djmB3q6W*iltLQXkXA@_B-ihsh!p^40ZHj9dI(It(F153QHbl}>4R4d sgIh9|uUp%zx)1M2-C73;hPoPmtJ)+e&!(`m-}$s3)$jJI;qR0F7g4~Co&W#< delta 2385 zcmV-X39k136XFtoFoFqQ0s#Xsf(aM~2`Yw2hW8Bt2LYgh2?+#(2?a2M2>~#I1zrXT zDuzgg_YDCD0ic2fPXvMmOE7{3M=*i~Lk0^fhDe6@4FL=a0Ro_c1o|+71oki}1_~;M zNQUr$p88?!IeYkAd_Mn z_-A;k0y%5W_wM_ztKnvmBLz60-UV*jg>jC0_Z%n3?4$D{=MxgWQU@pv(YqL((Ae&O z0OZZofpatFlzK6JXupHsE>n8tJs@h00%4yJ74GX4>@s+UT&7HEk2!hc|Z#)z{Q}{z|Q3mwbbKHzx|%WCLx9 zGS_ESrN)kZ*xdxg`VG&Kg5xB}d-kN`J8@)xvx!{UMfR6R3pSeI{Py#-(^<1x*(<-y zHma?SVs|_|an23R=xF0iGVOu7ccZRbh@F+-Jh5umJ57^6a}rUfJwupu_zkI=+grhh zXIU$g($ZX|Nkw3wx-A_%W3-PM_7~|nT!^+r+9biZW?4af-*!CNG0b|dwF z(m4mCxpJEcg`nBa`@3|on~7+n{%zPCgB_)y`XHQDY@vdKsY*yrgFJe;G`dRL@a|I^ zRAU${&3mVGd&Hs$74V@bpdnFiXytvsUNHE=dk_WoVf0|4K!=wRJORp=?-h@zNAI=m zgBp?zl7#>J$3PndVM?dXv7gvE5*kMA~6TUN_XaED=( zVEWLuHMs9XRXos7JnNf&d}>uYk#c!X3o3rvd+~9MiDbYpFfpUfsUa?jv_Gs0Og=fQoR9_q@rg|iY;JpZz zQ<6JIgjD01P>U`!VpvGFUCVKpOwKHAam)40YIDhTvYgyFpIpHL{3|PS}Yy?_F@w0zj<#CHFIqTmhFsino z303cg|HCs5T>*eGEM#qqwM_&SUa-dDbj`IzcT!&DfA={5><_rohnFE?p=0wtObs>$;TyWQ4%Iuqq3Gx}&Re(7Kh2{|g zYNmEpWOv|J9_i(_<9WS!wMupF<3ngooYRw%1uTCxFf%nXGdMFhI50Udf&-fd2`Yw2 zhW8Bt2L_;m1B@_&1Be0v05F0Bfd&aGhDe6@4FLxMFenBJDuzgg_YDCI0R}J{1QY

01OR}714!ruE7h$e`4L(+(lGEOS`|(-l;+AainkAI z{mOqBcE54giZox*W#?Y<)?!U{lqt1{jH8@ie)(5_d$k0cAn9fN#4kyR>8;x1UEi9!C^Y#okY zcs(E%TkVOF;(W^VUK+FL8hbr?B=fw3rO$ukePG?YQ_pIm$;u~VXqjI32wHni_3eC> z&5=H9l&NhvJS&Ty5}I0=lw^jUtY7pAgP!3e#76wVfmdvC>oe531TxRR#zg4P(oh76 zU3-?FDUm0Ql_1`6a^L4gz=*Di$gHOiGJl-TxVmNyM{chqM!P|#o}b8f;9J-&pSgb= z^vs;c_YkuG9^ofV{HP~*4BEq_<_!*Xav%B#OA1_Nbd@)k>REVV9ObHoBXsGhPa6}$ z247h?pkk%iK*EZdbWMU!r@Z~@xw$o+|29!;0(|S{K-+w?wHfKsRIL27U-A{gD+;Wx zEm0SM2UmOP+piuVO^_-ckxLJil>vcTV=(X&~1xAz+X zZT?`y;Yy=Z;42X?SBR{S3fcbERqlH#j?>Uwu3M)6lE!5=M45`4LS$`LR*)KSe`KG( za^S7;B9=kbX71V(hC*-c14{itRcZ}O7K+m1gBV_`a$eMvppcW+720vWJz9ZOAIkG0 zz4il~gNB}kmm>q;WjWN7bf(cy(}*BaPEd&ycZ722r!=Lg4h?6G@=^P&w*&I~0s;g8 D2Y_FL From ef37cd9afb2739561be4943289d36dd047ff5d8d Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Thu, 29 Jun 2023 10:25:38 -0700 Subject: [PATCH 13/18] AIRHelper: needs .app file extension on macOS if AIR target is bundle --- src/lime/tools/AIRHelper.hx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lime/tools/AIRHelper.hx b/src/lime/tools/AIRHelper.hx index 039ea0de6..01045e8d5 100644 --- a/src/lime/tools/AIRHelper.hx +++ b/src/lime/tools/AIRHelper.hx @@ -17,7 +17,10 @@ class AIRHelper { case MAC: - // extension = ".app"; + if (airTarget == "bundle") + { + extension = ".app"; + } case IOS: if (project.targetFlags.exists("simulator")) From a917b5ea51ed24a2811b4ab24bbf2c8c8799b623 Mon Sep 17 00:00:00 2001 From: player-03 Date: Tue, 4 Jul 2023 20:14:39 -0400 Subject: [PATCH 14/18] Don't check out submodules during docs action. The docs action only needs to look at Haxe code, so downloading the submodules just wastes 30-50 seconds. That's a lot of time for an action that clocks in at about 2 minutes. --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e7703f2e0..e73e3c457 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -419,8 +419,6 @@ jobs: steps: - uses: actions/checkout@v3 - with: - submodules: true - uses: krdlab/setup-haxe@v1 with: From 8b27623afb33305317fb30196250151e34ad0e12 Mon Sep 17 00:00:00 2001 From: player-03 Date: Tue, 4 Jul 2023 20:30:33 -0400 Subject: [PATCH 15/18] Follow formatting conventions. --- src/lime/utils/AssetLibrary.hx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lime/utils/AssetLibrary.hx b/src/lime/utils/AssetLibrary.hx index 3c40d9768..b368f7954 100644 --- a/src/lime/utils/AssetLibrary.hx +++ b/src/lime/utils/AssetLibrary.hx @@ -611,7 +611,8 @@ class AssetLibrary } } - public function unload():Void { + public function unload():Void + { #if haxe4 cachedBytes.clear(); cachedFonts.clear(); From b6cfc7d8120401cb09e314ffad98f2bcd7681d60 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Fri, 11 Aug 2023 13:42:44 -0700 Subject: [PATCH 16/18] HTTPRequest: fix missing response data for HTTP status codes (closes #1699) Backends now return error and response data, but public API has not changed. This allows OpenFL to expose URLLoader.data on IOErrorEvent.IO_ERROR to match the behavior of Flash --- .../backend/flash/FlashHTTPRequest.hx | 12 ++++--- .../backend/html5/HTML5HTTPRequest.hx | 35 +++++++++---------- .../backend/native/NativeHTTPRequest.hx | 13 ++++--- src/lime/net/HTTPRequest.hx | 21 +++++++++-- 4 files changed, 52 insertions(+), 29 deletions(-) diff --git a/src/lime/_internal/backend/flash/FlashHTTPRequest.hx b/src/lime/_internal/backend/flash/FlashHTTPRequest.hx index 6c11c209e..67861d810 100644 --- a/src/lime/_internal/backend/flash/FlashHTTPRequest.hx +++ b/src/lime/_internal/backend/flash/FlashHTTPRequest.hx @@ -117,12 +117,13 @@ class FlashHTTPRequest urlLoader.addEventListener(IOErrorEvent.IO_ERROR, function(event) { - promise.error(event.errorID); + var bytes = Bytes.ofData(cast(urlLoader.data, ByteArray)); + promise.error(new _HTTPRequestErrorResponse(event.errorID, bytes)); }); urlLoader.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function(event) { - promise.error(403); + promise.error(new _HTTPRequestErrorResponse(403, null)); }); urlLoader.addEventListener(Event.COMPLETE, function(event) @@ -156,12 +157,13 @@ class FlashHTTPRequest urlLoader.addEventListener(IOErrorEvent.IO_ERROR, function(event) { - promise.error(event.errorID); + var responseData = cast(urlLoader.data, String); + promise.error(new _HTTPRequestErrorResponse(event.errorID, responseData)); }); urlLoader.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function(event) { - promise.error(403); + promise.error(new _HTTPRequestErrorResponse(403, null)); }); urlLoader.addEventListener(Event.COMPLETE, function(event) @@ -172,4 +174,4 @@ class FlashHTTPRequest urlLoader.load(urlRequest); return promise.future; } -} +} \ No newline at end of file diff --git a/src/lime/_internal/backend/html5/HTML5HTTPRequest.hx b/src/lime/_internal/backend/html5/HTML5HTTPRequest.hx index a45d34c0d..d6f741f3a 100644 --- a/src/lime/_internal/backend/html5/HTML5HTTPRequest.hx +++ b/src/lime/_internal/backend/html5/HTML5HTTPRequest.hx @@ -407,29 +407,28 @@ class HTML5HTTPRequest { if (request.readyState != 4) return; + var bytes = null; + if (request.responseType == NONE) + { + if (request.responseText != null) + { + bytes = Bytes.ofString(request.responseText); + } + } + else if (request.response != null) + { + bytes = Bytes.ofData(request.response); + } + if (request.status != null && ((request.status >= 200 && request.status < 400) || (validStatus0 && request.status == 0))) { - var bytes = null; - - if (request.responseType == NONE) - { - if (request.responseText != null) - { - bytes = Bytes.ofString(request.responseText); - } - } - else if (request.response != null) - { - bytes = Bytes.ofData(request.response); - } - processResponse(); promise.complete(bytes); } else { processResponse(); - promise.error(request.status); + promise.error(new _HTTPRequestErrorResponse(request.status, bytes)); } request = null; @@ -482,7 +481,7 @@ class HTML5HTTPRequest activeRequests--; processQueue(); - promise.error(event.detail); + promise.error(new _HTTPRequestErrorResponse(event.detail, null)); }, false); image.src = uri; @@ -505,7 +504,7 @@ class HTML5HTTPRequest request.onerror = function(event:ErrorEvent) { - promise.error(event.message); + promise.error(new _HTTPRequestErrorResponse(event.message, null)); } request.onprogress = function(event:ProgressEvent) @@ -542,7 +541,7 @@ class HTML5HTTPRequest else { processResponse(); - promise.error(request.status); + promise.error(new _HTTPRequestErrorResponse(request.status, request.responseText)); } request = null; diff --git a/src/lime/_internal/backend/native/NativeHTTPRequest.hx b/src/lime/_internal/backend/native/NativeHTTPRequest.hx index 0236551ec..04b102757 100644 --- a/src/lime/_internal/backend/native/NativeHTTPRequest.hx +++ b/src/lime/_internal/backend/native/NativeHTTPRequest.hx @@ -465,7 +465,7 @@ class NativeHTTPRequest private static function localThreadPool_onError(state:{instance:NativeHTTPRequest, promise:Promise, error:String}):Void { var promise:Promise = state.promise; - promise.error(state.error); + promise.error(new _HTTPRequestErrorResponse(state.error, null)); var instance = state.instance; @@ -576,16 +576,21 @@ class NativeHTTPRequest } else if (instance.bytes != null) { - instance.promise.error(instance.bytes.getString(0, instance.bytes.length)); + var error = instance.bytes.getString(0, instance.bytes.length); + var responseData = instance.buildBuffer(); + instance.promise.error(new _HTTPRequestErrorResponse(error, responseData)); } else { - instance.promise.error('Status ${state.status}'); + var error = 'Status ${state.status}'; + var responseData = instance.buildBuffer(); + instance.promise.error(new _HTTPRequestErrorResponse(error, responseData)); } } else { - instance.promise.error(CURL.strerror(state.result)); + var error = CURL.strerror(state.result); + instance.promise.error(new _HTTPRequestErrorResponse(error, null)); } if (instance.timeout != null) diff --git a/src/lime/net/HTTPRequest.hx b/src/lime/net/HTTPRequest.hx index ce5a0eaa7..6627103db 100644 --- a/src/lime/net/HTTPRequest.hx +++ b/src/lime/net/HTTPRequest.hx @@ -106,7 +106,11 @@ public function load(uri:String = null):Future var future = __backend.loadData(this.uri); future.onProgress(promise.progress); - future.onError(promise.error); + future.onError(function(errorResponse:_HTTPRequestErrorResponse) + { + responseData = errorResponse.responseData; + promise.error(errorResponse.error); + }); future.onComplete(function(bytes) { @@ -140,7 +144,11 @@ public function load(uri:String = null):Future var future = __backend.loadText(this.uri); future.onProgress(promise.progress); - future.onError(promise.error); + future.onError(function(errorResponse:_HTTPRequestErrorResponse) + { + responseData = errorResponse.responseData; + promise.error(errorResponse.error); + }); future.onComplete(function(text) { @@ -152,6 +160,15 @@ public function load(uri:String = null):Future } } +@:noCompletion class _HTTPRequestErrorResponse { + public var error:Dynamic; + public var responseData:T; + public function new(error:Dynamic, responseData:T) { + this.error = error; + this.responseData = responseData; + } +} + @:noCompletion interface _IHTTPRequest { public var contentType:String; From 42ae523188c39fc921f8ac0a2091b6e525794b10 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Mon, 14 Aug 2023 13:24:02 -0700 Subject: [PATCH 17/18] AIR externs: Haxe 3 compatibility on :extern :enum abstracts --- externs/air/flash/data/SQLCollationType.hx | 6 ++-- externs/air/flash/data/SQLColumnNameStyle.hx | 8 ++--- externs/air/flash/data/SQLMode.hx | 8 ++--- .../air/flash/data/SQLTransactionLockType.hx | 8 ++--- .../air/flash/desktop/InvokeEventReason.hx | 10 +++--- .../air/flash/desktop/NativeDragActions.hx | 10 +++--- externs/air/flash/desktop/NotificationType.hx | 6 ++-- externs/air/flash/desktop/SystemIdleMode.hx | 6 ++-- .../flash/display/NativeWindowDisplayState.hx | 8 ++--- .../flash/display/NativeWindowRenderMode.hx | 10 +++--- .../air/flash/display/NativeWindowResize.hx | 20 +++++------ .../flash/display/NativeWindowSystemChrome.hx | 8 ++--- externs/air/flash/display/NativeWindowType.hx | 8 ++--- externs/air/flash/display/StageAspectRatio.hx | 8 ++--- externs/air/flash/display/StageOrientation.hx | 12 +++---- .../air/flash/display3D/Context3DProfile.hx | 16 ++++----- externs/air/flash/errors/SQLErrorOperation.hx | 34 +++++++++--------- externs/air/flash/events/TouchEventIntent.hx | 8 ++--- externs/air/flash/filesystem/FileMode.hx | 10 +++--- externs/air/flash/media/AudioPlaybackMode.hx | 8 ++--- externs/air/flash/media/CameraPosition.hx | 8 ++--- externs/air/flash/media/MediaType.hx | 6 ++-- externs/air/flash/net/IPVersion.hx | 6 ++-- .../flash/notifications/NotificationStyle.hx | 8 ++--- externs/air/flash/printing/PaperSize.hx | 36 +++++++++---------- externs/air/flash/printing/PrintMethod.hx | 8 ++--- .../security/ReferencesValidationSetting.hx | 8 ++--- .../flash/security/RevocationCheckSettings.hx | 10 +++--- externs/air/flash/security/SignatureStatus.hx | 8 ++--- .../air/flash/security/SignerTrustSettings.hx | 8 ++--- externs/air/flash/text/AutoCapitalize.hx | 10 +++--- externs/air/flash/text/ReturnKeyLabel.hx | 12 +++---- externs/air/flash/text/SoftKeyboardType.hx | 14 ++++---- .../flash/text/StageTextClearButtonMode.hx | 10 +++--- 34 files changed, 182 insertions(+), 182 deletions(-) diff --git a/externs/air/flash/data/SQLCollationType.hx b/externs/air/flash/data/SQLCollationType.hx index a8c24f41c..fecbfc838 100644 --- a/externs/air/flash/data/SQLCollationType.hx +++ b/externs/air/flash/data/SQLCollationType.hx @@ -1,8 +1,8 @@ package flash.data; @:native("flash.data.SQLCollationType") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLCollationType(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLCollationType(String) { - var BINARY; - var NO_CASE; + var BINARY = "binary"; + var NO_CASE = "noCase"; } diff --git a/externs/air/flash/data/SQLColumnNameStyle.hx b/externs/air/flash/data/SQLColumnNameStyle.hx index e4a8946f3..03cb7a5ad 100644 --- a/externs/air/flash/data/SQLColumnNameStyle.hx +++ b/externs/air/flash/data/SQLColumnNameStyle.hx @@ -1,9 +1,9 @@ package flash.data; @:native("flash.data.SQLColumnNameStyle") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLColumnNameStyle(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLColumnNameStyle(String) { - var DEFAULT; - var LONG; - var SHORT; + var DEFAULT = "default"; + var LONG = "long"; + var SHORT = "short"; } diff --git a/externs/air/flash/data/SQLMode.hx b/externs/air/flash/data/SQLMode.hx index 35371ecfe..ebddf4c8c 100644 --- a/externs/air/flash/data/SQLMode.hx +++ b/externs/air/flash/data/SQLMode.hx @@ -1,9 +1,9 @@ package flash.data; @:native("flash.data.SQLMode") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLMode(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLMode(String) { - var CREATE; - var READ; - var UPDATE; + var CREATE = "create"; + var READ = "read"; + var UPDATE = "update"; } diff --git a/externs/air/flash/data/SQLTransactionLockType.hx b/externs/air/flash/data/SQLTransactionLockType.hx index 9f9f0ab57..36c24bc1a 100644 --- a/externs/air/flash/data/SQLTransactionLockType.hx +++ b/externs/air/flash/data/SQLTransactionLockType.hx @@ -1,9 +1,9 @@ package flash.data; @:native("flash.data.SQLTransactionLockType") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLTransactionLockType(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLTransactionLockType(String) { - var DEFERRED; - var EXCLUSIVE; - var IMMEDIATE; + var DEFERRED = "deferred"; + var EXCLUSIVE = "exclusive"; + var IMMEDIATE = "immediate"; } diff --git a/externs/air/flash/desktop/InvokeEventReason.hx b/externs/air/flash/desktop/InvokeEventReason.hx index 32d5fadd5..d06e591c1 100644 --- a/externs/air/flash/desktop/InvokeEventReason.hx +++ b/externs/air/flash/desktop/InvokeEventReason.hx @@ -1,10 +1,10 @@ package flash.desktop; @:native("flash.desktop.InvokeEventReason") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract InvokeEventReason(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract InvokeEventReason(String) { - var LOGIN; - var NOTIFICATION; - var OPEN_URL; - var STANDARD; + var LOGIN = "login"; + var NOTIFICATION = "notification"; + var OPEN_URL = "openUrl"; + var STANDARD = "standard"; } diff --git a/externs/air/flash/desktop/NativeDragActions.hx b/externs/air/flash/desktop/NativeDragActions.hx index 36a55309e..fe67ff9db 100644 --- a/externs/air/flash/desktop/NativeDragActions.hx +++ b/externs/air/flash/desktop/NativeDragActions.hx @@ -1,10 +1,10 @@ package flash.desktop; @:native("flash.desktop.NativeDragActions") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeDragActions(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeDragActions(String) { - var COPY; - var LINK; - var MOVE; - var NONE; + var COPY = "copy"; + var LINK = "link"; + var MOVE = "move"; + var NONE = "none"; } diff --git a/externs/air/flash/desktop/NotificationType.hx b/externs/air/flash/desktop/NotificationType.hx index 7fa80ff50..b2b3dcfb0 100644 --- a/externs/air/flash/desktop/NotificationType.hx +++ b/externs/air/flash/desktop/NotificationType.hx @@ -1,8 +1,8 @@ package flash.desktop; @:native("flash.desktop.NotificationType") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NotificationType(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NotificationType(String) { - var CRITICAL; - var INFORMATIONAL; + var CRITICAL = "critical"; + var INFORMATIONAL = "informational"; } diff --git a/externs/air/flash/desktop/SystemIdleMode.hx b/externs/air/flash/desktop/SystemIdleMode.hx index e2ddd69c2..7fda8df04 100644 --- a/externs/air/flash/desktop/SystemIdleMode.hx +++ b/externs/air/flash/desktop/SystemIdleMode.hx @@ -1,8 +1,8 @@ package flash.desktop; @:native("flash.desktop.SystemIdleMode") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SystemIdleMode(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SystemIdleMode(String) { - var KEEP_AWAKE; - var NORMAL; + var KEEP_AWAKE = "keepAwake"; + var NORMAL = "normal"; } diff --git a/externs/air/flash/display/NativeWindowDisplayState.hx b/externs/air/flash/display/NativeWindowDisplayState.hx index 01c6e6d6f..4fb63f10d 100644 --- a/externs/air/flash/display/NativeWindowDisplayState.hx +++ b/externs/air/flash/display/NativeWindowDisplayState.hx @@ -1,9 +1,9 @@ package flash.display; @:native("flash.display.NativeWindowDisplayState") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowDisplayState(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowDisplayState(String) { - var MAXIMIZED; - var MINIMIZED; - var NORMAL; + var MAXIMIZED = "maximized"; + var MINIMIZED = "minimized"; + var NORMAL = "normal"; } diff --git a/externs/air/flash/display/NativeWindowRenderMode.hx b/externs/air/flash/display/NativeWindowRenderMode.hx index 079400ac8..e2d182c5b 100644 --- a/externs/air/flash/display/NativeWindowRenderMode.hx +++ b/externs/air/flash/display/NativeWindowRenderMode.hx @@ -1,10 +1,10 @@ package flash.display; @:native("flash.display.NativeWindowRenderMode") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowRenderMode(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowRenderMode(String) { - var AUTO; - var CPU; - var DIRECT; - var GPU; + var AUTO = "auto"; + var CPU = "cpu"; + var DIRECT = "direct"; + var GPU = "gpu"; } diff --git a/externs/air/flash/display/NativeWindowResize.hx b/externs/air/flash/display/NativeWindowResize.hx index 2d738d78a..b3cd1a1f9 100644 --- a/externs/air/flash/display/NativeWindowResize.hx +++ b/externs/air/flash/display/NativeWindowResize.hx @@ -1,15 +1,15 @@ package flash.display; @:native("flash.display.NativeWindowResize") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowResize(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowResize(String) { - var BOTTOM; - var BOTTOM_LEFT; - var BOTTOM_RIGHT; - var LEFT; - var NONE; - var RIGHT; - var TOP; - var TOP_LEFT; - var TOP_RIGHT; + var BOTTOM = "bottom"; + var BOTTOM_LEFT = "bottomLeft"; + var BOTTOM_RIGHT = "bottomRight"; + var LEFT = "left"; + var NONE = "none"; + var RIGHT = "right"; + var TOP = "top"; + var TOP_LEFT = "topLeft"; + var TOP_RIGHT = "topRight"; } diff --git a/externs/air/flash/display/NativeWindowSystemChrome.hx b/externs/air/flash/display/NativeWindowSystemChrome.hx index de606b526..e27196983 100644 --- a/externs/air/flash/display/NativeWindowSystemChrome.hx +++ b/externs/air/flash/display/NativeWindowSystemChrome.hx @@ -1,9 +1,9 @@ package flash.display; @:native("flash.display.NativeWindowSystemChrome") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowSystemChrome(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowSystemChrome(String) { - var ALTERNATE; - var NONE; - var STANDARD; + var ALTERNATE = "alternate"; + var NONE = "none"; + var STANDARD = "standard"; } diff --git a/externs/air/flash/display/NativeWindowType.hx b/externs/air/flash/display/NativeWindowType.hx index 7ffff5824..90ff5bb41 100644 --- a/externs/air/flash/display/NativeWindowType.hx +++ b/externs/air/flash/display/NativeWindowType.hx @@ -1,9 +1,9 @@ package flash.display; @:native("flash.display.NativeWindowType") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowType(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowType(String) { - var LIGHTWEIGHT; - var NORMAL; - var UTILITY; + var LIGHTWEIGHT = "lightweight"; + var NORMAL = "normal"; + var UTILITY = "utility"; } diff --git a/externs/air/flash/display/StageAspectRatio.hx b/externs/air/flash/display/StageAspectRatio.hx index 740d04e65..70ede1651 100644 --- a/externs/air/flash/display/StageAspectRatio.hx +++ b/externs/air/flash/display/StageAspectRatio.hx @@ -1,9 +1,9 @@ package flash.display; @:native("flash.display.StageAspectRatio") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract StageAspectRatio(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract StageAspectRatio(String) { - var ANY; - var LANDSCAPE; - var PORTRAIT; + var ANY = "any"; + var LANDSCAPE = "landscape"; + var PORTRAIT = "portrait"; } diff --git a/externs/air/flash/display/StageOrientation.hx b/externs/air/flash/display/StageOrientation.hx index f61d7f6ec..d55da8477 100644 --- a/externs/air/flash/display/StageOrientation.hx +++ b/externs/air/flash/display/StageOrientation.hx @@ -1,11 +1,11 @@ package flash.display; @:native("flash.display.StageOrientation") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract StageOrientation(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract StageOrientation(String) { - var DEFAULT; - var ROTATED_LEFT; - var ROTATED_RIGHT; - var UNKNOWN; - var UPSIDE_DOWN; + var DEFAULT = "default"; + var ROTATED_LEFT = "rotatedLeft"; + var ROTATED_RIGHT = "rotatedRight"; + var UNKNOWN = "unknown"; + var UPSIDE_DOWN = "upsideDown"; } diff --git a/externs/air/flash/display3D/Context3DProfile.hx b/externs/air/flash/display3D/Context3DProfile.hx index 83c272238..2c29eea67 100644 --- a/externs/air/flash/display3D/Context3DProfile.hx +++ b/externs/air/flash/display3D/Context3DProfile.hx @@ -1,15 +1,15 @@ package flash.display3D; @:native("flash.display3D.Context3DProfile") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract Context3DProfile(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract Context3DProfile(String) { - var BASELINE; - var BASELINE_CONSTRAINED; - var BASELINE_EXTENDED; - var STANDARD; - var STANDARD_CONSTRAINED; - var STANDARD_EXTENDED; + var BASELINE = "baseline"; + var BASELINE_CONSTRAINED = "baselineConstrained"; + var BASELINE_EXTENDED = "baselineExtended"; + var STANDARD = "standard"; + var STANDARD_CONSTRAINED = "standardConstrained"; + var STANDARD_EXTENDED = "standardExtended"; #if air - var ENHANCED; + var ENHANCED = "enhanced"; #end } diff --git a/externs/air/flash/errors/SQLErrorOperation.hx b/externs/air/flash/errors/SQLErrorOperation.hx index a83b425e0..15e7a651c 100644 --- a/externs/air/flash/errors/SQLErrorOperation.hx +++ b/externs/air/flash/errors/SQLErrorOperation.hx @@ -1,22 +1,22 @@ package flash.errors; @:native("flash.errors.SQLErrorOperation") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLErrorOperation(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLErrorOperation(String) { - var ANALYZE; - var ATTACH; - var BEGIN; - var CLOSE; - var COMMIT; - var COMPACT; - var DEANALYZE; - var DETACH; - var EXECUTE; - var OPEN; - var REENCRYPT; - var RELEASE_SAVEPOINT; - var ROLLBACK; - var ROLLBACK_TO_SAVEPOINT; - var SCHEMA; - var SET_SAVEPOINT; + var ANALYZE = "analyze"; + var ATTACH = "attach"; + var BEGIN = "begin"; + var CLOSE = "close"; + var COMMIT = "commit"; + var COMPACT = "compact"; + var DEANALYZE = "deanalyze"; + var DETACH = "detach"; + var EXECUTE = "execute"; + var OPEN = "open"; + var REENCRYPT = "reencrypt"; + var RELEASE_SAVEPOINT = "releaseSavepoint"; + var ROLLBACK = "rollback"; + var ROLLBACK_TO_SAVEPOINT = "rollbackToSavepoint"; + var SCHEMA = "schema"; + var SET_SAVEPOINT = "setSavepoint"; } diff --git a/externs/air/flash/events/TouchEventIntent.hx b/externs/air/flash/events/TouchEventIntent.hx index c16b1f0e0..19a3c6a0e 100644 --- a/externs/air/flash/events/TouchEventIntent.hx +++ b/externs/air/flash/events/TouchEventIntent.hx @@ -1,9 +1,9 @@ package flash.events; @:native("flash.events.TouchEventIntent") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract TouchEventIntent(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract TouchEventIntent(String) { - var ERASER; - var PEN; - var UNKNOWN; + var ERASER = "eraser"; + var PEN = "pen"; + var UNKNOWN = "unknown"; } diff --git a/externs/air/flash/filesystem/FileMode.hx b/externs/air/flash/filesystem/FileMode.hx index 30910b81e..3041db9b9 100644 --- a/externs/air/flash/filesystem/FileMode.hx +++ b/externs/air/flash/filesystem/FileMode.hx @@ -1,10 +1,10 @@ package flash.filesystem; @:native("flash.filesystem.FileMode") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract FileMode(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract FileMode(String) { - var APPEND; - var READ; - var UPDATE; - var WRITE; + var APPEND = "append"; + var READ = "read"; + var UPDATE = "update"; + var WRITE = "write"; } diff --git a/externs/air/flash/media/AudioPlaybackMode.hx b/externs/air/flash/media/AudioPlaybackMode.hx index 1b37a6008..fdc31990c 100644 --- a/externs/air/flash/media/AudioPlaybackMode.hx +++ b/externs/air/flash/media/AudioPlaybackMode.hx @@ -1,9 +1,9 @@ package flash.media; @:native("flash.media.AudioPlaybackMode") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract AudioPlaybackMode(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract AudioPlaybackMode(String) { - var AMBIENT; - var MEDIA; - var VOICE; + var AMBIENT = "ambient"; + var MEDIA = "media"; + var VOICE = "voice"; } diff --git a/externs/air/flash/media/CameraPosition.hx b/externs/air/flash/media/CameraPosition.hx index dfe437046..06184cc9e 100644 --- a/externs/air/flash/media/CameraPosition.hx +++ b/externs/air/flash/media/CameraPosition.hx @@ -1,9 +1,9 @@ package flash.media; @:native("flash.media.CameraPosition") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract CameraPosition(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract CameraPosition(String) { - var BACK; - var FRONT; - var UNKNOWN; + var BACK = "back"; + var FRONT = "front"; + var UNKNOWN = "unknown"; } diff --git a/externs/air/flash/media/MediaType.hx b/externs/air/flash/media/MediaType.hx index 189688732..41a10306f 100644 --- a/externs/air/flash/media/MediaType.hx +++ b/externs/air/flash/media/MediaType.hx @@ -1,8 +1,8 @@ package flash.media; @:native("flash.media.MediaType") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract MediaType(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract MediaType(String) { - var IMAGE; - var VIDEO; + var IMAGE = "image"; + var VIDEO = "video"; } diff --git a/externs/air/flash/net/IPVersion.hx b/externs/air/flash/net/IPVersion.hx index 8df99a6a6..ef4a44fcf 100644 --- a/externs/air/flash/net/IPVersion.hx +++ b/externs/air/flash/net/IPVersion.hx @@ -1,8 +1,8 @@ package flash.net; @:native("flash.net.IPVersion") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract IPVersion(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract IPVersion(String) { - var IPV4; - var IPV6; + var IPV4 = "ipv4"; + var IPV6 = "ipv6"; } diff --git a/externs/air/flash/notifications/NotificationStyle.hx b/externs/air/flash/notifications/NotificationStyle.hx index 0de1e567b..a2a9f3fdd 100644 --- a/externs/air/flash/notifications/NotificationStyle.hx +++ b/externs/air/flash/notifications/NotificationStyle.hx @@ -1,9 +1,9 @@ package flash.notifications; @:native("flash.notifications.NotificationStyle") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NotificationStyle(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NotificationStyle(String) { - var ALERT; - var BADGE; - var SOUND; + var ALERT = "alert"; + var BADGE = "badge"; + var SOUND = "sound"; } diff --git a/externs/air/flash/printing/PaperSize.hx b/externs/air/flash/printing/PaperSize.hx index dbd0a5f6e..fe607d1e2 100644 --- a/externs/air/flash/printing/PaperSize.hx +++ b/externs/air/flash/printing/PaperSize.hx @@ -1,23 +1,23 @@ package flash.printing; @:native("flash.printing.PaperSize") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract PaperSize(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract PaperSize(String) { - var A4; - var A5; - var A6; - var CHOUKEI3GOU; - var CHOUKEI4GOU; - var ENV_10; - var ENV_B5; - var ENV_C5; - var ENV_DL; - var ENV_MONARCH; - var ENV_PERSONAL; - var EXECUTIVE; - var FOLIO; - var JIS_B5; - var LEGAL; - var LETTER; - var STATEMENT; + var A4 = "a4"; + var A5 = "a5"; + var A6 = "a6"; + var CHOUKEI3GOU = "choukei3gou"; + var CHOUKEI4GOU = "choukei4gou"; + var ENV_10 = "env_10"; + var ENV_B5 = "env_b5"; + var ENV_C5 = "env_c5"; + var ENV_DL = "env_dl"; + var ENV_MONARCH = "env_monarch"; + var ENV_PERSONAL = "env_personal"; + var EXECUTIVE = "executive"; + var FOLIO = "folio"; + var JIS_B5 = "jis_b5"; + var LEGAL = "legal"; + var LETTER = "letter"; + var STATEMENT = "statement"; } diff --git a/externs/air/flash/printing/PrintMethod.hx b/externs/air/flash/printing/PrintMethod.hx index 81669995f..070fcfcf1 100644 --- a/externs/air/flash/printing/PrintMethod.hx +++ b/externs/air/flash/printing/PrintMethod.hx @@ -1,9 +1,9 @@ package flash.printing; @:native("flash.printing.PrintMethod") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract PrintMethod(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract PrintMethod(String) { - var AUTO; - var BITMAP; - var VECTOR; + var AUTO = "auto"; + var BITMAP = "bitmap"; + var VECTOR = "vector"; } diff --git a/externs/air/flash/security/ReferencesValidationSetting.hx b/externs/air/flash/security/ReferencesValidationSetting.hx index a189ff390..08fda5c8c 100644 --- a/externs/air/flash/security/ReferencesValidationSetting.hx +++ b/externs/air/flash/security/ReferencesValidationSetting.hx @@ -1,9 +1,9 @@ package flash.security; @:native("flash.security.ReferencesValidationSetting") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract ReferencesValidationSetting(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract ReferencesValidationSetting(String) { - var NEVER; - var VALID_IDENTITY; - var VALID_OR_UNKNOWN_IDENTITY; + var NEVER = "never"; + var VALID_IDENTITY = "validIdentity"; + var VALID_OR_UNKNOWN_IDENTITY = "validOrUnknownIdentity"; } diff --git a/externs/air/flash/security/RevocationCheckSettings.hx b/externs/air/flash/security/RevocationCheckSettings.hx index 983c20365..09725cea8 100644 --- a/externs/air/flash/security/RevocationCheckSettings.hx +++ b/externs/air/flash/security/RevocationCheckSettings.hx @@ -1,10 +1,10 @@ package flash.security; @:native("flash.security.RevocationCheckSettings") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract RevocationCheckSettings(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract RevocationCheckSettings(String) { - var ALWAYS_REQUIRED; - var BEST_EFFORT; - var NEVER; - var REQUIRED_IF_AVAILABLE; + var ALWAYS_REQUIRED = "alwaysRequired"; + var BEST_EFFORT = "bestEffort"; + var NEVER = "never"; + var REQUIRED_IF_AVAILABLE = "requiredIfAvailable"; } diff --git a/externs/air/flash/security/SignatureStatus.hx b/externs/air/flash/security/SignatureStatus.hx index c1ce01420..f8c632599 100644 --- a/externs/air/flash/security/SignatureStatus.hx +++ b/externs/air/flash/security/SignatureStatus.hx @@ -1,9 +1,9 @@ package flash.security; @:native("flash.security.SignatureStatus") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SignatureStatus(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SignatureStatus(String) { - var INVALID; - var UNKNOWN; - var VALID; + var INVALID = "invalid"; + var UNKNOWN = "unknown"; + var VALID = "valid"; } diff --git a/externs/air/flash/security/SignerTrustSettings.hx b/externs/air/flash/security/SignerTrustSettings.hx index ec930c7e8..0164a3a25 100644 --- a/externs/air/flash/security/SignerTrustSettings.hx +++ b/externs/air/flash/security/SignerTrustSettings.hx @@ -1,9 +1,9 @@ package flash.security; @:native("flash.security.SignerTrustSettings") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SignerTrustSettings(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SignerTrustSettings(String) { - var CODE_SIGNING; - var PLAYLIST_SIGNING; - var SIGNING; + var CODE_SIGNING = "codeSigning"; + var PLAYLIST_SIGNING = "playlistSigning"; + var SIGNING = "signing"; } diff --git a/externs/air/flash/text/AutoCapitalize.hx b/externs/air/flash/text/AutoCapitalize.hx index 3ca9ce87b..e0bb0169d 100644 --- a/externs/air/flash/text/AutoCapitalize.hx +++ b/externs/air/flash/text/AutoCapitalize.hx @@ -1,10 +1,10 @@ package flash.text; @:native("flash.text.AutoCapitalize") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract AutoCapitalize(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract AutoCapitalize(String) { - var ALL; - var NONE; - var SENTENCE; - var WORD; + var ALL = "all"; + var NONE = "none"; + var SENTENCE = "sentence"; + var WORD = "word"; } diff --git a/externs/air/flash/text/ReturnKeyLabel.hx b/externs/air/flash/text/ReturnKeyLabel.hx index 51156f680..3936c1722 100644 --- a/externs/air/flash/text/ReturnKeyLabel.hx +++ b/externs/air/flash/text/ReturnKeyLabel.hx @@ -1,11 +1,11 @@ package flash.text; @:native("flash.text.ReturnKeyLabel") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract ReturnKeyLabel(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract ReturnKeyLabel(String) { - var DEFAULT; - var DONE; - var GO; - var NEXT; - var SEARCH; + var DEFAULT = "default"; + var DONE = "done"; + var GO = "go"; + var NEXT = "next"; + var SEARCH = "search"; } diff --git a/externs/air/flash/text/SoftKeyboardType.hx b/externs/air/flash/text/SoftKeyboardType.hx index 1f6e60f56..3a9f747dc 100644 --- a/externs/air/flash/text/SoftKeyboardType.hx +++ b/externs/air/flash/text/SoftKeyboardType.hx @@ -1,12 +1,12 @@ package flash.text; @:native("flash.text.SoftKeyboardType") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SoftKeyboardType(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SoftKeyboardType(String) { - var CONTACT; - var DEFAULT; - var EMAIL; - var NUMBER; - var PUNCTUATION; - var URL; + var CONTACT = "contact"; + var DEFAULT = "default"; + var EMAIL = "email"; + var NUMBER = "number"; + var PUNCTUATION = "punctuation"; + var URL = "url"; } diff --git a/externs/air/flash/text/StageTextClearButtonMode.hx b/externs/air/flash/text/StageTextClearButtonMode.hx index d7708ab40..21f09ecb2 100644 --- a/externs/air/flash/text/StageTextClearButtonMode.hx +++ b/externs/air/flash/text/StageTextClearButtonMode.hx @@ -1,10 +1,10 @@ package flash.text; @:native("flash.text.StageTextClearButtonMode") -#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract StageTextClearButtonMode(String) +#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract StageTextClearButtonMode(String) { - var ALWAYS; - var NEVER; - var UNLESS_EDITING; - var WHILE_EDITING; + var ALWAYS = "always"; + var NEVER = "never"; + var UNLESS_EDITING = "unlessEditing"; + var WHILE_EDITING = "whileEditing"; } From 39c77cfe4613c608747c7393f5e60f7dcf6d734e Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Mon, 14 Aug 2023 15:53:01 -0700 Subject: [PATCH 18/18] CHANGELOG for develop branch before merge --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e62abb25d..da1200645 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,19 @@ Changelog ========= +8.1.0 (??/??/2023) +------------------ + +* Added new `onShow` and `onHide` events to `Window` +* Fixed unpopulated `responseData` on `HTTPRequest` when server returns error status code +* Fixed `Clipboard` contents being empty when app starts up on Windows and macOS +* Fixed Unicode string conversion for `alert()` method on `Window` on HashLink target +* Fixed asset cache clearing when unloading asset library +* Fixed incorrect timer pause and resume behavior when window goes into background and back to foreground +* Fixed _.app_ file extension for macOS when building Adobe AIR captive runtime bundle +* Fixed expired Adobe AIR debug certificate +* Fixed Haxe 3 compatibility for enum abstracts + 8.0.2 (05/31/2023) ------------------