From f830f5758de04cabbb619ff2d6685fcf2746668c Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Fri, 29 Jun 2018 11:00:13 -0700 Subject: [PATCH] Rename CanvasRenderContext to Canvas2DRenderContext --- docs/api/ImportAll.hx | 2 +- .../_internal/backend/html5/HTML5Window.hx | 2 +- src/lime/graphics/CanvasRenderContext.hx | 113 ------------------ src/lime/graphics/FlashRenderContext.hx | 2 + src/lime/graphics/RenderContext.hx | 2 +- 5 files changed, 5 insertions(+), 116 deletions(-) delete mode 100644 src/lime/graphics/CanvasRenderContext.hx diff --git a/docs/api/ImportAll.hx b/docs/api/ImportAll.hx index b515bf77b..2d0bb217f 100644 --- a/docs/api/ImportAll.hx +++ b/docs/api/ImportAll.hx @@ -45,7 +45,7 @@ import lime.graphics.opengl.GLTransformFeedback; import lime.graphics.opengl.GLUniformLocation; import lime.graphics.opengl.GLVertexArrayObject; import lime.graphics.CairoRenderContext; -import lime.graphics.CanvasRenderContext; +import lime.graphics.Canvas2DRenderContext; import lime.graphics.DOMRenderContext; import lime.graphics.FlashRenderContext; import lime.graphics.Image; diff --git a/src/lime/_internal/backend/html5/HTML5Window.hx b/src/lime/_internal/backend/html5/HTML5Window.hx index 7fe094d45..411479fe8 100644 --- a/src/lime/_internal/backend/html5/HTML5Window.hx +++ b/src/lime/_internal/backend/html5/HTML5Window.hx @@ -325,7 +325,7 @@ class HTML5Window { if (webgl == null) { - context.ctx = cast canvas.getContext ("2d"); + context.canvas2D = cast canvas.getContext ("2d"); context.type = CANVAS; context.version = ""; diff --git a/src/lime/graphics/CanvasRenderContext.hx b/src/lime/graphics/CanvasRenderContext.hx deleted file mode 100644 index 640e006cf..000000000 --- a/src/lime/graphics/CanvasRenderContext.hx +++ /dev/null @@ -1,113 +0,0 @@ -package lime.graphics; -#if (js && html5 && !doc_gen) -typedef CanvasRenderContext = js.html.CanvasRenderingContext2D; -#else - - -class CanvasRenderContext { - - - public var backingStorePixelRatio (default, null):Float; - public var canvas:Dynamic /*CanvasElement*/; - public var fillStyle:Dynamic; - public var font:String; - public var globalAlpha:Float; - public var globalCompositeOperation:String; - public var imageSmoothingEnabled:Bool; - public var lineCap:String; - public var lineDash:Array; - public var lineDashOffset:Float; - public var lineJoin:String; - public var lineWidth:Float; - public var miterLimit:Float; - public var shadowBlur:Float; - public var shadowColor:String; - public var shadowOffsetX:Float; - public var shadowOffsetY:Float; - public var strokeStyle:Dynamic; - public var textAlign:String; - public var textBaseline:String; - - - public function new () { - - - - } - - - public function arc (x:Float, y:Float, radius:Float, startAngle:Float, endAngle:Float, anticlockwise:Bool):Void {}; - public function arcTo (x1:Float, y1:Float, x2:Float, y2:Float, radius:Float):Void {}; - public function beginPath ():Void {}; - public function bezierCurveTo (cp1x:Float, cp1y:Float, cp2x:Float, cp2y:Float, x:Float, y:Float):Void {}; - public function clearRect (x:Float, y:Float, width:Float, height:Float):Void {}; - public function clearShadow ():Void {}; - public function clip ():Void {}; - public function closePath ():Void {}; - @:overload(function(dynamicImageData:Dynamic /*ImageData*/):Dynamic /*ImageData*/ {}) - public function createDynamicImageData (sw:Float, sh:Float):Dynamic /*ImageData*/ { return null; }; - public function createLinearGradient (x0:Float, y0:Float, x1:Float, y1:Float):Dynamic /*CanvasGradient*/ { return null; }; - @:overload(function(canvas:Dynamic /*CanvasElement*/, repetitionType:String):Dynamic /*CanvasPattern*/ {}) - public function createPattern (image:Dynamic /*ImageElement*/, repetitionType:String):Dynamic /*CanvasPattern*/ { return null; }; - public function createRadialGradient (x0:Float, y0:Float, r0:Float, x1:Float, y1:Float, r1:Float):Dynamic /*CanvasGradient*/ { return null; }; - //@:overload(function(image:Dynamic /*ImageElement*/, x:Float, y:Float):Void {}) - //@:overload(function(image:Dynamic /*ImageElement*/, x:Float, y:Float, width:Float, height:Float):Void {}) - //@:overload(function(image:Dynamic /*ImageElement*/, sx:Float, sy:Float, sw:Float, sh:Float, dx:Float, dy:Float, dw:Float, dh:Float):Void {}) - //@:overload(function(canvas:Dynamic /*CanvasElement*/, x:Float, y:Float):Void {}) - //@:overload(function(canvas:Dynamic /*CanvasElement*/, x:Float, y:Float, width:Float, height:Float):Void {}) - //@:overload(function(canvas:Dynamic /*CanvasElement*/, sx:Float, sy:Float, sw:Float, sh:Float, dx:Float, dy:Float, dw:Float, dh:Float):Void {}) - //@:overload(function(video:Dynamic /*VideoElement*/, x:Float, y:Float):Void {}) - //@:overload(function(video:Dynamic /*VideoElement*/, x:Float, y:Float, width:Float, height:Float):Void {}) - public function drawImage (element:Dynamic /*VideoElement*/, sx:Float, sy:Float, ?sw:Float, ?sh:Float, ?dx:Float, ?dy:Float, ?dw:Float, ?dh:Float):Void {}; - public function drawImageFromRect (image:Dynamic /*ImageElement*/, ?sx:Float, ?sy:Float, ?sw:Float, ?sh:Float, ?dx:Float, ?dy:Float, ?dw:Float, ?dh:Float, ?compositeOperation:String):Void {}; - public function fill ():Void {}; - public function fillRect (x:Float, y:Float, width:Float, height:Float):Void {}; - public function fillText (text:String, x:Float, y:Float, ?maxWidth:Float):Void {}; - public function getDynamicImageData (sx:Float, sy:Float, sw:Float, sh:Float):Dynamic /*ImageData*/ { return null; }; - public function getDynamicImageDataHD (sx:Float, sy:Float, sw:Float, sh:Float):Dynamic /*ImageData*/ { return null; }; - public function getLineDash ():Array { return null; }; - public function isPointInPath (x:Float, y:Float):Bool { return false; }; - public function lineTo (x:Float, y:Float):Void {}; - public function measureText(text:String):Dynamic /*TextMetrics*/ { return null; }; - public function moveTo (x:Float, y:Float):Void {}; - @:overload(function(dynamicImageData:Dynamic /*ImageData*/, dx:Float, dy:Float):Void {}) - public function putDynamicImageData (dynamicImageData:Dynamic /*ImageData*/, dx:Float, dy:Float, dirtyX:Float, dirtyY:Float, dirtyWidth:Float, dirtyHeight:Float):Void {}; - @:overload(function(dynamicImageData:Dynamic /*ImageData*/, dx:Float, dy:Float):Void {}) - public function putDynamicImageDataHD (dynamicImageData:Dynamic /*ImageData*/, dx:Float, dy:Float, dirtyX:Float, dirtyY:Float, dirtyWidth:Float, dirtyHeight:Float):Void {}; - public function quadraticCurveTo (cpx:Float, cpy:Float, x:Float, y:Float):Void {}; - public function rect (x:Float, y:Float, width:Float, height:Float):Void {}; - public function restore ():Void {}; - public function rotate (angle:Float):Void {}; - public function save ():Void {}; - public function scale (sx:Float, sy:Float):Void {}; - public function setAlpha (alpha:Float):Void {}; - public function setCompositeOperation (compositeOperation:String):Void {}; - @:overload(function(color:String, ?alpha:Float):Void {}) - @:overload(function(grayLevel:Float, ?alpha:Float):Void {}) - @:overload(function(r:Float, g:Float, b:Float, a:Float):Void {}) - public function setFillColor (c:Float, m:Float, y:Float, k:Float, a:Float):Void {}; - public function setLineCap (cap:String):Void {}; - public function setLineDash (dash:Array):Void {}; - public function setLineJoin (join:String):Void {}; - public function setLineWidth (width:Float):Void {}; - public function setMiterLimit (limit:Float):Void {}; - @:overload(function(width:Float, height:Float, blur:Float, ?color:String, ?alpha:Float):Void {}) - @:overload(function(width:Float, height:Float, blur:Float, grayLevel:Float, ?alpha:Float):Void {}) - @:overload(function(width:Float, height:Float, blur:Float, r:Float, g:Float, b:Float, a:Float):Void {}) - public function setShadow (width:Float, height:Float, blur:Float, c:Float, m:Float, y:Float, k:Float, a:Float):Void {}; - @:overload(function(color:String, ?alpha:Float):Void {}) - @:overload(function(grayLevel:Float, ?alpha:Float):Void {}) - @:overload(function(r:Float, g:Float, b:Float, a:Float):Void {}) - public function setStrokeColor (c:Float, m:Float, y:Float, k:Float, a:Float):Void {}; - public function setTransform (m11:Float, m12:Float, m21:Float, m22:Float, dx:Float, dy:Float):Void {}; - public function stroke ():Void {}; - public function strokeRect (x:Float, y:Float, width:Float, height:Float, ?lineWidth:Float):Void {}; - public function strokeText (text:String, x:Float, y:Float, ?maxWidth:Float):Void {}; - public function transform (m11:Float, m12:Float, m21:Float, m22:Float, dx:Float, dy:Float):Void {}; - public function translate (tx:Float, ty:Float):Void {}; - - -} - - -#end \ No newline at end of file diff --git a/src/lime/graphics/FlashRenderContext.hx b/src/lime/graphics/FlashRenderContext.hx index a0c6ea422..c34ff1098 100644 --- a/src/lime/graphics/FlashRenderContext.hx +++ b/src/lime/graphics/FlashRenderContext.hx @@ -27,6 +27,8 @@ abstract FlashRenderContext(Sprite) from Sprite to Sprite { #else +@:forward() + abstract FlashRenderContext(Dynamic) from Dynamic to Dynamic { diff --git a/src/lime/graphics/RenderContext.hx b/src/lime/graphics/RenderContext.hx index ad0549fbc..a54aaf4fa 100644 --- a/src/lime/graphics/RenderContext.hx +++ b/src/lime/graphics/RenderContext.hx @@ -9,7 +9,7 @@ class RenderContext { public var cairo (default, null):CairoRenderContext; - public var ctx (default, null):CanvasRenderContext; + public var canvas2D (default, null):Canvas2DRenderContext; public var element (default, null):DOMRenderContext; public var gl (default, null):OpenGLRenderContext; public var gles2 (default, null):OpenGLES2RenderContext;