@galacean/engine-loader 2.0.0-alpha.54 → 2.0.0-alpha.56
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 +94 -72
- package/dist/main.js.map +1 -1
- package/dist/module.js +94 -72
- package/dist/module.js.map +1 -1
- package/package.json +4 -4
- package/types/schema/MaterialSchema.d.ts +39 -9
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@galacean/engine-loader",
|
|
3
|
-
"version": "2.0.0-alpha.
|
|
3
|
+
"version": "2.0.0-alpha.56",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public",
|
|
6
6
|
"registry": "https://registry.npmjs.org"
|
|
@@ -19,9 +19,9 @@
|
|
|
19
19
|
"libs/**/*"
|
|
20
20
|
],
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@galacean/engine-
|
|
23
|
-
"@galacean/engine-
|
|
24
|
-
"@galacean/engine-
|
|
22
|
+
"@galacean/engine-math": "2.0.0-alpha.56",
|
|
23
|
+
"@galacean/engine-core": "2.0.0-alpha.56",
|
|
24
|
+
"@galacean/engine-rhi-webgl": "2.0.0-alpha.56"
|
|
25
25
|
},
|
|
26
26
|
"scripts": {
|
|
27
27
|
"b:types": "tsc"
|
|
@@ -1,20 +1,49 @@
|
|
|
1
1
|
import type { RefItem } from "./CommonSchema";
|
|
2
|
-
import type { IColor, IVector2, IVector3 } from "./BasicSchema";
|
|
3
|
-
|
|
2
|
+
import type { IColor, IVector2, IVector3, IVector4 } from "./BasicSchema";
|
|
3
|
+
interface MaterialData {
|
|
4
4
|
name: string;
|
|
5
|
-
|
|
6
|
-
shaderData: {
|
|
7
|
-
[key: string]: {
|
|
8
|
-
type: MaterialLoaderType;
|
|
9
|
-
value: IVector3 | IVector2 | IColor | number | RefItem;
|
|
10
|
-
};
|
|
11
|
-
};
|
|
5
|
+
shaderData: Record<string, MaterialShaderProperty>;
|
|
12
6
|
macros: Array<{
|
|
13
7
|
name: string;
|
|
14
8
|
value?: string;
|
|
15
9
|
}>;
|
|
10
|
+
}
|
|
11
|
+
interface MaterialWithShaderName extends MaterialData {
|
|
12
|
+
/** Registered shader name used to resolve the material's shader. */
|
|
13
|
+
shader: string;
|
|
14
|
+
shaderRef?: undefined;
|
|
15
|
+
}
|
|
16
|
+
interface MaterialWithShaderReference extends MaterialData {
|
|
17
|
+
/** Shader asset reference that determines the material's shader. */
|
|
16
18
|
shaderRef: RefItem;
|
|
19
|
+
/** Optional shader name retained alongside the explicit reference. */
|
|
20
|
+
shader?: string;
|
|
17
21
|
}
|
|
22
|
+
/** Serialized material with a shader name or an explicit shader asset reference. */
|
|
23
|
+
export type IMaterialSchema = MaterialWithShaderName | MaterialWithShaderReference;
|
|
24
|
+
/** Serialized shader property whose type determines the value representation. */
|
|
25
|
+
export type MaterialShaderProperty = {
|
|
26
|
+
type: MaterialLoaderType.Vector2;
|
|
27
|
+
value: IVector2;
|
|
28
|
+
} | {
|
|
29
|
+
type: MaterialLoaderType.Vector3;
|
|
30
|
+
value: IVector3;
|
|
31
|
+
} | {
|
|
32
|
+
type: MaterialLoaderType.Vector4;
|
|
33
|
+
value: IVector4;
|
|
34
|
+
} | {
|
|
35
|
+
type: MaterialLoaderType.Color;
|
|
36
|
+
value: IColor;
|
|
37
|
+
} | {
|
|
38
|
+
type: MaterialLoaderType.Float | MaterialLoaderType.Integer;
|
|
39
|
+
value: number;
|
|
40
|
+
} | {
|
|
41
|
+
type: MaterialLoaderType.Boolean;
|
|
42
|
+
value: boolean;
|
|
43
|
+
} | {
|
|
44
|
+
type: MaterialLoaderType.Texture;
|
|
45
|
+
value: RefItem;
|
|
46
|
+
};
|
|
18
47
|
export declare enum MaterialLoaderType {
|
|
19
48
|
Vector2 = "Vector2",
|
|
20
49
|
Vector3 = "Vector3",
|
|
@@ -25,3 +54,4 @@ export declare enum MaterialLoaderType {
|
|
|
25
54
|
Boolean = "Boolean",
|
|
26
55
|
Integer = "Integer"
|
|
27
56
|
}
|
|
57
|
+
export {};
|