Merge latest main to dev/0.7

packages/controls/src/FreeControl.ts

@@ -72,7 +72,7 @@ export class FreeControl extends Script {
     this.camera = entity;
     // @ts-ignore
     // @todo In the future, the dependence on html elements will be removed and realized through the input of the packaging engine.
-    this.mainElement = this.scene.engine.canvas._webCanvas;
+    this.mainElement = this.engine.canvas._webCanvas;
     this.domElement = document;
 
     this.movementSpeed = 1.0;

packages/core/src/RenderPipeline/BasicRenderPipeline.ts

@@ -180,10 +180,12 @@ export class BasicRenderPipeline {
       } else {
         this._opaqueQueue.render(camera, pass.replaceMaterial, pass.mask);
         this._alphaTestQueue.render(camera, pass.replaceMaterial, pass.mask);
-        if (background.mode === BackgroundMode.Sky) {
-          this._drawSky(engine, camera, background.sky);
-        } else if (background.mode === BackgroundMode.Texture && background.texture) {
-          this._drawBackgroundTexture(engine, background);
+        if (camera.clearFlags === CameraClearFlags.DepthColor) {
+          if (background.mode === BackgroundMode.Sky) {
+            this._drawSky(engine, camera, background.sky);
+          } else if (background.mode === BackgroundMode.Texture && background.texture) {
+            this._drawBackgroundTexture(engine, background);
+          }
         }
         this._transparentQueue.render(camera, pass.replaceMaterial, pass.mask);
       }

packages/core/src/Scene.ts

@@ -137,7 +137,7 @@ export class Scene extends EngineObject {
   removeRootEntity(entity: Entity): void {
     if (entity._isRoot && entity._scene == this) {
       this._removeEntity(entity);
-      this._isActiveInEngine && entity._processInActive();
+      this._isActiveInEngine && entity._isActiveInHierarchy && entity._processInActive();
       Entity._traverseSetOwnerScene(entity, null);
     }
   }

packages/core/src/asset/ResourceManager.ts

@@ -213,9 +213,10 @@ export class ResourceManager {
     promise
       .then((res: EngineObject) => {
         if (loader.useCache) this._addAsset(url, res);
+        delete this._loadingPromises[url];
       })
-      .catch((err: Error) => Promise.reject(err))
-      .finally(() => {
+      .catch((err: Error) => {
+        Promise.reject(err)
         delete this._loadingPromises[url];
       });
     return promise;

packages/core/src/asset/request.ts

@@ -122,7 +122,8 @@ function requestRes<T>(url: string, config: RequestConfig): AssetPromise<T> {
         xhr.setRequestHeader(name, headers[name]);
       });
     }
-    xhr.send(config.body as any);
+    // @ts-ignore
+    xhr.send(config.body as XMLHttpRequestBodyInit);
   });
 }
 

packages/core/src/material/BlinnPhongMaterial.ts

@@ -145,7 +145,7 @@ export class BlinnPhongMaterial extends BaseMaterial {
   }
 
   set shininess(value: number) {
-    this.shaderData.setFloat(BlinnPhongMaterial._shininessProp, value);
+    this.shaderData.setFloat(BlinnPhongMaterial._shininessProp, Math.max(value, 1e-4));
   }
 
   /**

packages/core/tests/material/BlinnPhongMaterial.test.ts

@@ -49,11 +49,13 @@ describe("BlinnPhongMaterial", () => {
     material.specularTexture = null;
     material.emissiveTexture = null;
     material.normalTexture = null;
+    material.shininess = 0;
 
     expect(material.baseTexture).toBeNull();
     expect(material.specularTexture).toBeNull();
     expect(material.emissiveTexture).toBeNull();
     expect(material.normalTexture).toBeNull();
+    expect(material.shininess).toBe(1e-4);
   });
 
   it("clone", () => {

packages/loader/src/gltf/parser/MeshParser.ts

@@ -164,15 +164,19 @@ export class MeshParser extends Parser {
         case "TEXCOORD_3":
           const texturecoords3 = GLTFUtil.floatBufferToVector2Array(<Float32Array>bufferData);
           mesh.setUVs(texturecoords3, 3);
+          break;
         case "TEXCOORD_4":
           const texturecoords4 = GLTFUtil.floatBufferToVector2Array(<Float32Array>bufferData);
           mesh.setUVs(texturecoords4, 4);
+          break;
         case "TEXCOORD_5":
           const texturecoords5 = GLTFUtil.floatBufferToVector2Array(<Float32Array>bufferData);
           mesh.setUVs(texturecoords5, 5);
+          break;
         case "TEXCOORD_6":
           const texturecoords6 = GLTFUtil.floatBufferToVector2Array(<Float32Array>bufferData);
           mesh.setUVs(texturecoords6, 6);
+          break;
         case "TEXCOORD_7":
           const texturecoords7 = GLTFUtil.floatBufferToVector2Array(<Float32Array>bufferData);
           mesh.setUVs(texturecoords7, 7);

packages/physics-physx/src/shape/PhysXBoxColliderShape.ts

@@ -1,8 +1,8 @@
 import { IBoxColliderShape } from "@oasis-engine/design";
 import { Vector3 } from "oasis-engine";
 import { PhysXPhysics } from "../PhysXPhysics";
-import { PhysXColliderShape } from "./PhysXColliderShape";
 import { PhysXPhysicsMaterial } from "../PhysXPhysicsMaterial";
+import { PhysXColliderShape } from "./PhysXColliderShape";
 
 /**
  * Box collider shape in PhysX.