@galacean/engine-loader 1.1.0-beta.21 → 1.1.0-beta.22
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 +28 -14
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +28 -14
- package/dist/module.js +29 -15
- package/dist/module.js.map +1 -1
- package/package.json +5 -5
- package/types/gltf/GLTFUtil.d.ts +3 -3
- package/types/index.d.ts +1 -1
- package/types/ktx2/BinomialLLCTranscoder/BinomialLLCTranscoder.d.ts +13 -0
- package/types/ktx2/BinomialLLCTranscoder/TranscodeWorkerCode.d.ts +33 -0
- package/types/ktx2/KTX2Loader.d.ts +12 -2
- package/types/ktx2/KhronosTranscoder/KhronosTranscoder.d.ts +17 -0
- package/types/ktx2/KhronosTranscoder/TranscoderWorkerCode.d.ts +34 -0
- package/types/ktx2/TranscodeResult.d.ts +10 -0
- package/types/ktx2/constants.d.ts +7 -0
- package/types/ktx2/zstddec.d.ts +62 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@galacean/engine-loader",
|
|
3
|
-
"version": "1.1.0-beta.
|
|
3
|
+
"version": "1.1.0-beta.22",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public",
|
|
6
6
|
"registry": "https://registry.npmjs.org"
|
|
@@ -15,10 +15,10 @@
|
|
|
15
15
|
"types/**/*"
|
|
16
16
|
],
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@galacean/engine-
|
|
19
|
-
"@galacean/engine-
|
|
20
|
-
"@galacean/engine-
|
|
21
|
-
"@galacean/engine-rhi-webgl": "1.1.0-beta.
|
|
18
|
+
"@galacean/engine-math": "1.1.0-beta.22",
|
|
19
|
+
"@galacean/engine-core": "1.1.0-beta.22",
|
|
20
|
+
"@galacean/engine-draco": "1.1.0-beta.22",
|
|
21
|
+
"@galacean/engine-rhi-webgl": "1.1.0-beta.22"
|
|
22
22
|
},
|
|
23
23
|
"scripts": {
|
|
24
24
|
"b:types": "tsc"
|
package/types/gltf/GLTFUtil.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { IndexFormat, TypedArray, VertexElementFormat } from "@galacean/engine-core";
|
|
2
2
|
import { Color, Vector2, Vector3, Vector4 } from "@galacean/engine-math";
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { BufferInfo, ParserContext } from "./parser/ParserContext";
|
|
4
|
+
import { AccessorComponentType, AccessorType, IAccessor, IBufferView, IGLTF } from "./Schema";
|
|
5
5
|
/**
|
|
6
6
|
* @internal
|
|
7
7
|
*/
|
|
@@ -23,7 +23,7 @@ export declare class GLTFUtil {
|
|
|
23
23
|
*/
|
|
24
24
|
static getComponentType(componentType: AccessorComponentType): Int8ArrayConstructor | Uint8ArrayConstructor | Int16ArrayConstructor | Uint16ArrayConstructor | Uint32ArrayConstructor | Float32ArrayConstructor;
|
|
25
25
|
static getNormalizedComponentScale(componentType: AccessorComponentType): number;
|
|
26
|
-
static getAccessorBuffer(context:
|
|
26
|
+
static getAccessorBuffer(context: ParserContext, gltf: IGLTF, accessor: IAccessor): BufferInfo;
|
|
27
27
|
/**
|
|
28
28
|
* @deprecated
|
|
29
29
|
* Get accessor data.
|
package/types/index.d.ts
CHANGED
|
@@ -22,6 +22,6 @@ export * from "./SceneLoader";
|
|
|
22
22
|
export type { Texture2DParams } from "./Texture2DLoader";
|
|
23
23
|
export { parseSingleKTX } from "./compressed-texture";
|
|
24
24
|
export * from "./gltf";
|
|
25
|
-
export { KTX2Loader } from "./ktx2/KTX2Loader";
|
|
25
|
+
export { KTX2Loader, KTX2Transcoder } from "./ktx2/KTX2Loader";
|
|
26
26
|
export { KTX2TargetFormat } from "./ktx2/KTX2TargetFormat";
|
|
27
27
|
export * from "./resource-deserialize";
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { KTX2TargetFormat } from "../KTX2TargetFormat";
|
|
2
|
+
import { TranscodeResult } from "../TranscodeResult";
|
|
3
|
+
/** @internal */
|
|
4
|
+
export declare class BinomialLLCTranscoder {
|
|
5
|
+
readonly workerLimit: number;
|
|
6
|
+
static MessageId: number;
|
|
7
|
+
private _transcodeWorkerPool;
|
|
8
|
+
private _initPromise;
|
|
9
|
+
constructor(workerLimit: number);
|
|
10
|
+
init(): Promise<any>;
|
|
11
|
+
transcode(buffer: ArrayBuffer, format: KTX2TargetFormat): Promise<TranscodeResult>;
|
|
12
|
+
destroy(): void;
|
|
13
|
+
}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
type MessageType = "init" | "transcode";
|
|
2
|
+
export interface IBaseMessage {
|
|
3
|
+
type: MessageType;
|
|
4
|
+
}
|
|
5
|
+
export interface IInitMessage extends IBaseMessage {
|
|
6
|
+
type: "init";
|
|
7
|
+
transcoderWasm: ArrayBuffer;
|
|
8
|
+
}
|
|
9
|
+
export interface ITranscodeMessage extends IBaseMessage {
|
|
10
|
+
type: "transcode";
|
|
11
|
+
format: number;
|
|
12
|
+
buffer: ArrayBuffer;
|
|
13
|
+
}
|
|
14
|
+
export type IMessage = IInitMessage | ITranscodeMessage;
|
|
15
|
+
export type TranscodeResult = {
|
|
16
|
+
width: number;
|
|
17
|
+
height: number;
|
|
18
|
+
hasAlpha: boolean;
|
|
19
|
+
format: number;
|
|
20
|
+
faces: Array<{
|
|
21
|
+
data: Uint8Array;
|
|
22
|
+
width: number;
|
|
23
|
+
height: number;
|
|
24
|
+
}>[];
|
|
25
|
+
faceCount: number;
|
|
26
|
+
};
|
|
27
|
+
export type TranscodeResponse = {
|
|
28
|
+
id: number;
|
|
29
|
+
type: "transcoded";
|
|
30
|
+
} & TranscodeResult;
|
|
31
|
+
/** @internal */
|
|
32
|
+
export declare function TranscodeWorkerCode(): void;
|
|
33
|
+
export {};
|
|
@@ -25,22 +25,29 @@ export declare class KTX2Loader extends Loader<Texture2D | TextureCube> {
|
|
|
25
25
|
private static _getBinomialLLCTranscoder;
|
|
26
26
|
private static _getKhronosTranscoder;
|
|
27
27
|
private static _getEngineTextureFormat;
|
|
28
|
-
initialize(
|
|
28
|
+
initialize(_: Engine, configuration: EngineConfiguration): Promise<void>;
|
|
29
29
|
/**
|
|
30
30
|
* @internal
|
|
31
31
|
*/
|
|
32
32
|
load(item: LoadItem & {
|
|
33
33
|
params?: KTX2Params;
|
|
34
34
|
}, resourceManager: ResourceManager): AssetPromise<Texture2D | TextureCube>;
|
|
35
|
-
private _isKhronosSupported;
|
|
36
35
|
}
|
|
37
36
|
/**
|
|
38
37
|
* KTX2 loader params interface.
|
|
39
38
|
*/
|
|
40
39
|
export interface KTX2Params {
|
|
41
40
|
/** Priority transcoding format queue which is preferred options, default is BC7/ASTC/BC3_BC1/ETC/PVRTC/R8G8B8A8. */
|
|
41
|
+
/** @deprecated */
|
|
42
42
|
priorityFormats: KTX2TargetFormat[];
|
|
43
43
|
}
|
|
44
|
+
/** Used for initialize KTX2 transcoder. */
|
|
45
|
+
export declare enum KTX2Transcoder {
|
|
46
|
+
/** BinomialLLC transcoder. */
|
|
47
|
+
BinomialLLC = 0,
|
|
48
|
+
/** Khronos transcoder. */
|
|
49
|
+
Khronos = 1
|
|
50
|
+
}
|
|
44
51
|
declare module "@galacean/engine-core" {
|
|
45
52
|
interface EngineConfiguration {
|
|
46
53
|
/** KTX2 loader options. */
|
|
@@ -48,7 +55,10 @@ declare module "@galacean/engine-core" {
|
|
|
48
55
|
/** Worker count for transcoder, default is 4. */
|
|
49
56
|
workerCount?: number;
|
|
50
57
|
/** Global transcoding format queue which will be used if not specified in per-instance param, default is BC7/ASTC/BC3_BC1/ETC/PVRTC/R8G8B8A8. */
|
|
58
|
+
/** @deprecated */
|
|
51
59
|
priorityFormats?: KTX2TargetFormat[];
|
|
60
|
+
/** Used for initialize KTX2 transcoder, default is BinomialLLC. */
|
|
61
|
+
transcoder?: KTX2Transcoder;
|
|
52
62
|
};
|
|
53
63
|
}
|
|
54
64
|
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { KTX2Container } from "../KTX2Container";
|
|
2
|
+
import { KTX2TargetFormat } from "../KTX2TargetFormat";
|
|
3
|
+
import { TranscodeResult } from "./TranscoderWorkerCode";
|
|
4
|
+
/** @internal */
|
|
5
|
+
export declare class KhronosTranscoder {
|
|
6
|
+
readonly workerLimit: number;
|
|
7
|
+
readonly type: KTX2TargetFormat;
|
|
8
|
+
static transcoderMap: {
|
|
9
|
+
0: string;
|
|
10
|
+
};
|
|
11
|
+
private _transcodeWorkerPool;
|
|
12
|
+
private _initPromise;
|
|
13
|
+
constructor(workerLimit: number, type: KTX2TargetFormat);
|
|
14
|
+
init(): Promise<any>;
|
|
15
|
+
transcode(ktx2Container: KTX2Container): Promise<TranscodeResult>;
|
|
16
|
+
destroy(): void;
|
|
17
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
export interface EncodedData {
|
|
2
|
+
buffer: Uint8Array;
|
|
3
|
+
levelWidth: number;
|
|
4
|
+
levelHeight: number;
|
|
5
|
+
uncompressedByteLength: number;
|
|
6
|
+
}
|
|
7
|
+
type MessageType = "init" | "transcode";
|
|
8
|
+
export interface IBaseMessage {
|
|
9
|
+
type: MessageType;
|
|
10
|
+
}
|
|
11
|
+
export interface IInitMessage extends IBaseMessage {
|
|
12
|
+
type: "init";
|
|
13
|
+
transcoderWasm: ArrayBuffer;
|
|
14
|
+
}
|
|
15
|
+
export interface ITranscodeMessage extends IBaseMessage {
|
|
16
|
+
type: "transcode";
|
|
17
|
+
format: number;
|
|
18
|
+
needZstd: boolean;
|
|
19
|
+
data: EncodedData[][];
|
|
20
|
+
}
|
|
21
|
+
export type IMessage = IInitMessage | ITranscodeMessage;
|
|
22
|
+
export type TranscodeResult = {
|
|
23
|
+
data: Array<{
|
|
24
|
+
data: Uint8Array;
|
|
25
|
+
width: number;
|
|
26
|
+
height: number;
|
|
27
|
+
}>;
|
|
28
|
+
};
|
|
29
|
+
export type TranscodeResponse = {
|
|
30
|
+
id: number;
|
|
31
|
+
type: "transcoded";
|
|
32
|
+
} & TranscodeResult;
|
|
33
|
+
export declare function TranscodeWorkerCode(): void;
|
|
34
|
+
export {};
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* From https://github.com/donmccurdy/zstddec by Don McCurdy
|
|
3
|
+
*/
|
|
4
|
+
interface DecoderExports {
|
|
5
|
+
memory: Uint8Array;
|
|
6
|
+
ZSTD_findDecompressedSize: (compressedPtr: number, compressedSize: number) => number;
|
|
7
|
+
ZSTD_decompress: (uncompressedPtr: number, uncompressedSize: number, compressedPtr: number, compressedSize: number) => number;
|
|
8
|
+
malloc: (ptr: number) => number;
|
|
9
|
+
free: (ptr: number) => void;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* ZSTD (Zstandard) decoder.
|
|
13
|
+
*/
|
|
14
|
+
export declare class ZSTDDecoder {
|
|
15
|
+
static heap: Uint8Array;
|
|
16
|
+
static IMPORT_OBJECT: {
|
|
17
|
+
env: {
|
|
18
|
+
emscripten_notify_memory_growth: () => void;
|
|
19
|
+
};
|
|
20
|
+
};
|
|
21
|
+
static instance: {
|
|
22
|
+
exports: DecoderExports;
|
|
23
|
+
};
|
|
24
|
+
static WasmModuleURL: string;
|
|
25
|
+
_initPromise: Promise<any>;
|
|
26
|
+
init(): Promise<void>;
|
|
27
|
+
_init(result: WebAssembly.WebAssemblyInstantiatedSource): void;
|
|
28
|
+
decode(array: Uint8Array, uncompressedSize?: number): Uint8Array;
|
|
29
|
+
}
|
|
30
|
+
export {};
|
|
31
|
+
/**
|
|
32
|
+
* BSD License
|
|
33
|
+
*
|
|
34
|
+
* For Zstandard software
|
|
35
|
+
*
|
|
36
|
+
* Copyright (c) 2016-present, Yann Collet, Facebook, Inc. All rights reserved.
|
|
37
|
+
*
|
|
38
|
+
* Redistribution and use in source and binary forms, with or without modification,
|
|
39
|
+
* are permitted provided that the following conditions are met:
|
|
40
|
+
*
|
|
41
|
+
* * Redistributions of source code must retain the above copyright notice, this
|
|
42
|
+
* list of conditions and the following disclaimer.
|
|
43
|
+
*
|
|
44
|
+
* * Redistributions in binary form must reproduce the above copyright notice,
|
|
45
|
+
* this list of conditions and the following disclaimer in the documentation
|
|
46
|
+
* and/or other materials provided with the distribution.
|
|
47
|
+
*
|
|
48
|
+
* * Neither the name Facebook nor the names of its contributors may be used to
|
|
49
|
+
* endorse or promote products derived from this software without specific
|
|
50
|
+
* prior written permission.
|
|
51
|
+
*
|
|
52
|
+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
53
|
+
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
54
|
+
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
55
|
+
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
|
56
|
+
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
57
|
+
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
58
|
+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
59
|
+
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
60
|
+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
61
|
+
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
62
|
+
*/
|