@galacean/effects-plugin-editor-gizmo 2.0.0-alpha.23 → 2.0.0-alpha.25

package/dist/gizmo-component.d.ts

@@ -1,4 +1,5 @@
-import type { GeometryDrawMode, Mesh, Texture, VFXItem } from '@galacean/effects';
+import type { GeometryDrawMode, Texture, VFXItem } from '@galacean/effects';
+import { Mesh } from '@galacean/effects';
 import { ItemBehaviour, Transform, math, spec } from '@galacean/effects';
 import { GizmoSubType } from './define';
 import { type EditorGizmoPlugin } from './gizmo-loader';
@@ -19,6 +20,7 @@ export declare class GizmoComponent extends ItemBehaviour {
         position: Vector3;
     };
     wireframeMesh: Mesh;
+    coordinateSpace: CoordinateSpace;
     color: spec.vec3;
     renderMode: GeometryDrawMode;
     depthTest?: boolean;
@@ -68,4 +70,8 @@ export declare class GizmoComponent extends ItemBehaviour {
      */
     private getHitTestParams;
 }
+export declare enum CoordinateSpace {
+    Local = 0,
+    World = 1
+}
 export {};

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player editor gizmo plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 茂安,旻诺
- * Version: v2.0.0-alpha.23
+ * Version: v2.0.0-alpha.25
  */
 
 'use strict';
@@ -281,10 +281,14 @@ function destroyWireframeMesh(mesh) {
         geometries: EFFECTS.DestroyOptions.keep
     });
 }
