From 1254c84cf697542d50d3cd696a352bc2bf6791af Mon Sep 17 00:00:00 2001 From: Ignatiev Mikhail Date: Tue, 4 Jul 2017 17:48:24 +0300 Subject: [PATCH] BlendModes consistency, gitignore to ignore node_modules, samples output and local haxelib --- .gitignore | 3 +++ src/pixi/core/display/BlendMode.hx | 23 ------------------- src/pixi/core/graphics/Graphics.hx | 3 ++- .../core/renderers/canvas/CanvasRenderer.hx | 6 +++-- .../core/renderers/webgl/WebGLRenderer.hx | 3 ++- .../webgl/managers/BlendModeManager.hx | 3 ++- src/pixi/core/sprites/Sprite.hx | 4 ++-- src/pixi/mesh/Mesh.hx | 3 ++- src/pixi/particles/ParticleContainer.hx | 3 ++- src/pixi/plugins/spine/core/SlotData.hx | 3 ++- 10 files changed, 21 insertions(+), 33 deletions(-) delete mode 100644 src/pixi/core/display/BlendMode.hx diff --git a/.gitignore b/.gitignore index 6534ed6d..e6cbbcd9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ docs.xml +node_modules/ +samples/output/ +.haxelib/ \ No newline at end of file diff --git a/src/pixi/core/display/BlendMode.hx b/src/pixi/core/display/BlendMode.hx deleted file mode 100644 index 237d8323..00000000 --- a/src/pixi/core/display/BlendMode.hx +++ /dev/null @@ -1,23 +0,0 @@ -package pixi.core.display; - -@:native("PIXI.BLEND_MODES") -extern enum BlendMode -{ - NORMAL; - ADD; - MULTIPLY; - SCREEN; - OVERLAY; - DARKEN; - LIGHTEN; - COLOR_DODGE; - COLOR_BURN; - HARD_LIGHT; - SOFT_LIGHT; - DIFFERENCE; - EXCLUSION; - HUE; - SATURATION; - COLOR; - LUMINOSITY; -} \ No newline at end of file diff --git a/src/pixi/core/graphics/Graphics.hx b/src/pixi/core/graphics/Graphics.hx index 6585c320..85f45c6d 100644 --- a/src/pixi/core/graphics/Graphics.hx +++ b/src/pixi/core/graphics/Graphics.hx @@ -1,5 +1,6 @@ package pixi.core.graphics; +import pixi.core.Pixi.BlendModes; import pixi.core.textures.Texture; import pixi.core.math.Point; import pixi.core.math.shapes.Polygon; @@ -75,7 +76,7 @@ extern class Graphics extends Container { * @member {Int} * @default CONST.BLEND_MODES.NORMAL; */ - var blendMode:Int; + var blendMode:BlendModes; /** * Whether this shape is being used as a mask. diff --git a/src/pixi/core/renderers/canvas/CanvasRenderer.hx b/src/pixi/core/renderers/canvas/CanvasRenderer.hx index eaed7e33..c5b232ea 100644 --- a/src/pixi/core/renderers/canvas/CanvasRenderer.hx +++ b/src/pixi/core/renderers/canvas/CanvasRenderer.hx @@ -1,5 +1,7 @@ package pixi.core.renderers.canvas; +import pixi.core.Pixi.BlendModes; +import pixi.core.Pixi.ScaleModes; import pixi.core.renderers.canvas.utils.CanvasMaskManager; import js.html.CanvasRenderingContext2D; @@ -66,12 +68,12 @@ extern class CanvasRenderer extends SystemRenderer { * * @member {SCALE_MODE} */ - var currentScaleMode:Int; + var currentScaleMode:ScaleModes; /** * Tracks the active blend mode for this renderer. * * @member {BLEND_MODES} */ - var currentBlendMode:Int; + var currentBlendMode:BlendModes; } \ No newline at end of file diff --git a/src/pixi/core/renderers/webgl/WebGLRenderer.hx b/src/pixi/core/renderers/webgl/WebGLRenderer.hx index 4fd32a61..c3f50e06 100644 --- a/src/pixi/core/renderers/webgl/WebGLRenderer.hx +++ b/src/pixi/core/renderers/webgl/WebGLRenderer.hx @@ -1,5 +1,6 @@ package pixi.core.renderers.webgl; +import pixi.core.Pixi.BlendModes; import pixi.core.display.Transform; import pixi.core.renderers.webgl.utils.RenderTarget; import pixi.core.textures.Texture; @@ -101,7 +102,7 @@ extern class WebGLRenderer extends SystemRenderer { * * @param {Int} blendMode - the desired blend mode */ - function setBlendMode(blendMode:Int):Void; + function setBlendMode(blendMode:BlendModes):Void; /** * Erases the active render target and fills the drawing area with a colour diff --git a/src/pixi/core/renderers/webgl/managers/BlendModeManager.hx b/src/pixi/core/renderers/webgl/managers/BlendModeManager.hx index 28b073f9..53895282 100644 --- a/src/pixi/core/renderers/webgl/managers/BlendModeManager.hx +++ b/src/pixi/core/renderers/webgl/managers/BlendModeManager.hx @@ -1,4 +1,5 @@ package pixi.core.renderers.webgl.managers; +import pixi.core.Pixi.BlendModes; extern class BlendModeManager extends WebGLManager { @@ -15,5 +16,5 @@ extern class BlendModeManager extends WebGLManager { * * @param blendMode {number} the blendMode, should be a Pixi const, such as BlendModes.ADD */ - function setBlendMode(blendMode:Int):Void; + function setBlendMode(blendMode:BlendModes):Void; } \ No newline at end of file diff --git a/src/pixi/core/sprites/Sprite.hx b/src/pixi/core/sprites/Sprite.hx index 35422590..89f4561a 100644 --- a/src/pixi/core/sprites/Sprite.hx +++ b/src/pixi/core/sprites/Sprite.hx @@ -1,12 +1,12 @@ package pixi.core.sprites; +import pixi.core.Pixi.BlendModes; import pixi.core.renderers.webgl.filters.Filter; import js.html.VideoElement; import js.html.CanvasElement; import pixi.core.textures.BaseTexture; import pixi.core.math.ObservablePoint; import haxe.extern.EitherType; -import pixi.core.display.BlendMode; import pixi.core.math.Point; import pixi.core.textures.Texture; import pixi.core.display.Container; @@ -61,7 +61,7 @@ extern class Sprite extends Container { * @member {Int} * @default CONST.blendModes.NORMAL; */ - var blendMode:BlendMode; + var blendMode:BlendModes; /** * The shader that will be used to render the sprite. Set to null to remove a current shader. diff --git a/src/pixi/mesh/Mesh.hx b/src/pixi/mesh/Mesh.hx index 2e72c1dc..05258ef2 100644 --- a/src/pixi/mesh/Mesh.hx +++ b/src/pixi/mesh/Mesh.hx @@ -1,5 +1,6 @@ package pixi.mesh; +import pixi.core.Pixi.BlendModes; import pixi.core.math.Point; import js.html.Uint16Array; import pixi.core.Shader; @@ -121,7 +122,7 @@ extern class Mesh extends Container { * @member {Int} * @default CONST.BLEND_MODES.NORMAL; */ - var blendMode:Int; + var blendMode:BlendModes; /** * Triangles in canvas mode are automatically antialiased, use var value to force triangles to overlap a bit with each other. diff --git a/src/pixi/particles/ParticleContainer.hx b/src/pixi/particles/ParticleContainer.hx index 54047113..e597cbb0 100644 --- a/src/pixi/particles/ParticleContainer.hx +++ b/src/pixi/particles/ParticleContainer.hx @@ -1,5 +1,6 @@ package pixi.particles; +import pixi.core.Pixi.BlendModes; import pixi.core.textures.BaseTexture; import pixi.core.display.Container; @@ -57,7 +58,7 @@ extern class ParticleContainer extends Container { * @default PIXI.BLEND_MODES.NORMAL * @see PIXI.BLEND_MODES */ - var blendMode:Int; + var blendMode:BlendModes; /** * Used for canvas renderering. If true then the elements will be positioned at the diff --git a/src/pixi/plugins/spine/core/SlotData.hx b/src/pixi/plugins/spine/core/SlotData.hx index fcc726cf..fc664ce4 100644 --- a/src/pixi/plugins/spine/core/SlotData.hx +++ b/src/pixi/plugins/spine/core/SlotData.hx @@ -1,5 +1,6 @@ package pixi.plugins.spine.core; +import pixi.core.Pixi.BlendModes; import pixi.plugins.spine.core.utils.Color; @:native("PIXI.spine.core.SlotData") @@ -10,7 +11,7 @@ extern class SlotData { var boneData:BoneData; var color:Color; var attachmentName:String; - var blendMode:Int; + var blendMode:BlendModes; function new(index:Int, name:String, boneData:BoneData); } \ No newline at end of file