@galacean/engine-physics-physx 1.0.0-beta.5 → 1.0.0-beta.7
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/main.js.map +1 -1
- package/dist/miniprogram.js +66 -30
- package/dist/module.js.map +1 -1
- package/package.json +4 -4
package/dist/miniprogram.js
CHANGED
|
@@ -15033,7 +15033,7 @@ var Basic2DBatcher = /*#__PURE__*/ function() {
|
|
|
15033
15033
|
// vertices
|
|
15034
15034
|
this._vertexBuffers[index] = new Buffer(engine, exports.BufferBindFlag.VertexBuffer, MAX_VERTEX_COUNT * 4 * vertexStride, exports.BufferUsage.Dynamic);
|
|
15035
15035
|
// indices
|
|
15036
|
-
this._indiceBuffers[index] = new Buffer(engine, exports.BufferBindFlag.IndexBuffer, MAX_VERTEX_COUNT * 3, exports.BufferUsage.Dynamic);
|
|
15036
|
+
this._indiceBuffers[index] = new Buffer(engine, exports.BufferBindFlag.IndexBuffer, MAX_VERTEX_COUNT * 2 * 3, exports.BufferUsage.Dynamic);
|
|
15037
15037
|
mesh.setVertexBufferBinding(this._vertexBuffers[index], vertexStride);
|
|
15038
15038
|
mesh.setIndexBufferBinding(this._indiceBuffers[index], exports.IndexFormat.UInt16);
|
|
15039
15039
|
mesh.setVertexElements(vertexElements);
|
|
@@ -17901,7 +17901,7 @@ var /**
|
|
|
17901
17901
|
// prepare render target
|
|
17902
17902
|
var renderTarget = this._getAvailableRenderTarget();
|
|
17903
17903
|
// @todo: shouldn't set viewport and scissor in activeRenderTarget
|
|
17904
|
-
rhi.activeRenderTarget(renderTarget,
|
|
17904
|
+
rhi.activeRenderTarget(renderTarget, CascadedShadowCasterPass._viewport, 0);
|
|
17905
17905
|
if (this._supportDepthTexture) {
|
|
17906
17906
|
rhi.clearRenderTarget(engine, exports.CameraClearFlags.Depth, null);
|
|
17907
17907
|
} else {
|
|
@@ -18106,6 +18106,9 @@ var /**
|
|
|
18106
18106
|
(function() {
|
|
18107
18107
|
CascadedShadowCasterPass._cascadesSplitDistance = new Array(CascadedShadowCasterPass._maxCascades + 1);
|
|
18108
18108
|
})();
|
|
18109
|
+
(function() {
|
|
18110
|
+
CascadedShadowCasterPass._viewport = new miniprogram$7.Vector4(0, 0, 1, 1);
|
|
18111
|
+
})();
|
|
18109
18112
|
(function() {
|
|
18110
18113
|
CascadedShadowCasterPass._clearColor = new miniprogram$7.Color(1, 1, 1, 1);
|
|
18111
18114
|
})();
|
|
@@ -26269,12 +26272,6 @@ function _create_for_of_iterator_helper_loose(o, allowArrayLike) {
|
|
|
26269
26272
|
this.vertexBuffers = [];
|
|
26270
26273
|
this.blendShapes = [];
|
|
26271
26274
|
};
|
|
26272
|
-
/**
|
|
26273
|
-
* @internal
|
|
26274
|
-
*/ var BufferRestoreInfo = function BufferRestoreInfo(buffer, data) {
|
|
26275
|
-
this.buffer = buffer;
|
|
26276
|
-
this.data = data;
|
|
26277
|
-
};
|
|
26278
26275
|
/**
|
|
26279
26276
|
* @internal
|
|
26280
26277
|
*/ var BufferDataRestoreInfo = function BufferDataRestoreInfo(main, typeSize, sparseCount, sparseIndices, sparseValues) {
|
|
@@ -27578,21 +27575,31 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
27578
27575
|
var vertexCount;
|
|
27579
27576
|
var bufferBindIndex = 0;
|
|
27580
27577
|
var positions;
|
|
27581
|
-
|
|
27578
|
+
var boneIndices;
|
|
27579
|
+
var boneWeights;
|
|
27580
|
+
if (keepMeshData) {
|
|
27581
|
+
positions = new Array(vertexCount);
|
|
27582
|
+
boneIndices = new Array(vertexCount);
|
|
27583
|
+
boneWeights = new Array(vertexCount);
|
|
27584
|
+
}
|
|
27582
27585
|
for(var attribute in attributes){
|
|
27583
27586
|
var accessor = accessors[attributes[attribute]];
|
|
27584
27587
|
var accessorBuffer = GLTFUtils.getAccessorBuffer(context, gltf.bufferViews, accessor);
|
|
27585
27588
|
var dataElementSize = GLTFUtils.getAccessorTypeSize(accessor.type);
|
|
27586
|
-
var
|
|
27589
|
+
var accessorCount = accessor.count;
|
|
27587
27590
|
var vertices = accessorBuffer.data;
|
|
27588
27591
|
var vertexElement = void 0;
|
|
27589
27592
|
var meshId = mesh.instanceId;
|
|
27590
27593
|
var vertexBindingInfos = accessorBuffer.vertexBindingInfos;
|
|
27591
|
-
var
|
|
27594
|
+
var elementNormalized = accessor.normalized;
|
|
27595
|
+
var elementFormat = GLTFUtils.getElementFormat(accessor.componentType, dataElementSize, elementNormalized);
|
|
27596
|
+
var scaleFactor = void 0;
|
|
27597
|
+
elementNormalized && (scaleFactor = GLTFUtils.getNormalizedComponentScale(accessor.componentType));
|
|
27598
|
+
var elementOffset = void 0;
|
|
27592
27599
|
if (accessorBuffer.interleaved) {
|
|
27593
27600
|
var byteOffset = accessor.byteOffset || 0;
|
|
27594
27601
|
var stride = accessorBuffer.stride;
|
|
27595
|
-
|
|
27602
|
+
elementOffset = byteOffset % stride;
|
|
27596
27603
|
if (vertexBindingInfos[meshId] === undefined) {
|
|
27597
27604
|
vertexElement = new miniprogram$5.VertexElement(attribute, elementOffset, elementFormat, bufferBindIndex);
|
|
27598
27605
|
var vertexBuffer = accessorBuffer.vertexBuffer;
|
|
@@ -27600,7 +27607,6 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
27600
27607
|
vertexBuffer = new miniprogram$5.Buffer(engine, miniprogram$5.BufferBindFlag.VertexBuffer, vertices.byteLength, miniprogram$5.BufferUsage.Static);
|
|
27601
27608
|
vertexBuffer.setData(vertices);
|
|
27602
27609
|
accessorBuffer.vertexBuffer = vertexBuffer;
|
|
27603
|
-
meshRestoreInfo.vertexBuffers.push(new BufferRestoreInfo(vertexBuffer, accessorBuffer.restoreInfo));
|
|
27604
27610
|
}
|
|
27605
27611
|
mesh.setVertexBufferBinding(vertexBuffer, stride, bufferBindIndex);
|
|
27606
27612
|
vertexBindingInfos[meshId] = bufferBindIndex++;
|
|
@@ -27608,44 +27614,70 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
27608
27614
|
vertexElement = new miniprogram$5.VertexElement(attribute, elementOffset, elementFormat, vertexBindingInfos[meshId]);
|
|
27609
27615
|
}
|
|
27610
27616
|
} else {
|
|
27611
|
-
|
|
27617
|
+
elementOffset = 0;
|
|
27618
|
+
vertexElement = new miniprogram$5.VertexElement(attribute, elementOffset, elementFormat, bufferBindIndex);
|
|
27612
27619
|
var vertexBuffer1 = new miniprogram$5.Buffer(engine, miniprogram$5.BufferBindFlag.VertexBuffer, vertices.byteLength, miniprogram$5.BufferUsage.Static);
|
|
27613
27620
|
vertexBuffer1.setData(vertices);
|
|
27614
|
-
meshRestoreInfo.vertexBuffers.push(new BufferRestoreInfo(vertexBuffer1, accessorBuffer.restoreInfo));
|
|
27615
27621
|
mesh.setVertexBufferBinding(vertexBuffer1, accessorBuffer.stride, bufferBindIndex);
|
|
27616
27622
|
vertexBindingInfos[meshId] = bufferBindIndex++;
|
|
27617
27623
|
}
|
|
27618
27624
|
vertexElements.push(vertexElement);
|
|
27619
27625
|
if (attribute === "POSITION") {
|
|
27620
|
-
vertexCount =
|
|
27626
|
+
vertexCount = accessorCount;
|
|
27621
27627
|
var _mesh_bounds = mesh.bounds, min = _mesh_bounds.min, max = _mesh_bounds.max;
|
|
27622
27628
|
if (accessor.min && accessor.max) {
|
|
27623
27629
|
min.copyFromArray(accessor.min);
|
|
27624
27630
|
max.copyFromArray(accessor.max);
|
|
27625
27631
|
if (keepMeshData) {
|
|
27626
|
-
var
|
|
27627
|
-
|
|
27628
|
-
|
|
27629
|
-
|
|
27632
|
+
var baseOffset = elementOffset / vertices.BYTES_PER_ELEMENT;
|
|
27633
|
+
var stride1 = vertices.length / accessorCount;
|
|
27634
|
+
for(var j = 0; j < accessorCount; j++){
|
|
27635
|
+
var offset = baseOffset + j * stride1;
|
|
27636
|
+
var position = new miniprogram$1$2.Vector3(vertices[offset], vertices[offset + 1], vertices[offset + 2]);
|
|
27637
|
+
elementNormalized && position.scale(scaleFactor);
|
|
27638
|
+
positions[j] = position;
|
|
27630
27639
|
}
|
|
27631
27640
|
}
|
|
27632
27641
|
} else {
|
|
27633
|
-
var
|
|
27642
|
+
var position1 = GLTFMeshParser._tempVector3;
|
|
27634
27643
|
min.set(Number.MAX_VALUE, Number.MAX_VALUE, Number.MAX_VALUE);
|
|
27635
27644
|
max.set(-Number.MAX_VALUE, -Number.MAX_VALUE, -Number.MAX_VALUE);
|
|
27636
|
-
var
|
|
27637
|
-
|
|
27638
|
-
|
|
27639
|
-
|
|
27640
|
-
|
|
27641
|
-
miniprogram$1$2.Vector3.
|
|
27645
|
+
var baseOffset1 = elementOffset / vertices.BYTES_PER_ELEMENT;
|
|
27646
|
+
var stride2 = vertices.length / accessorCount;
|
|
27647
|
+
for(var j1 = 0; j1 < accessorCount; j1++){
|
|
27648
|
+
var offset1 = baseOffset1 + j1 * stride2;
|
|
27649
|
+
position1.copyFromArray(vertices, offset1);
|
|
27650
|
+
miniprogram$1$2.Vector3.min(min, position1, min);
|
|
27651
|
+
miniprogram$1$2.Vector3.max(max, position1, max);
|
|
27652
|
+
if (keepMeshData) {
|
|
27653
|
+
var clonePosition = position1.clone();
|
|
27654
|
+
elementNormalized && clonePosition.scale(scaleFactor);
|
|
27655
|
+
positions[j1] = clonePosition;
|
|
27656
|
+
}
|
|
27642
27657
|
}
|
|
27643
27658
|
}
|
|
27644
|
-
if (
|
|
27645
|
-
var scaleFactor = GLTFUtils.getNormalizedComponentScale(accessor.componentType);
|
|
27659
|
+
if (elementNormalized) {
|
|
27646
27660
|
min.scale(scaleFactor);
|
|
27647
27661
|
max.scale(scaleFactor);
|
|
27648
27662
|
}
|
|
27663
|
+
} else if (attribute === "JOINTS_0" && keepMeshData) {
|
|
27664
|
+
var baseOffset2 = elementOffset / vertices.BYTES_PER_ELEMENT;
|
|
27665
|
+
var stride3 = vertices.length / accessorCount;
|
|
27666
|
+
for(var j2 = 0; j2 < accessorCount; j2++){
|
|
27667
|
+
var offset2 = baseOffset2 + j2 * stride3;
|
|
27668
|
+
var boneIndex = new miniprogram$1$2.Vector4(vertices[offset2], vertices[offset2 + 1], vertices[offset2 + 2], vertices[offset2 + 3]);
|
|
27669
|
+
elementNormalized && boneIndex.scale(scaleFactor);
|
|
27670
|
+
boneIndices[j2] = boneIndex;
|
|
27671
|
+
}
|
|
27672
|
+
} else if (attribute === "WEIGHTS_0" && keepMeshData) {
|
|
27673
|
+
var baseOffset3 = elementOffset / vertices.BYTES_PER_ELEMENT;
|
|
27674
|
+
var stride4 = vertices.length / accessorCount;
|
|
27675
|
+
for(var j3 = 0; j3 < accessorCount; j3++){
|
|
27676
|
+
var offset3 = baseOffset3 + j3 * stride4;
|
|
27677
|
+
var boneWeight = new miniprogram$1$2.Vector4(vertices[offset3], vertices[offset3 + 1], vertices[offset3 + 2], vertices[offset3 + 3]);
|
|
27678
|
+
elementNormalized && boneWeight.scale(scaleFactor);
|
|
27679
|
+
boneWeights[j3] = boneWeight;
|
|
27680
|
+
}
|
|
27649
27681
|
}
|
|
27650
27682
|
}
|
|
27651
27683
|
mesh.setVertexElements(vertexElements);
|
|
@@ -27664,6 +27696,10 @@ var GLTFMeshParser = /*#__PURE__*/ function(GLTFParser1) {
|
|
|
27664
27696
|
mesh.uploadData(!keepMeshData);
|
|
27665
27697
|
//@ts-ignore
|
|
27666
27698
|
mesh._positions = positions;
|
|
27699
|
+
//@ts-ignore
|
|
27700
|
+
mesh._boneIndices = boneIndices;
|
|
27701
|
+
//@ts-ignore
|
|
27702
|
+
mesh._boneWeights = boneWeights;
|
|
27667
27703
|
return Promise.resolve(mesh);
|
|
27668
27704
|
};
|
|
27669
27705
|
/**
|
|
@@ -37492,7 +37528,7 @@ function _interopNamespace(e) {
|
|
|
37492
37528
|
}
|
|
37493
37529
|
var CoreObjects__namespace = /*#__PURE__*/ _interopNamespace(CoreObjects);
|
|
37494
37530
|
//@ts-ignore
|
|
37495
|
-
var version = "1.0.0-beta.
|
|
37531
|
+
var version = "1.0.0-beta.7";
|
|
37496
37532
|
console.log("Galacean engine version: " + version);
|
|
37497
37533
|
for(var key in CoreObjects__namespace){
|
|
37498
37534
|
CoreObjects.Loader.registerClass(key, CoreObjects__namespace[key]);
|