@galacean/engine-loader 1.2.0-alpha.12 → 1.2.0-alpha.13
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 +6 -3
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +6 -3
- package/dist/module.js +6 -3
- package/dist/module.js.map +1 -1
- package/package.json +4 -4
package/dist/miniprogram.js
CHANGED
|
@@ -2165,7 +2165,9 @@ function registerGLTFParser(pipeline) {
|
|
|
2165
2165
|
};
|
|
2166
2166
|
GLTFUtils.getAccessorBuffer = function getAccessorBuffer(context, bufferViews, accessor) {
|
|
2167
2167
|
var componentType = accessor.componentType;
|
|
2168
|
-
var
|
|
2168
|
+
var _accessor_bufferView;
|
|
2169
|
+
var bufferViewIndex = (_accessor_bufferView = accessor.bufferView) != null ? _accessor_bufferView : 0;
|
|
2170
|
+
var bufferView = bufferViews[bufferViewIndex];
|
|
2169
2171
|
return context.get(exports.GLTFParserType.BufferView, accessor.bufferView).then(function(bufferViewData) {
|
|
2170
2172
|
var bufferIndex = bufferView.buffer;
|
|
2171
2173
|
var _bufferViewData_byteOffset;
|
|
@@ -2182,7 +2184,7 @@ function registerGLTFParser(pipeline) {
|
|
|
2182
2184
|
// According to the glTF official documentation only byteStride not undefined is allowed
|
|
2183
2185
|
if (bufferStride !== undefined && bufferStride !== elementStride) {
|
|
2184
2186
|
var bufferSlice = Math.floor(byteOffset / bufferStride);
|
|
2185
|
-
var bufferCacheKey =
|
|
2187
|
+
var bufferCacheKey = bufferViewIndex + ":" + componentType + ":" + bufferSlice + ":" + accessorCount;
|
|
2186
2188
|
var accessorBufferCache = context.accessorBufferCache;
|
|
2187
2189
|
bufferInfo = accessorBufferCache[bufferCacheKey];
|
|
2188
2190
|
if (!bufferInfo) {
|
|
@@ -2223,7 +2225,8 @@ function registerGLTFParser(pipeline) {
|
|
|
2223
2225
|
* Get accessor data.
|
|
2224
2226
|
*/ GLTFUtils.getAccessorData = function getAccessorData(glTF, accessor, buffers) {
|
|
2225
2227
|
var bufferViews = glTF.bufferViews;
|
|
2226
|
-
var
|
|
2228
|
+
var _accessor_bufferView;
|
|
2229
|
+
var bufferView = bufferViews[(_accessor_bufferView = accessor.bufferView) != null ? _accessor_bufferView : 0];
|
|
2227
2230
|
var arrayBuffer = buffers[bufferView.buffer];
|
|
2228
2231
|
var accessorByteOffset = accessor.hasOwnProperty("byteOffset") ? accessor.byteOffset : 0;
|
|
2229
2232
|
var bufferViewByteOffset = bufferView.hasOwnProperty("byteOffset") ? bufferView.byteOffset : 0;
|
package/dist/module.js
CHANGED
|
@@ -2160,7 +2160,9 @@ function registerGLTFParser(pipeline) {
|
|
|
2160
2160
|
};
|
|
2161
2161
|
GLTFUtils.getAccessorBuffer = function getAccessorBuffer(context, bufferViews, accessor) {
|
|
2162
2162
|
var componentType = accessor.componentType;
|
|
2163
|
-
var
|
|
2163
|
+
var _accessor_bufferView;
|
|
2164
|
+
var bufferViewIndex = (_accessor_bufferView = accessor.bufferView) != null ? _accessor_bufferView : 0;
|
|
2165
|
+
var bufferView = bufferViews[bufferViewIndex];
|
|
2164
2166
|
return context.get(GLTFParserType.BufferView, accessor.bufferView).then(function(bufferViewData) {
|
|
2165
2167
|
var bufferIndex = bufferView.buffer;
|
|
2166
2168
|
var _bufferViewData_byteOffset;
|
|
@@ -2177,7 +2179,7 @@ function registerGLTFParser(pipeline) {
|
|
|
2177
2179
|
// According to the glTF official documentation only byteStride not undefined is allowed
|
|
2178
2180
|
if (bufferStride !== undefined && bufferStride !== elementStride) {
|
|
2179
2181
|
var bufferSlice = Math.floor(byteOffset / bufferStride);
|
|
2180
|
-
var bufferCacheKey =
|
|
2182
|
+
var bufferCacheKey = bufferViewIndex + ":" + componentType + ":" + bufferSlice + ":" + accessorCount;
|
|
2181
2183
|
var accessorBufferCache = context.accessorBufferCache;
|
|
2182
2184
|
bufferInfo = accessorBufferCache[bufferCacheKey];
|
|
2183
2185
|
if (!bufferInfo) {
|
|
@@ -2218,7 +2220,8 @@ function registerGLTFParser(pipeline) {
|
|
|
2218
2220
|
* Get accessor data.
|
|
2219
2221
|
*/ GLTFUtils.getAccessorData = function getAccessorData(glTF, accessor, buffers) {
|
|
2220
2222
|
var bufferViews = glTF.bufferViews;
|
|
2221
|
-
var
|
|
2223
|
+
var _accessor_bufferView;
|
|
2224
|
+
var bufferView = bufferViews[(_accessor_bufferView = accessor.bufferView) != null ? _accessor_bufferView : 0];
|
|
2222
2225
|
var arrayBuffer = buffers[bufferView.buffer];
|
|
2223
2226
|
var accessorByteOffset = accessor.hasOwnProperty("byteOffset") ? accessor.byteOffset : 0;
|
|
2224
2227
|
var bufferViewByteOffset = bufferView.hasOwnProperty("byteOffset") ? bufferView.byteOffset : 0;
|