@galacean/effects-plugin-editor-gizmo 2.0.0-alpha.32 → 2.0.0-alpha.34

package/dist/index.mjs

@@ -3,11 +3,11 @@
  * Description: Galacean Effects player editor gizmo plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 茂安,旻诺
- * Version: v2.0.0-alpha.32
+ * Version: v2.0.0-alpha.34
  */
 
 import * as EFFECTS from '@galacean/effects';
-import { math, DestroyOptions, glContext, ShaderType, GLSLVersion, Material, Mesh, GLGeometry, createShaderWithMacros, Texture, noop, Geometry, Transform, serialize, effectsClass, RendererComponent, ParticleSystemRenderer, assertExist, HitTestType, spec, removeItem, RenderPass, RenderPassPriorityPostprocess, TextureLoadAction, RenderPassPriorityPrepare, AbstractPlugin, registerPlugin, VFXItem, logger } from '@galacean/effects';
+import { math, DestroyOptions, glContext, GLSLVersion, Material, Mesh, GLGeometry, Texture, noop, Geometry, Transform, serialize, effectsClass, RendererComponent, ParticleSystemRenderer, assertExist, HitTestType, spec, removeItem, RenderPass, RenderPassPriorityPostprocess, TextureLoadAction, RenderPassPriorityPrepare, AbstractPlugin, registerPlugin, VFXItem, logger } from '@galacean/effects';
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
@@ -303,7 +303,6 @@ function getQuadIndexData(faceCount, oid) {
     return indexData;
 }
 function createModeWireframe(engine, mesh, color) {
-    var level = engine.gpuCapability.level;
     var geometry = new SharedGeometry(engine, {
         geometry: mesh.firstGeometry(),
         mode: glContext.LINES,
@@ -321,8 +320,9 @@ function createModeWireframe(engine, mesh, color) {
     ];
     var _mesh_name;
     materialOptions.shader = {
-        vertex: createGizmoShader(newMacros, vertex, ShaderType.vertex, level),
-        fragment: createGizmoShader(newMacros, fragment, ShaderType.fragment, level),
+        vertex: vertex,
+        fragment: fragment,
+        macros: newMacros,
         shared: true,
         name: ((_mesh_name = mesh.name) != null ? _mesh_name : "unamedmesh") + "_wireframe",
         glslVersion: engine.gpuCapability.level === 2 ? GLSLVersion.GLSL3 : GLSLVersion.GLSL1
@@ -429,12 +429,6 @@ var SharedGeometry = /*#__PURE__*/ function(GLGeometry) {
     };
     return SharedGeometry;
 }(GLGeometry);
-function createGizmoShader(macros, shader, shaderType, level) {
-    var versionTag = /#version\s+\b\d{3}\b\s*(es)?/;
-    var shaderMatch = shader.match(versionTag);
-    var newShader = shaderMatch ? shader.substring(shaderMatch[0].length) : shader;
-    return createShaderWithMacros(macros, newShader, shaderType, level);
-}
 
 // 坐标轴默认颜色
 var color = {
@@ -3018,8 +3012,10 @@ var GizmoComponent = /*#__PURE__*/ function(RendererComponent1) {
     }
     var _proto = GizmoComponent.prototype;
     _proto.start = function start() {
+        var _this_item_composition;
         this.item.getHitTestParams = this.getHitTestParams;
-        for(var _iterator = _create_for_of_iterator_helper_loose(this.item.composition.items), _step; !(_step = _iterator()).done;){
+        var _this_item_composition_items;
+        for(var _iterator = _create_for_of_iterator_helper_loose((_this_item_composition_items = (_this_item_composition = this.item.composition) == null ? void 0 : _this_item_composition.items) != null ? _this_item_composition_items : []), _step; !(_step = _iterator()).done;){
             var item = _step.value;
             if (item.id === this.target) {
                 this.targetItem = item;
@@ -3030,7 +3026,8 @@ var GizmoComponent = /*#__PURE__*/ function(RendererComponent1) {
             return;
         }
         var composition = this.item.composition;
-        for(var _iterator1 = _create_for_of_iterator_helper_loose(composition.pluginSystem.plugins), _step1; !(_step1 = _iterator1()).done;){
+        var _composition_pluginSystem_plugins;
+        for(var _iterator1 = _create_for_of_iterator_helper_loose((_composition_pluginSystem_plugins = composition == null ? void 0 : composition.pluginSystem.plugins) != null ? _composition_pluginSystem_plugins : []), _step1; !(_step1 = _iterator1()).done;){
             var plugin = _step1.value;
             if (plugin.name === "editor-gizmo") {
                 this.gizmoPlugin = plugin;
@@ -3079,7 +3076,7 @@ var GizmoComponent = /*#__PURE__*/ function(RendererComponent1) {
                 this.createBoundingBoxContent(targetItem, gizmoPlugin.meshToAdd);
                 break;
         }
-        composition.loaderData.gizmoItems.push(this.item);
+        composition == null ? void 0 : composition.loaderData.gizmoItems.push(this.item);
     };
     _proto.update = function update(dt) {
         this.updateRenderData();
@@ -3693,7 +3690,7 @@ var EditorGizmoPlugin = /*#__PURE__*/ function(AbstractPlugin) {
 }(AbstractPlugin);
 
 registerPlugin("editor-gizmo", EditorGizmoPlugin, VFXItem);
-var version = "2.0.0-alpha.32";
+var version = "2.0.0-alpha.34";
 logger.info("Plugin editor gizmo version: " + version + ".");
 if (version !== EFFECTS.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!");