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

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player editor gizmo plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 茂安,旻诺
- * Version: v2.6.5
+ * Version: v2.7.0-alpha.0
  */
 
 'use strict';
@@ -271,9 +271,6 @@ function destroyWireframeMesh(mesh) {
     var _mesh_geometry;
     (_mesh_geometry = mesh.geometry) == null ? void 0 : _mesh_geometry.dispose();
     mesh.dispose({
-        material: {
-            textures: EFFECTS.DestroyOptions.keep
-        },
         geometries: EFFECTS.DestroyOptions.keep
     });
 }
@@ -425,7 +422,7 @@ var SharedGeometry = /*#__PURE__*/ function(GLGeometry) {
             //this.vaos = this._source.vaos;
             //创建ibo
             if (this.indices) {
-                this.indicesBuffer = this.createIndicesBuffer(this.engine.getGLPipelineContext(), this.indices);
+                this.indicesBuffer = this.createIndicesBuffer(this.indices);
             }
             this.flush();
             this.initialized = true;
@@ -1954,15 +1951,9 @@ var Vector2$1 = EFFECTS.math.Vector2, Vector3$3 = EFFECTS.math.Vector3, Matrix4$
                 1
             ])
         },
-        uniformSemantics: {
-            u_viewinverse: "VIEWINVERSE",
-            u_v: "VIEW",
-            u_p: "PROJECTION",
-            u_et: "EDITOR_TRANSFORM"
-        },
         shader: {
             fragment: "\n        precision mediump float;\n\n        uniform vec3 u_color;\n\n        void main(){\n          gl_FragColor = vec4(u_color,1.0);\n        }",
-            vertex: "\n        precision highp float;\n\n        attribute vec3 a_Position;\n\n        uniform mat4 u_model;\n        uniform mat4 effects_MatrixV;\n        uniform mat4 _MatrixP;\n        uniform vec4 uEditorTransform;\n\n        void main(){\n          gl_Position = _MatrixP * effects_MatrixV * u_model * vec4(a_Position,1.0);\n          gl_Position = vec4(gl_Position.xy * uEditorTransform.xy + uEditorTransform.zw * gl_Position.w,gl_Position.zw);\n        }",
+            vertex: "\n        precision highp float;\n\n        attribute vec3 a_Position;\n\n        uniform mat4 u_model;\n        uniform mat4 effects_MatrixV;\n        uniform mat4 _MatrixP;\n\n        void main(){\n          gl_Position = _MatrixP * effects_MatrixV * u_model * vec4(a_Position,1.0);\n        }",
             shared: true
         }
     });
@@ -2015,15 +2006,9 @@ var Vector2$1 = EFFECTS.math.Vector2, Vector3$3 = EFFECTS.math.Vector3, Matrix4$
                 0
             ])
         },
-        uniformSemantics: {
-            u_viewinverse: "VIEWINVERSE",
-            u_v: "VIEW",
-            u_p: "PROJECTION",
-            u_et: "EDITOR_TRANSFORM"
-        },
         shader: {
             fragment: "\n        precision mediump float;\n\n        uniform vec3 u_color;\n\n        varying float flag;\n\n        void main(){\n          if(flag > 0.0) {\n            discard;\n          }\n\n          gl_FragColor = vec4(u_color,1.0);\n        }",
-            vertex: "\n        precision highp float;\n\n        attribute vec3 a_Position;\n\n        uniform mat4 u_model;\n        uniform mat4 effects_MatrixV;\n        uniform mat4 _MatrixP;\n        uniform vec4 uEditorTransform;\n\n        uniform vec3 u_cameraPos;\n        uniform vec3 u_center;\n\n        varying float flag;\n        void main(){\n          float distance = length(u_cameraPos - u_center);\n          vec3 worldPosition = (u_model * vec4(a_Position,1.0)).xyz;\n          flag = length(u_cameraPos - worldPosition) - distance;\n          gl_Position = _MatrixP * effects_MatrixV * u_model * vec4(a_Position,1.0);\n          gl_Position = vec4(gl_Position.xy * uEditorTransform.xy + uEditorTransform.zw * gl_Position.w,gl_Position.zw);\n        }",
+            vertex: "\n        precision highp float;\n\n        attribute vec3 a_Position;\n\n        uniform mat4 u_model;\n        uniform mat4 effects_MatrixV;\n        uniform mat4 _MatrixP;\n\n        uniform vec3 u_cameraPos;\n        uniform vec3 u_center;\n\n        varying float flag;\n        void main(){\n          float distance = length(u_cameraPos - u_center);\n          vec3 worldPosition = (u_model * vec4(a_Position,1.0)).xyz;\n          flag = length(u_cameraPos - worldPosition) - distance;\n          gl_Position = _MatrixP * effects_MatrixV * u_model * vec4(a_Position,1.0);\n        }",
             shared: true
         }
     });
