From 437755c5a2017e2e06cb0e06c5242d8da5bd8edd Mon Sep 17 00:00:00 2001 From: Leslie Date: Tue, 15 Jan 2019 11:13:24 +0800 Subject: [PATCH] fix ts errors --- cocos/3d/framework/renderable-component.ts | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/cocos/3d/framework/renderable-component.ts b/cocos/3d/framework/renderable-component.ts index 24131cf972..4d0055ed0e 100644 --- a/cocos/3d/framework/renderable-component.ts +++ b/cocos/3d/framework/renderable-component.ts @@ -6,11 +6,8 @@ const { ccclass, property } = _decorator; @ccclass('cc.RenderableComponent') export default class RenderableComponent extends Component { - /** - * @type {Material[]} - */ @property([Material]) - public _materials = []; + private _materials: Material[] = []; constructor () { super(); @@ -39,7 +36,7 @@ export default class RenderableComponent extends Component { */ get materials () { for (let i = 0; i < this._materials.length; i++) { - this._materials[i] = this.getMaterial(i); + this._materials[i] = this.getMaterial(i)!; } return this._materials; } @@ -86,10 +83,6 @@ export default class RenderableComponent extends Component { return this.getMaterial(0); } - get sharedMaterial () { - return this.getSharedMaterial(0); - } - set material (val) { if (this._materials.length === 1 && this._materials[0] === val) { return; @@ -97,6 +90,10 @@ export default class RenderableComponent extends Component { this.setMaterial(val, 0); } + get sharedMaterial () { + return this.getSharedMaterial(0); + } + public setMaterial (material, index) { this._materials[index] = material; this._onMaterialModified(index, material);