Improve

cocos/3d/assets/mesh.js

@@ -60,10 +60,6 @@ export default class Mesh extends Asset {
         this.flush();
     }
 
-    onLoad() {
-        this.flush();
-    }
-
     constructor() {
         super();
 

cocos/3d/framework/animation-component.js

@@ -333,7 +333,7 @@ export default class AnimationComponent extends Component {
 
     _preview = false;
 
-    @property({type: Boolean, editorOnly: true})
+    @property({type: Boolean})
     get preview() {
         return this._preview;
     }
@@ -342,9 +342,11 @@ export default class AnimationComponent extends Component {
         this._preview = value;
         if (value) {
             if (this.currentClip) {
+                cc.engine.animatingInEditMode = true;
                 this.play(this.currentClip.name);
             }
         } else {
+            cc.engine.animatingInEditMode = false;
             this._animCtrl.crossFade(null, 0);
         }
     }

cocos/3d/framework/camera-component.js

@@ -295,6 +295,17 @@ export default class CameraComponent extends RenderSystemActor{
     }
 
     onLoad() {
+        this.projection = this._projection;
+        this.priority = this._priority;
+        this.fov = this._fov;
+        this.orthoHeight = this._orthoHeight;
+        this.near = this._near;
+        this.far = this._far;
+        this.color = this._color;
+        this.depth = this._depth;
+        this.stencil = this._stencil;
+        this.clearFlags = this._clearFlags;
+        this.rect = this._rect;
         this._camera.setStages([
             'opaque',
             'transparent'

cocos/3d/framework/model-component.js

@@ -245,6 +245,9 @@ export default class ModelComponent extends RenderableComponent {
     }
 
     _updateModels() {
+        if (this._mesh) {
+            this._mesh.flush();
+        }
         let meshCount = this._mesh ? this._mesh.subMeshCount : 0;
         let oldModels = this._models;
 
@@ -292,12 +295,12 @@ export default class ModelComponent extends RenderableComponent {
     }
 
     _updateCastShadow() {
-        if (this._shadowCastingMode === 'off') {
+        if (this._shadowCastingMode === ModelShadowCastingMode.Off) {
             for (let i = 0; i < this._models.length; ++i) {
                 let model = this._models[i];
                 model._castShadow = false;
             }
-        } else if (this._shadowCastingMode === 'on') {
+        } else if (this._shadowCastingMode === ModelShadowCastingMode.On) {
             for (let i = 0; i < this._models.length; ++i) {
                 let model = this._models[i];
                 model._castShadow = true;

cocos/3d/framework/renderSystemActor.js

@@ -10,7 +10,9 @@ class RenderSystemActorListener {
             this._renderSystem = cc.director._renderSystem;
         }
         comp._system = this._renderSystem;
-        comp._scene = this._renderSystem.scene;
+        if (this._renderSystem) {
+            comp._scene = this._renderSystem.scene;
+        }
     }
 }
 

cocos/3d/framework/skinning-model-component.js

@@ -172,6 +172,10 @@ export default class SkinningModelComponent extends ModelComponent {
     }
 
     _updateModels() {
+        if (this._mesh) {
+            this._mesh.flush();
+        }
+
         let meshCount = this._mesh ? this._mesh.subMeshCount : 0;
         let oldModels = this._models;
 

cocos/load-pipeline/uuid-loader.js

@@ -288,12 +288,7 @@ export function loadUuid (item, callback) {
     if (depends.length === 0) {
         return callback(null, asset);
     }
-    loadDepends(this.pipeline, item, asset, depends, (...args)=> {
-        if (asset.onLoad) {
-            asset.onLoad();
-        }
-        callback(...args);
-    });
+    loadDepends(this.pipeline, item, asset, depends, callback);
 }
 
 loadUuid.isSceneObj = isSceneObj;