@galacean/effects-plugin-editor-gizmo 2.7.0-alpha.1 → 2.7.0-beta.0

package/dist/gizmo-component.d.ts

@@ -26,6 +26,7 @@ export declare class GizmoComponent extends RendererComponent {
     depthTest?: boolean;
     mat: math.Matrix4;
     wireframeMeshes: Mesh[];
+    mesh: Mesh | null;
     onStart(): void;
     onUpdate(dt: number): void;
     render(renderer: Renderer): void;

package/dist/gizmo-loader.d.ts

@@ -6,7 +6,6 @@ export declare class EditorGizmoPlugin extends AbstractPlugin {
     meshToRemove: Mesh[];
     order: number;
     static prepareResource(scene: Scene): Promise<any>;
-    static onPlayerDestroy(): void;
     onCompositionConstructed(composition: Composition, scene: Scene): void;
     onCompositionReset(composition: Composition): void;
     onCompositionItemRemoved(composition: Composition, item: VFXItem): void;

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player editor gizmo plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 茂安,旻诺
- * Version: v2.7.0-alpha.1
+ * Version: v2.7.0-beta.0
  */
 
 'use strict';
@@ -2796,6 +2796,7 @@ exports.GizmoComponent = /*#__PURE__*/ function(RendererComponent1) {
         _this.coordinateSpace = 0;
         _this.mat = Matrix4.fromIdentity();
         _this.wireframeMeshes = [];
+        _this.mesh = null;
         /**
    * 射线检测算法
    * @returns 包含射线检测算法回调方法的参数
@@ -3089,9 +3090,9 @@ exports.GizmoComponent = /*#__PURE__*/ function(RendererComponent1) {
         var item = this.item;
         var gizmoSubType = this.subType;
         if (gizmoSubType === exports.GizmoSubType.particleEmitter) {
-            if (this.targetItem && item.content) {
+            if (this.targetItem && this.mesh) {
                 this.mat = this.targetItem.transform.getWorldMatrix();
-                item.content.material.setMatrix("u_model", this.mat);
+                this.mesh.material.setMatrix("u_model", this.mat);
             }
             if (this.wireframeMesh && this.targetItem) {
                 var particle = this.targetItem.getComponent(EFFECTS.ParticleSystemRenderer);
@@ -3190,7 +3191,7 @@ exports.GizmoComponent = /*#__PURE__*/ function(RendererComponent1) {
                         }
                     }
                 }
-                if (item.content) {
+                if (this.mesh) {
                     var worldPos1 = new Vector3();
                     var worldQuat1 = new Quaternion();
                     var worldSca = new Vector3(1, 1, 1);
@@ -3209,7 +3210,7 @@ exports.GizmoComponent = /*#__PURE__*/ function(RendererComponent1) {
                         targetTransform1.setPosition(newPos1.x, newPos1.y, newPos1.z);
                     }
                     this.mat = targetTransform1.getWorldMatrix();
-                    item.content.material.setMatrix("u_model", targetTransform1.getWorldMatrix());
+                    this.mesh.material.setMatrix("u_model", targetTransform1.getWorldMatrix());
                 }
             }
         }
@@ -3300,7 +3301,7 @@ exports.GizmoComponent = /*#__PURE__*/ function(RendererComponent1) {
         EFFECTS.assertExist(engine);
         this.targetItem = item;
         if (shape && shape.type) {
-            var mesh = this.item._content = createMeshFromShape(engine, shape, {
+            var mesh = this.mesh = createMeshFromShape(engine, shape, {
                 color: this.color
             });
             meshesToAdd.push(mesh);
@@ -3324,7 +3325,7 @@ exports.GizmoComponent = /*#__PURE__*/ function(RendererComponent1) {
         EFFECTS.assertExist(engine);
         this.targetItem = item;
         if (shape) {
-            var mesh = gizmoItem._content = createMeshFromShape(engine, shape, {
+            var mesh = this.mesh = createMeshFromShape(engine, shape, {
                 color: this.color,
                 depthTest: this.depthTest
             });
@@ -3347,7 +3348,7 @@ exports.GizmoComponent = /*#__PURE__*/ function(RendererComponent1) {
         };
         var engine = (_gizmoItem_composition = gizmoItem.composition) == null ? void 0 : _gizmoItem_composition.renderer.engine;
         EFFECTS.assertExist(engine);
-        var mesh = gizmoItem._content = createMeshFromSubType(engine, subType, this.boundingMap, iconTextures, options);
+        var mesh = this.mesh = createMeshFromSubType(engine, subType, this.boundingMap, iconTextures, options);
         this.targetItem = item;
         meshesToAdd.push(mesh);
     };
@@ -3429,6 +3430,7 @@ var EditorGizmoPlugin = /*#__PURE__*/ function(AbstractPlugin) {
     var _proto = EditorGizmoPlugin.prototype;
     _proto.onCompositionConstructed = function onCompositionConstructed(composition, scene) {
         var engine = composition.renderer.engine;
+        iconTextures.clear();
         iconImages.forEach(function(image, name) {
             iconTextures.set(name, createTexture(engine, image));
         });
@@ -3516,7 +3518,7 @@ var EditorGizmoPlugin = /*#__PURE__*/ function(AbstractPlugin) {
     };
     _proto.removeGizmoItem = function removeGizmoItem(composition, gizmoVFXItem) {
         var _this = this;
-        var gizmoMesh = gizmoVFXItem.content;
+        var gizmoMesh = gizmoVFXItem.getComponent(exports.GizmoComponent).mesh;
         if (gizmoMesh && !gizmoMesh.isDestroyed) {
             gizmoMesh.dispose();
             if (gizmoMesh.name === exports.GeometryType.FloorGrid.toString() || gizmoMesh.name === "Box") {
@@ -3671,16 +3673,13 @@ var EditorGizmoPlugin = /*#__PURE__*/ function(AbstractPlugin) {
             });
         })();
     };
-    EditorGizmoPlugin.onPlayerDestroy = function onPlayerDestroy() {
-        iconTextures.clear();
-    };
     return EditorGizmoPlugin;
 }(EFFECTS.AbstractPlugin);
 
 EFFECTS.registerPlugin("editor-gizmo", EditorGizmoPlugin, EFFECTS.VFXItem);
 /**
  * 插件版本号
- */ var version = "2.7.0-alpha.1";
+ */ var version = "2.7.0-beta.0";
 EFFECTS.logger.info("Plugin editor gizmo version: " + version + ".");
 if (version !== EFFECTS__namespace.version) {
     console.error("注意：请统一 Editor Gizmo 插件与 Player 版本，不统一的版本混用会有不可预知的后果！", "\nAttention: Please ensure the Editor Gizmo plugin is synchronized with the Player version. Mixing and matching incompatible versions may result in unpredictable consequences!");