@@ -2074,16 +2059,10 @@ var Vector2$1 = EFFECTS.math.Vector2, Vector3$3 = EFFECTS.math.Vector3, Matrix4$
                 1
             ])
         },
-        uniformSemantics: {
-            u_viewinverse: "VIEWINVERSE",
-            u_v: "VIEW",
-            u_p: "PROJECTION",
-            u_et: "EDITOR_TRANSFORM"
-        },
         shader: {
             shared: true,
             fragment: "\n        precision mediump float;\n\n        uniform vec3 u_color;\n        uniform vec2 u_alpha;\n\n        void main(){\n          gl_FragColor = vec4(u_color,u_alpha);\n        }",
-            vertex: "\n        precision highp float;\n\n        attribute vec3 a_Position;\n\n        uniform mat4 u_model;\n        uniform mat4 effects_MatrixV;\n        uniform mat4 _MatrixP;\n        uniform vec4 uEditorTransform;\n        void main(){\n          gl_Position = _MatrixP * effects_MatrixV * u_model * vec4(a_Position,1.0);\n          gl_Position = vec4(gl_Position.xy * uEditorTransform.xy + uEditorTransform.zw * gl_Position.w,gl_Position.zw);\n        }"
+            vertex: "\n        precision highp float;\n\n        attribute vec3 a_Position;\n\n        uniform mat4 u_model;\n        uniform mat4 effects_MatrixV;\n        uniform mat4 _MatrixP;\n        void main(){\n          gl_Position = _MatrixP * effects_MatrixV * u_model * vec4(a_Position,1.0);\n        }"
         }
     });
     material.setVector3("u_color", myColor);
@@ -2133,16 +2112,10 @@ function createSpriteMaterial(engine, data, depthTest) {
     };
     var material = EFFECTS.Material.create(engine, {
         uniformValues: uniformValues,
-        uniformSemantics: {
-            u_viewinverse: "VIEWINVERSE",
-            u_v: "VIEW",
-            u_p: "PROJECTION",
-            u_et: "EDITOR_TRANSFORM"
-        },
         shader: {
             shared: true,
             fragment: "\n        precision highp float;\n\n        uniform vec2 u_alpha;\n        uniform vec3 u_color;\n        uniform sampler2D u_iconTex;\n\n        varying vec2 v_uv;\n\n        void main(){\n          vec4 color = texture2D(u_iconTex, vec2(v_uv.x, 1.0 - v_uv.y));\n          if(color.a < 0.001)\n          {\n              discard;\n          }\n          gl_FragColor = vec4(color.xyz, color.w * u_alpha.x);\n        }",
-            vertex: "\n        precision highp float;\n\n        attribute vec3 a_Position;\n        attribute vec2 a_UV1;\n\n        uniform mat4 u_model;\n        uniform mat4 effects_MatrixV;\n        uniform mat4 _MatrixP;\n        uniform mat4 effects_MatrixInvV;\n        uniform vec4 uEditorTransform;\n        varying vec2 v_uv;\n\n        void main(){\n          v_uv = a_UV1;\n          vec4 pos = u_model * vec4(0., 0., 0., 1.0);\n         // vec4 pos = u_model * vec4(a_Position,1.0);\n\n          pos.xyz += effects_MatrixInvV[0].xyz * a_Position.x + effects_MatrixInvV[1].xyz * a_Position.y;\n          gl_Position = _MatrixP * effects_MatrixV * pos;\n          gl_Position = vec4(gl_Position.xy * uEditorTransform.xy + uEditorTransform.zw * gl_Position.w,gl_Position.zw);\n        }"
+            vertex: "\n        precision highp float;\n\n        attribute vec3 a_Position;\n        attribute vec2 a_UV1;\n\n        uniform mat4 u_model;\n        uniform mat4 effects_MatrixV;\n        uniform mat4 _MatrixP;\n        uniform mat4 effects_MatrixInvV;\n        varying vec2 v_uv;\n\n        void main(){\n          v_uv = a_UV1;\n          vec4 pos = u_model * vec4(0., 0., 0., 1.0);\n         // vec4 pos = u_model * vec4(a_Position,1.0);\n\n          pos.xyz += effects_MatrixInvV[0].xyz * a_Position.x + effects_MatrixInvV[1].xyz * a_Position.y;\n          gl_Position = _MatrixP * effects_MatrixV * pos;\n        }"
         }
     });
     material.setMatrix("u_model", Matrix4$3.IDENTITY);
