@galacean/engine 1.3.27 → 1.3.28
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/browser.js +111 -105
- package/dist/browser.js.map +1 -1
- package/dist/browser.min.js +1 -1
- package/dist/browser.min.js.map +1 -1
- package/dist/main.js +1 -1
- package/dist/miniprogram.js +1 -1
- package/dist/module.js +1 -1
- package/package.json +5 -5
package/dist/browser.js
CHANGED
|
@@ -42311,6 +42311,7 @@
|
|
|
42311
42311
|
exports.Texture2DDecoder = /*#__PURE__*/ function() {
|
|
42312
42312
|
var Texture2DDecoder = function Texture2DDecoder() {};
|
|
42313
42313
|
Texture2DDecoder.decode = function decode(engine, bufferReader) {
|
|
42314
|
+
var _this = this;
|
|
42314
42315
|
return new AssetPromise(function(resolve, reject) {
|
|
42315
42316
|
var objectId = bufferReader.nextStr();
|
|
42316
42317
|
var mipmap = !!bufferReader.nextUint8();
|
|
@@ -42343,40 +42344,52 @@
|
|
|
42343
42344
|
engine.resourceManager._objectPool[objectId] = texture2D;
|
|
42344
42345
|
resolve(texture2D);
|
|
42345
42346
|
} else {
|
|
42346
|
-
var
|
|
42347
|
-
|
|
42348
|
-
|
|
42349
|
-
|
|
42350
|
-
|
|
42351
|
-
texture2D.setImageSource(img);
|
|
42352
|
-
var completedCount = 0;
|
|
42353
|
-
var onComplete = function onComplete() {
|
|
42354
|
-
completedCount++;
|
|
42355
|
-
if (completedCount >= mipCount) {
|
|
42356
|
-
resolve(texture2D);
|
|
42357
|
-
}
|
|
42358
|
-
};
|
|
42359
|
-
onComplete();
|
|
42360
|
-
if (mipmap) {
|
|
42361
|
-
var _loop = function _loop(i) {
|
|
42362
|
-
var blob = new window.Blob([
|
|
42363
|
-
imagesData[i]
|
|
42364
|
-
]);
|
|
42365
|
-
var img = new Image();
|
|
42366
|
-
img.onload = function() {
|
|
42367
|
-
texture2D.setImageSource(img, i);
|
|
42368
|
-
onComplete();
|
|
42369
|
-
};
|
|
42370
|
-
img.src = URL.createObjectURL(blob);
|
|
42371
|
-
};
|
|
42372
|
-
texture2D.generateMipmaps();
|
|
42373
|
-
for(var i = 1; i < mipCount; i++)_loop(i);
|
|
42347
|
+
var completedCount = 0;
|
|
42348
|
+
var onComplete = function onComplete() {
|
|
42349
|
+
completedCount++;
|
|
42350
|
+
if (completedCount >= mipCount) {
|
|
42351
|
+
resolve(texture2D);
|
|
42374
42352
|
}
|
|
42375
42353
|
};
|
|
42376
|
-
|
|
42354
|
+
_this._loadImageBuffer(imagesData[0]).then(function(img) {
|
|
42355
|
+
texture2D.setImageSource(img);
|
|
42356
|
+
onComplete();
|
|
42357
|
+
}, reject);
|
|
42358
|
+
if (mipmap) {
|
|
42359
|
+
var _loop = function _loop(i1) {
|
|
42360
|
+
_this._loadImageBuffer(imagesData[i1]).then(function(img) {
|
|
42361
|
+
texture2D.setImageSource(img, i1);
|
|
42362
|
+
onComplete();
|
|
42363
|
+
}, reject);
|
|
42364
|
+
};
|
|
42365
|
+
texture2D.generateMipmaps();
|
|
42366
|
+
for(var i1 = 1; i1 < mipCount; i1++)_loop(i1);
|
|
42367
|
+
}
|
|
42377
42368
|
}
|
|
42378
42369
|
});
|
|
42379
42370
|
};
|
|
42371
|
+
Texture2DDecoder._loadImageBuffer = function _loadImageBuffer(imageBuffer) {
|
|
42372
|
+
return new Promise(function(resolve, reject) {
|
|
42373
|
+
var blob = new window.Blob([
|
|
42374
|
+
imageBuffer
|
|
42375
|
+
]);
|
|
42376
|
+
var img = new Image();
|
|
42377
|
+
img.onerror = function() {
|
|
42378
|
+
reject(new Error("Failed to load image buffer"));
|
|
42379
|
+
};
|
|
42380
|
+
img.onload = function() {
|
|
42381
|
+
// Call requestAnimationFrame to avoid iOS's bug.
|
|
42382
|
+
requestAnimationFrame(function() {
|
|
42383
|
+
resolve(img);
|
|
42384
|
+
img.onload = null;
|
|
42385
|
+
img.onerror = null;
|
|
42386
|
+
img.onabort = null;
|
|
42387
|
+
});
|
|
42388
|
+
};
|
|
42389
|
+
img.crossOrigin = "anonymous";
|
|
42390
|
+
img.src = URL.createObjectURL(blob);
|
|
42391
|
+
});
|
|
42392
|
+
};
|
|
42380
42393
|
return Texture2DDecoder;
|
|
42381
42394
|
}();
|
|
42382
42395
|
exports.Texture2DDecoder = __decorate([
|
|
@@ -43205,15 +43218,11 @@
|
|
|
43205
43218
|
_inherits(EditorTextureLoader, Loader1);
|
|
43206
43219
|
var _proto = EditorTextureLoader.prototype;
|
|
43207
43220
|
_proto.load = function load(item, resourceManager) {
|
|
43208
|
-
return
|
|
43209
|
-
|
|
43210
|
-
|
|
43211
|
-
|
|
43212
|
-
|
|
43213
|
-
decode(data, resourceManager.engine).then(function(texture) {
|
|
43214
|
-
resolve(texture);
|
|
43215
|
-
});
|
|
43216
|
-
}).catch(reject);
|
|
43221
|
+
return resourceManager // @ts-ignore
|
|
43222
|
+
._request(item.url, _extends({}, item, {
|
|
43223
|
+
type: "arraybuffer"
|
|
43224
|
+
})).then(function(data) {
|
|
43225
|
+
return decode(data, resourceManager.engine);
|
|
43217
43226
|
});
|
|
43218
43227
|
};
|
|
43219
43228
|
return EditorTextureLoader;
|
|
@@ -43296,79 +43305,76 @@
|
|
|
43296
43305
|
var _proto = AnimatorControllerLoader.prototype;
|
|
43297
43306
|
_proto.load = function load(item, resourceManager) {
|
|
43298
43307
|
var _this = this;
|
|
43299
|
-
return
|
|
43300
|
-
|
|
43301
|
-
|
|
43302
|
-
|
|
43303
|
-
|
|
43304
|
-
|
|
43305
|
-
|
|
43306
|
-
|
|
43307
|
-
|
|
43308
|
-
|
|
43309
|
-
|
|
43310
|
-
|
|
43311
|
-
|
|
43312
|
-
|
|
43313
|
-
|
|
43314
|
-
|
|
43315
|
-
|
|
43316
|
-
|
|
43317
|
-
|
|
43318
|
-
|
|
43319
|
-
|
|
43320
|
-
|
|
43321
|
-
|
|
43322
|
-
|
|
43323
|
-
|
|
43324
|
-
|
|
43325
|
-
state.addStateMachineScript(Loader.getClass(script));
|
|
43326
|
-
});
|
|
43327
|
-
statesMap[id] = state;
|
|
43328
|
-
if (clipData) {
|
|
43329
|
-
promises.push(new Promise(function(resolve) {
|
|
43330
|
-
//@ts-ignore
|
|
43331
|
-
resourceManager.getResourceByRef(clipData).then(function(clip) {
|
|
43332
|
-
resolve({
|
|
43333
|
-
layerIndex: layerIndex,
|
|
43334
|
-
stateIndex: stateIndex,
|
|
43335
|
-
clip: clip
|
|
43336
|
-
});
|
|
43337
|
-
});
|
|
43338
|
-
}));
|
|
43339
|
-
}
|
|
43340
|
-
});
|
|
43341
|
-
transitions.forEach(function(transitionData) {
|
|
43342
|
-
var transition = _this._createTransition(transitionData, statesMap[transitionData.destinationStateId]);
|
|
43343
|
-
transitionsMap[transitionData.id] = transition;
|
|
43344
|
-
});
|
|
43345
|
-
states.forEach(function(stateData) {
|
|
43346
|
-
var id = stateData.id, transitions = stateData.transitions;
|
|
43347
|
-
transitions.forEach(function(transitionId) {
|
|
43348
|
-
var transition = transitionsMap[transitionId];
|
|
43349
|
-
transition && statesMap[id].addTransition(transition);
|
|
43350
|
-
});
|
|
43351
|
-
});
|
|
43352
|
-
entryTransitions.forEach(function(entryTransitionData) {
|
|
43353
|
-
stateMachine.addEntryStateTransition(_this._createTransition(entryTransitionData, statesMap[entryTransitionData.destinationStateId]));
|
|
43308
|
+
return resourceManager // @ts-ignore
|
|
43309
|
+
._request(item.url, _extends({}, item, {
|
|
43310
|
+
type: "json"
|
|
43311
|
+
})).then(function(data) {
|
|
43312
|
+
var animatorController = new AnimatorController(resourceManager.engine);
|
|
43313
|
+
var layers = data.layers, parameters = data.parameters;
|
|
43314
|
+
var promises = [];
|
|
43315
|
+
layers.forEach(function(layerData, layerIndex) {
|
|
43316
|
+
var name = layerData.name, blendingMode = layerData.blendingMode, weight = layerData.weight, stateMachineData = layerData.stateMachine;
|
|
43317
|
+
var layer = new AnimatorControllerLayer(name);
|
|
43318
|
+
layer.blendingMode = blendingMode;
|
|
43319
|
+
layer.weight = weight;
|
|
43320
|
+
if (stateMachineData) {
|
|
43321
|
+
var states = stateMachineData.states, transitions = stateMachineData.transitions, entryTransitions = stateMachineData.entryTransitions, anyTransitions = stateMachineData.anyTransitions;
|
|
43322
|
+
var stateMachine = layer.stateMachine;
|
|
43323
|
+
var statesMap = {};
|
|
43324
|
+
var transitionsMap = {};
|
|
43325
|
+
states.forEach(function(stateData, stateIndex) {
|
|
43326
|
+
var id = stateData.id, name = stateData.name, speed = stateData.speed, wrapMode = stateData.wrapMode, clipStartNormalizedTime = stateData.clipStartNormalizedTime, clipEndNormalizedTime = stateData.clipEndNormalizedTime, clipData = stateData.clip, scripts = stateData.scripts;
|
|
43327
|
+
var state = stateMachine.addState(name);
|
|
43328
|
+
state.speed = speed;
|
|
43329
|
+
state.wrapMode = wrapMode;
|
|
43330
|
+
state.clipStartTime = clipStartNormalizedTime;
|
|
43331
|
+
state.clipEndTime = clipEndNormalizedTime;
|
|
43332
|
+
scripts.forEach(function(script) {
|
|
43333
|
+
state.addStateMachineScript(Loader.getClass(script));
|
|
43354
43334
|
});
|
|
43355
|
-
|
|
43356
|
-
|
|
43335
|
+
statesMap[id] = state;
|
|
43336
|
+
if (clipData) {
|
|
43337
|
+
promises.push(resourceManager.getResourceByRef(clipData).then(function(clip) {
|
|
43338
|
+
return {
|
|
43339
|
+
layerIndex: layerIndex,
|
|
43340
|
+
stateIndex: stateIndex,
|
|
43341
|
+
clip: clip
|
|
43342
|
+
};
|
|
43343
|
+
}));
|
|
43344
|
+
}
|
|
43345
|
+
});
|
|
43346
|
+
transitions.forEach(function(transitionData) {
|
|
43347
|
+
var transition = _this._createTransition(transitionData, statesMap[transitionData.destinationStateId]);
|
|
43348
|
+
transitionsMap[transitionData.id] = transition;
|
|
43349
|
+
});
|
|
43350
|
+
states.forEach(function(stateData) {
|
|
43351
|
+
var id = stateData.id, transitions = stateData.transitions;
|
|
43352
|
+
transitions.forEach(function(transitionId) {
|
|
43353
|
+
var transition = transitionsMap[transitionId];
|
|
43354
|
+
transition && statesMap[id].addTransition(transition);
|
|
43357
43355
|
});
|
|
43358
|
-
}
|
|
43359
|
-
|
|
43360
|
-
|
|
43361
|
-
|
|
43362
|
-
|
|
43363
|
-
|
|
43364
|
-
|
|
43356
|
+
});
|
|
43357
|
+
entryTransitions.forEach(function(entryTransitionData) {
|
|
43358
|
+
stateMachine.addEntryStateTransition(_this._createTransition(entryTransitionData, statesMap[entryTransitionData.destinationStateId]));
|
|
43359
|
+
});
|
|
43360
|
+
anyTransitions.forEach(function(anyTransitionData) {
|
|
43361
|
+
stateMachine.addAnyStateTransition(_this._createTransition(anyTransitionData, statesMap[anyTransitionData.destinationStateId]));
|
|
43362
|
+
});
|
|
43363
|
+
}
|
|
43364
|
+
animatorController.addLayer(layer);
|
|
43365
|
+
});
|
|
43366
|
+
parameters.forEach(function(parameterData) {
|
|
43367
|
+
animatorController.addParameter(parameterData.name, parameterData.defaultValue);
|
|
43368
|
+
});
|
|
43369
|
+
return new AssetPromise(function(resolve, reject) {
|
|
43370
|
+
AssetPromise.all(promises).then(function(clipData) {
|
|
43365
43371
|
clipData.forEach(function(data) {
|
|
43366
43372
|
var layerIndex = data.layerIndex, stateIndex = data.stateIndex, clip = data.clip;
|
|
43367
43373
|
animatorController.layers[layerIndex].stateMachine.states[stateIndex].clip = clip;
|
|
43368
43374
|
});
|
|
43369
43375
|
resolve(animatorController);
|
|
43370
|
-
});
|
|
43371
|
-
})
|
|
43376
|
+
}, reject).catch(reject);
|
|
43377
|
+
});
|
|
43372
43378
|
});
|
|
43373
43379
|
};
|
|
43374
43380
|
_proto._createTransition = function _createTransition(transitionData, destinationState) {
|
|
@@ -48877,7 +48883,7 @@
|
|
|
48877
48883
|
], EXT_texture_webp);
|
|
48878
48884
|
|
|
48879
48885
|
//@ts-ignore
|
|
48880
|
-
var version = "1.3.
|
|
48886
|
+
var version = "1.3.28";
|
|
48881
48887
|
console.log("Galacean engine version: " + version);
|
|
48882
48888
|
for(var key in CoreObjects){
|
|
48883
48889
|
Loader.registerClass(key, CoreObjects[key]);
|