@galacean/engine 1.1.0-beta.1 → 1.1.0-beta.3

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 CHANGED
@@ -11056,6 +11056,12 @@
11056
11056
  };
11057
11057
  return BlendState;
11058
11058
  }();
11059
+ __decorate$1([
11060
+ deepClone
11061
+ ], BlendState.prototype, "targetBlendState", void 0);
11062
+ __decorate$1([
11063
+ deepClone
11064
+ ], BlendState.prototype, "blendColor", void 0);
11059
11065
  /**
11060
11066
  * Depth state.
11061
11067
  */ var DepthState = /*#__PURE__*/ function() {
@@ -11434,6 +11440,18 @@
11434
11440
  };
11435
11441
  return RenderState;
11436
11442
  }();
11443
+ __decorate$1([
11444
+ deepClone
11445
+ ], RenderState.prototype, "blendState", void 0);
11446
+ __decorate$1([
11447
+ deepClone
11448
+ ], RenderState.prototype, "depthState", void 0);
11449
+ __decorate$1([
11450
+ deepClone
11451
+ ], RenderState.prototype, "stencilState", void 0);
11452
+ __decorate$1([
11453
+ deepClone
11454
+ ], RenderState.prototype, "rasterState", void 0);
11437
11455
  /**
11438
11456
  * Shader for rendering.
11439
11457
  */ var Shader = /*#__PURE__*/ function() {
@@ -39299,20 +39317,56 @@
39299
39317
  return AbstractTranscoder;
39300
39318
  }();
