From 76918f8e5266386ec0220e31fc03332b44d5f905 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Wed, 7 Feb 2024 15:12:23 -0800 Subject: [PATCH] Hide private from code completion --- src/starling/animation/DelayedCall.hx | 10 +-- src/starling/animation/Juggler.hx | 8 +- src/starling/animation/Tween.hx | 56 +++++++------- src/starling/core/Starling.hx | 56 +++++++------- src/starling/core/StatsDisplay.hx | 22 +++--- src/starling/display/BlendMode.hx | 6 +- src/starling/display/Button.hx | 34 ++++----- src/starling/display/Canvas.hx | 8 +- src/starling/display/DisplayObject.hx | 74 +++++++++---------- .../display/DisplayObjectContainer.hx | 6 +- src/starling/display/Image.hx | 10 +-- src/starling/display/Mesh.hx | 8 +- src/starling/display/MeshBatch.hx | 16 ++-- src/starling/display/MovieClip.hx | 18 ++--- src/starling/display/Quad.hx | 4 +- src/starling/display/Sprite3D.hx | 18 ++--- src/starling/display/Stage.hx | 16 ++-- src/starling/events/EventDispatcher.hx | 8 +- src/starling/events/KeyboardEvent.hx | 14 ++-- src/starling/events/Touch.hx | 34 ++++----- src/starling/events/TouchEvent.hx | 8 +- src/starling/events/TouchMarker.hx | 4 +- src/starling/events/TouchProcessor.hx | 40 +++++----- src/starling/extensions/ChildAccess.hx | 2 +- src/starling/filters/BlurFilter.hx | 6 +- src/starling/filters/FilterChain.hx | 2 +- src/starling/geom/Ellipse.hx | 8 +- src/starling/geom/ImmutablePolygon.hx | 2 +- src/starling/geom/Polygon.hx | 2 +- src/starling/geom/Rectangle.hx | 8 +- src/starling/text/BitmapChar.hx | 12 +-- src/starling/text/BitmapFont.hx | 24 +++--- src/starling/text/TextFormat.hx | 22 +++--- src/starling/text/TextOptions.hx | 16 ++-- src/starling/textures/RenderTexture.hx | 4 +- src/starling/textures/TextureAtlas.hx | 12 ++- src/starling/utils/AssetManager.hx | 40 +++++----- src/starling/utils/ButtonBehavior.hx | 16 ++-- 38 files changed, 329 insertions(+), 325 deletions(-) diff --git a/src/starling/animation/DelayedCall.hx b/src/starling/animation/DelayedCall.hx index 927f0b69..445b5648 100644 --- a/src/starling/animation/DelayedCall.hx +++ b/src/starling/animation/DelayedCall.hx @@ -29,11 +29,11 @@ import starling.events.EventDispatcher; */ class DelayedCall extends EventDispatcher implements IAnimatable { - private var __currentTime:Float; - private var __totalTime:Float; - @:allow(starling) private var __callback:Function; - private var __args:Array; - private var __repeatCount:Int; + @:noCompletion private var __currentTime:Float; + @:noCompletion private var __totalTime:Float; + @:allow(starling) @:noCompletion private var __callback:Function; + @:noCompletion private var __args:Array; + @:noCompletion private var __repeatCount:Int; #if commonjs private static function __init__ () { diff --git a/src/starling/animation/Juggler.hx b/src/starling/animation/Juggler.hx index c103ae94..ffa72ed2 100644 --- a/src/starling/animation/Juggler.hx +++ b/src/starling/animation/Juggler.hx @@ -50,10 +50,10 @@ import starling.events.EventDispatcher; */ class Juggler implements IAnimatable { - private var __objects:Vector; - private var __objectIDs:Map; - private var __elapsedTime:Float; - private var __timeScale:Float; + @:noCompletion private var __objects:Vector; + @:noCompletion private var __objectIDs:Map; + @:noCompletion private var __elapsedTime:Float; + @:noCompletion private var __timeScale:Float; private static var sCurrentObjectID:UInt = 0; private static var sTweenInstanceFields:Array; diff --git a/src/starling/animation/Tween.hx b/src/starling/animation/Tween.hx index 75393283..62ae2932 100644 --- a/src/starling/animation/Tween.hx +++ b/src/starling/animation/Tween.hx @@ -49,35 +49,35 @@ import starling.utils.Color; { private static inline var HINT_MARKER:String = '#'; - private var __target:Dynamic; - private var __transitionFunc:Float->Float; - private var __transitionName:String; - - private var __properties:Vector; - private var __startValues:Vector; - private var __endValues:Vector; - private var __updateFuncs:VectorFloat->Float->Void>; + @:noCompletion private var __target:Dynamic; + @:noCompletion private var __transitionFunc:Float->Float; + @:noCompletion private var __transitionName:String; + + @:noCompletion private var __properties:Vector; + @:noCompletion private var __startValues:Vector; + @:noCompletion private var __endValues:Vector; + @:noCompletion private var __updateFuncs:VectorFloat->Float->Void>; - private var __onStart:Function; - private var __onUpdate:Function; - private var __onRepeat:Function; - private var __onComplete:Function; - - private var __onStartArgs:Array; - private var __onUpdateArgs:Array; - private var __onRepeatArgs:Array; - private var __onCompleteArgs:Array; - - private var __totalTime:Float; - private var __currentTime:Float; - private var __progress:Float; - private var __delay:Float; - private var __roundToInt:Bool; - private var __nextTween:Tween; - private var __repeatCount:Int; - private var __repeatDelay:Float; - private var __reverse:Bool; - private var __currentCycle:Int; + @:noCompletion private var __onStart:Function; + @:noCompletion private var __onUpdate:Function; + @:noCompletion private var __onRepeat:Function; + @:noCompletion private var __onComplete:Function; + + @:noCompletion private var __onStartArgs:Array; + @:noCompletion private var __onUpdateArgs:Array; + @:noCompletion private var __onRepeatArgs:Array; + @:noCompletion private var __onCompleteArgs:Array; + + @:noCompletion private var __totalTime:Float; + @:noCompletion private var __currentTime:Float; + @:noCompletion private var __progress:Float; + @:noCompletion private var __delay:Float; + @:noCompletion private var __roundToInt:Bool; + @:noCompletion private var __nextTween:Tween; + @:noCompletion private var __repeatCount:Int; + @:noCompletion private var __repeatDelay:Float; + @:noCompletion private var __reverse:Bool; + @:noCompletion private var __currentCycle:Int; #if commonjs private static function __init__ () { diff --git a/src/starling/core/Starling.hx b/src/starling/core/Starling.hx index e076e3af..1c302a88 100644 --- a/src/starling/core/Starling.hx +++ b/src/starling/core/Starling.hx @@ -219,35 +219,35 @@ class Starling extends EventDispatcher // members - private var __stage:Stage; // starling.display.stage! - private var __rootClass:Class; - private var __root:DisplayObject; - private var __juggler:Juggler; - private var __painter:Painter; - private var __touchProcessor:TouchProcessor; - private var __antiAliasing:Int; - private var __frameTimestamp:Float; - private var __frameID:UInt; - private var __leftMouseDown:Bool; - private var __statsDisplay:StatsDisplay; - private var __statsDisplayAlign:openfl.utils.Object; - private var __started:Bool; - private var __rendering:Bool; - private var __supportHighResolutions:Bool; - private var __supportBrowserZoom:Bool; - private var __skipUnchangedFrames:Bool; - private var __showStats:Bool; - private var __supportsCursor:Bool; - private var __multitouchEnabled:Bool; + @:noCompletion private var __stage:Stage; // starling.display.stage! + @:noCompletion private var __rootClass:Class; + @:noCompletion private var __root:DisplayObject; + @:noCompletion private var __juggler:Juggler; + @:noCompletion private var __painter:Painter; + @:noCompletion private var __touchProcessor:TouchProcessor; + @:noCompletion private var __antiAliasing:Int; + @:noCompletion private var __frameTimestamp:Float; + @:noCompletion private var __frameID:UInt; + @:noCompletion private var __leftMouseDown:Bool; + @:noCompletion private var __statsDisplay:StatsDisplay; + @:noCompletion private var __statsDisplayAlign:openfl.utils.Object; + @:noCompletion private var __started:Bool; + @:noCompletion private var __rendering:Bool; + @:noCompletion private var __supportHighResolutions:Bool; + @:noCompletion private var __supportBrowserZoom:Bool; + @:noCompletion private var __skipUnchangedFrames:Bool; + @:noCompletion private var __showStats:Bool; + @:noCompletion private var __supportsCursor:Bool; + @:noCompletion private var __multitouchEnabled:Bool; - private var __viewPort:Rectangle; - private var __previousViewPort:Rectangle; - private var __clippedViewPort:Rectangle; - - private var __nativeStage:OpenFLStage; - private var __nativeStageEmpty:Bool; - private var __nativeOverlay:Sprite; - private var __nativeOverlayBlocksTouches:Bool; + @:noCompletion private var __viewPort:Rectangle; + @:noCompletion private var __previousViewPort:Rectangle; + @:noCompletion private var __clippedViewPort:Rectangle; + + @:noCompletion private var __nativeStage:OpenFLStage; + @:noCompletion private var __nativeStageEmpty:Bool; + @:noCompletion private var __nativeOverlay:Sprite; + @:noCompletion private var __nativeOverlayBlocksTouches:Bool; private static var sCurrent:Starling; private static var sAll:Vector = new Vector(); diff --git a/src/starling/core/StatsDisplay.hx b/src/starling/core/StatsDisplay.hx index a5576f28..5110481e 100644 --- a/src/starling/core/StatsDisplay.hx +++ b/src/starling/core/StatsDisplay.hx @@ -32,19 +32,19 @@ class StatsDisplay extends Sprite private static inline var UPDATE_INTERVAL:Float = 0.5; private static inline var B_TO_MB:Float = 1.0 / (1024 * 1024); // convert from bytes to MB - private var __background:Quad; - private var __labels:TextField; - private var __values:TextField; + @:noCompletion private var __background:Quad; + @:noCompletion private var __labels:TextField; + @:noCompletion private var __values:TextField; - private var __frameCount:Int = 0; - private var __totalTime:Float = 0; + @:noCompletion private var __frameCount:Int = 0; + @:noCompletion private var __totalTime:Float = 0; - private var __fps:Float = 0; - private var __memory:Float = 0; - private var __gpuMemory:Float = 0; - private var __drawCount:Int = 0; - private var __skipCount:Int = 0; - private var __showSkipped:Bool = false; + @:noCompletion private var __fps:Float = 0; + @:noCompletion private var __memory:Float = 0; + @:noCompletion private var __gpuMemory:Float = 0; + @:noCompletion private var __drawCount:Int = 0; + @:noCompletion private var __skipCount:Int = 0; + @:noCompletion private var __showSkipped:Bool = false; #if commonjs private static function __init__ () { diff --git a/src/starling/display/BlendMode.hx b/src/starling/display/BlendMode.hx index a9e0d013..cb83b886 100644 --- a/src/starling/display/BlendMode.hx +++ b/src/starling/display/BlendMode.hx @@ -37,9 +37,9 @@ import starling.core.Starling; */ class BlendMode { - private var __name:String; - private var __sourceFactor:Context3DBlendFactor; - private var __destinationFactor:Context3DBlendFactor; + @:noCompletion private var __name:String; + @:noCompletion private var __sourceFactor:Context3DBlendFactor; + @:noCompletion private var __destinationFactor:Context3DBlendFactor; private static var sBlendModes:Map; diff --git a/src/starling/display/Button.hx b/src/starling/display/Button.hx index 53e4397d..73ea5459 100644 --- a/src/starling/display/Button.hx +++ b/src/starling/display/Button.hx @@ -45,22 +45,22 @@ import starling.textures.Texture; */ class Button extends DisplayObjectContainer { - private var __upState:Texture; - private var __downState:Texture; - private var __overState:Texture; - private var __disabledState:Texture; + @:noCompletion private var __upState:Texture; + @:noCompletion private var __downState:Texture; + @:noCompletion private var __overState:Texture; + @:noCompletion private var __disabledState:Texture; - private var __contents:Sprite; - private var __body:Image; - private var __textField:TextField; - private var __textBounds:Rectangle; - private var __overlay:Sprite; + @:noCompletion private var __contents:Sprite; + @:noCompletion private var __body:Image; + @:noCompletion private var __textField:TextField; + @:noCompletion private var __textBounds:Rectangle; + @:noCompletion private var __overlay:Sprite; - private var __behavior:ButtonBehavior; - private var __scaleWhenDown:Float; - private var __scaleWhenOver:Float; - private var __alphaWhenDown:Float; - private var __alphaWhenDisabled:Float; + @:noCompletion private var __behavior:ButtonBehavior; + @:noCompletion private var __scaleWhenDown:Float; + @:noCompletion private var __scaleWhenOver:Float; + @:noCompletion private var __alphaWhenDown:Float; + @:noCompletion private var __alphaWhenDisabled:Float; #if commonjs private static function __init__ () { @@ -188,7 +188,7 @@ class Button extends DisplayObjectContainer if (__textField != null) __createTextField(); } - private function __createTextField():Void + @:noCompletion private function __createTextField():Void { if (__textField == null) { @@ -211,14 +211,14 @@ class Button extends DisplayObjectContainer private function get_state():String { return __behavior.state; } private function set_state(value:String):String { return __behavior.state = value; } - private function __setContentScale(scale:Float):Void + @:noCompletion private function __setContentScale(scale:Float):Void { __contents.scaleX = __contents.scaleY = scale; __contents.x = (1.0 - scale) / 2.0 * __body.width; __contents.y = (1.0 - scale) / 2.0 * __body.height; } - private function __setStateTexture(texture:Texture):Void + @:noCompletion private function __setStateTexture(texture:Texture):Void { __body.texture = texture != null ? texture : __upState; diff --git a/src/starling/display/Canvas.hx b/src/starling/display/Canvas.hx index 0c020873..7171d449 100644 --- a/src/starling/display/Canvas.hx +++ b/src/starling/display/Canvas.hx @@ -22,9 +22,9 @@ import starling.rendering.VertexData; */ class Canvas extends DisplayObjectContainer { - private var __polygons:Vector; - private var __fillColor:UInt; - private var __fillAlpha:Float; + @:noCompletion private var __polygons:Vector; + @:noCompletion private var __fillColor:UInt; + @:noCompletion private var __fillAlpha:Float; /** Creates a new (empty) Canvas. Call one or more of the 'draw' methods to add content. */ public function new() @@ -123,7 +123,7 @@ class Canvas extends DisplayObjectContainer __polygons.length = 0; } - private function __appendPolygon(polygon:Polygon):Void + @:noCompletion private function __appendPolygon(polygon:Polygon):Void { var vertexData:VertexData = new VertexData(); var indexData:IndexData = new IndexData(polygon.numTriangles * 3); diff --git a/src/starling/display/DisplayObject.hx b/src/starling/display/DisplayObject.hx index 9693849d..c8c17b39 100644 --- a/src/starling/display/DisplayObject.hx +++ b/src/starling/display/DisplayObject.hx @@ -123,39 +123,39 @@ class DisplayObject extends EventDispatcher { // private members - private var __x:Float; - private var __y:Float; - private var __pivotX:Float; - private var __pivotY:Float; - private var __scaleX:Float; - private var __scaleY:Float; - private var __skewX:Float; - private var __skewY:Float; - private var __rotation:Float; - private var __alpha:Float; - private var __visible:Bool; - private var __touchable:Bool; - private var __blendMode:String; - private var __name:String; - private var __useHandCursor:Bool; - private var __transformationMatrix:Matrix; - private var __transformationMatrix3D:Matrix3D; - private var __transformationChanged:Bool; - private var __is3D:Bool = false; - private var __maskee:DisplayObject; - private var __maskInverted:Bool = false; + @:noCompletion private var __x:Float; + @:noCompletion private var __y:Float; + @:noCompletion private var __pivotX:Float; + @:noCompletion private var __pivotY:Float; + @:noCompletion private var __scaleX:Float; + @:noCompletion private var __scaleY:Float; + @:noCompletion private var __skewX:Float; + @:noCompletion private var __skewY:Float; + @:noCompletion private var __rotation:Float; + @:noCompletion private var __alpha:Float; + @:noCompletion private var __visible:Bool; + @:noCompletion private var __touchable:Bool; + @:noCompletion private var __blendMode:String; + @:noCompletion private var __name:String; + @:noCompletion private var __useHandCursor:Bool; + @:noCompletion private var __transformationMatrix:Matrix; + @:noCompletion private var __transformationMatrix3D:Matrix3D; + @:noCompletion private var __transformationChanged:Bool; + @:noCompletion private var __is3D:Bool = false; + @:noCompletion private var __maskee:DisplayObject; + @:noCompletion private var __maskInverted:Bool = false; // internal members (for fast access on rendering) - @:allow(starling) private var __parent:DisplayObjectContainer; - @:allow(starling) private var __lastParentOrSelfChangeFrameID:UInt; - @:allow(starling) private var __lastChildChangeFrameID:UInt; - @:allow(starling) private var __tokenFrameID:UInt; - @:allow(starling) private var __pushToken:BatchToken = new BatchToken(); - @:allow(starling) private var __popToken:BatchToken = new BatchToken(); - @:allow(starling) private var __hasVisibleArea:Bool; - @:allow(starling) private var __filter:FragmentFilter; - @:allow(starling) private var __mask:DisplayObject; + @:allow(starling) @:noCompletion private var __parent:DisplayObjectContainer; + @:allow(starling) @:noCompletion private var __lastParentOrSelfChangeFrameID:UInt; + @:allow(starling) @:noCompletion private var __lastChildChangeFrameID:UInt; + @:allow(starling) @:noCompletion private var __tokenFrameID:UInt; + @:allow(starling) @:noCompletion private var __pushToken:BatchToken = new BatchToken(); + @:allow(starling) @:noCompletion private var __popToken:BatchToken = new BatchToken(); + @:allow(starling) @:noCompletion private var __hasVisibleArea:Bool; + @:allow(starling) @:noCompletion private var __filter:FragmentFilter; + @:allow(starling) @:noCompletion private var __mask:DisplayObject; // helper objects @@ -643,7 +643,7 @@ class DisplayObject extends EventDispatcher // internal methods /** @private */ - private function __setParent(value:DisplayObjectContainer):Void + @:noCompletion private function __setParent(value:DisplayObjectContainer):Void { // check for a recursion var ancestor:DisplayObject = value; @@ -658,7 +658,7 @@ class DisplayObject extends EventDispatcher } /** @private */ - private function __setIs3D(value:Bool):Void + @:noCompletion private function __setIs3D(value:Bool):Void { __is3D = value; } @@ -729,14 +729,14 @@ class DisplayObject extends EventDispatcher // helpers /** @private */ - @:allow(starling) private function __setTransformationChanged():Void + @:allow(starling) @:noCompletion private function __setTransformationChanged():Void { __transformationChanged = true; setRequiresRedraw(); } /** @private */ - @:allow(starling) private function __updateTransformationMatrices( + @:allow(starling) @:noCompletion private function __updateTransformationMatrices( x:Float, y:Float, pivotX:Float, pivotY:Float, scaleX:Float, scaleY:Float, skewX:Float, skewY:Float, rotation:Float, out:Matrix, out3D:Matrix3D):Void { @@ -861,12 +861,12 @@ class DisplayObject extends EventDispatcher super.removeEventListeners(type); } - private function __addEnterFrameListenerToStage(e:Event = null):Void + @:noCompletion private function __addEnterFrameListenerToStage(e:Event = null):Void { Starling.current.stage.addEnterFrameListener(this); } - private function __removeEnterFrameListenerFromStage(e:Event = null):Void + @:noCompletion private function __removeEnterFrameListenerFromStage(e:Event = null):Void { Starling.current.stage.removeEnterFrameListener(this); } @@ -981,7 +981,7 @@ class DisplayObject extends EventDispatcher return value; } - private function __onTouch(event:TouchEvent):Void + @:noCompletion private function __onTouch(event:TouchEvent):Void { Mouse.cursor = event.interactsWith(this) ? MouseCursor.BUTTON : MouseCursor.AUTO; } diff --git a/src/starling/display/DisplayObjectContainer.hx b/src/starling/display/DisplayObjectContainer.hx index 864f808d..44f778d2 100644 --- a/src/starling/display/DisplayObjectContainer.hx +++ b/src/starling/display/DisplayObjectContainer.hx @@ -66,8 +66,8 @@ class DisplayObjectContainer extends DisplayObject { // members - private var __children:Vector; - private var __touchGroup:Bool; + @:noCompletion private var __children:Vector; + @:noCompletion private var __touchGroup:Bool; // helper objects private static var sHitTestMatrix:Matrix = new Matrix(); @@ -522,7 +522,7 @@ class DisplayObjectContainer extends DisplayObject } /** @private */ - private function __getChildEventListeners(object:DisplayObject, eventType:String, + @:noCompletion private function __getChildEventListeners(object:DisplayObject, eventType:String, listeners:Vector):Void { var container:DisplayObjectContainer = #if (haxe_ver < 4.2) Std.is #else Std.isOfType #end(object, DisplayObjectContainer) ? cast object : null; diff --git a/src/starling/display/Image.hx b/src/starling/display/Image.hx index 450ca0bf..a376af9e 100644 --- a/src/starling/display/Image.hx +++ b/src/starling/display/Image.hx @@ -47,8 +47,8 @@ import starling.utils.Execute; */ class Image extends Quad { - private var __scale9Grid:Rectangle; - private var __tileGrid:Rectangle; + @:noCompletion private var __scale9Grid:Rectangle; + @:noCompletion private var __tileGrid:Rectangle; private static var sAutomators = new Map(); @@ -222,7 +222,7 @@ class Image extends Quad // vertex setup - private function __setupScale9Grid():Void + @:noCompletion private function __setupScale9Grid():Void { var texture:Texture = this.texture; var frame:Rectangle = texture.frame; @@ -374,7 +374,7 @@ class Image extends Quad setRequiresRedraw(); } - private function __setupScale9GridAttributes(startX:Float, startY:Float, + @:noCompletion private function __setupScale9GridAttributes(startX:Float, startY:Float, posCols:Vector, posRows:Vector, texCols:Vector, texRows:Vector):Int { @@ -439,7 +439,7 @@ class Image extends Quad return vertexID; } - private function __setupTileGrid():Void + @:noCompletion private function __setupTileGrid():Void { // calculate the grid of vertices simulating a repeating / tiled texture. // again, texture frames make this somewhat more complicated than one would think. diff --git a/src/starling/display/Mesh.hx b/src/starling/display/Mesh.hx index 226d666d..b18f15c4 100644 --- a/src/starling/display/Mesh.hx +++ b/src/starling/display/Mesh.hx @@ -43,10 +43,10 @@ import starling.utils.MeshUtil; */ class Mesh extends DisplayObject { - @:allow(starling) private var __style:MeshStyle; - @:allow(starling) private var __vertexData:VertexData; - @:allow(starling) private var __indexData:IndexData; - @:allow(starling) private var __pixelSnapping:Bool; + @:allow(starling) @:noCompletion private var __style:MeshStyle; + @:allow(starling) @:noCompletion private var __vertexData:VertexData; + @:allow(starling) @:noCompletion private var __indexData:IndexData; + @:allow(starling) @:noCompletion private var __pixelSnapping:Bool; private static var sDefaultStyle:Class = MeshStyle; private static var sDefaultStyleFactory:?Mesh->MeshStyle = null; diff --git a/src/starling/display/MeshBatch.hx b/src/starling/display/MeshBatch.hx index 0222d2cb..ade41868 100644 --- a/src/starling/display/MeshBatch.hx +++ b/src/starling/display/MeshBatch.hx @@ -49,10 +49,10 @@ class MeshBatch extends Mesh /** The maximum number of vertices that fit into one MeshBatch. */ public static inline var MAX_NUM_VERTICES:Int = 65535; - private var __effect:MeshEffect; - private var __batchable:Bool; - private var __vertexSyncRequired:Bool; - private var __indexSyncRequired:Bool; + @:noCompletion private var __effect:MeshEffect; + @:noCompletion private var __batchable:Bool; + @:noCompletion private var __vertexSyncRequired:Bool; + @:noCompletion private var __indexSyncRequired:Bool; // helper object private static var sFullMeshSubset:MeshSubset = new MeshSubset(); @@ -99,18 +99,18 @@ class MeshBatch extends Mesh super.setIndexDataChanged(); } - private function __setVertexAndIndexDataChanged():Void + @:noCompletion private function __setVertexAndIndexDataChanged():Void { __vertexSyncRequired = __indexSyncRequired = true; } - private function __syncVertexBuffer():Void + @:noCompletion private function __syncVertexBuffer():Void { __effect.uploadVertexData(__vertexData); __vertexSyncRequired = false; } - private function __syncIndexBuffer():Void + @:noCompletion private function __syncIndexBuffer():Void { __effect.uploadIndexData(__indexData); __indexSyncRequired = false; @@ -202,7 +202,7 @@ class MeshBatch extends Mesh __indexSyncRequired = __vertexSyncRequired = true; } - private function __setupFor(mesh:Mesh):Void + @:noCompletion private function __setupFor(mesh:Mesh):Void { var meshStyle:MeshStyle = mesh.__style; var meshStyleType:Class = meshStyle.type; diff --git a/src/starling/display/MovieClip.hx b/src/starling/display/MovieClip.hx index b15a51b9..9aebf2f3 100644 --- a/src/starling/display/MovieClip.hx +++ b/src/starling/display/MovieClip.hx @@ -48,15 +48,15 @@ import starling.textures.Texture; */ class MovieClip extends Image implements IAnimatable { - private var __frames:Vector; - private var __defaultFrameDuration:Float; - private var __currentTime:Float; - private var __currentFrameID:Int; - private var __loop:Bool; - private var __playing:Bool; - private var __muted:Bool; - private var __wasStopped:Bool; - private var __soundTransform:SoundTransform = null; + @:noCompletion private var __frames:Vector; + @:noCompletion private var __defaultFrameDuration:Float; + @:noCompletion private var __currentTime:Float; + @:noCompletion private var __currentFrameID:Int; + @:noCompletion private var __loop:Bool; + @:noCompletion private var __playing:Bool; + @:noCompletion private var __muted:Bool; + @:noCompletion private var __wasStopped:Bool; + @:noCompletion private var __soundTransform:SoundTransform = null; #if commonjs private static function __init__ () { diff --git a/src/starling/display/Quad.hx b/src/starling/display/Quad.hx index e2f42281..a14ab316 100644 --- a/src/starling/display/Quad.hx +++ b/src/starling/display/Quad.hx @@ -52,7 +52,7 @@ import starling.utils.RectangleUtil; */ class Quad extends Mesh { - private var __bounds:Rectangle; + @:noCompletion private var __bounds:Rectangle; // helper objects private static var sPoint3D:Vector3D = new Vector3D(); @@ -77,7 +77,7 @@ class Quad extends Mesh } /** Sets up vertex- and index-data according to the current settings. */ - private function __setupVertices():Void + @:noCompletion private function __setupVertices():Void { var posAttr:String = "position"; var texAttr:String = "texCoords"; diff --git a/src/starling/display/Sprite3D.hx b/src/starling/display/Sprite3D.hx index 88f24894..945f6d98 100644 --- a/src/starling/display/Sprite3D.hx +++ b/src/starling/display/Sprite3D.hx @@ -67,11 +67,11 @@ class Sprite3D extends DisplayObjectContainer { private static inline var E:Float = 0.00001; - private var __rotationX:Float; - private var __rotationY:Float; - private var __scaleZ:Float; - private var __pivotZ:Float; - private var __z:Float; + @:noCompletion private var __rotationX:Float; + @:noCompletion private var __rotationY:Float; + @:noCompletion private var __scaleZ:Float; + @:noCompletion private var __pivotZ:Float; + @:noCompletion private var __z:Float; /** Helper objects. */ private static var sHelperPoint:Vector3D = new Vector3D(); @@ -149,17 +149,17 @@ class Sprite3D extends DisplayObjectContainer // helpers - private function __onAddedChild(event:Event):Void + @:noCompletion private function __onAddedChild(event:Event):Void { __recursivelySetIs3D(cast(event.target, DisplayObject), true); } - private function __onRemovedChild(event:Event):Void + @:noCompletion private function __onRemovedChild(event:Event):Void { __recursivelySetIs3D(cast(event.target, DisplayObject), false); } - private function __recursivelySetIs3D(object:DisplayObject, value:Bool):Void + @:noCompletion private function __recursivelySetIs3D(object:DisplayObject, value:Bool):Void { if (#if (haxe_ver < 4.2) Std.is #else Std.isOfType #end(object, Sprite3D)) return; @@ -187,7 +187,7 @@ class Sprite3D extends DisplayObjectContainer __rotationX, __rotationY, rotation, out, out3D); } - @:allow(starling) private function __updateTransformationMatrices3D( + @:allow(starling) @:noCompletion private function __updateTransformationMatrices3D( x:Float, y:Float, z:Float, pivotX:Float, pivotY:Float, pivotZ:Float, scaleX:Float, scaleY:Float, scaleZ:Float, diff --git a/src/starling/display/Stage.hx b/src/starling/display/Stage.hx index a36ab765..72303627 100644 --- a/src/starling/display/Stage.hx +++ b/src/starling/display/Stage.hx @@ -56,14 +56,14 @@ import starling.utils.RectangleUtil; */ class Stage extends DisplayObjectContainer { - private var __width:Int; - private var __height:Int; - private var __color:UInt; - private var __fieldOfView:Float; - private var __projectionOffset:Point; - private var __cameraPosition:Vector3D; - private var __enterFrameEvent:EnterFrameEvent; - private var __enterFrameListeners:Vector; + @:noCompletion private var __width:Int; + @:noCompletion private var __height:Int; + @:noCompletion private var __color:UInt; + @:noCompletion private var __fieldOfView:Float; + @:noCompletion private var __projectionOffset:Point; + @:noCompletion private var __cameraPosition:Vector3D; + @:noCompletion private var __enterFrameEvent:EnterFrameEvent; + @:noCompletion private var __enterFrameListeners:Vector; /** Helper objects. */ private static var sMatrix:Matrix = new Matrix(); diff --git a/src/starling/events/EventDispatcher.hx b/src/starling/events/EventDispatcher.hx index bbbfee3a..c9c777ba 100644 --- a/src/starling/events/EventDispatcher.hx +++ b/src/starling/events/EventDispatcher.hx @@ -36,8 +36,8 @@ import starling.display.DisplayObject; */ class EventDispatcher { - private var __eventListeners:Map>; - private var __eventStack:Vector = new Vector(); + @:noCompletion private var __eventListeners:Map>; + @:noCompletion private var __eventStack:Vector = new Vector(); /** Helper object. */ private static var sBubbleChains:Array> = new Array>(); @@ -150,7 +150,7 @@ class EventDispatcher * Invokes an event on the current object. This method does not do any bubbling, nor * does it back-up and restore the previous target on the event. The 'dispatchEvent' * method uses this method internally. */ - @:allow(starling) private function __invokeEvent(event:Event):Bool + @:allow(starling) @:noCompletion private function __invokeEvent(event:Event):Bool { var listeners:Vector = __eventListeners != null ? __eventListeners[event.type] : null; @@ -204,7 +204,7 @@ class EventDispatcher } /** @private */ - private function __bubbleEvent(event:Event):Void + @:noCompletion private function __bubbleEvent(event:Event):Void { // we determine the bubble chain before starting to invoke the listeners. // that way, changes done by the listeners won't affect the bubble chain. diff --git a/src/starling/events/KeyboardEvent.hx b/src/starling/events/KeyboardEvent.hx index 27e9fcbc..43ebdf46 100644 --- a/src/starling/events/KeyboardEvent.hx +++ b/src/starling/events/KeyboardEvent.hx @@ -28,13 +28,13 @@ class KeyboardEvent extends Event /** Event type for a key that was pressed. */ public static inline var KEY_DOWN:String = "keyDown"; - private var __charCode:UInt; - private var __keyCode:UInt; - private var __keyLocation:UInt; - private var __altKey:Bool; - private var __ctrlKey:Bool; - private var __shiftKey:Bool; - private var __isDefaultPrevented:Bool; + @:noCompletion private var __charCode:UInt; + @:noCompletion private var __keyCode:UInt; + @:noCompletion private var __keyLocation:UInt; + @:noCompletion private var __altKey:Bool; + @:noCompletion private var __ctrlKey:Bool; + @:noCompletion private var __shiftKey:Bool; + @:noCompletion private var __isDefaultPrevented:Bool; #if commonjs private static function __init__ () { diff --git a/src/starling/events/Touch.hx b/src/starling/events/Touch.hx index 62838c8a..caffb9d7 100644 --- a/src/starling/events/Touch.hx +++ b/src/starling/events/Touch.hx @@ -38,23 +38,23 @@ import starling.utils.StringUtil; */ class Touch { - private var __id:Int; - private var __globalX:Float; - private var __globalY:Float; - private var __previousGlobalX:Float; - private var __previousGlobalY:Float; - private var __startGlobalX:Float; - private var __startGlobalY:Float; - private var __startTimestamp:Float; - private var __tapCount:Int; - private var __phase:String; - private var __target:DisplayObject; - private var __timestamp:Float; - private var __pressure:Float; - private var __width:Float; - private var __height:Float; - private var __cancelled:Bool; - private var __bubbleChain:Vector; + @:noCompletion private var __id:Int; + @:noCompletion private var __globalX:Float; + @:noCompletion private var __globalY:Float; + @:noCompletion private var __previousGlobalX:Float; + @:noCompletion private var __previousGlobalY:Float; + @:noCompletion private var __startGlobalX:Float; + @:noCompletion private var __startGlobalY:Float; + @:noCompletion private var __startTimestamp:Float; + @:noCompletion private var __tapCount:Int; + @:noCompletion private var __phase:String; + @:noCompletion private var __target:DisplayObject; + @:noCompletion private var __timestamp:Float; + @:noCompletion private var __pressure:Float; + @:noCompletion private var __width:Float; + @:noCompletion private var __height:Float; + @:noCompletion private var __cancelled:Bool; + @:noCompletion private var __bubbleChain:Vector; /** Helper object. */ private static var sHelperPoint:Point = new Point(); diff --git a/src/starling/events/TouchEvent.hx b/src/starling/events/TouchEvent.hx index ec32451c..62da70a6 100644 --- a/src/starling/events/TouchEvent.hx +++ b/src/starling/events/TouchEvent.hx @@ -57,10 +57,10 @@ class TouchEvent extends Event /** Event type for touch or mouse input. */ public static inline var TOUCH:String = "touch"; - private var __shiftKey:Bool; - private var __ctrlKey:Bool; - private var __timestamp:Float; - private var __visitedObjects:Vector; + @:noCompletion private var __shiftKey:Bool; + @:noCompletion private var __ctrlKey:Bool; + @:noCompletion private var __timestamp:Float; + @:noCompletion private var __visitedObjects:Vector; /** Helper object. */ private static var sTouches:Vector = new Vector(); diff --git a/src/starling/events/TouchMarker.hx b/src/starling/events/TouchMarker.hx index 01606962..7e23c9d6 100644 --- a/src/starling/events/TouchMarker.hx +++ b/src/starling/events/TouchMarker.hx @@ -22,8 +22,8 @@ import starling.textures.Texture; /** The TouchMarker is used internally to mark touches created through "simulateMultitouch". */ class TouchMarker extends Sprite { - private var __center:Point; - private var __texture:Texture; + @:noCompletion private var __center:Point; + @:noCompletion private var __texture:Texture; #if commonjs private static function __init__ () { diff --git a/src/starling/events/TouchProcessor.hx b/src/starling/events/TouchProcessor.hx index 0a8104a3..f7bea82a 100644 --- a/src/starling/events/TouchProcessor.hx +++ b/src/starling/events/TouchProcessor.hx @@ -57,33 +57,33 @@ import starling.utils.Pool; */ class TouchProcessor { - private var __stage:Stage; - private var __root:DisplayObject; - private var __elapsedTime:Float; - private var __lastTaps:Vector; - private var __shiftDown:Bool = false; - private var __ctrlDown:Bool = false; - private var __multitapTime:Float = 0.3; - private var __multitapDistance:Float = 25; - private var __touchEvent:TouchEvent; - private var __isProcessing:Bool; - private var __cancelRequested:Bool; - - private var __touchMarker:TouchMarker; - private var __simulateMultitouch:Bool; - private var __occlusionTest:Float->Float->Bool; + @:noCompletion private var __stage:Stage; + @:noCompletion private var __root:DisplayObject; + @:noCompletion private var __elapsedTime:Float; + @:noCompletion private var __lastTaps:Vector; + @:noCompletion private var __shiftDown:Bool = false; + @:noCompletion private var __ctrlDown:Bool = false; + @:noCompletion private var __multitapTime:Float = 0.3; + @:noCompletion private var __multitapDistance:Float = 25; + @:noCompletion private var __touchEvent:TouchEvent; + @:noCompletion private var __isProcessing:Bool; + @:noCompletion private var __cancelRequested:Bool; + + @:noCompletion private var __touchMarker:TouchMarker; + @:noCompletion private var __simulateMultitouch:Bool; + @:noCompletion private var __occlusionTest:Float->Float->Bool; // system gesture detection - private var __discardSystemGestures:Bool; - private var __systemGestureTouchID:Int = -1; - private var __systemGestureMargins:Array = [15, 15, 15, 0]; + @:noCompletion private var __discardSystemGestures:Bool; + @:noCompletion private var __systemGestureTouchID:Int = -1; + @:noCompletion private var __systemGestureMargins:Array = [15, 15, 15, 0]; /** A vector of arrays with the arguments that were passed to the "enqueue" * method (the oldest being at the end of the vector). */ - private var __queue:Vector; + @:noCompletion private var __queue:Vector; /** The list of all currently active touches. */ - private var __currentTouches:Vector; + @:noCompletion private var __currentTouches:Vector; /** Helper objects. */ private static var sUpdatedTouches:Vector = new Vector(); diff --git a/src/starling/extensions/ChildAccess.hx b/src/starling/extensions/ChildAccess.hx index e984a8db..34cb8854 100644 --- a/src/starling/extensions/ChildAccess.hx +++ b/src/starling/extensions/ChildAccess.hx @@ -1282,7 +1282,7 @@ abstract ChildAccess(T) from T to T **/ @:op(a.b) @:arrayAccess - private function __resolve(childName:String):ChildAccess + @:noCompletion private function __resolve(childName:String):ChildAccess { if (this != null && #if (haxe_ver >= 4.2) Std.isOfType #else Std.is #end (this, DisplayObjectContainer)) { diff --git a/src/starling/filters/BlurFilter.hx b/src/starling/filters/BlurFilter.hx index fbab466b..ae1b3e18 100644 --- a/src/starling/filters/BlurFilter.hx +++ b/src/starling/filters/BlurFilter.hx @@ -25,9 +25,9 @@ import starling.utils.MathUtil; * set for x- and y-axis separately. */ class BlurFilter extends FragmentFilter { - private var __blurX:Float; - private var __blurY:Float; - private var __quality:Float; + @:noCompletion private var __blurX:Float; + @:noCompletion private var __blurY:Float; + @:noCompletion private var __quality:Float; #if commonjs private static function __init__ () { diff --git a/src/starling/filters/FilterChain.hx b/src/starling/filters/FilterChain.hx index d0dea352..f57a0e9f 100644 --- a/src/starling/filters/FilterChain.hx +++ b/src/starling/filters/FilterChain.hx @@ -180,7 +180,7 @@ class FilterChain extends FragmentFilter this.padding.copyFrom(sPadding); } - private function __onEnterFrame(event:Event):Void + @:noCompletion private function __onEnterFrame(event:Event):Void { var numFilters:Int = _filters.length; for (i in 0...numFilters) _filters[i].dispatchEvent(event); diff --git a/src/starling/geom/Ellipse.hx b/src/starling/geom/Ellipse.hx index 8e1ec12a..8c67fb05 100644 --- a/src/starling/geom/Ellipse.hx +++ b/src/starling/geom/Ellipse.hx @@ -6,10 +6,10 @@ import starling.rendering.IndexData; class Ellipse extends ImmutablePolygon { - private var __x:Float; - private var __y:Float; - private var __radiusX:Float; - private var __radiusY:Float; + @:noCompletion private var __x:Float; + @:noCompletion private var __y:Float; + @:noCompletion private var __radiusX:Float; + @:noCompletion private var __radiusY:Float; public function new(x:Float, y:Float, radiusX:Float, radiusY:Float, numSides:Int = -1) { diff --git a/src/starling/geom/ImmutablePolygon.hx b/src/starling/geom/ImmutablePolygon.hx index 208ea8ab..af72b527 100644 --- a/src/starling/geom/ImmutablePolygon.hx +++ b/src/starling/geom/ImmutablePolygon.hx @@ -7,7 +7,7 @@ import starling.geom.Polygon; class ImmutablePolygon extends Polygon { - private var __frozen:Bool; + @:noCompletion private var __frozen:Bool; public function new(vertices:Array) { diff --git a/src/starling/geom/Polygon.hx b/src/starling/geom/Polygon.hx index db150e3f..9a1a2cbf 100644 --- a/src/starling/geom/Polygon.hx +++ b/src/starling/geom/Polygon.hx @@ -30,7 +30,7 @@ import starling.utils.Pool; */ class Polygon { - private var __coords:Vector; + @:noCompletion private var __coords:Vector; // Helper object private static var sRestIndices:Vector = new Vector(); diff --git a/src/starling/geom/Rectangle.hx b/src/starling/geom/Rectangle.hx index cbb3e989..561e3044 100644 --- a/src/starling/geom/Rectangle.hx +++ b/src/starling/geom/Rectangle.hx @@ -6,10 +6,10 @@ import starling.rendering.IndexData; class Rectangle extends ImmutablePolygon { - private var __x:Float; - private var __y:Float; - private var __width:Float; - private var __height:Float; + @:noCompletion private var __x:Float; + @:noCompletion private var __y:Float; + @:noCompletion private var __width:Float; + @:noCompletion private var __height:Float; public function new(x:Float, y:Float, width:Float, height:Float) { diff --git a/src/starling/text/BitmapChar.hx b/src/starling/text/BitmapChar.hx index e4f2b3b5..1771a687 100644 --- a/src/starling/text/BitmapChar.hx +++ b/src/starling/text/BitmapChar.hx @@ -19,12 +19,12 @@ import starling.textures.Texture; */ class BitmapChar { - private var __texture:Texture; - private var __charID:Int; - private var __xOffset:Float; - private var __yOffset:Float; - private var __xAdvance:Float; - private var __kernings:Map; + @:noCompletion private var __texture:Texture; + @:noCompletion private var __charID:Int; + @:noCompletion private var __xOffset:Float; + @:noCompletion private var __yOffset:Float; + @:noCompletion private var __xAdvance:Float; + @:noCompletion private var __kernings:Map; #if commonjs private static function __init__ () { diff --git a/src/starling/text/BitmapFont.hx b/src/starling/text/BitmapFont.hx index 47b695f0..3d5e3c8c 100644 --- a/src/starling/text/BitmapFont.hx +++ b/src/starling/text/BitmapFont.hx @@ -71,18 +71,18 @@ class BitmapFont implements ITextCompositor private static inline var CHAR_CARRIAGE_RETURN:Int = 13; private static inline var CHAR_SPACE:Int = 32; - private var __texture:Texture; - private var __chars:Map; - private var __name:String; - private var __size:Float; - private var __lineHeight:Float; - private var __baseline:Float; - private var __offsetX:Float; - private var __offsetY:Float; - private var __padding:Float; - private var __helperImage:Image; - private var __type:String; - private var __distanceFieldSpread:Float; + @:noCompletion private var __texture:Texture; + @:noCompletion private var __chars:Map; + @:noCompletion private var __name:String; + @:noCompletion private var __size:Float; + @:noCompletion private var __lineHeight:Float; + @:noCompletion private var __baseline:Float; + @:noCompletion private var __offsetX:Float; + @:noCompletion private var __offsetY:Float; + @:noCompletion private var __padding:Float; + @:noCompletion private var __helperImage:Image; + @:noCompletion private var __type:String; + @:noCompletion private var __distanceFieldSpread:Float; // helper objects private static var sLines:Array> = []; diff --git a/src/starling/text/TextFormat.hx b/src/starling/text/TextFormat.hx index 436d5b4b..5aa349d8 100644 --- a/src/starling/text/TextFormat.hx +++ b/src/starling/text/TextFormat.hx @@ -28,17 +28,17 @@ import starling.utils.Align; */ class TextFormat extends EventDispatcher { - private var __font:String; - private var __size:Float; - private var __color:UInt; - private var __bold:Bool; - private var __italic:Bool; - private var __underline:Bool; - private var __horizontalAlign:String; - private var __verticalAlign:String; - private var __kerning:Bool; - private var __leading:Float; - private var __letterSpacing:Float; + @:noCompletion private var __font:String; + @:noCompletion private var __size:Float; + @:noCompletion private var __color:UInt; + @:noCompletion private var __bold:Bool; + @:noCompletion private var __italic:Bool; + @:noCompletion private var __underline:Bool; + @:noCompletion private var __horizontalAlign:String; + @:noCompletion private var __verticalAlign:String; + @:noCompletion private var __kerning:Bool; + @:noCompletion private var __leading:Float; + @:noCompletion private var __letterSpacing:Float; #if commonjs private static function __init__ () { diff --git a/src/starling/text/TextOptions.hx b/src/starling/text/TextOptions.hx index c12cca4d..7b927153 100644 --- a/src/starling/text/TextOptions.hx +++ b/src/starling/text/TextOptions.hx @@ -29,16 +29,16 @@ import starling.events.EventDispatcher; */ class TextOptions extends EventDispatcher { - private var __wordWrap:Bool; - private var __autoScale:Bool; - private var __autoSize:String; - private var __isHtmlText:Bool; - private var __textureScale:Float; - private var __textureFormat:String; + @:noCompletion private var __wordWrap:Bool; + @:noCompletion private var __autoScale:Bool; + @:noCompletion private var __autoSize:String; + @:noCompletion private var __isHtmlText:Bool; + @:noCompletion private var __textureScale:Float; + @:noCompletion private var __textureFormat:String; #if flash - private var __styleSheet:StyleSheet; + @:noCompletion private var __styleSheet:StyleSheet; #end - private var __padding:Float; + @:noCompletion private var __padding:Float; #if commonjs private static function __init__ () { diff --git a/src/starling/textures/RenderTexture.hx b/src/starling/textures/RenderTexture.hx index 1e090abc..0ff99158 100644 --- a/src/starling/textures/RenderTexture.hx +++ b/src/starling/textures/RenderTexture.hx @@ -208,7 +208,7 @@ class RenderTexture extends SubTexture __renderBundled(renderBlockFunc, null, null, 1.0, antiAliasing, cameraPos); } - private function __render(object:DisplayObject, matrix:Matrix=null, alpha:Float=1.0):Void + @:noCompletion private function __render(object:DisplayObject, matrix:Matrix=null, alpha:Float=1.0):Void { var painter:Painter = Starling.current.painter; var state:RenderState = painter.state; @@ -238,7 +238,7 @@ class RenderTexture extends SubTexture painter.cacheEnabled = wasCacheEnabled; } - private function __renderBundled(renderBlock:DisplayObject->Matrix->Float->Void, object:DisplayObject=null, + @:noCompletion private function __renderBundled(renderBlock:DisplayObject->Matrix->Float->Void, object:DisplayObject=null, matrix:Matrix=null, alpha:Float=1.0, antiAliasing:Int=0, cameraPos:Vector3D=null):Void { diff --git a/src/starling/textures/TextureAtlas.hx b/src/starling/textures/TextureAtlas.hx index aa518a7c..449d43ef 100644 --- a/src/starling/textures/TextureAtlas.hx +++ b/src/starling/textures/TextureAtlas.hx @@ -76,10 +76,12 @@ import starling.utils.StringUtil; class TextureAtlas { private static var NAME_REGEX:EReg = ~/(.+?)\d+$/; // find text before trailing digits + + public var xmlScale = 1.0; - private var __atlasTexture:Texture; - private var __subTextures:Map; - private var __subTextureNames:Vector; + @:noCompletion private var __atlasTexture:Texture; + @:noCompletion private var __subTextures:Map; + @:noCompletion private var __subTextureNames:Vector; /** helper objects */ private static var sNames:Vector = new Vector(); @@ -96,10 +98,12 @@ class TextureAtlas /** Create a texture atlas from a texture and atlas data. The second argument typically * points to an XML file. */ - public function new(texture:Texture, data:Dynamic=null) + public function new(texture:Texture, data:Dynamic=null, xmlScale:Float = 1) { __subTextures = new Map(); __atlasTexture = texture; + + this.xmlScale = xmlScale; if (data != null) parseAtlasData(data); diff --git a/src/starling/utils/AssetManager.hx b/src/starling/utils/AssetManager.hx index 604de5f5..feb623c6 100644 --- a/src/starling/utils/AssetManager.hx +++ b/src/starling/utils/AssetManager.hx @@ -129,27 +129,27 @@ class AssetManager extends EventDispatcher // This HTTPStatusEvent is only available in AIR private static inline var HTTP_RESPONSE_STATUS:String = "httpResponseStatus"; - private var __starling:Starling; - private var __numLostTextures:Int; - private var __numRestoredTextures:Int; - private var __numLoadingQueues:Int = 0; - - private var __defaultTextureOptions:TextureOptions; - private var __registerBitmapFontsWithFontFace:Bool; - private var __checkPolicyFile:Bool; - private var __keepAtlasXmls:Bool; - private var __keepFontXmls:Bool; - private var __numConnections:Int; - private var __verbose:Bool; - private var __queue:Array; + @:noCompletion private var __starling:Starling; + @:noCompletion private var __numLostTextures:Int; + @:noCompletion private var __numRestoredTextures:Int; + @:noCompletion private var __numLoadingQueues:Int = 0; + + @:noCompletion private var __defaultTextureOptions:TextureOptions; + @:noCompletion private var __registerBitmapFontsWithFontFace:Bool; + @:noCompletion private var __checkPolicyFile:Bool; + @:noCompletion private var __keepAtlasXmls:Bool; + @:noCompletion private var __keepFontXmls:Bool; + @:noCompletion private var __numConnections:Int; + @:noCompletion private var __verbose:Bool; + @:noCompletion private var __queue:Array; - private var __textures:Map; - private var __atlases:Map; - private var __sounds:Map; - private var __xmls:Map; - private var __objects:Map; - private var __byteArrays:Map; - private var __bitmapFonts:Map; + @:noCompletion private var __textures:Map; + @:noCompletion private var __atlases:Map; + @:noCompletion private var __sounds:Map; + @:noCompletion private var __xmls:Map; + @:noCompletion private var __objects:Map; + @:noCompletion private var __byteArrays:Map; + @:noCompletion private var __bitmapFonts:Map; /** helper objects */ private static var sNames:Vector = new Vector(); diff --git a/src/starling/utils/ButtonBehavior.hx b/src/starling/utils/ButtonBehavior.hx index 7d932ac3..0b60ca64 100644 --- a/src/starling/utils/ButtonBehavior.hx +++ b/src/starling/utils/ButtonBehavior.hx @@ -66,14 +66,14 @@ class ButtonBehavior // 'minHitAreaSize' defaults to 44 points, as recommended by Apple Human Interface Guidelines. // -> https://developer.apple.com/ios/human-interface-guidelines/visual-design/adaptivity-and-layout/ - private var __state:String; - private var __target:DisplayObject; - private var __triggerBounds:Rectangle; - private var __minHitAreaSize:Float; - private var __abortDistance:Float; - private var __onStateChange:Function; - private var __useHandCursor:Bool; - private var __enabled:Bool; + @:noCompletion private var __state:String; + @:noCompletion private var __target:DisplayObject; + @:noCompletion private var __triggerBounds:Rectangle; + @:noCompletion private var __minHitAreaSize:Float; + @:noCompletion private var __abortDistance:Float; + @:noCompletion private var __onStateChange:Function; + @:noCompletion private var __useHandCursor:Bool; + @:noCompletion private var __enabled:Bool; private static var sBounds:Rectangle = new Rectangle();