Browse Source

[ts][canvas] Fixed alpha tinting

badlogic 8 years ago
parent
commit
7e0df8fa6d

+ 1 - 1
spine-ts/build/spine-canvas.js

@@ -260,10 +260,10 @@ var spine;
                     ctx.translate(w / 2, h / 2);
                     ctx.scale(1, -1);
                     ctx.translate(-w / 2, -h / 2);
-                    ctx.drawImage(image, region.x, region.y, w, h, 0, 0, w, h);
                     if (color.r != 1 || color.g != 1 || color.b != 1 || color.a != 1) {
                         ctx.globalAlpha = color.a;
                     }
+                    ctx.drawImage(image, region.x, region.y, w, h, 0, 0, w, h);
                     if (this.debugRendering)
                         ctx.strokeRect(0, 0, w, h);
                     ctx.restore();

File diff suppressed because it is too large
+ 0 - 0
spine-ts/build/spine-canvas.js.map


+ 1 - 1
spine-ts/canvas/src/SkeletonRenderer.ts

@@ -90,7 +90,6 @@ module spine.canvas {
 				ctx.translate(w / 2, h / 2);
 				ctx.scale(1, -1);
 				ctx.translate(-w / 2, -h / 2);
-				ctx.drawImage(image, region.x, region.y, w, h, 0, 0, w, h);
 				if (color.r != 1 || color.g != 1 || color.b != 1 || color.a != 1) {
 					ctx.globalAlpha = color.a;
 					// experimental tinting via compositing, doesn't work
@@ -98,6 +97,7 @@ module spine.canvas {
 					// ctx.fillStyle = "rgba(" + (color.r * 255 | 0) + ", " + (color.g * 255 | 0)  + ", " + (color.b * 255 | 0) + ", " + color.a + ")";
 					// ctx.fillRect(0, 0, w, h);
 				}
+				ctx.drawImage(image, region.x, region.y, w, h, 0, 0, w, h);
 				if (this.debugRendering) ctx.strokeRect(0, 0, w, h);
 				ctx.restore();
 			}

Some files were not shown because too many files changed in this diff