39301
39319
  /** @internal */ function TranscodeWorkerCode$1() {
39302
- var concat = function concat(arrays) {
39303
- if (arrays.length === 1) return arrays[0];
39304
- var totalByteLength = 0;
39305
- for(var i = 0; i < arrays.length; i++){
39306
- totalByteLength += arrays[i].byteLength;
39320
+ self.onmessage = function onmessage(event) {
39321
+ var message = event.data;
39322
+ switch(message.type){
39323
+ case "init":
39324
+ init(message.transcoderWasm).then(function() {
39325
+ self.postMessage("init-completed");
39326
+ }).catch(function(e) {
39327
+ return self.postMessage({
39328
+ error: e
39329
+ });
39330
+ });
39331
+ break;
39332
+ case "transcode":
39333
+ init().then(function(KTX2File) {
39334
+ var result = transcode(message.buffer, message.format, KTX2File);
39335
+ // @ts-ignore
39336
+ result.type = "transcoded";
39337
+ self.postMessage(result);
39338
+ }).catch(function(e) {
39339
+ return self.postMessage({
39340
+ error: e
39341
+ });
39342
+ });
39343
+ break;
39307
39344
  }
39308
- var result = new Uint8Array(totalByteLength);
39309
- var byteOffset = 0;
39310
- for(var i1 = 0; i1 < arrays.length; i1++){
39311
- result.set(arrays[i1], byteOffset);
39312
- byteOffset += arrays[i1].byteLength;
39345
+ };
39346
+ }
39347
+ var _init = function init() {
39348
+ var initPromise;
39349
+ return function init(wasmBinary) {
39350
+ if (!initPromise) {
39351
+ initPromise = new Promise(function(resolve, reject) {
39352
+ var BasisModule = {
39353
+ wasmBinary: wasmBinary,
39354
+ onRuntimeInitialized: function onRuntimeInitialized() {
39355
+ return resolve(BasisModule);
39356
+ },
39357
+ onAbort: reject
39358
+ };
39359
+ self["BASIS"](BasisModule);
39360
+ }).then(function(BasisModule) {
39361
+ BasisModule.initializeBasis();
39362
+ return BasisModule.KTX2File;
39363
+ });
39313
39364
  }
39314
- return result;
39365
+ return initPromise;
39315
39366
  };
39367
+ };
39368
+ var init = _init();
39369
+ function transcode(buffer, targetFormat, KTX2File) {
39316
39370
  var getTranscodeFormatFromTarget = function getTranscodeFormatFromTarget(target, hasAlpha) {
39317
39371
  switch(target){
39318
39372
  case 2:
@@ -39329,76 +39383,24 @@
39329
39383
  return 7;
39330
39384
  }
39331
39385
  };
39332
- var init = function init(wasmBinary) {
39333
- transcodePromise = new Promise(function(resolve, reject) {
39334
- var BasisModule = {
39335
- wasmBinary: wasmBinary,
39336
- onRuntimeInitialized: function onRuntimeInitialized() {
39337
- return resolve(BasisModule);
39338
- },
39339
- onAbort: reject
39340
- };
39341
- self["BASIS"](BasisModule);
39342
- }).then(function(BasisModule) {
39343
- BasisModule.initializeBasis();
39344
- return BasisModule.KTX2File;
39345
- });
39346
- return transcodePromise;
39347
- };
39348
- var transcode = function transcode(buffer, targetFormat, KTX2File) {
39349
- var cleanup = function cleanup() {
39350
- ktx2File.close();
39351
- ktx2File.delete();
39352
- };
39353
- var ktx2File = new KTX2File(new Uint8Array(buffer));
39354
- if (!ktx2File.isValid()) {
39355
- cleanup();
39356
- throw new Error("Invalid or unsupported .ktx2 file");
39357
- }
39358
- var width = ktx2File.getWidth();
39359
- var height = ktx2File.getHeight();
39360
- var layerCount = ktx2File.getLayers() || 1;
39361
- var levelCount = ktx2File.getLevels();
39362
- var hasAlpha = ktx2File.getHasAlpha();
39363
- var faceCount = ktx2File.getFaces();
39364
- var format = getTranscodeFormatFromTarget(targetFormat, hasAlpha);
39365
- var faces = new Array(faceCount);
39366
- for(var face = 0; face < faceCount; face++){
39367
- var mipmaps = new Array(levelCount);
39368
- for(var mip = 0; mip < levelCount; mip++){
39369
- var layerMips = new Array(layerCount);
39370
- var mipWidth = void 0, mipHeight = void 0;
39371
- for(var layer = 0; layer < layerCount; layer++){
39372
- var levelInfo = ktx2File.getImageLevelInfo(mip, layer, face);
39373
- mipWidth = levelInfo.origWidth;
39374
- mipHeight = levelInfo.origHeight;
39375
- var dst = new Uint8Array(ktx2File.getImageTranscodedSizeInBytes(mip, layer, 0, format));
39376
- var status = ktx2File.transcodeImage(dst, mip, layer, face, format, 0, -1, -1);
39377
- if (!status) {
39378
- cleanup();
39379
- throw new Error("transcodeImage failed.");
39380
- }
39381
- layerMips[layer] = dst;
39382
- }
39383
- mipmaps[mip] = {
39384
- data: concat(layerMips),
39385
- width: mipWidth,
39386
- height: mipHeight
39387
- };
39388
- }
39389
- faces[face] = mipmaps;
39386
+ var concat = function concat(arrays) {
39387
+ if (arrays.length === 1) return arrays[0];
39388
+ var totalByteLength = 0;
39389
+ for(var i = 0; i < arrays.length; i++){
39390
+ totalByteLength += arrays[i].byteLength;
39390
39391
  }
39391
- cleanup();
39392
- return {
39393
- faces: faces,
39394
- width: width,
39395
- height: height,
39396
- hasAlpha: hasAlpha,
39397
- faceCount: faceCount,
39398
- format: format
39399
- };
39392
+ var result = new Uint8Array(totalByteLength);
39393
+ var byteOffset = 0;
39394
+ for(var i1 = 0; i1 < arrays.length; i1++){
39395
+ result.set(arrays[i1], byteOffset);
39396
+ byteOffset += arrays[i1].byteLength;
39397
+ }
39398
+ return result;
39399
+ };
39400
+ var cleanup = function cleanup() {
39401
+ ktx2File.close();
39402
+ ktx2File.delete();
39400
39403
  };
39401
- var transcodePromise;
39402
39404
  var BasisFormat;
39403
39405
  (function(BasisFormat) {
39404
39406
  BasisFormat[BasisFormat["ETC1"] = 0] = "ETC1";
@@ -39424,31 +39426,52 @@
39424
39426
  TargetFormat[TargetFormat["RG8"] = 6] = "RG8";
39425
39427
  TargetFormat[TargetFormat["RGBA8"] = 7] = "RGBA8";
39426
39428
  })(TargetFormat || (TargetFormat = {}));
39427
- self.onmessage = function onmessage(event) {
39428
- var message = event.data;
39429
- switch(message.type){
39430
- case "init":
39431
- init(message.transcoderWasm).then(function() {
39432
- return self.postMessage("init-completed");
39433
- }).catch(function(e) {
39434
- return self.postMessage({
39435
- error: e
39436
- });
39437
- });
39438
- break;
39439
- case "transcode":
39440
- transcodePromise.then(function(KTX2File) {
39441
- var result = transcode(message.buffer, message.format, KTX2File);
39442
- // @ts-ignore
39443
- result.type = "transcoded";
39444
- self.postMessage(result);
39445
- }).catch(function(e) {
39446
- return self.postMessage({
39447
- error: e
39448
- });
39449
- });
39450
- break;
39429
+ var ktx2File = new KTX2File(new Uint8Array(buffer));
39430
+ if (!ktx2File.isValid()) {
39431
+ cleanup();
39432
+ throw new Error("Invalid or unsupported .ktx2 file");
39433
+ }
39434
+ var width = ktx2File.getWidth();
39435
+ var height = ktx2File.getHeight();
39436
+ var layerCount = ktx2File.getLayers() || 1;
39437
+ var levelCount = ktx2File.getLevels();
39438
+ var hasAlpha = ktx2File.getHasAlpha();
39439
+ var faceCount = ktx2File.getFaces();
39440
+ var format = getTranscodeFormatFromTarget(targetFormat, hasAlpha);
39441
+ var faces = new Array(faceCount);
39442
+ for(var face = 0; face < faceCount; face++){
39443
+ var mipmaps = new Array(levelCount);
39444
+ for(var mip = 0; mip < levelCount; mip++){
39445
+ var layerMips = new Array(layerCount);
39446
+ var mipWidth = void 0, mipHeight = void 0;
39447
+ for(var layer = 0; layer < layerCount; layer++){
39448
+ var levelInfo = ktx2File.getImageLevelInfo(mip, layer, face);
39449
+ mipWidth = levelInfo.origWidth;
39450
+ mipHeight = levelInfo.origHeight;
39451
+ var dst = new Uint8Array(ktx2File.getImageTranscodedSizeInBytes(mip, layer, 0, format));
39452
+ var status = ktx2File.transcodeImage(dst, mip, layer, face, format, 0, -1, -1);
39453
+ if (!status) {
39454
+ cleanup();
39455
+ throw new Error("transcodeImage failed.");
39456
+ }
39457
+ layerMips[layer] = dst;
39458
+ }
39459
+ mipmaps[mip] = {
39460
+ data: concat(layerMips),
39461
+ width: mipWidth,
39462
+ height: mipHeight
39463
+ };
39451
39464
  }
39465
+ faces[face] = mipmaps;
39466
+ }
39467
+ cleanup();
39468
+ return {
39469
+ faces: faces,
39470
+ width: width,
39471
+ height: height,
39472
+ hasAlpha: hasAlpha,
39473
+ faceCount: faceCount,
39474
+ format: format
39452
39475
  };
39453
39476
  }
39454
39477
  /** @internal */ var BinomialLLCTranscoder = /*#__PURE__*/ function(AbstractTranscoder1) {
@@ -39468,23 +39491,49 @@
39468
39491
  })
39469
39492
  ]).then(function(param) {
39470
39493
  var jsCode = param[0], wasmBuffer = param[1];
39471
- var funcCode = TranscodeWorkerCode$1.toString();
39472
- var transcodeString = funcCode.substring(funcCode.indexOf("{"), funcCode.lastIndexOf("}") + 1);
39473
- var workerCode = "\n " + jsCode + "\n " + transcodeString + "\n ";
39474
- var workerURL = URL.createObjectURL(new Blob([
39475
- workerCode
39476
- ], {
39477
- type: "application/javascript"
39478
- }));
39479
- return _this._createTranscodePool(workerURL, wasmBuffer);
39494
+ if (_this.workerLimitCount === 0) {
39495
+ return new Promise(function(resolve, reject) {
39496
+ var scriptDom = document.createElement("script");
39497
+ scriptDom.src = URL.createObjectURL(new Blob([
39498
+ jsCode
39499
+ ], {
39500
+ type: "application/javascript"
39501
+ }));
39502
+ document.body.appendChild(scriptDom);
39503
+ scriptDom.onload = function() {
39504
+ init(wasmBuffer).then(function() {
39505
+ resolve(null);
39506
+ });
39507
+ };
39508
+ scriptDom.onerror = function() {
39509
+ reject();
39510
+ };
39511
+ });
39512
+ } else {
39513
+ var funcCode = TranscodeWorkerCode$1.toString();
39514
+ var transcodeString = funcCode.substring(funcCode.indexOf("{"), funcCode.lastIndexOf("}") + 1);
39515
+ var workerCode = "\n " + jsCode + "\n var init = (" + _init.toString() + ")();\n " + transcode.toString() + "\n " + transcodeString + "\n ";
39516
+ var workerURL = URL.createObjectURL(new Blob([
39517
+ workerCode
39518
+ ], {
39519
+ type: "application/javascript"
39520
+ }));
39521
+ return _this._createTranscodePool(workerURL, wasmBuffer);
39522
+ }
39480
39523
  });
39481
39524
  };
39482
- _proto.transcode = function transcode(buffer, format) {
39483
- return this._transcodeWorkerPool.postMessage({
39484
- buffer: buffer,
39485
- format: format,
39486
- type: "transcode"
39487
- });
39525
+ _proto.transcode = function transcode1(buffer, format) {
39526
+ if (this.workerLimitCount === 0) {
39527
+ return init().then(function(KTX2File) {
39528
+ return transcode(buffer, format, KTX2File);
39529
+ });
39530
+ } else {
39531
+ return this._transcodeWorkerPool.postMessage({
39532
+ buffer: buffer,
39533
+ format: format,
39534
+ type: "transcode"
39535
+ });
39536
+ }
39488
39537
  };
39489
39538
  return BinomialLLCTranscoder;
39490
39539
  }(AbstractTranscoder);
@@ -39708,7 +39757,7 @@
39708
39757
  _proto.initialize = function initialize(engine, configuration) {
39709
39758
  if (configuration.ktx2Loader) {
39710
39759
  var options = configuration.ktx2Loader;
39711
- if (this._isKhronosSupported(options.priorityFormats, engine)) {
39760
+ if (this._isKhronosSupported(options.priorityFormats, engine) && options.workerCount !== 0) {
39712
39761
  return exports.KTX2Loader._getKhronosTranscoder(options.workerCount).init();
39713
39762
  } else {
39714
39763
  return exports.KTX2Loader._getBinomialLLCTranscoder(options.workerCount).init();
@@ -42857,7 +42906,7 @@
42857
42906
  ], GALACEAN_animation_event);
42858
42907
 
42859
42908
  //@ts-ignore
42860
- var version = "1.1.0-beta.1";
42909
+ var version = "1.1.0-beta.3";
42861
42910
  console.log("Galacean engine version: " + version);
42862
42911
  for(var key in CoreObjects){
42863
42912
  Loader.registerClass(key, CoreObjects[key]);