@galacean/effects-plugin-editor-gizmo 2.0.0-alpha.16 → 2.0.0-alpha.18

package/dist/index.mjs

@@ -3,10 +3,11 @@
  * Description: Galacean Effects player editor gizmo plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 茂安,旻诺
- * Version: v2.0.0-alpha.16
+ * Version: v2.0.0-alpha.18
  */
 
-import { math, DestroyOptions, glContext, ShaderType, GLSLVersion, Material, Mesh, GLGeometry, createShaderWithMarcos, Texture, noop, Geometry, Transform, effectsClass, ParticleSystemRenderer, RendererComponent, assertExist, ItemBehaviour, HitTestType, spec, removeItem, RenderPass, RenderPassPriorityPostprocess, TextureLoadAction, RenderPassPriorityPrepare, AbstractPlugin, registerPlugin, VFXItem, logger, version as version$1 } from '@galacean/effects';
+import * as EFFECTS from '@galacean/effects';
+import { math, DestroyOptions, glContext, ShaderType, GLSLVersion, Material, Mesh, GLGeometry, createShaderWithMacros, Texture, noop, Geometry, Transform, effectsClass, ParticleSystemRenderer, RendererComponent, assertExist, ItemBehaviour, HitTestType, spec, removeItem, RenderPass, RenderPassPriorityPostprocess, TextureLoadAction, RenderPassPriorityPrepare, AbstractPlugin, registerPlugin, VFXItem, logger } from '@galacean/effects';
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
@@ -306,9 +307,9 @@ 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, marcos = _mesh_material_props_shader.marcos;
+    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 materialOptions = _extends({}, mesh.material.props);
-    var newMarcos = [].concat(marcos || [], [
+    var newMacros = [].concat(macros || [], [
         [
             "PREVIEW_BORDER",
             1
@@ -316,8 +317,8 @@ function createModeWireframe(engine, mesh, color) {
     ]);
     var _mesh_name;
     materialOptions.shader = {
-        vertex: createGizmoShader(newMarcos, vertex, ShaderType.vertex, level),
-        fragment: createGizmoShader(newMarcos, fragment, ShaderType.fragment, level),
+        vertex: createGizmoShader(newMacros, vertex, ShaderType.vertex, level),
+        fragment: createGizmoShader(newMacros, fragment, ShaderType.fragment, level),
         shared: true,
         name: ((_mesh_name = mesh.name) != null ? _mesh_name : "unamedmesh") + "_wireframe",
         glslVersion: engine.gpuCapability.level === 2 ? GLSLVersion.GLSL3 : GLSLVersion.GLSL1
@@ -424,11 +425,11 @@ var SharedGeometry = /*#__PURE__*/ function(GLGeometry) {
     };
     return SharedGeometry;
 }(GLGeometry);
-function createGizmoShader(marcos, shader, shaderType, level) {
+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 createShaderWithMarcos(marcos, newShader, shaderType, level);
+    return createShaderWithMacros(macros, newShader, shaderType, level);
 }
 
 // 坐标轴默认颜色
@@ -3384,21 +3385,21 @@ var GizmoComponent = /*#__PURE__*/ function(ItemBehaviour) {
         ItemBehaviour.prototype.fromData.call(this, data);
         var item = this.item;
         item.duration = 999;
-        var opt = data.options;
-        this.target = opt.target;
-        this.subType = opt.subType;
-        this.renderMode = opt.renderMode || this.getDefaultRenderMode();
-        this.size = opt.size || this.getDefaultSize();
-        this.depthTest = opt.depthTest;
-        var c = opt.color || [
+        var _data_options = data.options, target = _data_options.target, subType = _data_options.subType, renderMode = _data_options.renderMode, size = _data_options.size, depthTest = _data_options.depthTest, _data_options_color = _data_options.color, color = _data_options_color === void 0 ? [
             255,
             255,
             255
-        ];
+        ] : _data_options_color;
+        this.target = target;
+        this.subType = subType;
+        this.renderMode = renderMode || this.getDefaultRenderMode();
+        this.size = size || this.getDefaultSize();
+        this.depthTest = depthTest;
+        var r = color[0], g = color[1], b = color[2];
         this.color = [
-            c[0] / 255,
-            c[1] / 255,
-            c[2] / 255
+            r / 255,
+            g / 255,
+            b / 255
         ];
         if (data) {
             item.transform = new Transform(data.transform);
@@ -3677,9 +3678,9 @@ var EditorGizmoPlugin = /*#__PURE__*/ function(AbstractPlugin) {
 }(AbstractPlugin);
 
 registerPlugin("editor-gizmo", EditorGizmoPlugin, VFXItem);
-var version = "2.0.0-alpha.16";
-logger.info("plugin editor gizmo version: " + version);
-if (version !== version$1) {
+var version = "2.0.0-alpha.18";
+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!");
 }