Merge branch '3d' of https://github.com/cocos-creator/engine into 3d

mikemik2009 · Feb 25, 2019 · 47c5fd0 · 47c5fd0
2 parents fb126fc + f1c0c60
commit 47c5fd0
Show file tree

Hide file tree

Showing 40 changed files with 1,382 additions and 1,334 deletions.
diff --git a/cocos/3d/assets/bitmap-font.js b/cocos/3d/assets/bitmap-font.js
@@ -29,7 +29,7 @@ import Font from "./font";
 import vec2 from "../../core/vmath/vec2";
 import { Texture2D } from "../../assets/texture-2d";
 
-@ccclass('cc.BitmapFont')
+// @ccclass('cc.BitmapFont')
 export class BitmapFont extends Font {
     /**
      * @type {Texture2D}
@@ -82,4 +82,4 @@ export class BitmapFont extends Font {
     }
 }
 
-cc.BitmapFont = BitmapFont;
+// cc.BitmapFont = BitmapFont;
diff --git a/cocos/3d/assets/font.js b/cocos/3d/assets/font.js
@@ -27,7 +27,7 @@ import { _decorator } from "../../core/data/index";
 const {ccclass} = _decorator;
 import { Asset } from "../../assets/asset";
 
-@ccclass('cc.Font')
+// @ccclass('cc.Font')
 export default class Font extends Asset {
     /** Font size.
     * @type {number}
@@ -78,4 +78,4 @@ export default class Font extends Asset {
     }
 }
 
-cc.Font = Font;
+// cc.Font = Font;
diff --git a/cocos/3d/assets/physics/material.ts b/cocos/3d/assets/physics/material.ts
@@ -20,11 +20,11 @@ export class PhysicsMaterial extends Asset {
      * If non-negative, it will be used instead of the friction given by ContactMaterials.
      * If there's no matching ContactMaterial, the value from .defaultContactMaterial in the World will be used.
      */
-    get friction() {
+    get friction () {
         return this._friction;
     }
 
-    set friction(value) {
+    set friction (value) {
         this._friction = value;
         this._cannonMaterial.friction = value;
     }
@@ -34,21 +34,21 @@ export class PhysicsMaterial extends Asset {
      * If non-negative, it will be used instead of the restitution given by ContactMaterials.
      * If there's no matching ContactMaterial, the value from .defaultContactMaterial in the World will be used
      */
-    get restitution() {
+    get restitution () {
         return this._restitution;
     }
 
-    set restitution(value) {
+    set restitution (value) {
         this._restitution = value;
         this._cannonMaterial.restitution = value;
     }
 
-    constructor() {
+    constructor () {
         super();
         this._cannonMaterial = new CANNON.Material('');
     }
 
-    public _getImpl() {
+    public _getImpl () {
         return this._cannonMaterial;
     }
 }

diff --git a/cocos/3d/framework/index.ts b/cocos/3d/framework/index.ts
@@ -28,7 +28,7 @@ import AnimationComponent from './animation-component';
 import { CameraComponent } from './camera-component';
 import LightComponent from './light-component';
 import { ModelComponent } from './model-component';
-import { BoxColliderComponent, SphereColliderComponent, ColliderComponentBase } from './physics/collider-component';
+import { BoxColliderComponent, SphereColliderComponent } from './physics/collider-component';
 import { RigidBodyComponent } from './physics/rigid-body-component';
 import SkinningModelComponent from './skinning-model-component';
 import SkyboxComponent from './skybox-component';
@@ -56,7 +56,6 @@ cc.SkinningModelComponent = SkinningModelComponent;
 cc.SkyboxComponent = SkyboxComponent;
 
 cc.RigidBodyComponent = RigidBodyComponent;
-cc.ColliderComponentBase = ColliderComponentBase;
 cc.BoxColliderComponent = BoxColliderComponent;
 cc.SphereColliderComponent = SphereColliderComponent;
 cc.ParticleSystemComponent = ParticleSystemComponent;