Squashed commit of the following:

commit 590b213 Author: ShuangLiu <[email protected]> Date: Wed May 22 20:47:28 2024 +0800 feat(buffer): return promise result commit 4e05c04 Author: ShuangLiu <[email protected]> Date: Wed May 1 03:04:32 2024 +0800 fix(picker): missing normal in pickFire commit 1ab8718 Author: hellmor <[email protected]> Date: Thu Mar 21 20:36:23 2024 +0800 fix: Error when lineJoin is set to round (Orillusion#366) * fix: Error when lineJoin is set to round Fix error when lineJoin is set to round. * fix: Remove eventListener. Remove the eventListener when transform is disposed. commit 7ab2f48 Author: hellmor <[email protected]> Date: Thu Mar 21 20:35:36 2024 +0800 fix: Solve the issues mentioned in Issue367 (Orillusion#368) Solve the issues mentioned in Issue367. commit 51ff3ee Author: Codeboy <[email protected]> Date: Thu Mar 21 20:35:09 2024 +0800 fix: object is disabled after removeChild (Orillusion#381) * chore: remove sample_candleflame maskMap * fix: addChild and removeChild related * chore: remove log commit 65bda50 Author: ShuangLiu <[email protected]> Date: Wed Mar 13 03:59:02 2024 +0800 fix(loaderFunctions): onUrl on loadGltf
hellmor · May 22, 2024 · 7c3d6e0 · 7c3d6e0
1 parent 40da2f1
commit 7c3d6e0
Show file tree

Hide file tree

Showing 13 changed files with 1,744 additions and 1,637 deletions.
diff --git a/packages/graphic/compute/shape3d/Path2DShape3DCode_cs.ts b/packages/graphic/compute/shape3d/Path2DShape3DCode_cs.ts
@@ -442,10 +442,10 @@ fn drawPath2DCorner(shapeData:Path2DShape3D, currentPoint:Path3DKeyPoint){
             var rotateFrom:vec3<f32>;
             if(isPositive){
                 rotateFrom = -prevPoint.right;
-                rotateMat = buildRotateZ(-cornerAngle * 2.0 / f32(cornerPointExt));
+                rotateMat = buildRotateYMat3(-cornerAngle * 2.0 / f32(cornerPointExt));
             }else{
                 rotateFrom = prevPoint.right;
-                rotateMat = buildRotateZ(cornerAngle * 2.0 / f32(cornerPointExt));
+                rotateMat = buildRotateYMat3(cornerAngle * 2.0 / f32(cornerPointExt));
             }
     
             tempV = currentPoint.overallLength - cornerUVLength * lastLengthUVRatio;

diff --git a/public b/public
diff --git a/samples/base/Sample_AddRemove.ts b/samples/base/Sample_AddRemove.ts
@@ -41,13 +41,20 @@ class Sample_AddRemove {
     }
 
     private async test() {
-        let list: Object3D[] = [];
+        let visibleList: Object3D[] = [];
+        let invisibleList: Object3D[] = [];
         let player = await Engine3D.res.loadGltf('gltfs/anim/Minion_Lane_Super_Dawn/Minion_Lane_Super_Dawn.glb');
         // gui
         GUIHelp.init();
         GUIHelp.addButton("add", async () => {
             /******** player1 *******/
-            let clone = player.clone()
+            let clone: Object3D
+            if (invisibleList.length > 0) {
+                clone = invisibleList[invisibleList.length-1];
+                invisibleList.splice(invisibleList.length-1, 1);
+            } else {
+                clone = player.clone();
+            }
             clone.transform.x = Math.random() * 100 - 50;
             clone.transform.y = Math.random() * 100 - 50;
             clone.transform.z = Math.random() * 100 - 50;
@@ -56,16 +63,17 @@ class Sample_AddRemove {
             clone.transform.scaleZ = 20;
 
             this.view.scene.addChild(clone);
-            list.push(clone);
+            visibleList.push(clone);
         });
 
         GUIHelp.addButton("remove", () => {
-            let index = Math.floor(list.length * Math.random());
-            let obj = list[index];
+            let index = Math.floor(visibleList.length * Math.random());
+            let obj = visibleList[index];
             if (obj) {
-                list.splice(index, 1)
+                visibleList.splice(index, 1)
                 this.view.scene.removeChild(obj)
-                obj.destroy(true);
+                // obj.destroy(true);
+                invisibleList.push(obj)
             }
         });
 

diff --git a/src/assets/Res.ts b/src/assets/Res.ts
@@ -179,13 +179,15 @@ export class Res {
         if (this._prefabPool.has(url)) {
             return this._prefabPool.get(url) as Object3D;
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
 
         let parser;
         let ext = url.substring(url.lastIndexOf('.')).toLowerCase();
         let loader = new FileLoader();
         if (ext == '.gltf') {
             parser = await loader.load(url, GLTFParser, loaderFunctions);
-
         } else {
             parser = await loader.load(url, GLBParser, loaderFunctions);
         }
@@ -206,6 +208,9 @@ export class Res {
         if (this._prefabPool.has(url)) {
             return this._prefabPool.get(url) as Object3D;
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
 
         let parser;
         let ext = url.substring(url.lastIndexOf('.')).toLowerCase();
@@ -229,6 +234,9 @@ export class Res {
         if (this._prefabPool.has(url)) {
             return this._prefabPool.get(url) as Object3D;
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         let loader = new FileLoader();
         let parser = await loader.load(url, B3DMParser, loaderFunctions, userData);
         let obj = parser.data;
@@ -246,6 +254,9 @@ export class Res {
         if (this._prefabPool.has(url)) {
             return this._prefabPool.get(url) as Object3D;
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         let loader = new FileLoader();
         let parser = await loader.load(url, I3DMParser, loaderFunctions, userData);
         let obj = parser.data;
@@ -264,6 +275,9 @@ export class Res {
         if (this._texturePool.has(url)) {
             return this._texturePool.get(url);
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         let texture = new BitmapTexture2D();
         texture.flipY = flipY;
         await texture.load(url, loaderFunctions);
@@ -314,7 +328,9 @@ export class Res {
         if (this._texturePool.has(url)) {
             return this._texturePool.get(url);
         }
-
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         let hdrTexture = new HDRTexture();
         hdrTexture = await hdrTexture.load(url, loaderFunctions);
         this._texturePool.set(url, hdrTexture);
@@ -332,6 +348,9 @@ export class Res {
         if (this._texturePool.has(url)) {
             return this._texturePool.get(url);
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         let hdrTexture = new HDRTextureCube();
         hdrTexture = await hdrTexture.load(url, loaderFunctions);
         this._texturePool.set(url, hdrTexture);
@@ -348,6 +367,9 @@ export class Res {
         if (this._texturePool.has(url)) {
             return this._texturePool.get(url);
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         let ldrTextureCube = new LDRTextureCube();
         ldrTextureCube = await ldrTextureCube.load(url, loaderFunctions);
         this._texturePool.set(url, ldrTextureCube);
@@ -381,6 +403,9 @@ export class Res {
         if (this._texturePool.has(url)) {
             return this._texturePool.get(url);
         }
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
 
         let cubeMap = new BitmapTextureCube();
         await cubeMap.loadStd(url);
@@ -392,6 +417,9 @@ export class Res {
      * @param url the path of image
      */
     public async loadJSON(url: string, loaderFunctions?: LoaderFunctions) {
+        if (loaderFunctions?.onUrl) {
+            url = await loaderFunctions.onUrl(url);
+        }
         return await new FileLoader()
             .loadJson(url, loaderFunctions)
             .then(async (ret) => {

diff --git a/src/components/gui/core/GUICanvas.ts b/src/components/gui/core/GUICanvas.ts
@@ -38,7 +38,7 @@ export class GUICanvas extends ComponentBase {
     }
 
     public copyComponent(from: this): this {
-        from.index = from.index;
+        this.index = from.index;
         return this;
     }
 }
diff --git a/src/components/gui/uiComponents/UITransform.ts b/src/components/gui/uiComponents/UITransform.ts
@@ -298,7 +298,7 @@ export class UITransform extends ComponentBase {
     }
 
     public beforeDestroy(force?: boolean): void {
-        this.transform.eventDispatcher.addEventListener(this.transform.eventLocalChange.type, this.onTransformChange, this);
+        this.transform.eventDispatcher.removeEventListener(this.transform.eventLocalChange.type, this.onTransformChange, this);
         super.beforeDestroy?.(force);
     }
 }
diff --git a/src/components/renderer/RenderNode.ts b/src/components/renderer/RenderNode.ts
@@ -238,7 +238,6 @@ export class RenderNode extends ComponentBase {
     }
 
     public onDisable(): void {
-        this._enable = false;
         EntityCollect.instance.removeRenderNode(this.transform.scene3D, this);
         super.onDisable?.();
     }

diff --git a/src/event/CEvent.ts b/src/event/CEvent.ts
@@ -56,6 +56,11 @@ export class CEvent {
      */
     public ctrlKey: boolean;
 
+    /**
+     * Is Meta key pressed when the event occurs
+     */
+    public metaKey: boolean;
+
     /**
      * Is Alt key pressed when the event occurs
      */
+11,495 −0		fnt/alibabapuhuiti-bold.fnt
+ −		fnt/alibabapuhuiti-bold_0.png
+11,461 −0		fnt/alibabapuhuiti-light.fnt
+ −		fnt/alibabapuhuiti-light_0.png
+7,414 −0		fnt/deyihei.fnt
+ −		fnt/deyihei_0.png
+11,126 −0		fnt/dot-diamond.fnt
+ −		fnt/dot-diamond_0.png
+ −		voxs/chr_knight.vox