@galacean/effects-plugin-model 2.0.0-alpha.14 → 2.0.0-alpha.16

package/dist/gltf/loader-ecs.d.ts

@@ -2,8 +2,8 @@ import { spec } from '@galacean/effects';
 import type { Texture, Engine, TextureSourceOptions } from '@galacean/effects';
 import type { LoaderOptions, SkyboxType, LoadSceneOptions, LoadSceneECSResult, LoaderECS } from './protocol';
 import type { ModelMeshComponentData, ModelSkyboxComponentData, ModelAnimationOptions, ModelCameraOptions, ModelLightOptions, ModelTreeOptions, ModelLightComponentData, ModelCameraComponentData } from '../index';
+import { PSkyboxType } from '../runtime';
 import type { GLTFImage, GLTFTexture, GLTFScene, GLTFLight, GLTFCamera, GLTFAnimation, GLTFResources } from '@vvfx/resource-detection';
-import { PSkyboxType } from '../runtime/skybox';
 export declare class LoaderECSImpl implements LoaderECS {
     private sceneOptions;
     private loaderOptions;
@@ -16,7 +16,7 @@ export declare class LoaderECSImpl implements LoaderECS {
     private gltfTextures;
     private gltfMaterials;
     private gltfAnimations;
-    composition: spec.Composition;
+    composition: spec.CompositionData;
     images: spec.Image[];
     textures: spec.TextureDefine[];
     items: spec.VFXItemData[];
@@ -26,7 +26,7 @@ export declare class LoaderECSImpl implements LoaderECS {
     geometries: spec.GeometryData[];
     animations: spec.AnimationClipData[];
     engine: Engine;
-    constructor(composition?: spec.Composition);
+    constructor(composition?: spec.CompositionData);
     initial(engine: Engine, options?: LoaderOptions): void;
     loadScene(options: LoadSceneOptions): Promise<LoadSceneECSResult>;
     checkMeshComponentData(mesh: ModelMeshComponentData, resource: GLTFResources): void;

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player model plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 飂兮
- * Version: v2.0.0-alpha.14
+ * Version: v2.0.0-alpha.16
  */
 
 'use strict';
@@ -203,7 +203,7 @@ function _extends() {
     return _extends.apply(this, arguments);
 }
 
-var Vector2 = effects.math.Vector2, Vector3 = effects.math.Vector3, Vector4 = effects.math.Vector4, Matrix3 = effects.math.Matrix3, Matrix4 = effects.math.Matrix4, Color = effects.math.Color, Euler = effects.math.Euler, EulerOrder = effects.math.EulerOrder, Quaternion = effects.math.Quaternion, Box3 = effects.math.Box3; effects.math.Sphere; effects.math.Ray; var DEG2RAD = effects.math.DEG2RAD;
+var Vector2 = effects.math.Vector2, Vector3 = effects.math.Vector3, Vector4 = effects.math.Vector4, Matrix3 = effects.math.Matrix3, Matrix4 = effects.math.Matrix4, Color = effects.math.Color, Euler = effects.math.Euler, EulerOrder = effects.math.EulerOrder, Quaternion = effects.math.Quaternion, Box3 = effects.math.Box3, Sphere = effects.math.Sphere, Ray = effects.math.Ray, DEG2RAD = effects.math.DEG2RAD;
 
 exports.PObjectType = void 0;
 (function(PObjectType) {
@@ -2533,7 +2533,7 @@ function _assert_this_initialized(self) {
         _this.skin = proxy.getSkinObj(engine);
         _this.morph = proxy.getMorphObj();
         _this.hide = proxy.isHide();
-        _this.priority = (owner == null ? void 0 : (_owner_item = owner.item) == null ? void 0 : _owner_item.listIndex) || 0;
+        _this.priority = (owner == null ? void 0 : (_owner_item = owner.item) == null ? void 0 : _owner_item.renderOrder) || 0;
         //
         _this.subMeshes = [];
         var geometry = proxy.getGeometry();
@@ -4438,7 +4438,7 @@ exports.ModelMeshComponent = /*#__PURE__*/ function(RendererComponent) {
         var _this_sceneManager;
         this.createContent();
         this.item.type = VFX_ITEM_TYPE_3D;
-        this.priority = this.item.listIndex;
+        this.priority = this.item.renderOrder;
         this.sceneManager = getSceneManager(this);
         (_this_sceneManager = this.sceneManager) == null ? void 0 : _this_sceneManager.addItem(this.content);
         if (this.item.parentId && this.item.parent) {
@@ -4555,7 +4555,7 @@ exports.ModelSkyboxComponent = /*#__PURE__*/ function(RendererComponent) {
         var _this_sceneManager;
         this.createContent();
         this.item.type = VFX_ITEM_TYPE_3D;
-        this.priority = this.item.listIndex;
+        this.priority = this.item.renderOrder;
         this.sceneManager = getSceneManager(this);
         (_this_sceneManager = this.sceneManager) == null ? void 0 : _this_sceneManager.addItem(this.content);
         this.setVisible(true);
@@ -8607,7 +8607,7 @@ exports.CullMode = void 0;
         _this.specularImage = data.specularImage;
         _this.specularImageSize = data.specularImageSize;
         _this.specularMipCount = data.specularMipCount;
-        _this.priority = (owner == null ? void 0 : (_owner_item = owner.item) == null ? void 0 : _owner_item.listIndex) || 0;
+        _this.priority = (owner == null ? void 0 : (_owner_item = owner.item) == null ? void 0 : _owner_item.renderOrder) || 0;
         return _this;
     }
     var _proto = PSkybox.prototype;
@@ -12255,13 +12255,10 @@ var JSONConverter = /*#__PURE__*/ function() {
         newScene.compositionId = oldScene.compositionId;
         newScene.compositions = oldScene.compositions;
         newScene.items.forEach(function(item) {
-            // @ts-expect-error
             if (item.type === "root") {
-                // @ts-expect-error
                 item.type = "ECS";
             }
         });
-        // @ts-expect-error
         newScene.compositions[0].items = newScene.items.map(function(item) {
             return {
                 id: item.id
@@ -13372,17 +13369,22 @@ var vertexBufferSemanticMap = {
 
 effects.registerPlugin("tree", ModelTreePlugin, effects.VFXItem, true);
 effects.registerPlugin("model", ModelPlugin, effects.VFXItem);
-var version = "2.0.0-alpha.14";
+var version = "2.0.0-alpha.16";
 effects.logger.info("plugin model version: " + version);
 if (version !== effects.version) {
     console.error("注意：请统一 Model 插件与 Player 版本，不统一的版本混用会有不可预知的后果！", "\nAttention: Please ensure the Model plugin is synchronized with the Player version. Mixing and matching incompatible versions may result in unpredictable consequences!");
 }
 
+exports.Box3 = Box3;
 exports.BoxMesh = BoxMesh;
 exports.CameraGestureHandlerImp = CameraGestureHandlerImp;
 exports.CheckerHelper = CheckerHelper;
+exports.Color = Color;
 exports.CompositionCache = CompositionCache;
 exports.CompositionHitTest = CompositionHitTest;
+exports.DEG2RAD = DEG2RAD;
+exports.Euler = Euler;
+exports.EulerOrder = EulerOrder;
 exports.FBOOptions = FBOOptions;
 exports.Float16ArrayWrapper = Float16ArrayWrapper;
 exports.GeometryBoxProxy = GeometryBoxProxy;
@@ -13392,6 +13394,8 @@ exports.InterpolationSampler = InterpolationSampler;
 exports.JSONConverter = JSONConverter;
 exports.LoaderHelper = LoaderHelper;
 exports.LoaderImpl = LoaderImpl;
+exports.Matrix3 = Matrix3;
+exports.Matrix4 = Matrix4;
 exports.MeshHelper = MeshHelper;
 exports.ModelPlugin = ModelPlugin;
 exports.ModelTreeItem = ModelTreeItem;
@@ -13424,13 +13428,19 @@ exports.PSkyboxCreator = PSkyboxCreator;
 exports.PSubMesh = PSubMesh;
 exports.PTransform = PTransform;
 exports.PluginHelper = PluginHelper;
+exports.Quaternion = Quaternion;
+exports.Ray = Ray;
 exports.RayBoxTesting = RayBoxTesting;
 exports.RayIntersectsBoxWithRotation = RayIntersectsBoxWithRotation;
 exports.RayTriangleTesting = RayTriangleTesting;
+exports.Sphere = Sphere;
 exports.ToggleItemBounding = ToggleItemBounding;
 exports.TwoStatesSet = TwoStatesSet;
 exports.UnlitShaderGUID = UnlitShaderGUID;
 exports.VFX_ITEM_TYPE_3D = VFX_ITEM_TYPE_3D;
+exports.Vector2 = Vector2;
+exports.Vector3 = Vector3;
+exports.Vector4 = Vector4;
 exports.VertexAttribBuffer = VertexAttribBuffer;
 exports.WebGLHelper = WebGLHelper;
 exports.WebHelper = WebHelper;