瀏覽代碼

Merge pull request #1689 from nockawa/wscbillboard

Canvas2D: Fix WSC Billboard bug...
Loïc Baumann 8 年之前
父節點
當前提交
62871d30a6

+ 3 - 3
canvas2D/src/Engine/babylon.canvas2d.ts

@@ -1301,7 +1301,7 @@
                 if (this._trackNodeBillboard) {
                     let viewMtx = cam.getViewMatrix().clone().invert();
                     viewMtx.decompose(Canvas2D.tS, Canvas2D.tR, Canvas2D.tT);
-                    rot = Canvas2D.tR;
+                    rot = Canvas2D.tR.clone();
                 }
 
                 worldmtx.decompose(Canvas2D.tS, Canvas2D.tR, Canvas2D.tT);
@@ -1313,12 +1313,12 @@
                 }
 
                 if (!this._trackNodeBillboard) {
-                    rot = Canvas2D.tR;
+                    rot = Canvas2D.tR.clone();
                 }
 
                 if (wsn instanceof AbstractMesh) {
                     wsn.position = pos;
-                    wsn.rotationQuaternion = rot.clone();
+                    wsn.rotationQuaternion = rot;
                     if (scale) {
                         wsn.scaling = scale;
                     }

+ 3 - 3
dist/preview release/canvas2D/babylon.canvas2d.js

@@ -14064,7 +14064,7 @@ var BABYLON;
                 if (this._trackNodeBillboard) {
                     var viewMtx = cam.getViewMatrix().clone().invert();
                     viewMtx.decompose(Canvas2D_1.tS, Canvas2D_1.tR, Canvas2D_1.tT);
-                    rot = Canvas2D_1.tR;
+                    rot = Canvas2D_1.tR.clone();
                 }
                 worldmtx.decompose(Canvas2D_1.tS, Canvas2D_1.tR, Canvas2D_1.tT);
                 var mtx = BABYLON.Matrix.Compose(Canvas2D_1.tS, Canvas2D_1.tR, BABYLON.Vector3.Zero());
@@ -14073,11 +14073,11 @@ var BABYLON;
                     scale = Canvas2D_1.tS.clone();
                 }
                 if (!this._trackNodeBillboard) {
-                    rot = Canvas2D_1.tR;
+                    rot = Canvas2D_1.tR.clone();
                 }
                 if (wsn instanceof BABYLON.AbstractMesh) {
                     wsn.position = pos;
-                    wsn.rotationQuaternion = rot.clone();
+                    wsn.rotationQuaternion = rot;
                     if (scale) {
                         wsn.scaling = scale;
                     }

文件差異過大導致無法顯示
+ 2 - 2
dist/preview release/canvas2D/babylon.canvas2d.min.js