jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

fix spacing and add fallback for ie

Browse source
This commit is contained in:
cjgammon 2014-01-16 12:22:15 -08:00
parent 079bac99a5
commit c49474ef3c
2 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/pixi/display/Sprite.js
View file

@ -7,19 +7,19 @@ PIXI.blendModes.NORMAL = 0;
PIXI.blendModes.ADD = 1; PIXI.blendModes.ADD = 1;
PIXI.blendModes.MULTIPLY = 2; PIXI.blendModes.MULTIPLY = 2;
PIXI.blendModes.SCREEN = 3; PIXI.blendModes.SCREEN = 3;
PIXI.blendModes.OVERLAY = 4; PIXI.blendModes.OVERLAY = 4;
PIXI.blendModes.DARKEN = 5; PIXI.blendModes.DARKEN = 5;
PIXI.blendModes.LIGHTEN = 6; PIXI.blendModes.LIGHTEN = 6;
PIXI.blendModes.COLOR_DODGE = 7; PIXI.blendModes.COLOR_DODGE = 7;
PIXI.blendModes.COLOR_BURN = 8; PIXI.blendModes.COLOR_BURN = 8;
PIXI.blendModes.HARD_LIGHT = 9; PIXI.blendModes.HARD_LIGHT = 9;
PIXI.blendModes.SOFT_LIGHT = 10; PIXI.blendModes.SOFT_LIGHT = 10;
PIXI.blendModes.DIFFERENCE = 11; PIXI.blendModes.DIFFERENCE = 11;
PIXI.blendModes.EXCLUSION = 12; PIXI.blendModes.EXCLUSION = 12;
PIXI.blendModes.HUE = 13; PIXI.blendModes.HUE = 13;
PIXI.blendModes.SATURATION = 14; PIXI.blendModes.SATURATION = 14;
PIXI.blendModes.COLOR = 15; PIXI.blendModes.COLOR = 15;
PIXI.blendModes.LUMINOSITY = 16; PIXI.blendModes.LUMINOSITY = 16;
/** /**
* The SPrite object is the base for all textured objects that are rendered to the screen * The SPrite object is the base for all textured objects that are rendered to the screen

23
src/pixi/renderers/canvas/CanvasRenderer.js
View file

@ -31,18 +31,18 @@ PIXI.CanvasRenderer = function(width, height, view, transparent)
PIXI.blendModesCanvas[PIXI.blendModes.ADD] = "lighter"; //IS THIS OK??? PIXI.blendModesCanvas[PIXI.blendModes.ADD] = "lighter"; //IS THIS OK???
PIXI.blendModesCanvas[PIXI.blendModes.MULTIPLY] = "multiply"; PIXI.blendModesCanvas[PIXI.blendModes.MULTIPLY] = "multiply";
PIXI.blendModesCanvas[PIXI.blendModes.SCREEN] = "screen"; PIXI.blendModesCanvas[PIXI.blendModes.SCREEN] = "screen";
PIXI.blendModesCanvas[PIXI.blendModes.OVERLAY] = "overlay"; PIXI.blendModesCanvas[PIXI.blendModes.OVERLAY] = "overlay";
PIXI.blendModesCanvas[PIXI.blendModes.DARKEN] = "darken"; PIXI.blendModesCanvas[PIXI.blendModes.DARKEN] = "darken";
PIXI.blendModesCanvas[PIXI.blendModes.LIGHTEN] = "lighten"; PIXI.blendModesCanvas[PIXI.blendModes.LIGHTEN] = "lighten";
PIXI.blendModesCanvas[PIXI.blendModes.COLOR_DODGE] = "color-dodge"; PIXI.blendModesCanvas[PIXI.blendModes.COLOR_DODGE] = "color-dodge";
PIXI.blendModesCanvas[PIXI.blendModes.COLOR_BURN] = "color-burn"; PIXI.blendModesCanvas[PIXI.blendModes.COLOR_BURN] = "color-burn";
PIXI.blendModesCanvas[PIXI.blendModes.HARD_LIGHT] = "hard-light"; PIXI.blendModesCanvas[PIXI.blendModes.HARD_LIGHT] = "hard-light";
PIXI.blendModesCanvas[PIXI.blendModes.SOFT_LIGHT] = "soft-light"; PIXI.blendModesCanvas[PIXI.blendModes.SOFT_LIGHT] = "soft-light";
PIXI.blendModesCanvas[PIXI.blendModes.DIFFERENCE] = "difference"; PIXI.blendModesCanvas[PIXI.blendModes.DIFFERENCE] = "difference";
PIXI.blendModesCanvas[PIXI.blendModes.EXCLUSION] = "exclusion"; PIXI.blendModesCanvas[PIXI.blendModes.EXCLUSION] = "exclusion";
PIXI.blendModesCanvas[PIXI.blendModes.HUE] = "hue"; PIXI.blendModesCanvas[PIXI.blendModes.HUE] = "hue";
PIXI.blendModesCanvas[PIXI.blendModes.SATURATION] = "saturation"; PIXI.blendModesCanvas[PIXI.blendModes.SATURATION] = "saturation";
PIXI.blendModesCanvas[PIXI.blendModes.COLOR] = "color"; PIXI.blendModesCanvas[PIXI.blendModes.COLOR] = "color";
PIXI.blendModesCanvas[PIXI.blendModes.LUMINOSITY] = "luminosity"; PIXI.blendModesCanvas[PIXI.blendModes.LUMINOSITY] = "luminosity";
} }
else else
@ -52,6 +52,19 @@ PIXI.CanvasRenderer = function(width, height, view, transparent)
PIXI.blendModesCanvas[PIXI.blendModes.ADD] = "lighter"; //IS THIS OK??? PIXI.blendModesCanvas[PIXI.blendModes.ADD] = "lighter"; //IS THIS OK???
PIXI.blendModesCanvas[PIXI.blendModes.MULTIPLY] = "source-over"; PIXI.blendModesCanvas[PIXI.blendModes.MULTIPLY] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.SCREEN] = "source-over"; PIXI.blendModesCanvas[PIXI.blendModes.SCREEN] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.OVERLAY] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.DARKEN] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.LIGHTEN] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.COLOR_DODGE] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.COLOR_BURN] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.HARD_LIGHT] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.SOFT_LIGHT] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.DIFFERENCE] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.EXCLUSION] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.HUE] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.SATURATION] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.COLOR] = "source-over";
PIXI.blendModesCanvas[PIXI.blendModes.LUMINOSITY] = "source-over";
} }
} }