diff --git a/cocos/3d/framework/model-component.js b/cocos/3d/framework/model-component.js index f12afc3011..a52e2cd0a5 100644 --- a/cocos/3d/framework/model-component.js +++ b/cocos/3d/framework/model-component.js @@ -170,10 +170,11 @@ export class ModelComponent extends RenderableComponent { this._updateModels(); this._updateCastShadow(); this._updateReceiveShadow(); + if (this._model) { this._model.enabled = true; } } onDisable() { - if (this._model) { this._model.enabled = this.enabled; } + if (this._model) { this._model.enabled = false; } } onDestroy() { @@ -190,7 +191,6 @@ export class ModelComponent extends RenderableComponent { } else { this._model = this._createModel(); } - this._model.enable = this.enabled; this._model.createBoundingShape(this._mesh.minPosition, this._mesh.maxPosition); diff --git a/cocos/components/component.js b/cocos/components/component.js index 027555d5b1..867c106ea6 100644 --- a/cocos/components/component.js +++ b/cocos/components/component.js @@ -178,7 +178,7 @@ class Component extends CCObject { visible: false }) get enabledInHierarchy () { - return (this._objFlags & IsOnEnableCalled) > 0; + return this._enabled && this.node._activeInHierarchy; } /** diff --git a/cocos/core/director.js b/cocos/core/director.js index 4f475aef48..3eec6f45d7 100644 --- a/cocos/core/director.js +++ b/cocos/core/director.js @@ -918,18 +918,14 @@ class Director extends EventTarget { CCObject._deferredDestroy(); } - // Render this._physicsSystem.update(this._deltaTime); + this.emit(cc.Director.EVENT_BEFORE_DRAW); - //this._renderSystem.update(this._deltaTime); - - - this._root.frameMove(this._deltaTime); - - // After draw + this._root.frameMove(this._deltaTime); // Render this.emit(cc.Director.EVENT_AFTER_DRAW); eventManager.frameUpdateListeners(); + this._scene.resetHasChanged(); this._totalFrames++; } } diff --git a/cocos/pipeline/render-pipeline.ts b/cocos/pipeline/render-pipeline.ts index c85d96ae14..52bcc31cd6 100644 --- a/cocos/pipeline/render-pipeline.ts +++ b/cocos/pipeline/render-pipeline.ts @@ -349,9 +349,7 @@ export abstract class RenderPipeline { for (const model of scene.models) { // filter model by view visibility - if (view.visibility > 0 && model.viewID !== view.visibility || - !model.enabled || - !model.node.activeInHierarchy) { + if (view.visibility > 0 && model.viewID !== view.visibility || !model.enabled) { continue; } diff --git a/cocos/renderer/scene/model.ts b/cocos/renderer/scene/model.ts index 4986fb4eea..af070d7b04 100644 --- a/cocos/renderer/scene/model.ts +++ b/cocos/renderer/scene/model.ts @@ -31,7 +31,7 @@ export class Model { private _scene: RenderScene; private _node: Node; private _id: number; - private _isEnable: boolean = true; + private _isEnable: boolean = false; private _viewID: number = -1; private _cameraID: number = -1; private _userKey: number = -1; @@ -99,7 +99,6 @@ export class Model { if (this._node.hasChanged) { this._node.updateWorldTransformFull(); if (this._modelBounds) { - this._modelBounds.transform( // @ts-ignore this._node._mat, this._node._pos, this._node._rot, this._node._scale,