Fix Conflics for Merging dev/0.8

packages/math/src/Color.ts

@@ -196,13 +196,6 @@ export class Color implements IClone<Color>, ICopy<ColorLike, Color> {
     return out;
   }
 
-  copyFrom(color: Color) {
-    this.r = color.r;
-    this.g = color.g;
-    this.b = color.b;
-    this.a = color.a;
-  }
-
   toObject() {
     return {
       r: this.r,

packages/oasis-engine/src/index.ts

@@ -1,15 +1,16 @@
 import * as CoreObjects from "@oasis-engine/core";
 import { Loader } from "@oasis-engine/core";
-for (let key in CoreObjects) {
-  Loader.register(key, CoreObjects[key]);
-}
-
 //@ts-ignore
 export const version = `__buildVersion`;
 
+console.log(`oasis engine version: ${version}`);
+
 export * from "@oasis-engine/core";
 export * from "@oasis-engine/loader";
 export * from "@oasis-engine/math";
 export * from "@oasis-engine/rhi-webgl";
 
-console.log(`oasis engine version: ${version}`);
+for (let key in CoreObjects) {
+  Loader.register(key, CoreObjects[key]);
+}
+

packages/resource-process/src/index.ts

@@ -4,12 +4,9 @@ import { BufferWriter } from "./utils/BufferWriter";
 import { decoderMap, encoderMap } from "./utils/Decorator";
 import { FileHeader } from "./utils/FileHeader";
 
-export { MaterialDecoder } from "./resources/material/MaterialDecoder";
-export { MaterialEncoder } from "./resources/material/MaterialEncoder";
 export { MeshDecoder } from "./resources/mesh/MeshDecoder";
 export { MeshEncoder } from "./resources/mesh/MeshEncoder";
 export { encoder, decoder } from "./utils/Decorator";
-export { UniformType } from "./resources/material/type";
 export { Texture2DDecoder } from "./resources/texture2D/TextureDecoder";
 export { Texture2DEncoder } from "./resources/texture2D/TextureEncoder";
 export { ReflectionParser } from "./resources/prefab/ReflectionParser";