-function updateWireframeMesh(originMesh, wireframe, type) {
-    wireframe.material.cloneUniforms(originMesh.material);
-    var geometry = originMesh.firstGeometry();
+function updateWireframeMesh(originGeometry, originMaterial, wireframe, type) {
+    wireframe.material.cloneUniforms(originMaterial);
+    var geometry = originGeometry;
     var wireframeGeometry = wireframe.firstGeometry();
+    for(var _iterator = _create_for_of_iterator_helper_loose(Object.keys(originMaterial.enabledMacros)), _step; !(_step = _iterator()).done;){
+        var macro = _step.value;
+        wireframe.material.enableMacro(macro, originMaterial.enabledMacros[macro]);
+    }
     if (type === 0) {
         // 线框模式不绘制模型的时候，drawCount 为负数
         var drawCount = Math.abs(geometry.getDrawCount());
@@ -330,14 +334,14 @@ function createModeWireframe(engine, mesh, color) {
             data: new Uint32Array(0)
         }
     });
-    var _mesh_material_props_shader = mesh.material.props.shader, vertex = _mesh_material_props_shader.vertex, fragment = _mesh_material_props_shader.fragment, macros = _mesh_material_props_shader.macros;
+    var _mesh_material_shader_shaderData = mesh.material.shader.shaderData, vertex = _mesh_material_shader_shaderData.vertex, fragment = _mesh_material_shader_shaderData.fragment;
     var materialOptions = _extends({}, mesh.material.props);
-    var newMacros = [].concat(macros || [], [
+    var newMacros = [
         [
             "PREVIEW_BORDER",
             1
         ]
-    ]);
+    ];
     var _mesh_name;
     materialOptions.shader = {
         vertex: createGizmoShader(newMacros, vertex, EFFECTS.ShaderType.vertex, level),
@@ -347,9 +351,9 @@ function createModeWireframe(engine, mesh, color) {
         glslVersion: engine.gpuCapability.level === 2 ? EFFECTS.GLSLVersion.GLSL3 : EFFECTS.GLSLVersion.GLSL1
     };
     var material = EFFECTS.Material.create(engine, materialOptions);
-    material.depthTest = mesh.material.depthTest;
+    material.depthTest = true;
     material.setVector4("uPreviewColor", new Vector4(color[0], color[1], color[2], 1));
-    return updateWireframeMesh(mesh, EFFECTS.Mesh.create(engine, {
+    return updateWireframeMesh(mesh.geometry, mesh.material, EFFECTS.Mesh.create(engine, {
         geometry: geometry,
         material: material,
         priority: 3000,
@@ -2830,6 +2834,7 @@ exports.GizmoComponent = /*#__PURE__*/ function(ItemBehaviour) {
         var _this;
         _this = ItemBehaviour.apply(this, arguments) || this;
         _this.boundingMap = new Map();
+        _this.coordinateSpace = 0;
         _this.mat = Matrix4.fromIdentity();
         _this.wireframeMeshes = [];
         /**
@@ -3062,6 +3067,7 @@ exports.GizmoComponent = /*#__PURE__*/ function(ItemBehaviour) {
                 break;
             case exports.GizmoSubType.modelWireframe:
                 this.needCreateModelContent = true;
+                this.createModelContent(targetItem, gizmoPlugin.meshToAdd);
                 break;
             case exports.GizmoSubType.box:
             case exports.GizmoSubType.sphere:
@@ -3115,20 +3121,18 @@ exports.GizmoComponent = /*#__PURE__*/ function(ItemBehaviour) {
             if (this.wireframeMesh && this.targetItem) {
                 var particle = this.targetItem.getComponent(EFFECTS.ParticleSystemRenderer);
                 if (particle) {
-                    updateWireframeMesh(particle.particleMesh.mesh, this.wireframeMesh, WireframeGeometryType.quad);
+                    updateWireframeMesh(particle.particleMesh.mesh.geometry, particle.particleMesh.mesh.material, this.wireframeMesh, WireframeGeometryType.quad);
                     this.wireframeMesh.worldMatrix = particle.particleMesh.mesh.worldMatrix;
                 }
             }
         } else if (gizmoSubType === exports.GizmoSubType.modelWireframe) {
             if (this.wireframeMesh && this.targetItem) {
                 var _this_targetItem_getComponent;
-                //@ts-expect-error
-                var meshes = (_this_targetItem_getComponent = this.targetItem.getComponent(EFFECTS.RendererComponent)) == null ? void 0 : _this_targetItem_getComponent.content.mriMeshs;
+                //@ts-expect-error TODO 和 3D 类型解耦
+                var meshes = (_this_targetItem_getComponent = this.targetItem.getComponent(EFFECTS.RendererComponent)) == null ? void 0 : _this_targetItem_getComponent.content.subMeshes;
                 var wireframeMeshes = this.wireframeMeshes;
                 if ((meshes == null ? void 0 : meshes.length) > 0) {
-                    for(var i = 0; i < meshes.length; i++){
-                        updateWireframeMesh(meshes[i], wireframeMeshes[i], WireframeGeometryType.triangle);
-                    }
+                    updateWireframeMesh(meshes[0].geometry.geometry, meshes[0].material.effectMaterial, wireframeMeshes[0], WireframeGeometryType.triangle);
                 }
             }
         } else {
@@ -3138,7 +3142,12 @@ exports.GizmoComponent = /*#__PURE__*/ function(ItemBehaviour) {
                     var worldPos = new Vector3();
                     var worldQuat = new Quaternion();
                     var worldScale = new Vector3(1, 1, 1);
-                    this.targetItem.transform.assignWorldTRS(worldPos, worldQuat);
+                    // Scale Gizmo 没有世界空间
+                    if (this.coordinateSpace == 0 || gizmoSubType === exports.GizmoSubType.scale) {
+                        this.targetItem.transform.assignWorldTRS(worldPos, worldQuat);
+                    } else {
+                        this.targetItem.transform.assignWorldTRS(worldPos);
+                    }
                     var targetTransform = new EFFECTS.Transform({
                         position: worldPos,
                         quat: worldQuat,
@@ -3301,21 +3310,23 @@ exports.GizmoComponent = /*#__PURE__*/ function(ItemBehaviour) {
         return result;
     };
     _proto.createModelContent = function createModelContent(item, meshesToAdd) {
-        var _this = this;
         var _item_composition;
         var modelComponent = item.getComponent(EFFECTS.RendererComponent);
-        //@ts-expect-error
-        var ms = modelComponent.content.mriMeshs;
+        //@ts-expect-error TODO 和 3D 类型解耦
+        var psubMesh = modelComponent.content.subMeshes[0];
         var engine = (_item_composition = item.composition) == null ? void 0 : _item_composition.renderer.engine;
         EFFECTS.assertExist(engine);
-        if (ms) {
+        if (psubMesh) {
             this.targetItem = item;
             this.wireframeMeshes = [];
-            ms.forEach(function(m) {
-                var mesh = _this.wireframeMesh = createModeWireframe(engine, m, _this.color);
-                _this.wireframeMeshes.push(mesh);
-                meshesToAdd.push(mesh);
+            var originMesh = EFFECTS.Mesh.create(engine, {
+                geometry: psubMesh.geometry.geometry,
+                material: psubMesh.material.effectMaterial,
+                priority: 3000
             });
+            var mesh = this.wireframeMesh = createModeWireframe(engine, originMesh, this.color);
+            this.wireframeMeshes.push(mesh);
+            meshesToAdd.push(mesh);
         }
     };
     _proto.createParticleContent = function createParticleContent(item, meshesToAdd) {
@@ -3424,9 +3435,17 @@ exports.GizmoComponent = /*#__PURE__*/ function(ItemBehaviour) {
     };
     return GizmoComponent;
 }(EFFECTS.ItemBehaviour);
+__decorate([
+    EFFECTS.serialize()
+], exports.GizmoComponent.prototype, "coordinateSpace", void 0);
 exports.GizmoComponent = __decorate([
     EFFECTS.effectsClass("GizmoComponent")
 ], exports.GizmoComponent);
+var CoordinateSpace;
+(function(CoordinateSpace) {
+    CoordinateSpace[CoordinateSpace["Local"] = 0] = "Local";
+    CoordinateSpace[CoordinateSpace["World"] = 1] = "World";
+})(CoordinateSpace || (CoordinateSpace = {}));
 
 var editorRenderPassName = "editor-gizmo";
 var frontRenderPassName = "front-gizmo";
@@ -3695,7 +3714,7 @@ var EditorGizmoPlugin = /*#__PURE__*/ function(AbstractPlugin) {
 }(EFFECTS.AbstractPlugin);
 
 EFFECTS.registerPlugin("editor-gizmo", EditorGizmoPlugin, EFFECTS.VFXItem);
-var version = "2.0.0-alpha.23";
+var version = "2.0.0-alpha.25";
 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!");