Skip to content

Commit 47bee69

Browse files
committed
Fixed transformation matrix order for batchGraphics
1 parent 18e178a commit 47bee69

1 file changed

Lines changed: 19 additions & 11 deletions

File tree

src/renderer/webgl/pipelines/FlatTintPipeline.js

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -716,11 +716,11 @@ var FlatTintPipeline = new Class({
716716

717717
var cameraScrollX = camera.scrollX * graphics.scrollFactorX;
718718
var cameraScrollY = camera.scrollY * graphics.scrollFactorY;
719-
var srcX = graphics.x - cameraScrollX;
720-
var srcY = graphics.y - cameraScrollY;
719+
var srcX = graphics.x;
720+
var srcY = graphics.y;
721721
var srcScaleX = graphics.scaleX;
722722
var srcScaleY = graphics.scaleY;
723-
var srcRotation = -graphics.rotation;
723+
var srcRotation = graphics.rotation;
724724
var commands = graphics.commandBuffer;
725725
var alpha = graphics.alpha;
726726
var lineAlpha = 1.0;
@@ -748,8 +748,8 @@ var FlatTintPipeline = new Class({
748748
var sr = sin(srcRotation);
749749
var cr = cos(srcRotation);
750750
var sra = cr * srcScaleX;
751-
var srb = -sr * srcScaleX;
752-
var src = sr * srcScaleY;
751+
var srb = sr * srcScaleX;
752+
var src = -sr * srcScaleY;
753753
var srd = cr * srcScaleY;
754754
var sre = srcX;
755755
var srf = srcY;
@@ -769,12 +769,17 @@ var FlatTintPipeline = new Class({
769769
var pmd = parentMatrix[3];
770770
var pme = parentMatrix[4];
771771
var pmf = parentMatrix[5];
772-
var pca = cma * pma + cmb * pmc;
773-
var pcb = cma * pmb + cmb * pmd;
774-
var pcc = cmc * pma + cmd * pmc;
775-
var pcd = cmc * pmb + cmd * pmd;
776-
var pce = cme * pma + cmf * pmc + pme;
777-
var pcf = cme * pmb + cmf * pmd + pmf;
772+
var cse = -cameraScrollX;
773+
var csf = -cameraScrollY;
774+
var pse = cse * cma + csf * cmc + cme;
775+
var psf = cse * cmb + csf * cmd + cmf;
776+
var pca = pma * cma + pmb * cmc;
777+
var pcb = pma * cmb + pmb * cmd;
778+
var pcc = pmc * cma + pmd * cmc;
779+
var pcd = pmc * cmb + pmd * cmd;
780+
var pce = pme * cma + pmf * cmc + pse;
781+
var pcf = pme * cmb + pmf * cmd + psf;
782+
778783
mva = sra * pca + srb * pcc;
779784
mvb = sra * pcb + srb * pcd;
780785
mvc = src * pca + srd * pcc;
@@ -784,6 +789,9 @@ var FlatTintPipeline = new Class({
784789
}
785790
else
786791
{
792+
sre -= cameraScrollX;
793+
srf -= cameraScrollY;
794+
787795
mva = sra * cma + srb * cmc;
788796
mvb = sra * cmb + srb * cmd;
789797
mvc = src * cma + srd * cmc;

0 commit comments

Comments
 (0)