fix: gizmo rendering problem

packages/effects-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-core",
-  "version": "1.1.1",
+  "version": "1.1.1-alpha.1",
   "description": "Galacean Effects runtime core for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

packages/effects-helper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-helper",
-  "version": "1.1.1",
+  "version": "1.1.1-alpha.1",
   "description": "Galacean Effects runtime helper for the web",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

packages/effects-threejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-threejs",
-  "version": "1.1.1",
+  "version": "1.1.1-alpha.1",
   "description": "Galacean Effects runtime threejs plugin for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

packages/effects-webgl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-webgl",
-  "version": "1.1.1",
+  "version": "1.1.1-alpha.1",
   "description": "Galacean Effects runtime webgl for the web",
   "types": "./dist/index.d.ts",
   "files": [

packages/effects/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects",
-  "version": "1.1.1",
+  "version": "1.1.1-alpha.1",
   "description": "Galacean Effects runtime player for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

plugin-packages/alipay-downgrade/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-alipay-downgrade",
-  "version": "1.1.1",
+  "version": "1.1.1-alpha.1",
   "description": "Galacean Effects player downgrade plugin for Alipay",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

plugin-packages/editor-gizmo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-editor-gizmo",
-  "version": "1.1.1",
+  "version": "1.1.1-alpha.2",
   "description": "Galacean Effects player editor gizmo plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

plugin-packages/editor-gizmo/src/gizmo-loader.ts

@@ -157,11 +157,21 @@ export class EditorGizmoPlugin extends AbstractPlugin {
         }
       }
     }
-    const wireframeMesh = gizmoVFXItem.wireframeMesh;
 
-    if (wireframeMesh && !wireframeMesh.isDestroyed) {
-      destroyWireframeMesh(wireframeMesh);
-      this.getEditorRenderPass(composition.renderFrame).removeMesh(wireframeMesh);
+    if (gizmoVFXItem.wireframeMeshes.length > 0) {
+      gizmoVFXItem.wireframeMeshes.forEach(mesh => {
+        if (!mesh.isDestroyed) {
+          destroyWireframeMesh(mesh);
+          this.getEditorRenderPass(composition.renderFrame).removeMesh(mesh);
+        }
+      });
+    } else {
+      const wireframeMesh = gizmoVFXItem.wireframeMesh;
+
+      if (wireframeMesh && !wireframeMesh.isDestroyed) {
+        destroyWireframeMesh(wireframeMesh);
+        this.getEditorRenderPass(composition.renderFrame).removeMesh(wireframeMesh);
+      }
     }
 
     const arr: GizmoVFXItem[] = composition.loaderData.gizmoItems;

plugin-packages/editor-gizmo/src/gizmo-vfx-item.ts

@@ -96,6 +96,7 @@ export class GizmoVFXItem extends VFXItem<Mesh | undefined> {
   hitBounding?: { key: string, position: Vector3 };
   mat = Matrix4.fromIdentity();
   wireframeMesh?: Mesh;
+  wireframeMeshes: Mesh[] = [];
   spriteMesh?: SpriteMesh;
 
   private engine: Engine;
@@ -197,9 +198,12 @@ export class GizmoVFXItem extends VFXItem<Mesh | undefined> {
 
     if (ms) {
       this.targetItem = item;
+      this.wireframeMeshes = [];
       ms.forEach(m => {
         const mesh = this.wireframeMesh = createModeWireframe(engine, m, this.color);
 
+        this.wireframeMeshes.push(mesh);
+
         meshesToAdd.push(mesh);
       });
     }
@@ -326,10 +330,12 @@ export class GizmoVFXItem extends VFXItem<Mesh | undefined> {
     } else if (this.subType === GizmoSubType.modelWireframe) { // 模型线框
       if (this.wireframeMesh && this.targetItem) {
         const meshes = this.targetItem.content.mriMeshs as Mesh[];
-        const wireframeMesh = this.wireframeMesh;
+        const wireframeMeshes = this.wireframeMeshes;
 
         if (meshes?.length > 0) {
-          meshes.forEach(mesh => updateWireframeMesh(mesh, wireframeMesh, WireframeGeometryType.triangle));
+          for (let i = 0;i < meshes.length;i++) {
+            updateWireframeMesh(meshes[i], wireframeMeshes[i], WireframeGeometryType.triangle);
+          }
         }
       }
     } else { // 几何体模型

plugin-packages/editor-gizmo/src/wireframe.ts

@@ -48,7 +48,7 @@ export enum WireframeGeometryType {
 }
 
 export function destroyWireframeMesh (mesh: Mesh) {
-  //mesh.geometry?.destroy();
+  mesh.geometry?.dispose();
   mesh.dispose({ material: { textures: DestroyOptions.keep }, geometries: DestroyOptions.keep });
 }
 
@@ -122,7 +122,7 @@ export function createModeWireframe (engine: Engine, mesh: Mesh, color: spec.vec
   materialOptions.shader = {
     vertex: createGizmoShader(newMarcos, vertex, ShaderType.vertex, level),
     fragment: createGizmoShader(newMarcos, fragment, ShaderType.fragment, level),
-    shared: true,
+    shared: false,
     name: (mesh.name ?? 'unamedmesh') + '_wireframe',
     glslVersion: engine.gpuCapability.level === 2 ? GLSLVersion.GLSL3 : GLSLVersion.GLSL1,
   };
@@ -244,8 +244,13 @@ export class SharedGeometry extends GLGeometry {
     super.flush();
   }
 
-  destroy () {
+  override dispose () {
+    // from source geometry
+    this.buffers = {};
+    this.bufferProps = {};
     super.dispose();
+    // @ts-expect-error
+    this.source = null;
   }
 }
 

plugin-packages/model/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-model",
-  "version": "1.1.1",
+  "version": "1.1.1-alpha.1",
   "description": "Galacean Effects player model plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

plugin-packages/orientation-transformer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-orientation-transformer",
-  "version": "1.1.1",
+  "version": "1.1.1-alpha.1",
   "description": "Galacean Effects player orientation transformer plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

plugin-packages/spine/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-plugin-spine",
-  "version": "1.1.1",
+  "version": "1.1.1-alpha.1",
   "description": "Galacean Effects player spine plugin",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",