fix node set world scale (cocos#5245)

lm601927339 · Aug 26, 2019 · ca0cbd9 · ca0cbd9
1 parent d3c4312
commit ca0cbd9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/cocos/3d/framework/batched-skinning-model-component.ts b/cocos/3d/framework/batched-skinning-model-component.ts
@@ -35,7 +35,6 @@ import { GFXAttributeName, GFXBufferTextureCopy, GFXFormatInfos } from '../../gf
 import { GFXFormat, GFXType } from '../../gfx/define';
 import { GFXDevice } from '../../gfx/device';
 import { IGFXAttribute } from '../../gfx/input-assembler';
-import { Node } from '../../scene-graph/node';
 import { Material } from '../assets/material';
 import { IMeshStruct, Mesh } from '../assets/mesh';
 import { Skeleton } from '../assets/skeleton';

diff --git a/cocos/core/math/mat3.ts b/cocos/core/math/mat3.ts
@@ -30,7 +30,7 @@
 import CCClass from '../data/class';
 import { ValueType } from '../value-types/value-type';
 import { Quat } from './quat';
-import { IMat3Like, IMat4Like, IQuatLike, IVec3Like } from './type-define';
+import { IMat3Like, IMat4Like, IQuatLike, IVec2Like, IVec3Like } from './type-define';
 import { EPSILON } from './utils';
 import { Vec3 } from './vec3';
 
@@ -204,7 +204,7 @@ export class Mat3 extends ValueType {
     }
 
     /**
-     * 三阶与四阶矩阵乘法
+     * 取四阶矩阵的前三阶，与三阶矩阵相乘
      */
     public static multiplyMat4 <Out extends IMat3Like> (out: Out, a: Out, b: IMat4Like) {
         _a00 = a.m00; _a01 = a.m01; _a02 = a.m02;
@@ -299,7 +299,7 @@ export class Mat3 extends ValueType {
     }
 
     /**
-     * @zh 根据指定四维矩阵计算三维矩阵
+     * @zh 取四阶矩阵的前三阶
      */
     public static fromMat4 <Out extends IMat3Like> (out: Out, a: IMat4Like) {
         out.m00 = a.m00;
@@ -347,7 +347,7 @@ export class Mat3 extends ValueType {
     /**
      * @zh 计算位移矩阵
      */
-    public static fromTranslation <Out extends IMat3Like, VecLike extends IVec3Like> (out: Out, v: VecLike) {
+    public static fromTranslation <Out extends IMat3Like, VecLike extends IVec2Like> (out: Out, v: VecLike) {
         out.m00 = 1;
         out.m01 = 0;
         out.m02 = 0;
@@ -363,7 +363,7 @@ export class Mat3 extends ValueType {
     /**
      * @zh 计算缩放矩阵
      */
-    public static fromScaling <Out extends IMat3Like, VecLike extends IVec3Like> (out: Out, v: VecLike) {
+    public static fromScaling <Out extends IMat3Like, VecLike extends IVec2Like> (out: Out, v: VecLike) {
         out.m00 = v.x;
         out.m01 = 0;
         out.m02 = 0;

diff --git a/cocos/scene-graph/node.ts b/cocos/scene-graph/node.ts
@@ -846,7 +846,7 @@ export class Node extends BaseNode implements INode {
             parent.updateWorldTransform();
             Mat3.fromQuat(m3_1, Quat.conjugate(qt_1, parent._rot));
             Mat3.multiplyMat4(m3_1, m3_1, parent._mat);
-            Mat3.fromScaling(m3_2, this._scale);
+            Mat3.fromScaling(m3_2, this._scale); m3_2.m08 = this._scale.z;
             Mat3.multiply(m3_1, m3_2, Mat3.invert(m3_1, m3_1));
             this._lscale.x = m3_1.m00;
             this._lscale.y = m3_1.m04;