@@ -2779,14 +2752,10 @@ function createMesh(engine, points, indices, color, depthTest, name) {
                 1
             ])
         },
-        uniformSemantics: {
-            u_vp: "VIEWPROJECTION",
-            u_et: "EDITOR_TRANSFORM"
-        },
         shader: {
             shared: true,
             fragment: "\n    precision mediump float;\n\n    uniform vec3 u_color;\n\n    void main(){\n      gl_FragColor = vec4(u_color,1.0);\n    }",
-            vertex: "precision highp float;\n\n    attribute vec3 a_Position;\n\n    uniform mat4 u_model;\n    uniform mat4 effects_MatrixVP;\n    uniform vec4 uEditorTransform;\n    void main(){\n      gl_Position = effects_MatrixVP * u_model * vec4(a_Position,1.0);\n      gl_Position = vec4(gl_Position.xy * uEditorTransform.xy + uEditorTransform.zw * gl_Position.w,gl_Position.zw);\n    }"
+            vertex: "precision highp float;\n\n    attribute vec3 a_Position;\n\n    uniform mat4 u_model;\n    uniform mat4 effects_MatrixVP;\n    void main(){\n      gl_Position = effects_MatrixVP * u_model * vec4(a_Position,1.0);\n    }"
         }
     });
     material.setVector3("u_color", Vector3$1.fromArray(color));
@@ -3106,9 +3075,11 @@ exports.GizmoComponent = /*#__PURE__*/ function(RendererComponent1) {
             if (this.wireframeMesh && this.targetItem) {
                 var _this_targetItem_getComponent;
                 //@ts-expect-error TODO 和 3D 类型解耦
-                var meshes = (_this_targetItem_getComponent = this.targetItem.getComponent(EFFECTS.RendererComponent)) == null ? void 0 : _this_targetItem_getComponent.content.subMeshes;
+                var pMesh = (_this_targetItem_getComponent = this.targetItem.getComponent(EFFECTS.RendererComponent)) == null ? void 0 : _this_targetItem_getComponent.content;
+                var meshes = pMesh.subMeshes;
                 var wireframeMeshes = this.wireframeMeshes;
                 if ((meshes == null ? void 0 : meshes.length) > 0) {
+                    wireframeMeshes[0].worldMatrix.copyFrom(pMesh.matrix);
                     updateWireframeMesh(meshes[0].geometry.geometry, meshes[0].material.effectMaterial, wireframeMeshes[0], WireframeGeometryType.triangle);
                 }
             }
@@ -3709,7 +3680,7 @@ var EditorGizmoPlugin = /*#__PURE__*/ function(AbstractPlugin) {
 EFFECTS.registerPlugin("editor-gizmo", EditorGizmoPlugin, EFFECTS.VFXItem);
 /**
  * 插件版本号
- */ var version = "2.6.5";
+ */ var version = "2.7.0-alpha.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!");