@galacean/effects-plugin-model 2.10.4 → 2.11.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/alipay.js +1 -1
- package/dist/alipay.js.map +1 -1
- package/dist/alipay.mjs +1 -1
- package/dist/alipay.mjs.map +1 -1
- package/dist/douyin.js +1 -1
- package/dist/douyin.js.map +1 -1
- package/dist/douyin.mjs +1 -1
- package/dist/douyin.mjs.map +1 -1
- package/dist/index.js +85 -111
- package/dist/index.js.map +1 -1
- package/dist/index.min.js +2 -2
- package/dist/index.min.js.map +1 -1
- package/dist/index.mjs +87 -112
- package/dist/index.mjs.map +1 -1
- package/dist/loader.mjs +843 -901
- package/dist/loader.mjs.map +1 -1
- package/dist/plugin/index.d.ts +0 -1
- package/dist/weapp.js +1 -1
- package/dist/weapp.js.map +1 -1
- package/dist/weapp.mjs +1 -1
- package/dist/weapp.mjs.map +1 -1
- package/package.json +4 -4
- package/dist/plugin/const.d.ts +0 -5
package/dist/index.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Description: Galacean Effects player model plugin
|
|
4
4
|
* Author: Ant Group CO., Ltd.
|
|
5
5
|
* Contributors: 飂兮
|
|
6
|
-
* Version: v2.
|
|
6
|
+
* Version: v2.11.0-alpha.1
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
'use strict';
|
|
@@ -32,10 +32,6 @@ function _interopNamespace(e) {
|
|
|
32
32
|
|
|
33
33
|
var EFFECTS__namespace = /*#__PURE__*/_interopNamespace(EFFECTS);
|
|
34
34
|
|
|
35
|
-
/**
|
|
36
|
-
* Model 插件元素类型
|
|
37
|
-
*/ var VFX_ITEM_TYPE_3D = "PluginModel";
|
|
38
|
-
|
|
39
35
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
|
|
40
36
|
try {
|
|
41
37
|
var info = gen[key](arg);
|
|
@@ -1279,11 +1275,11 @@ function GetNum2GLName(ctx) {
|
|
|
1279
1275
|
var meshList = [];
|
|
1280
1276
|
var composition = player.getCompositions()[0];
|
|
1281
1277
|
composition == null ? void 0 : composition.items.forEach(function(item) {
|
|
1282
|
-
|
|
1283
|
-
|
|
1284
|
-
|
|
1285
|
-
|
|
1286
|
-
|
|
1278
|
+
var _meshComponent_content;
|
|
1279
|
+
var meshComponent = item.getComponent(exports.ModelMeshComponent);
|
|
1280
|
+
// content 在组件 onStart 时创建,未开始前跳过
|
|
1281
|
+
if ((meshComponent == null ? void 0 : (_meshComponent_content = meshComponent.content) == null ? void 0 : _meshComponent_content.type) === exports.PObjectType.mesh) {
|
|
1282
|
+
meshList.push(meshComponent.content);
|
|
1287
1283
|
}
|
|
1288
1284
|
});
|
|
1289
1285
|
return meshList;
|
|
@@ -1462,7 +1458,7 @@ function GetNum2GLName(ctx) {
|
|
|
1462
1458
|
]);
|
|
1463
1459
|
var _obj;
|
|
1464
1460
|
return {
|
|
1465
|
-
attributes: (_obj = {}, _obj[EFFECTS.
|
|
1461
|
+
attributes: (_obj = {}, _obj[EFFECTS.VertexElementType.Position] = {
|
|
1466
1462
|
type: EFFECTS.glContext.FLOAT,
|
|
1467
1463
|
size: 1,
|
|
1468
1464
|
data: data,
|
|
@@ -1909,7 +1905,6 @@ exports.ModelMeshComponent = /*#__PURE__*/ function(RendererComponent) {
|
|
|
1909
1905
|
var _this_sceneManager;
|
|
1910
1906
|
this.sceneManager = getSceneManager(this);
|
|
1911
1907
|
this.createContent();
|
|
1912
|
-
this.item.type = VFX_ITEM_TYPE_3D;
|
|
1913
1908
|
this.priority = this.item.renderOrder;
|
|
1914
1909
|
(_this_sceneManager = this.sceneManager) == null ? void 0 : _this_sceneManager.addItem(this.content);
|
|
1915
1910
|
if (this.item.parentId && this.item.parent) {
|
|
@@ -1966,11 +1961,11 @@ exports.ModelMeshComponent = /*#__PURE__*/ function(RendererComponent) {
|
|
|
1966
1961
|
this.data = _extends({}, data, {
|
|
1967
1962
|
materials: []
|
|
1968
1963
|
});
|
|
1969
|
-
this.data.rootBone = data.rootBone ? this.
|
|
1970
|
-
this.data.geometry = this.
|
|
1964
|
+
this.data.rootBone = data.rootBone ? this.findObject(data.rootBone) : undefined;
|
|
1965
|
+
this.data.geometry = this.findObject(data.geometry);
|
|
1971
1966
|
if (data.materials) {
|
|
1972
1967
|
for(var i = 0; i < data.materials.length; i++){
|
|
1973
|
-
this.data.materials[i] = this.
|
|
1968
|
+
this.data.materials[i] = this.findObject(data.materials[i]);
|
|
1974
1969
|
}
|
|
1975
1970
|
}
|
|
1976
1971
|
};
|
|
@@ -2047,7 +2042,6 @@ exports.ModelSkyboxComponent = /*#__PURE__*/ function(RendererComponent) {
|
|
|
2047
2042
|
*/ _proto.onStart = function onStart() {
|
|
2048
2043
|
var _this_sceneManager;
|
|
2049
2044
|
this.createContent();
|
|
2050
|
-
this.item.type = VFX_ITEM_TYPE_3D;
|
|
2051
2045
|
this.priority = this.item.renderOrder;
|
|
2052
2046
|
this.sceneManager = getSceneManager(this);
|
|
2053
2047
|
(_this_sceneManager = this.sceneManager) == null ? void 0 : _this_sceneManager.addItem(this.content);
|
|
@@ -2082,8 +2076,8 @@ exports.ModelSkyboxComponent = /*#__PURE__*/ function(RendererComponent) {
|
|
|
2082
2076
|
* @param data - 组件参数
|
|
2083
2077
|
*/ _proto.fromData = function fromData(data) {
|
|
2084
2078
|
RendererComponent.prototype.fromData.call(this, data);
|
|
2085
|
-
data.diffuseImage = data.diffuseImage ? this.
|
|
2086
|
-
data.specularImage = this.
|
|
2079
|
+
data.diffuseImage = data.diffuseImage ? this.findObject(data.diffuseImage) : undefined;
|
|
2080
|
+
data.specularImage = this.findObject(data.specularImage);
|
|
2087
2081
|
this.data = data;
|
|
2088
2082
|
};
|
|
2089
2083
|
/**
|
|
@@ -2128,7 +2122,6 @@ exports.ModelLightComponent = /*#__PURE__*/ function(Behaviour) {
|
|
|
2128
2122
|
* 组件开始,需要创建内部对象和添加到场景管理器中
|
|
2129
2123
|
*/ _proto.onStart = function onStart() {
|
|
2130
2124
|
this.createContent();
|
|
2131
|
-
this.item.type = VFX_ITEM_TYPE_3D;
|
|
2132
2125
|
var scene = getSceneManager(this);
|
|
2133
2126
|
scene == null ? void 0 : scene.addItem(this.content);
|
|
2134
2127
|
this.setVisible(true);
|
|
@@ -2193,7 +2186,6 @@ exports.ModelCameraComponent = /*#__PURE__*/ function(Behaviour) {
|
|
|
2193
2186
|
* 组件开始,需要创建内部对象和添加到场景管理器中
|
|
2194
2187
|
*/ _proto.onStart = function onStart() {
|
|
2195
2188
|
this.createContent();
|
|
2196
|
-
this.item.type = VFX_ITEM_TYPE_3D;
|
|
2197
2189
|
var scene = getSceneManager(this);
|
|
2198
2190
|
scene == null ? void 0 : scene.addItem(this.content);
|
|
2199
2191
|
this.updateMainCamera();
|
|
@@ -2273,7 +2265,6 @@ exports.AnimationComponent = /*#__PURE__*/ function(Behaviour) {
|
|
|
2273
2265
|
* 组件开始,需要创建内部对象和添加到场景管理器中
|
|
2274
2266
|
*/ _proto.onStart = function onStart() {
|
|
2275
2267
|
this.elapsedTime = 0;
|
|
2276
|
-
this.item.type = VFX_ITEM_TYPE_3D;
|
|
2277
2268
|
};
|
|
2278
2269
|
/**
|
|
2279
2270
|
* 组件更新,更新内部对象状态
|
|
@@ -2302,7 +2293,7 @@ exports.AnimationComponent = /*#__PURE__*/ function(Behaviour) {
|
|
|
2302
2293
|
this.clips = [];
|
|
2303
2294
|
data.animationClips.forEach(function(clipData) {
|
|
2304
2295
|
var clipObj = new ModelAnimationClip(_this.engine);
|
|
2305
|
-
var animationClip = _this.
|
|
2296
|
+
var animationClip = _this.findObject(clipData);
|
|
2306
2297
|
clipObj.setFromAnimationClip(animationClip);
|
|
2307
2298
|
_this.clips.push(clipObj);
|
|
2308
2299
|
});
|
|
@@ -2610,15 +2601,14 @@ var normal = new Vector3();
|
|
|
2610
2601
|
*/ function ToggleItemBounding(composition, itemId) {
|
|
2611
2602
|
var _composition_items;
|
|
2612
2603
|
(_composition_items = composition.items) == null ? void 0 : _composition_items.forEach(function(item) {
|
|
2613
|
-
|
|
2614
|
-
|
|
2615
|
-
|
|
2616
|
-
|
|
2617
|
-
|
|
2618
|
-
|
|
2619
|
-
|
|
2620
|
-
|
|
2621
|
-
}
|
|
2604
|
+
var _item_getComponent;
|
|
2605
|
+
// content 在组件 onStart 时创建,未开始前跳过
|
|
2606
|
+
var mesh = (_item_getComponent = item.getComponent(exports.ModelMeshComponent)) == null ? void 0 : _item_getComponent.content;
|
|
2607
|
+
if (mesh) {
|
|
2608
|
+
if (item.id === itemId) {
|
|
2609
|
+
mesh.visBoundingBox = true;
|
|
2610
|
+
} else {
|
|
2611
|
+
mesh.visBoundingBox = false;
|
|
2622
2612
|
}
|
|
2623
2613
|
}
|
|
2624
2614
|
});
|
|
@@ -3064,9 +3054,6 @@ var normal = new Vector3();
|
|
|
3064
3054
|
* @param pass - 渲染 Pass
|
|
3065
3055
|
*/ WebGLHelper.deleteRenderPass = function deleteRenderPass(pass) {
|
|
3066
3056
|
pass.dispose({
|
|
3067
|
-
meshes: {
|
|
3068
|
-
geometries: EFFECTS.DestroyOptions.destroy
|
|
3069
|
-
},
|
|
3070
3057
|
depthStencilAttachment: EFFECTS.RenderPassDestroyAttachmentType.force,
|
|
3071
3058
|
colorAttachment: EFFECTS.RenderPassDestroyAttachmentType.force
|
|
3072
3059
|
});
|
|
@@ -3083,14 +3070,14 @@ var normal = new Vector3();
|
|
|
3083
3070
|
* @param engine - 引擎对象
|
|
3084
3071
|
* @returns
|
|
3085
3072
|
*/ WebGLHelper.isSupportFloatTexture = function isSupportFloatTexture(engine) {
|
|
3086
|
-
var capability = engine.gpuCapability;
|
|
3073
|
+
var capability = engine.displayServer.renderingDevice.gpuCapability;
|
|
3087
3074
|
return capability.detail.floatTexture !== 0;
|
|
3088
3075
|
};
|
|
3089
3076
|
/**
|
|
3090
3077
|
* renderer 是否支持 HalfFloat 纹理
|
|
3091
3078
|
* @returns
|
|
3092
3079
|
*/ WebGLHelper.isSupportHalfFloatTexture = function isSupportHalfFloatTexture(engine) {
|
|
3093
|
-
var capability = engine.gpuCapability;
|
|
3080
|
+
var capability = engine.displayServer.renderingDevice.gpuCapability;
|
|
3094
3081
|
return capability.detail.halfFloatTexture !== 0;
|
|
3095
3082
|
};
|
|
3096
3083
|
/**
|
|
@@ -3134,7 +3121,7 @@ var normal = new Vector3();
|
|
|
3134
3121
|
var vertexShader = material.vertexShaderCode;
|
|
3135
3122
|
var fragmentShader = material.fragmentShaderCode;
|
|
3136
3123
|
var geometry = EFFECTS.Geometry.create(engine, MeshHelper.getPlaneGeometry());
|
|
3137
|
-
var isWebGL2 = engine.gpuCapability.level === 2;
|
|
3124
|
+
var isWebGL2 = engine.displayServer.renderingDevice.gpuCapability.level === 2;
|
|
3138
3125
|
var effectsMaterial = EFFECTS.Material.create(engine, {
|
|
3139
3126
|
shader: {
|
|
3140
3127
|
vertex: vertexShader,
|
|
@@ -3158,24 +3145,24 @@ var normal = new Vector3();
|
|
|
3158
3145
|
var data = MeshHelper.getPlaneVertexArray();
|
|
3159
3146
|
var _obj;
|
|
3160
3147
|
return {
|
|
3161
|
-
attributes: (_obj = {}, _obj[EFFECTS.
|
|
3148
|
+
attributes: (_obj = {}, _obj[EFFECTS.VertexElementType.Position] = {
|
|
3162
3149
|
type: EFFECTS.glContext.FLOAT,
|
|
3163
3150
|
size: 3,
|
|
3164
3151
|
data: data,
|
|
3165
3152
|
stride: Float32Array.BYTES_PER_ELEMENT * 8,
|
|
3166
3153
|
offset: 0
|
|
3167
|
-
}, _obj[EFFECTS.
|
|
3154
|
+
}, _obj[EFFECTS.VertexElementType.TexCoord0] = {
|
|
3168
3155
|
type: EFFECTS.glContext.FLOAT,
|
|
3169
3156
|
size: 2,
|
|
3170
3157
|
stride: Float32Array.BYTES_PER_ELEMENT * 8,
|
|
3171
3158
|
offset: Float32Array.BYTES_PER_ELEMENT * 3,
|
|
3172
|
-
dataSource: EFFECTS.
|
|
3173
|
-
}, _obj[EFFECTS.
|
|
3159
|
+
dataSource: EFFECTS.VertexElementType.Position
|
|
3160
|
+
}, _obj[EFFECTS.VertexElementType.Normal] = {
|
|
3174
3161
|
type: EFFECTS.glContext.FLOAT,
|
|
3175
3162
|
size: 3,
|
|
3176
3163
|
stride: Float32Array.BYTES_PER_ELEMENT * 8,
|
|
3177
3164
|
offset: Float32Array.BYTES_PER_ELEMENT * 5,
|
|
3178
|
-
dataSource: EFFECTS.
|
|
3165
|
+
dataSource: EFFECTS.VertexElementType.Position
|
|
3179
3166
|
}, _obj),
|
|
3180
3167
|
drawStart: 0,
|
|
3181
3168
|
drawCount: data.length / 8
|
|
@@ -3603,19 +3590,19 @@ var normal = new Vector3();
|
|
|
3603
3590
|
*/ PluginHelper.getAttributeName = function getAttributeName(name) {
|
|
3604
3591
|
switch(name){
|
|
3605
3592
|
case "POSITION":
|
|
3606
|
-
return EFFECTS.
|
|
3593
|
+
return EFFECTS.VertexElementType.Position;
|
|
3607
3594
|
case "NORMAL":
|
|
3608
|
-
return EFFECTS.
|
|
3595
|
+
return EFFECTS.VertexElementType.Normal;
|
|
3609
3596
|
case "TANGENT":
|
|
3610
|
-
return EFFECTS.
|
|
3597
|
+
return EFFECTS.VertexElementType.Tangent;
|
|
3611
3598
|
case "TEXCOORD_0":
|
|
3612
|
-
return EFFECTS.
|
|
3599
|
+
return EFFECTS.VertexElementType.TexCoord0;
|
|
3613
3600
|
case "TEXCOORD_1":
|
|
3614
|
-
return EFFECTS.
|
|
3601
|
+
return EFFECTS.VertexElementType.TexCoord1;
|
|
3615
3602
|
case "JOINTS_0":
|
|
3616
|
-
return EFFECTS.
|
|
3603
|
+
return EFFECTS.VertexElementType.BlendIndices;
|
|
3617
3604
|
case "WEIGHTS_0":
|
|
3618
|
-
return EFFECTS.
|
|
3605
|
+
return EFFECTS.VertexElementType.BlendWeights;
|
|
3619
3606
|
}
|
|
3620
3607
|
if (!name.startsWith("a")) {
|
|
3621
3608
|
// aPos, aNormal, aTangent,
|
|
@@ -4009,16 +3996,16 @@ var AttributeArray = /*#__PURE__*/ function() {
|
|
|
4009
3996
|
this.drawCount = Math.abs(geometry.getDrawCount());
|
|
4010
3997
|
//
|
|
4011
3998
|
this.index = geometry.getIndexData();
|
|
4012
|
-
var positionAttrib = getAttributeLayout(geometry
|
|
4013
|
-
var positionArray = geometry.getAttributeData(EFFECTS.
|
|
3999
|
+
var positionAttrib = getAttributeLayout(geometry, EFFECTS.VertexElementType.Position);
|
|
4000
|
+
var positionArray = geometry.getAttributeData(EFFECTS.VertexElementType.Position);
|
|
4014
4001
|
this.position = new AttributeArray();
|
|
4015
4002
|
this.position.create(positionAttrib, positionArray);
|
|
4016
4003
|
//
|
|
4017
|
-
var jointAttrib = getAttributeLayout(geometry
|
|
4018
|
-
var weightAttrib = getAttributeLayout(geometry
|
|
4004
|
+
var jointAttrib = getAttributeLayout(geometry, EFFECTS.VertexElementType.BlendIndices);
|
|
4005
|
+
var weightAttrib = getAttributeLayout(geometry, EFFECTS.VertexElementType.BlendWeights);
|
|
4019
4006
|
if (jointAttrib !== undefined && weightAttrib !== undefined) {
|
|
4020
|
-
var jointArray = geometry.getAttributeData(EFFECTS.
|
|
4021
|
-
var weightArray = geometry.getAttributeData(EFFECTS.
|
|
4007
|
+
var jointArray = geometry.getAttributeData(EFFECTS.VertexElementType.BlendIndices);
|
|
4008
|
+
var weightArray = geometry.getAttributeData(EFFECTS.VertexElementType.BlendWeights);
|
|
4022
4009
|
this.joint = new AttributeArray();
|
|
4023
4010
|
this.joint.create(jointAttrib, jointArray);
|
|
4024
4011
|
this.weight = new AttributeArray();
|
|
@@ -4120,16 +4107,16 @@ var AttributeArray = /*#__PURE__*/ function() {
|
|
|
4120
4107
|
this.drawCount = Math.abs(geometry.getDrawCount());
|
|
4121
4108
|
//
|
|
4122
4109
|
this.index = geometry.getIndexData();
|
|
4123
|
-
var positionAttrib = getAttributeLayout(geometry
|
|
4124
|
-
var positionArray = geometry.getAttributeData(EFFECTS.
|
|
4110
|
+
var positionAttrib = getAttributeLayout(geometry, EFFECTS.VertexElementType.Position);
|
|
4111
|
+
var positionArray = geometry.getAttributeData(EFFECTS.VertexElementType.Position);
|
|
4125
4112
|
this.position = new AttributeArray();
|
|
4126
4113
|
this.position.create(positionAttrib, positionArray);
|
|
4127
4114
|
//
|
|
4128
|
-
var jointAttrib = getAttributeLayout(geometry
|
|
4129
|
-
var weightAttrib = getAttributeLayout(geometry
|
|
4115
|
+
var jointAttrib = getAttributeLayout(geometry, EFFECTS.VertexElementType.BlendIndices);
|
|
4116
|
+
var weightAttrib = getAttributeLayout(geometry, EFFECTS.VertexElementType.BlendWeights);
|
|
4130
4117
|
if (jointAttrib !== undefined && weightAttrib !== undefined) {
|
|
4131
|
-
var jointArray = geometry.getAttributeData(EFFECTS.
|
|
4132
|
-
var weightArray = geometry.getAttributeData(EFFECTS.
|
|
4118
|
+
var jointArray = geometry.getAttributeData(EFFECTS.VertexElementType.BlendIndices);
|
|
4119
|
+
var weightArray = geometry.getAttributeData(EFFECTS.VertexElementType.BlendWeights);
|
|
4133
4120
|
this.joint = new AttributeArray();
|
|
4134
4121
|
this.joint.create(jointAttrib, jointArray);
|
|
4135
4122
|
this.weight = new AttributeArray();
|
|
@@ -4591,7 +4578,7 @@ var AttributeArray = /*#__PURE__*/ function() {
|
|
|
4591
4578
|
* @param name - 名称
|
|
4592
4579
|
* @returns
|
|
4593
4580
|
*/ CheckerHelper.createAttributeArray = function createAttributeArray(v, name) {
|
|
4594
|
-
var dataAttrib = getAttributeLayout(v
|
|
4581
|
+
var dataAttrib = getAttributeLayout(v, name);
|
|
4595
4582
|
if (dataAttrib === undefined) {
|
|
4596
4583
|
return;
|
|
4597
4584
|
}
|
|
@@ -5062,15 +5049,16 @@ var AttributeArray = /*#__PURE__*/ function() {
|
|
|
5062
5049
|
};
|
|
5063
5050
|
return CheckerHelper;
|
|
5064
5051
|
}();
|
|
5065
|
-
function getAttributeLayout(
|
|
5052
|
+
function getAttributeLayout(geometry, name) {
|
|
5053
|
+
var vertexBuffer = geometry.getVertexElement(name);
|
|
5066
5054
|
if (!vertexBuffer) {
|
|
5067
5055
|
return;
|
|
5068
5056
|
}
|
|
5069
5057
|
return {
|
|
5070
5058
|
type: vertexBuffer.type,
|
|
5071
|
-
size: vertexBuffer.
|
|
5059
|
+
size: vertexBuffer.size,
|
|
5072
5060
|
offset: vertexBuffer.byteOffset,
|
|
5073
|
-
stride:
|
|
5061
|
+
stride: geometry.getAttributeStride(name),
|
|
5074
5062
|
normalize: vertexBuffer.normalized
|
|
5075
5063
|
};
|
|
5076
5064
|
}
|
|
@@ -5275,7 +5263,7 @@ exports.TextureDataMode = void 0;
|
|
|
5275
5263
|
};
|
|
5276
5264
|
_proto.getTextureDataMode = function getTextureDataMode(jointCount, engine) {
|
|
5277
5265
|
var uniformsRequiredForMostFeatures = 25;
|
|
5278
|
-
var detail = engine.gpuCapability.detail;
|
|
5266
|
+
var detail = engine.displayServer.renderingDevice.gpuCapability.detail;
|
|
5279
5267
|
var availableJointUniforms = detail.maxVertexUniforms - uniformsRequiredForMostFeatures;
|
|
5280
5268
|
var uniformsRequiredPerJoint = 8;
|
|
5281
5269
|
if (jointCount > Math.floor(availableJointUniforms / uniformsRequiredPerJoint)) {
|
|
@@ -7881,12 +7869,12 @@ function _assert_this_initialized(self) {
|
|
|
7881
7869
|
}
|
|
7882
7870
|
|
|
7883
7871
|
var uvKinds = [
|
|
7884
|
-
EFFECTS.
|
|
7885
|
-
EFFECTS.
|
|
7886
|
-
EFFECTS.
|
|
7887
|
-
EFFECTS.
|
|
7888
|
-
EFFECTS.
|
|
7889
|
-
EFFECTS.
|
|
7872
|
+
EFFECTS.VertexElementType.TexCoord0,
|
|
7873
|
+
EFFECTS.VertexElementType.TexCoord1,
|
|
7874
|
+
EFFECTS.VertexElementType.TexCoord2,
|
|
7875
|
+
EFFECTS.VertexElementType.TexCoord3,
|
|
7876
|
+
EFFECTS.VertexElementType.TexCoord4,
|
|
7877
|
+
EFFECTS.VertexElementType.TexCoord5
|
|
7890
7878
|
];
|
|
7891
7879
|
/**
|
|
7892
7880
|
* Mesh 类,负责 Mesh 相关的骨骼动画和 PBR 渲染
|
|
@@ -8797,7 +8785,7 @@ var uvKinds = [
|
|
|
8797
8785
|
* 是否压缩格式
|
|
8798
8786
|
* @returns
|
|
8799
8787
|
*/ _proto.isCompressed = function isCompressed() {
|
|
8800
|
-
var positionAttrib = this.geometry.getAttributeData(EFFECTS.
|
|
8788
|
+
var positionAttrib = this.geometry.getAttributeData(EFFECTS.VertexElementType.Position);
|
|
8801
8789
|
if (positionAttrib === undefined) {
|
|
8802
8790
|
return false;
|
|
8803
8791
|
}
|
|
@@ -8809,19 +8797,19 @@ var uvKinds = [
|
|
|
8809
8797
|
* 是否有位置属性
|
|
8810
8798
|
* @returns
|
|
8811
8799
|
*/ _proto.hasPositions = function hasPositions() {
|
|
8812
|
-
return this.hasAttribute(EFFECTS.
|
|
8800
|
+
return this.hasAttribute(EFFECTS.VertexElementType.Position);
|
|
8813
8801
|
};
|
|
8814
8802
|
/**
|
|
8815
8803
|
* 是否有法线属性
|
|
8816
8804
|
* @returns
|
|
8817
8805
|
*/ _proto.hasNormals = function hasNormals() {
|
|
8818
|
-
return this.hasAttribute(EFFECTS.
|
|
8806
|
+
return this.hasAttribute(EFFECTS.VertexElementType.Normal);
|
|
8819
8807
|
};
|
|
8820
8808
|
/**
|
|
8821
8809
|
* 是否有切线属性
|
|
8822
8810
|
* @returns
|
|
8823
8811
|
*/ _proto.hasTangents = function hasTangents() {
|
|
8824
|
-
return this.hasAttribute(EFFECTS.
|
|
8812
|
+
return this.hasAttribute(EFFECTS.VertexElementType.Tangent);
|
|
8825
8813
|
};
|
|
8826
8814
|
/**
|
|
8827
8815
|
* 是否有纹理坐标属性
|
|
@@ -8835,19 +8823,19 @@ var uvKinds = [
|
|
|
8835
8823
|
* 是否有颜色属性
|
|
8836
8824
|
* @returns
|
|
8837
8825
|
*/ _proto.hasColors = function hasColors() {
|
|
8838
|
-
return this.hasAttribute(EFFECTS.
|
|
8826
|
+
return this.hasAttribute(EFFECTS.VertexElementType.Color);
|
|
8839
8827
|
};
|
|
8840
8828
|
/**
|
|
8841
8829
|
* 是否有关节点属性
|
|
8842
8830
|
* @returns
|
|
8843
8831
|
*/ _proto.hasJoints = function hasJoints() {
|
|
8844
|
-
return this.hasAttribute(EFFECTS.
|
|
8832
|
+
return this.hasAttribute(EFFECTS.VertexElementType.BlendIndices);
|
|
8845
8833
|
};
|
|
8846
8834
|
/**
|
|
8847
8835
|
* 是否有权重属性
|
|
8848
8836
|
* @returns
|
|
8849
8837
|
*/ _proto.hasWeights = function hasWeights() {
|
|
8850
|
-
return this.hasAttribute(EFFECTS.
|
|
8838
|
+
return this.hasAttribute(EFFECTS.VertexElementType.BlendWeights);
|
|
8851
8839
|
};
|
|
8852
8840
|
return PGeometry;
|
|
8853
8841
|
}();
|
|
@@ -8970,7 +8958,7 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
|
|
|
8970
8958
|
}
|
|
8971
8959
|
};
|
|
8972
8960
|
_proto.initGlobalState = function initGlobalState(opts) {
|
|
8973
|
-
var capbility = this.engine.gpuCapability;
|
|
8961
|
+
var capbility = this.engine.displayServer.renderingDevice.gpuCapability;
|
|
8974
8962
|
var globalState = PGlobalState.getInstance();
|
|
8975
8963
|
globalState.reset();
|
|
8976
8964
|
globalState.isWebGL2 = capbility.level === 2;
|
|
@@ -9326,7 +9314,7 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
|
|
|
9326
9314
|
//
|
|
9327
9315
|
PluginHelper.preprocessScene(scene, runtimeEnv, compatibleMode);
|
|
9328
9316
|
// Add PBR and Unlit shader data
|
|
9329
|
-
var isWebGL2 = engine.gpuCapability.level === 2;
|
|
9317
|
+
var isWebGL2 = engine.displayServer.renderingDevice.gpuCapability.level === 2;
|
|
9330
9318
|
var pbrShaderCode = fetchPBRShaderCode();
|
|
9331
9319
|
var unlitShaderCode = fetchUnlitShaderCode();
|
|
9332
9320
|
var pbrShaderData = {
|
|
@@ -9347,8 +9335,8 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
|
|
|
9347
9335
|
// @ts-expect-error
|
|
9348
9336
|
glslVersion: isWebGL2 ? EFFECTS.GLSLVersion.GLSL3 : EFFECTS.GLSLVersion.GLSL1
|
|
9349
9337
|
};
|
|
9350
|
-
engine.addEffectsObjectData(pbrShaderData);
|
|
9351
|
-
engine.addEffectsObjectData(unlitShaderData);
|
|
9338
|
+
engine.assetServer.addEffectsObjectData(pbrShaderData);
|
|
9339
|
+
engine.assetServer.addEffectsObjectData(unlitShaderData);
|
|
9352
9340
|
};
|
|
9353
9341
|
/**
|
|
9354
9342
|
* 创建 3D 场景管理器和缓存器
|
|
@@ -9431,18 +9419,16 @@ exports.ModelPluginComponent = /*#__PURE__*/ function(Behaviour) {
|
|
|
9431
9419
|
// 更新相机的位置,主要是composition的camera数据,以及camera item数据
|
|
9432
9420
|
composition.camera.position = position;
|
|
9433
9421
|
(_composition_items = composition.items) == null ? void 0 : _composition_items.forEach(function(item) {
|
|
9434
|
-
|
|
9435
|
-
|
|
9436
|
-
|
|
9437
|
-
|
|
9438
|
-
|
|
9439
|
-
|
|
9440
|
-
|
|
9441
|
-
|
|
9442
|
-
|
|
9443
|
-
|
|
9444
|
-
console.info("Update camera position [" + newPosition.toArray() + "].");
|
|
9445
|
-
}
|
|
9422
|
+
var component = item.getComponent(exports.ModelCameraComponent);
|
|
9423
|
+
if (component == null ? void 0 : component.content) {
|
|
9424
|
+
var _item_transform_parentTransform;
|
|
9425
|
+
var worldMatrix = ((_item_transform_parentTransform = item.transform.parentTransform) == null ? void 0 : _item_transform_parentTransform.getWorldMatrix()) || Matrix4.IDENTITY.clone();
|
|
9426
|
+
var invWorldMatrix = worldMatrix.invert();
|
|
9427
|
+
var newPosition = invWorldMatrix.transformPoint(position);
|
|
9428
|
+
component.setTransform(newPosition);
|
|
9429
|
+
// 正式版本不会走到这个流程,只在测试时使用
|
|
9430
|
+
console.info("Scene AABB [" + sceneAABB.min.toArray() + "], [" + sceneAABB.max.toArray() + "].");
|
|
9431
|
+
console.info("Update camera position [" + newPosition.toArray() + "].");
|
|
9446
9432
|
}
|
|
9447
9433
|
});
|
|
9448
9434
|
}
|
|
@@ -10377,11 +10363,6 @@ var JSONConverter = /*#__PURE__*/ function() {
|
|
|
10377
10363
|
(_newScene_items = newScene.items).push.apply(_newScene_items, [].concat(this.treeInfo.getAllTreeNodeList()));
|
|
10378
10364
|
newScene.compositionId = oldScene.compositionId;
|
|
10379
10365
|
newScene.compositions = oldScene.compositions;
|
|
10380
|
-
newScene.items.forEach(function(item) {
|
|
10381
|
-
if (item.type === "root") {
|
|
10382
|
-
item.type = "ECS";
|
|
10383
|
-
}
|
|
10384
|
-
});
|
|
10385
10366
|
//@ts-expect-error
|
|
10386
10367
|
newScene.compositions[0].items = newScene.items.map(function(item) {
|
|
10387
10368
|
return {
|
|
@@ -10560,8 +10541,7 @@ var JSONConverter = /*#__PURE__*/ function() {
|
|
|
10560
10541
|
parentId: treeItem.id,
|
|
10561
10542
|
name: (_node_name = node.name) != null ? _node_name : "node" + index,
|
|
10562
10543
|
duration: treeItem.duration,
|
|
10563
|
-
|
|
10564
|
-
type: "ECS",
|
|
10544
|
+
type: EFFECTS.spec.ItemType.tree,
|
|
10565
10545
|
dataType: EFFECTS.spec.DataType.VFXItemData,
|
|
10566
10546
|
visible: treeItem.visible,
|
|
10567
10547
|
endBehavior: treeItem.endBehavior,
|
|
@@ -11141,7 +11121,7 @@ function getGeometryDataFromOptions(geomOptions) {
|
|
|
11141
11121
|
verticesNormalize = (_attribData_normalize = attribData.normalize) != null ? _attribData_normalize : false;
|
|
11142
11122
|
var _attribData_type;
|
|
11143
11123
|
verticesType = EFFECTS.glType2VertexFormatType((_attribData_type = attribData.type) != null ? _attribData_type : EFFECTS.glContext.FLOAT);
|
|
11144
|
-
} else if (attrib === EFFECTS.
|
|
11124
|
+
} else if (attrib === EFFECTS.VertexElementType.Normal) {
|
|
11145
11125
|
// @ts-expect-error
|
|
11146
11126
|
modelData.normals = attribData.data;
|
|
11147
11127
|
var _attribData_normalize1;
|
|
@@ -11457,7 +11437,7 @@ function mergeTypedArray(array1, array2, offset) {
|
|
|
11457
11437
|
}
|
|
11458
11438
|
}
|
|
11459
11439
|
var _obj;
|
|
11460
|
-
var vertexBufferSemanticMap = (_obj = {}, _obj[EFFECTS.
|
|
11440
|
+
var vertexBufferSemanticMap = (_obj = {}, _obj[EFFECTS.VertexElementType.Position] = "POSITION", _obj[EFFECTS.VertexElementType.TexCoord0] = "TEXCOORD0", _obj[EFFECTS.VertexElementType.TexCoord1] = "TEXCOORD1", _obj[EFFECTS.VertexElementType.Normal] = "NORMAL", _obj[EFFECTS.VertexElementType.Tangent] = "TANGENT", _obj[EFFECTS.VertexElementType.Color] = "COLOR", _obj[EFFECTS.VertexElementType.BlendIndices] = "JOINTS", _obj[EFFECTS.VertexElementType.BlendWeights] = "WEIGHTS", //
|
|
11461
11441
|
_obj.a_Position = "POSITION", _obj.a_UV = "TEXCOORD0", _obj.a_UV1 = "TEXCOORD0", _obj.a_UV2 = "TEXCOORD1", _obj.a_Normal = "NORMAL", _obj.a_Tangent = "TANGENT", _obj.a_Color = "COLOR", _obj.a_Joints = "JOINTS", _obj.a_Joint1 = "JOINTS", _obj.a_Weights = "WEIGHTS", _obj.a_Weight1 = "WEIGHTS", //
|
|
11462
11442
|
_obj.a_Target_Position0 = "POSITION_BS0", _obj.a_Target_Position1 = "POSITION_BS1", _obj.a_Target_Position2 = "POSITION_BS2", _obj.a_Target_Position3 = "POSITION_BS3", _obj.a_Target_Position4 = "POSITION_BS4", _obj.a_Target_Position5 = "POSITION_BS5", _obj.a_Target_Position6 = "POSITION_BS6", _obj.a_Target_Position7 = "POSITION_BS7", _obj.a_Target_Normal0 = "NORMAL_BS0", _obj.a_Target_Normal1 = "NORMAL_BS1", _obj.a_Target_Normal2 = "NORMAL_BS2", _obj.a_Target_Normal3 = "NORMAL_BS3", _obj.a_Target_Tangent0 = "TANGENT_BS0", _obj.a_Target_Tangent1 = "TANGENT_BS1", _obj.a_Target_Tangent2 = "TANGENT_BS2", _obj.a_Target_Tangent3 = "TANGENT_BS3", _obj);
|
|
11463
11443
|
|
|
@@ -11627,11 +11607,6 @@ var LoaderImpl = /*#__PURE__*/ function() {
|
|
|
11627
11607
|
case 2:
|
|
11628
11608
|
_state.sent();
|
|
11629
11609
|
(_this_items = _this.items).push.apply(_this_items, [].concat(gltfResource.scenes[0].vfxItemData));
|
|
11630
|
-
_this.items.forEach(function(item) {
|
|
11631
|
-
if (item.type === "root") {
|
|
11632
|
-
item.type = "ECS";
|
|
11633
|
-
}
|
|
11634
|
-
});
|
|
11635
11610
|
return [
|
|
11636
11611
|
2,
|
|
11637
11612
|
_this.getLoadResult()
|
|
@@ -13186,7 +13161,7 @@ var GLTFHelper = /*#__PURE__*/ function() {
|
|
|
13186
13161
|
EFFECTS.registerPlugin("model", ModelPlugin);
|
|
13187
13162
|
/**
|
|
13188
13163
|
* 插件版本号
|
|
13189
|
-
*/ var version = "2.
|
|
13164
|
+
*/ var version = "2.11.0-alpha.1";
|
|
13190
13165
|
EFFECTS.logger.info("Plugin model version: " + version + ".");
|
|
13191
13166
|
if (version !== EFFECTS__namespace.version) {
|
|
13192
13167
|
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!");
|
|
@@ -13249,7 +13224,6 @@ exports.Sphere = Sphere;
|
|
|
13249
13224
|
exports.ToggleItemBounding = ToggleItemBounding;
|
|
13250
13225
|
exports.TwoStatesSet = TwoStatesSet;
|
|
13251
13226
|
exports.UnlitShaderGUID = UnlitShaderGUID;
|
|
13252
|
-
exports.VFX_ITEM_TYPE_3D = VFX_ITEM_TYPE_3D;
|
|
13253
13227
|
exports.Vector2 = Vector2;
|
|
13254
13228
|
exports.Vector3 = Vector3;
|
|
13255
13229
|
exports.Vector4 = Vector4;
|