@tolokoban/tgd 2.0.62 → 2.0.64
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/lib/dist/controller/camera/orbit.d.ts +3 -1
- package/lib/dist/controller/camera/orbit.d.ts.map +1 -1
- package/lib/dist/controller/camera/orbit.js +5 -3
- package/lib/dist/material/bsdf.d.ts +25 -0
- package/lib/dist/material/bsdf.d.ts.map +1 -0
- package/lib/dist/material/bsdf.js +98 -0
- package/lib/dist/material/camera-light.js +2 -2
- package/lib/dist/material/diffuse.js +2 -2
- package/lib/dist/material/face-orientation.js +2 -2
- package/lib/dist/material/hull.js +2 -2
- package/lib/dist/material/index.d.ts +1 -0
- package/lib/dist/material/index.d.ts.map +1 -1
- package/lib/dist/material/index.js +2 -1
- package/lib/dist/material/material.d.ts +15 -4
- package/lib/dist/material/material.d.ts.map +1 -1
- package/lib/dist/material/material.js +3 -2
- package/lib/dist/material/principled.d.ts +25 -0
- package/lib/dist/material/principled.d.ts.map +1 -0
- package/lib/dist/material/principled.js +112 -0
- package/lib/dist/material/toon.js +2 -2
- package/lib/dist/painter/mesh/mesh/mesh.js +2 -2
- package/lib/dist/painter/segments/segments.d.ts.map +1 -1
- package/lib/dist/painter/segments/segments.js +2 -3
- package/lib/dist/texture/texture-cube.d.ts +0 -2
- package/lib/dist/texture/texture-cube.d.ts.map +1 -1
- package/lib/dist/texture/texture-cube.js +12 -1
- package/lib/dist/texture/texture2d.d.ts +0 -2
- package/lib/dist/texture/texture2d.d.ts.map +1 -1
- package/lib/dist/texture/texture2d.js +4 -5
- package/lib/dist/utils/canvas.d.ts +7 -5
- package/lib/dist/utils/canvas.d.ts.map +1 -1
- package/lib/dist/utils/canvas.js +13 -5
- package/package.json +1 -1
|
@@ -11,6 +11,7 @@ export interface TgdControllerCameraOrbitZoomRequest extends TgdInputPointerModi
|
|
|
11
11
|
zoom: number;
|
|
12
12
|
}
|
|
13
13
|
export interface TgdControllerCameraOrbitOptions {
|
|
14
|
+
name?: string;
|
|
14
15
|
zoom: number;
|
|
15
16
|
minZoom: number;
|
|
16
17
|
maxZoom: number;
|
|
@@ -89,6 +90,7 @@ export interface TgdControllerCameraOrbitOptions {
|
|
|
89
90
|
}
|
|
90
91
|
export declare class TgdControllerCameraOrbit {
|
|
91
92
|
private static counter;
|
|
93
|
+
readonly name: string;
|
|
92
94
|
readonly id: string;
|
|
93
95
|
readonly eventChange: TgdEvent<TgdCamera>;
|
|
94
96
|
readonly debug: boolean;
|
|
@@ -138,7 +140,7 @@ export declare class TgdControllerCameraOrbit {
|
|
|
138
140
|
private readonly tmpQuat;
|
|
139
141
|
private lastPointerEventTimestamp;
|
|
140
142
|
private _context;
|
|
141
|
-
constructor(context: TgdContext, { geo, zoom, minZoom, maxZoom, speedZoom, speedOrbit, speedPanning, inertiaZoom, inertiaOrbit, inertiaPanning, fixedTarget, debug, onZoomRequest, cameraInitialState, }?: Partial<TgdControllerCameraOrbitOptions>);
|
|
143
|
+
constructor(context: TgdContext, { name, geo, zoom, minZoom, maxZoom, speedZoom, speedOrbit, speedPanning, inertiaZoom, inertiaOrbit, inertiaPanning, fixedTarget, debug, onZoomRequest, cameraInitialState, }?: Partial<TgdControllerCameraOrbitOptions>);
|
|
142
144
|
get context(): TgdContext;
|
|
143
145
|
set context(value: TgdContext);
|
|
144
146
|
get zoom(): number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orbit.d.ts","sourceRoot":"","sources":["../../../src/controller/camera/orbit.ts"],"names":[],"mappings":"AAMA,OAAO,EAEH,2BAA2B,EAE9B,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"orbit.d.ts","sourceRoot":"","sources":["../../../src/controller/camera/orbit.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@ import { tgdCalcClamp } from "./../../math/math.js";
|
|
|
3
3
|
import { TgdEvent } from "./../../event/index.js";
|
|
4
4
|
import { TgdMat3, TgdQuat, TgdVec3 } from "./../../math/index.js";
|
|
5
5
|
export class TgdControllerCameraOrbit {
|
|
6
|
-
constructor(context, { geo, zoom = 1, minZoom = 1e-3, maxZoom = Infinity, speedZoom = 1, speedOrbit = 1, speedPanning = 1, inertiaZoom = 0, inertiaOrbit = 0, inertiaPanning = 0, fixedTarget = false, debug = false, onZoomRequest = alwaysTrue, cameraInitialState, } = {}) {
|
|
7
|
-
this.id = `TgdControllerCameraOrbit
|
|
6
|
+
constructor(context, { name, geo, zoom = 1, minZoom = 1e-3, maxZoom = Infinity, speedZoom = 1, speedOrbit = 1, speedPanning = 1, inertiaZoom = 0, inertiaOrbit = 0, inertiaPanning = 0, fixedTarget = false, debug = false, onZoomRequest = alwaysTrue, cameraInitialState, } = {}) {
|
|
7
|
+
this.id = `TgdControllerCameraOrbit#${TgdControllerCameraOrbit.counter++}`;
|
|
8
8
|
this.eventChange = new TgdEvent();
|
|
9
9
|
this.minZoom = 1e-3;
|
|
10
10
|
this.maxZoom = Infinity;
|
|
@@ -149,9 +149,11 @@ export class TgdControllerCameraOrbit {
|
|
|
149
149
|
};
|
|
150
150
|
this.handleDebug = (event) => {
|
|
151
151
|
if (event.key === "?") {
|
|
152
|
+
this.context.camera.debug(this.name);
|
|
152
153
|
console.log(this.context.camera.toCode());
|
|
153
154
|
}
|
|
154
155
|
};
|
|
156
|
+
this.name = name !== null && name !== void 0 ? name : this.id;
|
|
155
157
|
this.geo = undefined;
|
|
156
158
|
if (geo) {
|
|
157
159
|
this.geo = Object.assign({ lat: 0, lng: 0, minLat: -Math.PI / 2, maxLat: +Math.PI / 2, minLng: -Number.MAX_VALUE, maxLng: +Number.MAX_VALUE }, geo);
|
|
@@ -337,4 +339,4 @@ function makeGeoVec3(lat, lng) {
|
|
|
337
339
|
const x = radius * Math.sin(lng);
|
|
338
340
|
return new TgdVec3(x, y, z);
|
|
339
341
|
}
|
|
340
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orbit.js","sourceRoot":"","sources":["../../../src/controller/camera/orbit.ts"],"names":[],"mappings":"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"}
|
|
342
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"orbit.js","sourceRoot":"","sources":["../../../src/controller/camera/orbit.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { ArrayNumber3, ArrayNumber4 } from "../types";
|
|
2
|
+
import { TgdVec3, TgdVec4 } from "../math";
|
|
3
|
+
import { TgdMaterial } from "./material";
|
|
4
|
+
import { TgdLight } from "../light";
|
|
5
|
+
import { TgdTexture2D, TgdTextureCube } from "../texture";
|
|
6
|
+
export type TgdMaterialBSDFOptions = Partial<{
|
|
7
|
+
color: TgdVec4 | ArrayNumber4 | TgdTexture2D;
|
|
8
|
+
lights: TgdLight[];
|
|
9
|
+
ambientColor: TgdVec3 | ArrayNumber3 | TgdTextureCube;
|
|
10
|
+
ambientIntensity: number;
|
|
11
|
+
specularExponent: number;
|
|
12
|
+
specularIntensity: number;
|
|
13
|
+
normalMap: TgdVec3 | ArrayNumber3 | TgdTexture2D;
|
|
14
|
+
}>;
|
|
15
|
+
export declare class TgdMaterialBSDF extends TgdMaterial {
|
|
16
|
+
light: TgdLight;
|
|
17
|
+
ambient: TgdLight;
|
|
18
|
+
specularExponent: number;
|
|
19
|
+
specularIntensity: number;
|
|
20
|
+
private readonly texture;
|
|
21
|
+
private readonly lightColor;
|
|
22
|
+
private readonly ambientColor;
|
|
23
|
+
constructor(options?: TgdMaterialBSDFOptions);
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=bsdf.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bsdf.d.ts","sourceRoot":"","sources":["../../src/material/bsdf.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EACZ,YAAY,EAGf,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAG3D,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC;IACzC,KAAK,EAAE,OAAO,GAAG,YAAY,GAAG,YAAY,CAAA;IAC5C,MAAM,EAAE,QAAQ,EAAE,CAAA;IAClB,YAAY,EAAE,OAAO,GAAG,YAAY,GAAG,cAAc,CAAA;IACrD,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;IACzB,SAAS,EAAE,OAAO,GAAG,YAAY,GAAG,YAAY,CAAA;CACnD,CAAC,CAAA;AAIF,qBAAa,eAAgB,SAAQ,WAAW;IACrC,KAAK,WAAiB;IACtB,OAAO,WAAuD;IAC9D,gBAAgB,SAAK;IACrB,iBAAiB,SAAI;IAE5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;gBAEjC,OAAO,GAAE,sBAA2B;CAyFnD"}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
import { TgdVec3, TgdVec4 } from "./../math/index.js";
|
|
2
|
+
import { TgdMaterial } from "./material.js";
|
|
3
|
+
import { TgdLight } from "./../light/index.js";
|
|
4
|
+
import { TgdTexture2D } from "./../texture/index.js";
|
|
5
|
+
const DEFAULT_COLOR = new TgdVec4(0.8, 0.6, 0.1, 1);
|
|
6
|
+
export class TgdMaterialBSDF extends TgdMaterial {
|
|
7
|
+
constructor(options = {}) {
|
|
8
|
+
var _a;
|
|
9
|
+
const color = options.color instanceof TgdTexture2D
|
|
10
|
+
? options.color
|
|
11
|
+
: new TgdVec4((_a = options.color) !== null && _a !== void 0 ? _a : DEFAULT_COLOR);
|
|
12
|
+
const hasTexture = !(color instanceof TgdVec4);
|
|
13
|
+
const uniforms = {
|
|
14
|
+
uniLight: "vec3",
|
|
15
|
+
uniLightDir: "vec3",
|
|
16
|
+
uniAmbient: "vec3",
|
|
17
|
+
uniSpecularExponent: "float",
|
|
18
|
+
uniSpecularIntensity: "float",
|
|
19
|
+
uniModelViewMatrix: "mat4",
|
|
20
|
+
};
|
|
21
|
+
const fragmentShaderCode = [
|
|
22
|
+
`vec3 normal = ${options.lockLightsToCamera ? "mat3(uniModelViewMatrix) * " : ""}normalize(varNormal);`,
|
|
23
|
+
`float light = 1.0 - dot(normal, uniLightDir);`,
|
|
24
|
+
options.lockLightsToCamera
|
|
25
|
+
? "light = max(0.0, light - 1.0);"
|
|
26
|
+
: "light *= .5;",
|
|
27
|
+
hasTexture
|
|
28
|
+
? `vec4 color = texture(texDiffuse, varUV);`
|
|
29
|
+
: `vec4 color = vec4(${color.join(", ")});`,
|
|
30
|
+
`vec3 reflection = ${options.lockLightsToCamera ? "" : "mat3(uniModelViewMatrix) * "}reflect(uniLightDir, normal);`,
|
|
31
|
+
`float spec = max(0.0, reflection.z);`,
|
|
32
|
+
`spec = pow(spec, uniSpecularExponent) * uniSpecularIntensity;`,
|
|
33
|
+
`color = vec4(`,
|
|
34
|
+
` color.rgb * (`,
|
|
35
|
+
` uniAmbient + uniLight * light`,
|
|
36
|
+
` ) + vec3(spec),`,
|
|
37
|
+
` 1.0`,
|
|
38
|
+
`);`,
|
|
39
|
+
`return color;`,
|
|
40
|
+
];
|
|
41
|
+
const varyings = {
|
|
42
|
+
varNormal: "vec3",
|
|
43
|
+
};
|
|
44
|
+
if (hasTexture) {
|
|
45
|
+
varyings.varUV = "vec2";
|
|
46
|
+
uniforms.texDiffuse = "sampler2D";
|
|
47
|
+
}
|
|
48
|
+
const vertexShaderCode = () => {
|
|
49
|
+
const code = [
|
|
50
|
+
`varNormal = mat3(uniTransfoMatrix) * ${this.attNormal};`,
|
|
51
|
+
];
|
|
52
|
+
if (hasTexture) {
|
|
53
|
+
code.push(`varUV = ${this.attUV};`);
|
|
54
|
+
}
|
|
55
|
+
return code;
|
|
56
|
+
};
|
|
57
|
+
super({
|
|
58
|
+
uniforms,
|
|
59
|
+
varyings,
|
|
60
|
+
vertexShaderCode,
|
|
61
|
+
fragmentShaderCode,
|
|
62
|
+
setUniforms: (program) => {
|
|
63
|
+
program.uniform3fv("uniLightDir", this.light.direction);
|
|
64
|
+
this.lightColor.from(this.light.color).scale(this.light.color.w);
|
|
65
|
+
program.uniform3fv("uniLight", this.lightColor);
|
|
66
|
+
this.ambientColor
|
|
67
|
+
.from(this.ambient.color)
|
|
68
|
+
.scale(this.ambient.color.w);
|
|
69
|
+
program.uniform3fv("uniAmbient", this.ambientColor);
|
|
70
|
+
program.uniform1f("uniSpecularExponent", this.specularExponent);
|
|
71
|
+
program.uniform1f("uniSpecularIntensity", this.specularIntensity);
|
|
72
|
+
const { texture } = this;
|
|
73
|
+
if (texture)
|
|
74
|
+
texture.activate(0, program, "texDiffuse");
|
|
75
|
+
},
|
|
76
|
+
});
|
|
77
|
+
this.light = new TgdLight();
|
|
78
|
+
this.ambient = new TgdLight({ color: new TgdVec4(0.2, 0.1, 0, 0) });
|
|
79
|
+
this.specularExponent = 20;
|
|
80
|
+
this.specularIntensity = 1;
|
|
81
|
+
this.lightColor = new TgdVec3();
|
|
82
|
+
this.ambientColor = new TgdVec3();
|
|
83
|
+
this.texture = hasTexture ? color : null;
|
|
84
|
+
if (options.light) {
|
|
85
|
+
this.light = options.light;
|
|
86
|
+
}
|
|
87
|
+
if (options.ambient) {
|
|
88
|
+
this.ambient = options.ambient;
|
|
89
|
+
}
|
|
90
|
+
if (typeof options.specularExponent === "number") {
|
|
91
|
+
this.specularExponent = options.specularExponent;
|
|
92
|
+
}
|
|
93
|
+
if (typeof options.specularIntensity === "number") {
|
|
94
|
+
this.specularIntensity = options.specularIntensity;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnNkZi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tYXRlcmlhbC9ic2RmLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFeEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNyQyxPQUFPLEVBQUUsWUFBWSxFQUFrQixNQUFNLGNBQWMsQ0FBQTtBQWEzRCxNQUFNLGFBQWEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUVuRCxNQUFNLE9BQU8sZUFBZ0IsU0FBUSxXQUFXO0lBVTVDLFlBQVksVUFBa0MsRUFBRTs7UUFDNUMsTUFBTSxLQUFLLEdBQ1AsT0FBTyxDQUFDLEtBQUssWUFBWSxZQUFZO1lBQ2pDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSztZQUNmLENBQUMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxNQUFBLE9BQU8sQ0FBQyxLQUFLLG1DQUFJLGFBQWEsQ0FBQyxDQUFBO1FBQ3JELE1BQU0sVUFBVSxHQUFHLENBQUMsQ0FBQyxLQUFLLFlBQVksT0FBTyxDQUFDLENBQUE7UUFDOUMsTUFBTSxRQUFRLEdBQXlDO1lBQ25ELFFBQVEsRUFBRSxNQUFNO1lBQ2hCLFdBQVcsRUFBRSxNQUFNO1lBQ25CLFVBQVUsRUFBRSxNQUFNO1lBQ2xCLG1CQUFtQixFQUFFLE9BQU87WUFDNUIsb0JBQW9CLEVBQUUsT0FBTztZQUM3QixrQkFBa0IsRUFBRSxNQUFNO1NBQzdCLENBQUE7UUFDRCxNQUFNLGtCQUFrQixHQUFnQjtZQUNwQyxpQkFBaUIsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDLENBQUMsRUFBRSx1QkFBdUI7WUFDdkcsK0NB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
|
|
@@ -49,7 +49,7 @@ export class TgdMaterialCameraLight extends TgdMaterial {
|
|
|
49
49
|
");",
|
|
50
50
|
"return color;",
|
|
51
51
|
],
|
|
52
|
-
setUniforms: (program) => {
|
|
52
|
+
setUniforms: ({ program }) => {
|
|
53
53
|
program.uniform3fv("uniLightDir", this.light.direction);
|
|
54
54
|
this.lightColor.from(this.light.color).scale(this.light.color.w);
|
|
55
55
|
program.uniform3fv("uniLight", this.lightColor);
|
|
@@ -85,4 +85,4 @@ export class TgdMaterialCameraLight extends TgdMaterial {
|
|
|
85
85
|
this.texture = hasTexture ? color : null;
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FtZXJhLWxpZ2h0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21hdGVyaWFsL2NhbWVyYS1saWdodC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUM1QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ3hDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQVkzQyxNQUFNLGFBQWEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUVuRCxNQUFNLE9BQU8sc0JBQXVCLFNBQVEsV0FBVztJQVVuRCxZQUFZLFVBQWtELEVBQUU7O1FBQzVELE1BQU0sZ0JBQWdCLEdBQWdCO1lBQ2xDLDhDQUE4QztTQUNqRCxDQUFBO1FBQ0QsTUFBTSxRQUFRLEdBQXlDO1lBQ25ELFFBQVEsRUFBRSxNQUFNO1lBQ2hCLFdBQVcsRUFBRSxNQUFNO1lBQ25CLFVBQVUsRUFBRSxNQUFNO1lBQ2xCLG1CQUFtQixFQUFFLE9BQU87WUFDNUIsb0JBQW9CLEVBQUUsT0FBTztZQUM3QixrQkFBa0IsRUFBRSxNQUFNO1NBQzdCLENBQUE7UUFDRCxNQUFNLFFBQVEsR0FBMkM7WUFDckQsU0FBUyxFQUFFLE1BQU07U0FDcEIsQ0FBQTtRQUNELE1BQU0sS0FBSyxHQUNQLE9BQU8sQ0FBQyxLQUFLLFlBQVksWUFBWTtZQUNqQyxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUs7WUFDZixDQUFDLENBQUMsSUFBSSxPQUFPLENBQUMsTUFBQSxPQUFPLENBQUMsS0FBSyxtQ0FBSSxhQUFhLENBQUMsQ0FBQTtRQUNyRCxNQUFNLFVBQVUsR0FBRyxDQUFDLENBQUMsS0FBSyxZQUFZLE9BQU8sQ0FBQyxD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
|
|
@@ -59,7 +59,7 @@ export class TgdMaterialDiffuse extends TgdMaterial {
|
|
|
59
59
|
varyings,
|
|
60
60
|
vertexShaderCode,
|
|
61
61
|
fragmentShaderCode,
|
|
62
|
-
setUniforms: (program) => {
|
|
62
|
+
setUniforms: ({ program }) => {
|
|
63
63
|
program.uniform3fv("uniLightDir", this.light.direction);
|
|
64
64
|
this.lightColor.from(this.light.color).scale(this.light.color.w);
|
|
65
65
|
program.uniform3fv("uniLight", this.lightColor);
|
|
@@ -95,4 +95,4 @@ export class TgdMaterialDiffuse extends TgdMaterial {
|
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlmZnVzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tYXRlcmlhbC9kaWZmdXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFeEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNyQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBWTNDLE1BQU0sYUFBYSxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFBO0FBRW5ELE1BQU0sT0FBTyxrQkFBbUIsU0FBUSxXQUFXO0lBVS9DLFlBQVksVUFBcUMsRUFBRTs7UUFDL0MsTUFBTSxLQUFLLEdBQ1AsT0FBTyxDQUFDLEtBQUssWUFBWSxZQUFZO1lBQ2pDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSztZQUNmLENBQUMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxNQUFBLE9BQU8sQ0FBQyxLQUFLLG1DQUFJLGFBQWEsQ0FBQyxDQUFBO1FBQ3JELE1BQU0sVUFBVSxHQUFHLENBQUMsQ0FBQyxLQUFLLFlBQVksT0FBTyxDQUFDLENBQUE7UUFDOUMsTUFBTSxRQUFRLEdBQXlDO1lBQ25ELFFBQVEsRUFBRSxNQUFNO1lBQ2hCLFdBQVcsRUFBRSxNQUFNO1lBQ25CLFVBQVUsRUFBRSxNQUFNO1lBQ2xCLG1CQUFtQixFQUFFLE9BQU87WUFDNUIsb0JBQW9CLEVBQUUsT0FBTztZQUM3QixrQkFBa0IsRUFBRSxNQUFNO1NBQzdCLENBQUE7UUFDRCxNQUFNLGtCQUFrQixHQUFnQjtZQUNwQyxpQkFBaUIsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDLENBQUMsRUFBRSx1QkFBdUI7WUFD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
|
|
@@ -36,7 +36,7 @@ export class TgdMaterialFaceOrientation extends TgdMaterial {
|
|
|
36
36
|
vertexShaderCode: () => [
|
|
37
37
|
`varNormal = mat3(uniTransfoMatrix) * ${this.attNormal};`,
|
|
38
38
|
],
|
|
39
|
-
setUniforms: (program) => {
|
|
39
|
+
setUniforms: ({ program }) => {
|
|
40
40
|
program.uniform3fv("uniLightDir", this.light.direction);
|
|
41
41
|
this.lightColor.from(this.light.color).scale(this.light.color.w);
|
|
42
42
|
program.uniform3fv("uniLight", this.lightColor);
|
|
@@ -70,4 +70,4 @@ export class TgdMaterialFaceOrientation extends TgdMaterial {
|
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjZS1vcmllbnRhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tYXRlcmlhbC9mYWNlLW9yaWVudGF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQXNCLE1BQU0sWUFBWSxDQUFBO0FBQzVELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFXckM7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLDBCQUEyQixTQUFRLFdBQVc7SUFXdkQsWUFBWSxVQUE2QyxFQUFFO1FBQ3ZELEtBQUssQ0FBQztZQUNGLFFBQVEsRUFBRTtnQkFDTixRQUFRLEVBQUUsTUFBTTtnQkFDaEIsV0FBVyxFQUFFLE1BQU07Z0JBQ25CLFVBQVUsRUFBRSxNQUFNO2dCQUNsQixtQkFBbUIsRUFBRSxPQUFPO2dCQUM1QixvQkFBb0IsRUFBRSxPQUFPO2dCQUM3QixrQkFBa0IsRUFBRSxNQUFNO2FBQzdCO1lBQ0QsUUFBUSxFQUFFO2dCQUNOLFNBQVMsRUFBRSxNQUFNO2FBQ3BCO1lBQ0Qsa0JBQWtCLEVBQUU7Z0JBQ2hCLGdFQUFnRTtnQkFDaEUsK0NBQStDO2dCQUMvQyxrRkFBa0Y7Z0JBQ2xGLHdEQUF3RDtnQkFDeEQsK0RBQStEO2dCQUMvRCxlQUFlO2dCQUNmLGlCQUFpQjtnQkFDakIsbUNBQW1DO2dCQUNuQyxtQkFBbUI7Z0JBQ25CLE9BQU87Z0JBQ1AsSUFBSTtnQkFDSixlQUFlO2FBQ2xCO1lBQ0QsZ0JBQWdCLEVBQUUsR0FBRyxFQUFFLENBQUM7Z0JBQ3BCLHdDQUF3QyxJQUFJLENBQUMsU0FBUyxHQUFHO2FBQzVEO1lBQ0QsV0FBVyxFQUFFLENBQUMsRUFBRSxPQUFPLEVBQTJCLEVBQVEsRUFBRTtnQkFDeEQsT0FBTyxDQUFDLFVBQVUsQ0FBQyxhQUFhLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQTtnQkFDdkQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7Z0JBQ2hFLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtnQkFDL0MsSUFBSSxDQUFDLFlBQVk7cUJBQ1osSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDO3FCQUN4QixLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7Z0JBQ2hDLE9BQU8sQ0FBQyxVQUFVLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQTtnQkFDbkQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxxQkFBcUIsRUFBRSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtnQkFDL0QsT0FBTyxDQUFDLFNBQVMsQ0FDYixzQkFBc0IsRUFDdEIsSUFBSSxDQUFDLGlCQUFpQixDQUN6QixDQUFBO1lBQ0wsQ0FBQztTQUNKLENBQUMsQ0FBQTtRQXREQyxVQUFLLEdBQUcsSUFBSSxRQUFRLENBQUM7WUFDeEIsU0FBUyxFQUFFLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUU7U0FDbkQsQ0FBQyxDQUFBO1FBQ0ssWUFBTyxHQUFHLElBQUksUUFBUSxDQUFDLEVBQUUsS0FBSyxFQUFFLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUM5RCxxQkFBZ0IsR0FBRyxFQUFFLENBQUE7UUFDckIsc0JBQWlCLEdBQUcsR0FBRyxDQUFBO1FBRWIsZUFBVSxHQUFHLElBQUksT0FBTyxFQUFFLENBQUE7UUFDMUIsaUJBQVksR0FBRyxJQUFJLE9BQU8sRUFBRSxDQUFBO1FBZ0R6QyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNoQixJQUFJLENBQUMsS0FBSyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUE7UUFDOUIsQ0FBQztRQUNELElBQUksT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2xCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQTtRQUNsQyxDQUFDO1FBQ0QsSUFBSSxPQUFPLE9BQU8sQ0FBQyxnQkFBZ0IsS0FBSyxRQUFRLEVBQUUsQ0FBQztZQUMvQyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFBO1FBQ3BELENBQUM7UUFDRCxJQUFJLE9BQU8sT0FBTyxDQUFDLGlCQUFpQixLQUFLLFFBQVEsRUFBRSxDQUFDO1lBQ2hELElBQUksQ0FBQyxpQkFBaUIsR0FBRyxPQUFPLENBQUMsaUJBQWlCLENBQUE7UUFDdEQsQ0FBQztJQUNMLENBQUM7Q0FDSiJ9
|
|
@@ -19,7 +19,7 @@ export class TgdMaterialHull extends TgdMaterial {
|
|
|
19
19
|
"gl_Position.xy += n.xy;",
|
|
20
20
|
"gl_Position.z += size * uniZ;",
|
|
21
21
|
],
|
|
22
|
-
setUniforms: (program) => {
|
|
22
|
+
setUniforms: ({ program }) => {
|
|
23
23
|
program.uniform4fv("uniColor", this.color);
|
|
24
24
|
program.uniform1f("uniExpansion", this.thickness * 0.01);
|
|
25
25
|
program.uniform1f("uniZ", this.zShift);
|
|
@@ -33,4 +33,4 @@ export class TgdMaterialHull extends TgdMaterial {
|
|
|
33
33
|
this.zShift = (_c = options.zShift) !== null && _c !== void 0 ? _c : 0.01;
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHVsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tYXRlcmlhbC9odWxsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFNUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUNuQyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBcUJ4QyxNQUFNLGFBQWEsR0FBaUIsQ0FBQyxLQUFLLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUU1RCxNQUFNLE9BQU8sZUFBZ0IsU0FBUSxXQUFXO0lBSzVDLFlBQVksVUFBa0MsRUFBRTs7UUFDNUMsS0FBSyxDQUFDO1lBQ0YsUUFBUSxFQUFFO2dCQUNOLFFBQVEsRUFBRSxNQUFNO2dCQUNoQixZQUFZLEVBQUUsT0FBTztnQkFDckIsSUFBSSxFQUFFLE9BQU87YUFDaEI7WUFDRCxrQkFBa0IsRUFBRSxDQUFDLGtCQUFrQixDQUFDO1lBQ3hDLGdCQUFnQixFQUFFO2dCQUNkLHNFQUFzRTtnQkFDdEUsNENBQTRDO2dCQUM1QyxZQUFZO2dCQUNaLHlCQUF5QjtnQkFDekIsK0JBQStCO2FBQ2xDO1lBQ0QsV0FBVyxFQUFFLENBQUMsRUFBRSxPQUFPLEVBQTJCLEVBQVEsRUFBRTtnQkFDeEQsT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFBO2dCQUMxQyxPQUFPLENBQUMsU0FBUyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxDQUFBO2dCQUN4RCxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7WUFDMUMsQ0FBQztZQUNELEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxlQUFlLENBQUMsS0FBSyxFQUFFO1NBQ3pDLENBQUMsQ0FBQTtRQXhCQyxjQUFTLEdBQUcsQ0FBQyxDQUFBO1FBQ2IsV0FBTSxHQUFHLElBQUksQ0FBQTtRQXlCaEIsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLE9BQU8sQ0FBQyxNQUFBLE9BQU8sQ0FBQyxLQUFLLG1DQUFJLGFBQWEsQ0FBQyxDQUFBO1FBQ3hELElBQUksQ0FBQyxTQUFTLEdBQUcsTUFBQSxPQUFPLENBQUMsU0FBUyxtQ0FBSSxDQUFDLENBQUE7UUFDdkMsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFBLE9BQU8sQ0FBQyxNQUFNLG1DQUFJLElBQUksQ0FBQTtJQUN4QyxDQUFDO0NBQ0oifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/material/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA;AAClC,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,QAAQ,CAAA;AACtB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,QAAQ,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/material/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA;AAClC,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,QAAQ,CAAA;AACtB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,QAAQ,CAAA"}
|
|
@@ -7,5 +7,6 @@ export * from "./hull.js";
|
|
|
7
7
|
export * from "./material.js";
|
|
8
8
|
export * from "./normals.js";
|
|
9
9
|
export * from "./normal-map.js";
|
|
10
|
+
export * from "./principled.js";
|
|
10
11
|
export * from "./toon.js";
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWF0ZXJpYWwvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxTQUFTLENBQUE7QUFDdkIsY0FBYyxXQUFXLENBQUE7QUFDekIsY0FBYyxvQkFBb0IsQ0FBQTtBQUNsQyxjQUFjLFFBQVEsQ0FBQTtBQUN0QixjQUFjLFNBQVMsQ0FBQTtBQUN2QixjQUFjLFFBQVEsQ0FBQTtBQUN0QixjQUFjLFlBQVksQ0FBQTtBQUMxQixjQUFjLFdBQVcsQ0FBQTtBQUN6QixjQUFjLGNBQWMsQ0FBQTtBQUM1QixjQUFjLGNBQWMsQ0FBQTtBQUM1QixjQUFjLFFBQVEsQ0FBQSJ9
|
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
import { TgdCodeBloc, TgdCodeFunctions } from "../shader/code";
|
|
2
|
-
import { TgdPainterStateOptions, WebglAttributeType, WebglUniformType } from "..";
|
|
2
|
+
import { TgdCamera, TgdPainterStateOptions, WebglAttributeType, WebglUniformType } from "..";
|
|
3
3
|
import { TgdProgram } from "../program";
|
|
4
|
+
export interface TgdMaterialContext {
|
|
5
|
+
camera: TgdCamera;
|
|
6
|
+
program: TgdProgram;
|
|
7
|
+
time: number;
|
|
8
|
+
delay: number;
|
|
9
|
+
}
|
|
4
10
|
export interface TgdMaterialOptions {
|
|
5
11
|
/**
|
|
6
12
|
* Name of the vec4 attribute holding the vertex position.
|
|
@@ -43,11 +49,15 @@ export interface TgdMaterialOptions {
|
|
|
43
49
|
* If this function is defined, it will be called at each frame.
|
|
44
50
|
* Most of the time, it is used tu update the uniforms.
|
|
45
51
|
*/
|
|
46
|
-
setUniforms(
|
|
52
|
+
setUniforms(materialContext: TgdMaterialContext): void;
|
|
47
53
|
/**
|
|
48
54
|
* You may need specific CULL, BLEND, DEPTH, ...
|
|
49
55
|
*/
|
|
50
56
|
state: Partial<TgdPainterStateOptions>;
|
|
57
|
+
/**
|
|
58
|
+
* Cleanup function.
|
|
59
|
+
*/
|
|
60
|
+
delete: () => void;
|
|
51
61
|
/**
|
|
52
62
|
* If `true`, then the mesh will output the resulting shaders codes
|
|
53
63
|
* in the console.
|
|
@@ -97,9 +107,10 @@ export declare class TgdMaterial {
|
|
|
97
107
|
* before convertion to screen space.
|
|
98
108
|
*/
|
|
99
109
|
get vertexShaderCodeForGetPosition(): TgdCodeBloc | undefined;
|
|
100
|
-
readonly setUniforms: undefined | ((
|
|
110
|
+
readonly setUniforms: undefined | ((materialContext: TgdMaterialContext) => void);
|
|
101
111
|
protected readonly state: Partial<TgdPainterStateOptions>;
|
|
102
112
|
applyState(gl: WebGL2RenderingContext, action: () => void): void;
|
|
103
|
-
|
|
113
|
+
readonly delete: () => void;
|
|
114
|
+
constructor({ attPosition, attNormal, attUV, varyings, uniforms, fragmentShaderCode, extraFragmentShaderFunctions, vertexShaderCode, extraVertexShaderFunctions, vertexShaderCodeForGetPosition, setUniforms, state, debug, delete: deleteFunction, }: Partial<TgdMaterialOptions>);
|
|
104
115
|
}
|
|
105
116
|
//# sourceMappingURL=material.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"material.d.ts","sourceRoot":"","sources":["../../src/material/material.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,
|
|
1
|
+
{"version":3,"file":"material.d.ts","sourceRoot":"","sources":["../../src/material/material.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,8 +41,9 @@ export class TgdMaterial {
|
|
|
41
41
|
applyState(gl, action) {
|
|
42
42
|
TgdPainterState.do(Object.assign({ gl }, this.state), action);
|
|
43
43
|
}
|
|
44
|
-
constructor({ attPosition = "POSITION", attNormal = "NORMAL", attUV = "TEXCOORD_0", varyings = {}, uniforms = {}, fragmentShaderCode = ["return vec4(1, .666, .1, 1);"], extraFragmentShaderFunctions = {}, vertexShaderCode = [], extraVertexShaderFunctions = {}, vertexShaderCodeForGetPosition = "return pos;", setUniforms, state = {}, debug = false, }) {
|
|
44
|
+
constructor({ attPosition = "POSITION", attNormal = "NORMAL", attUV = "TEXCOORD_0", varyings = {}, uniforms = {}, fragmentShaderCode = ["return vec4(1, .666, .1, 1);"], extraFragmentShaderFunctions = {}, vertexShaderCode = [], extraVertexShaderFunctions = {}, vertexShaderCodeForGetPosition = "return pos;", setUniforms, state = {}, debug = false, delete: deleteFunction = () => { }, }) {
|
|
45
45
|
this.debug = false;
|
|
46
|
+
this.delete = deleteFunction;
|
|
46
47
|
this.debug = debug;
|
|
47
48
|
this.attPosition = attPosition;
|
|
48
49
|
this.attNormal = attNormal;
|
|
@@ -58,4 +59,4 @@ export class TgdMaterial {
|
|
|
58
59
|
this.state = state;
|
|
59
60
|
}
|
|
60
61
|
}
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWF0ZXJpYWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWF0ZXJpYWwvbWF0ZXJpYWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUVILGVBQWUsR0FJbEIsTUFBTSxJQUFJLENBQUE7QUFnRVgsTUFBTSxPQUFPLFdBQVc7SUFxQnBCOztPQUVHO0lBQ0gsSUFBSSxrQkFBa0I7UUFDbEIsSUFBSSxPQUFPLElBQUksQ0FBQyxtQkFBbUIsS0FBSyxVQUFVO1lBQzlDLE9BQU8sSUFBSSxDQUFDLG1CQUFtQixFQUFFLENBQUE7UUFDckMsT0FBTyxJQUFJLENBQUMsbUJBQW1CLENBQUE7SUFDbkMsQ0FBQztJQU1ELElBQUksNEJBQTRCO1FBQzVCLElBQUksT0FBTyxJQUFJLENBQUMsNkJBQTZCLEtBQUssVUFBVTtZQUN4RCxPQUFPLElBQUksQ0FBQyw2QkFBNkIsRUFBRSxDQUFBO1FBQy9DLE9BQU8sSUFBSSxDQUFDLDZCQUE2QixDQUFBO0lBQzdDLENBQUM7SUFJRDs7T0FFRztJQUNILElBQUksZ0JBQWdCO1FBQ2hCLElBQUksT0FBTyxJQUFJLENBQUMsaUJBQWlCLEtBQUssVUFBVTtZQUM1QyxPQUFPLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFBO1FBQ25DLE9BQU8sSUFBSSxDQUFDLGlCQUFpQixDQUFBO0lBQ2pDLENBQUM7SUFNRCxJQUFJLDBCQUEwQjtRQUMxQixJQUFJLE9BQU8sSUFBSSxDQUFDLDJCQUEyQixLQUFLLFVBQVU7WUFDdEQsT0FBTyxJQUFJLENBQUMsMkJBQTJCLEVBQUUsQ0FBQTtRQUM3QyxPQUFPLElBQUksQ0FBQywyQkFBMkIsQ0FBQTtJQUMzQyxDQUFDO0lBTUQ7Ozs7OztPQU1HO0lBQ0gsSUFBSSw4QkFBOEI7UUFDOUIsSUFBSSxPQUFPLElBQUksQ0FBQywrQkFBK0IsS0FBSyxVQUFVO1lBQzFELE9BQU8sSUFBSSxDQUFDLCtCQUErQixFQUFFLENBQUE7UUFDakQsT0FBTyxJQUFJLENBQUMsK0JBQStCLENBQUE7SUFDL0MsQ0FBQztJQVFNLFVBQVUsQ0FBQyxFQUEwQixFQUFFLE1BQWtCO1FBQzVELGVBQWUsQ0FBQyxFQUFFLGlCQUVWLEVBQUUsSUFDQyxJQUFJLENBQUMsS0FBSyxHQUVqQixNQUFNLENBQ1QsQ0FBQTtJQUNMLENBQUM7SUFJRCxZQUFZLEVBQ1IsV0FBVyxHQUFHLFVBQVUsRUFDeEIsU0FBUyxHQUFHLFFBQVEsRUFDcEIsS0FBSyxHQUFHLFlBQVksRUFDcEIsUUFBUSxHQUFHLEVBQUUsRUFDYixRQUFRLEdBQUcsRUFBRSxFQUNiLGtCQUFrQixHQUFHLENBQUMsOEJBQThCLENBQUMsRUFDckQsNEJBQTRCLEdBQUcsRUFBRSxFQUNqQyxnQkFBZ0IsR0FBRyxFQUFFLEVBQ3JCLDBCQUEwQixHQUFHLEVBQUUsRUFDL0IsOEJBQThCLEdBQUcsYUFBYSxFQUM5QyxXQUFXLEVBQ1gsS0FBSyxHQUFHLEVBQUUsRUFDVixLQUFLLEdBQUcsS0FBSyxFQUNiLE1BQU0sRUFBRSxjQUFjLEdBQUcsR0FBRyxFQUFFLEdBQUUsQ0FBQyxHQUNQO1FBOUd2QixVQUFLLEdBQUcsS0FBSyxDQUFBO1FBK0doQixJQUFJLENBQUMsTUFBTSxHQUFHLGNBQWMsQ0FBQTtRQUM1QixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQTtRQUNsQixJQUFJLENBQUMsV0FBVyxHQUFHLFdBQVcsQ0FBQTtRQUM5QixJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQTtRQUMxQixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQTtRQUNsQixJQUFJLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQTtRQUN4QixJQUFJLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQTtRQUN4QixJQUFJLENBQUMsbUJBQW1CLEdBQUcsa0JBQWtCLENBQUE7UUFDN0MsSUFBSSxDQUFDLDZCQUE2QixHQUFHLDRCQUE0QixDQUFBO1FBQ2pFLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxnQkFBZ0IsQ0FBQTtRQUN6QyxJQUFJLENBQUMsMkJBQTJCLEdBQUcsMEJBQTBCLENBQUE7UUFDN0QsSUFBSSxDQUFDLCtCQUErQixHQUFHLDhCQUE4QixDQUFBO1FBQ3JFLElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFBO1FBQzlCLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFBO0lBQ3RCLENBQUM7Q0FDSiJ9
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { ArrayNumber3, ArrayNumber4 } from "../types";
|
|
2
|
+
import { TgdVec3, TgdVec4 } from "../math";
|
|
3
|
+
import { TgdMaterial } from "./material";
|
|
4
|
+
import { TgdLight } from "../light";
|
|
5
|
+
import { TgdTexture2D, TgdTextureCube } from "../texture";
|
|
6
|
+
export type TgdMaterialPrincipledOptions = Partial<{
|
|
7
|
+
color: TgdVec4 | ArrayNumber4 | TgdTexture2D;
|
|
8
|
+
lights: TgdLight[];
|
|
9
|
+
ambientColor: TgdVec3 | ArrayNumber3 | TgdTextureCube;
|
|
10
|
+
ambientIntensity: number;
|
|
11
|
+
specularExponent: number;
|
|
12
|
+
specularIntensity: number;
|
|
13
|
+
normalMap: TgdTexture2D;
|
|
14
|
+
}>;
|
|
15
|
+
export declare class TgdMaterialPrincipled extends TgdMaterial {
|
|
16
|
+
private readonly options;
|
|
17
|
+
specularExponent: number;
|
|
18
|
+
specularIntensity: number;
|
|
19
|
+
private textureColor;
|
|
20
|
+
private mustDeleteTextureColor;
|
|
21
|
+
private textureAmbient;
|
|
22
|
+
private mustDeleteTextureAmbient;
|
|
23
|
+
constructor(options?: TgdMaterialPrincipledOptions);
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=principled.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"principled.d.ts","sourceRoot":"","sources":["../../src/material/principled.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EACZ,YAAY,EAGf,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAK3D,MAAM,MAAM,4BAA4B,GAAG,OAAO,CAAC;IAC/C,KAAK,EAAE,OAAO,GAAG,YAAY,GAAG,YAAY,CAAA;IAC5C,MAAM,EAAE,QAAQ,EAAE,CAAA;IAClB,YAAY,EAAE,OAAO,GAAG,YAAY,GAAG,cAAc,CAAA;IACrD,gBAAgB,EAAE,MAAM,CAAA;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CAC1B,CAAC,CAAA;AAKF,qBAAa,qBAAsB,SAAQ,WAAW;IAStC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR7B,gBAAgB,SAAM;IACtB,iBAAiB,SAAI;IAE5B,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,sBAAsB,CAAQ;IACtC,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,wBAAwB,CAAQ;gBAEX,OAAO,GAAE,4BAAiC;CAgH1E"}
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import { TgdVec3, TgdVec4 } from "./../math/index.js";
|
|
2
|
+
import { TgdMaterial } from "./material.js";
|
|
3
|
+
import { TgdTexture2D, TgdTextureCube } from "./../texture/index.js";
|
|
4
|
+
import { tgdCanvasCreateFill } from "./../utils/index.js";
|
|
5
|
+
const DEFAULT_COLOR = new TgdVec4(0.8, 0.6, 0.1, 1);
|
|
6
|
+
const DEFAULT_AMBIENT = new TgdVec3(0.8, 0.8, 0.8);
|
|
7
|
+
export class TgdMaterialPrincipled extends TgdMaterial {
|
|
8
|
+
constructor(options = {}) {
|
|
9
|
+
const uniforms = {
|
|
10
|
+
uniTransfoMatrix: "mat4",
|
|
11
|
+
uniSpecularExponent: "float",
|
|
12
|
+
uniSpecularIntensity: "float",
|
|
13
|
+
texColor: "sampler2D",
|
|
14
|
+
texAmbient: "samplerCube",
|
|
15
|
+
uniCameraPosition: "vec3",
|
|
16
|
+
};
|
|
17
|
+
const fragmentShaderCode = [
|
|
18
|
+
`vec3 N = normalize(varNormal);`,
|
|
19
|
+
`vec3 L = normalize(varPosition.xyz - uniCameraPosition);`,
|
|
20
|
+
`vec3 R = reflect(L, N);`,
|
|
21
|
+
`vec3 color = texture(texAmbient, R).rgb;`,
|
|
22
|
+
`color = pow(color, vec3(uniSpecularExponent));`,
|
|
23
|
+
`color *= uniSpecularIntensity;`,
|
|
24
|
+
`return vec4(color, 1) * texture(texColor, varUV);`,
|
|
25
|
+
];
|
|
26
|
+
const varyings = {
|
|
27
|
+
varUV: "vec2",
|
|
28
|
+
varNormal: "vec3",
|
|
29
|
+
varPosition: "vec4",
|
|
30
|
+
};
|
|
31
|
+
const vertexShaderCode = () => {
|
|
32
|
+
const code = [
|
|
33
|
+
`varUV = ${this.attUV};`,
|
|
34
|
+
`varNormal = mat3(uniTransfoMatrix) * ${this.attNormal};`,
|
|
35
|
+
`varPosition = uniTransfoMatrix * ${this.attPosition};`,
|
|
36
|
+
];
|
|
37
|
+
return code;
|
|
38
|
+
};
|
|
39
|
+
super({
|
|
40
|
+
delete: () => {
|
|
41
|
+
var _a, _b;
|
|
42
|
+
if (this.mustDeleteTextureAmbient)
|
|
43
|
+
(_a = this.textureAmbient) === null || _a === void 0 ? void 0 : _a.delete();
|
|
44
|
+
if (this.mustDeleteTextureColor)
|
|
45
|
+
(_b = this.textureColor) === null || _b === void 0 ? void 0 : _b.delete();
|
|
46
|
+
},
|
|
47
|
+
uniforms,
|
|
48
|
+
varyings,
|
|
49
|
+
vertexShaderCode,
|
|
50
|
+
fragmentShaderCode,
|
|
51
|
+
setUniforms: ({ program, camera, }) => {
|
|
52
|
+
var _a, _b;
|
|
53
|
+
if (!this.textureColor) {
|
|
54
|
+
// Lazy creation of a texture from an unique color.
|
|
55
|
+
this.textureColor = new TgdTexture2D(program);
|
|
56
|
+
const color = (_a = this.options.color) !== null && _a !== void 0 ? _a : DEFAULT_COLOR;
|
|
57
|
+
if (!(color instanceof TgdTexture2D)) {
|
|
58
|
+
this.textureColor.loadBitmap(tgdCanvasCreateFill(1, 1, color));
|
|
59
|
+
}
|
|
60
|
+
this.mustDeleteTextureColor = true;
|
|
61
|
+
}
|
|
62
|
+
if (!this.textureAmbient) {
|
|
63
|
+
// Lazy creation of a texture from an unique color.
|
|
64
|
+
const color = (_b = this.options.ambientColor) !== null && _b !== void 0 ? _b : DEFAULT_AMBIENT;
|
|
65
|
+
const canvas = tgdCanvasCreateFill(1, 1, color instanceof TgdTextureCube
|
|
66
|
+
? DEFAULT_AMBIENT
|
|
67
|
+
: color);
|
|
68
|
+
this.textureAmbient = new TgdTextureCube(program, {
|
|
69
|
+
imagePosX: canvas,
|
|
70
|
+
imagePosY: canvas,
|
|
71
|
+
imagePosZ: canvas,
|
|
72
|
+
imageNegX: canvas,
|
|
73
|
+
imageNegY: canvas,
|
|
74
|
+
imageNegZ: canvas,
|
|
75
|
+
});
|
|
76
|
+
this.mustDeleteTextureAmbient = true;
|
|
77
|
+
}
|
|
78
|
+
this.textureColor.activate(0, program, "texColor");
|
|
79
|
+
this.textureAmbient.activate(1, program, "texAmbient");
|
|
80
|
+
program.uniform3fv("uniCameraPosition", camera.transfo.actualPosition);
|
|
81
|
+
program.uniform1f("uniSpecularExponent", this.specularExponent);
|
|
82
|
+
program.uniform1f("uniSpecularIntensity", this.specularIntensity);
|
|
83
|
+
},
|
|
84
|
+
});
|
|
85
|
+
this.options = options;
|
|
86
|
+
this.specularExponent = 2.2;
|
|
87
|
+
this.specularIntensity = 2;
|
|
88
|
+
this.textureColor = null;
|
|
89
|
+
this.mustDeleteTextureColor = false;
|
|
90
|
+
this.textureAmbient = null;
|
|
91
|
+
this.mustDeleteTextureAmbient = false;
|
|
92
|
+
// if (options.light) {
|
|
93
|
+
// this.light = options.light
|
|
94
|
+
// }
|
|
95
|
+
// if (options.ambient) {
|
|
96
|
+
// this.ambient = options.ambient
|
|
97
|
+
// }
|
|
98
|
+
if (typeof options.specularExponent === "number") {
|
|
99
|
+
this.specularExponent = options.specularExponent;
|
|
100
|
+
}
|
|
101
|
+
if (typeof options.specularIntensity === "number") {
|
|
102
|
+
this.specularIntensity = options.specularIntensity;
|
|
103
|
+
}
|
|
104
|
+
if (options.color instanceof TgdTexture2D) {
|
|
105
|
+
this.textureColor = options.color;
|
|
106
|
+
}
|
|
107
|
+
if (options.ambientColor instanceof TgdTextureCube) {
|
|
108
|
+
this.textureAmbient = options.ambientColor;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpbmNpcGxlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tYXRlcmlhbC9wcmluY2lwbGVkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFHeEMsT0FBTyxFQUFFLFlBQVksRUFBRSxjQUFjLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFM0QsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sWUFBWSxDQUFBO0FBYWhELE1BQU0sYUFBYSxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFBO0FBQ25ELE1BQU0sZUFBZSxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUE7QUFFbEQsTUFBTSxPQUFPLHFCQUFzQixTQUFRLFdBQVc7SUFTbEQsWUFBNkIsVUFBd0MsRUFBRTtRQUNuRSxNQUFNLFFBQVEsR0FBeUM7WUFDbkQsZ0JBQWdCLEVBQUUsTUFBTTtZQUN4QixtQkFBbUIsRUFBRSxPQUFPO1lBQzVCLG9CQUFvQixFQUFFLE9BQU87WUFDN0IsUUFBUSxFQUFFLFdBQVc7WUFDckIsVUFBVSxFQUFFLGFBQWE7WUFDekIsaUJBQWlCLEVBQUUsTUFBTTtTQUM1QixDQUFBO1FBQ0QsTUFBTSxrQkFBa0IsR0FBZ0I7WUFDcEMsZ0NBQWdDO1lBQ2hDLDBEQUEwRDtZQUMxRCx5QkFBeUI7WUFDekIsMENBQTBDO1lBQzFDLGdEQUFnRDtZQUNoRCxnQ0FBZ0M7WUFDaEMsbURBQW1EO1NBQ3RELENBQUE7UUFDRCxNQUFNLFFBQVEsR0FBMkM7WUFDckQsS0FBSyxFQUFFLE1BQU07WUFDYixTQUFTLEVBQUUsTUFBTTtZQUNqQixXQUFXLEVBQUUsTUFBTTtTQUN0QixDQUFB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
|
|
@@ -57,7 +57,7 @@ export class TgdMaterialToon extends TgdMaterial {
|
|
|
57
57
|
`);`,
|
|
58
58
|
`return color;`,
|
|
59
59
|
],
|
|
60
|
-
setUniforms: (program) => {
|
|
60
|
+
setUniforms: ({ program }) => {
|
|
61
61
|
program.uniform1f("uniShades", this.shades);
|
|
62
62
|
program.uniform1f("uniShadesInverse", 1 / this.shades);
|
|
63
63
|
program.uniform3fv("uniLightDir", this.light.direction);
|
|
@@ -105,4 +105,4 @@ export class TgdMaterialToon extends TgdMaterial {
|
|
|
105
105
|
this.texture = hasTexture ? color : null;
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9vbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tYXRlcmlhbC90b29uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDeEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNyQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBYTNDLE1BQU0sYUFBYSxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFBO0FBSW5ELE1BQU0sT0FBTyxlQUFnQixTQUFRLFdBQVc7SUFjNUMsWUFBWSxVQUFrQyxFQUFFOztRQUM1QyxNQUFNLEtBQUssR0FDUCxPQUFPLENBQUMsS0FBSyxZQUFZLFlBQVk7WUFDakMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLO1lBQ2YsQ0FBQyxDQUFDLElBQUksT0FBTyxDQUFDLE1BQUEsT0FBTyxDQUFDLEtBQUssbUNBQUksYUFBYSxDQUFDLENBQUE7UUFDckQsTUFBTSxVQUFVLEdBQUcsQ0FBQyxDQUFDLEtBQUssWUFBWSxPQUFPLENBQUMsQ0FBQTtRQUM5QyxNQUFNLGdCQUFnQixHQUFHO1lBQ3JCLDhDQUE4QztTQUNqRCxDQUFBO1FBQ0QsTUFBTSxRQUFRLEdBQXlDO1lBQ25ELFNBQVMsRUFBRSxPQUFPO1lBQ2xCLGdCQUFnQixFQUFFLE9BQU87WUFDekIsUUFBUSxFQUFFLE1BQU07WUFDaEIsV0FBVyxFQUFFLE1BQU07WUFDbkIsVUFBVSxFQUFFLE1BQU07WUFDbEIsb0JBQW9CLEVBQUUsT0FBTztZQUM3QixlQUFlLEVBQUUsT0FBTztZQUN4QixvQkFBb0IsRUFBRSxPQUFPO1lBQzdCLGtCQUFrQixFQUFFLE1BQU07U0FDN0IsQ0FBQTtR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
|
|
@@ -22,7 +22,7 @@ export class TgdPainterMesh extends TgdPainter {
|
|
|
22
22
|
const { context, prg, geometry, material, drawMode, count, transfo } = this;
|
|
23
23
|
const { gl, camera } = context;
|
|
24
24
|
prg.use();
|
|
25
|
-
(_a = material.setUniforms) === null || _a === void 0 ? void 0 : _a.call(material, prg, time, delay);
|
|
25
|
+
(_a = material.setUniforms) === null || _a === void 0 ? void 0 : _a.call(material, { camera, program: prg, time, delay });
|
|
26
26
|
prg.uniformMatrix4fv("uniTransfoMatrix", transfo.matrix);
|
|
27
27
|
prg.uniformMatrix4fv("uniModelViewMatrix", camera.matrixModelView);
|
|
28
28
|
prg.uniformMatrix4fv("uniProjectionMatrix", camera.matrixProjection);
|
|
@@ -130,4 +130,4 @@ export class TgdPainterMesh extends TgdPainter {
|
|
|
130
130
|
this.vao.delete();
|
|
131
131
|
}
|
|
132
132
|
}
|
|
133
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
133
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9wYWludGVyL21lc2gvbWVzaC9tZXNoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBZSxjQUFjLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFDM0QsT0FBTyxFQUFlLGtCQUFrQixFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQy9ELE9BQU8sRUFBRSxVQUFVLEVBQXFCLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUNsRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBQ3pDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFDekMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDeEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBRXBELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFVMUM7R0FDRztBQUNILE1BQU0sT0FBTyxjQUNULFNBQVEsVUFBVTtJQWVsQixZQUN1QixPQUlsQixFQUNELFVBQWlDLEVBQUU7O1FBRW5DLEtBQUssRUFBRSxDQUFBO1FBUFksWUFBTyxHQUFQLE9BQU8sQ0FJekI7UUFqQlcsWUFBTyxHQUFHLElBQUksVUFBVSxFQUFFLENBQUE7UUFRekIsYUFBUSxHQUFXLENBQUMsQ0FBQTtRQUM3QixZQUFPLEdBQW1CLElBQUksQ0FBQTtRQUM5QixZQUFPLEdBQW1CLElBQUksQ0FBQTtRQWdJdEIsVUFBSyxHQUFHLENBQUMsSUFBWSxFQUFFLEtBQWEsRUFBRSxFQUFFOztZQUNwRCxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLEdBQ2hFLElBQUksQ0FBQTtZQUNSLE1BQU0sRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLEdBQUcs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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"segments.d.ts","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAG3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,WAAW,EAA8B,MAAM,eAAe,CAAA;AAIvE,MAAM,MAAM,yBAAyB,GAAG;IACpC;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;CACzB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,kBAAmB,SAAQ,UAAU;IAgB1C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE;QACxB,EAAE,EAAE,sBAAsB,CAAA;QAC1B,MAAM,EAAE,SAAS,CAAA;KACpB;IAlBE,YAAY,EAAE,YAAY,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAI;IACrB,gBAAgB,SAAI;IACpB,cAAc,SAAI;IAClB,YAAY,SAAI;IAEvB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAY;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;gBAKf,OAAO,EAAE;QACxB,EAAE,EAAE,sBAAsB,CAAA;QAC1B,MAAM,EAAE,SAAS,CAAA;KACpB,EACD,OAAO,EAAE,OAAO,CAAC,yBAAyB,CAAC,GAAG;QAC1C,WAAW,EAAE,MAAM,eAAe,CAAA;KACrC;IAiIL,MAAM,IAAI,IAAI;IAMd,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"segments.d.ts","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAG3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,WAAW,EAA8B,MAAM,eAAe,CAAA;AAIvE,MAAM,MAAM,yBAAyB,GAAG;IACpC;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,QAAQ,CAAC,EAAE,WAAW,CAAA;CACzB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,kBAAmB,SAAQ,UAAU;IAgB1C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE;QACxB,EAAE,EAAE,sBAAsB,CAAA;QAC1B,MAAM,EAAE,SAAS,CAAA;KACpB;IAlBE,YAAY,EAAE,YAAY,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAI;IACrB,gBAAgB,SAAI;IACpB,cAAc,SAAI;IAClB,YAAY,SAAI;IAEvB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAgB;IACpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAY;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAa;gBAKf,OAAO,EAAE;QACxB,EAAE,EAAE,sBAAsB,CAAA;QAC1B,MAAM,EAAE,SAAS,CAAA;KACpB,EACD,OAAO,EAAE,OAAO,CAAC,yBAAyB,CAAC,GAAG;QAC1C,WAAW,EAAE,MAAM,eAAe,CAAA;KACrC;IAiIL,MAAM,IAAI,IAAI;IAMd,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAwB3C;AAED,KAAK,eAAe,GAAG,UAAU,CAAA;AAEjC,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,MAAM,CAAI;IAClB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAe;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAe;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAE7C,IAAI,KAAK,WAER;IAED;;;;;;;OAOG;IACH,GAAG,CACC,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,YAAY,EACnB,GAAG,GAAE,YAAqB,EAC1B,GAAG,GAAE,YAAqB,EAC1B,0BAA0B,SAAI,EAC9B,0BAA0B,SAAI;IAWlC,QAAQ,CAAC,WAAW,QAAO,eAAe,CAqBzC;CACJ"}
|
|
@@ -147,12 +147,11 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
147
147
|
}
|
|
148
148
|
paint(time, delay) {
|
|
149
149
|
var _a, _b;
|
|
150
|
-
// this.painter.paint(_time, _delay)
|
|
151
150
|
const { context, prg, vao, vertexCount, instanceCount, material } = this;
|
|
152
151
|
const { gl, camera } = context;
|
|
153
152
|
gl.disable(gl.DITHER);
|
|
154
153
|
prg.use();
|
|
155
|
-
(_b = (_a = this.material).setUniforms) === null || _b === void 0 ? void 0 : _b.call(_a, prg, time, delay);
|
|
154
|
+
(_b = (_a = this.material).setUniforms) === null || _b === void 0 ? void 0 : _b.call(_a, { program: prg, camera, time, delay });
|
|
156
155
|
prg.uniform1f("uniMinRadius", (this.minRadius * 2) / gl.drawingBufferHeight);
|
|
157
156
|
prg.uniformMatrix4fv("uniModelViewMatrix", camera.matrixModelView);
|
|
158
157
|
prg.uniformMatrix4fv("uniProjectionMatrix", camera.matrixProjection);
|
|
@@ -213,4 +212,4 @@ export class TgdPainterSegmentsData {
|
|
|
213
212
|
this._count++;
|
|
214
213
|
}
|
|
215
214
|
}
|
|
216
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
215
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segments.js","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,12 @@ import { TgdTextureCubeOptions } from "../types";
|
|
|
3
3
|
export declare class TgdTextureCube {
|
|
4
4
|
readonly context: {
|
|
5
5
|
gl: WebGL2RenderingContext;
|
|
6
|
-
paint: () => void;
|
|
7
6
|
};
|
|
8
7
|
readonly texture: WebGLTexture;
|
|
9
8
|
private _width;
|
|
10
9
|
private _height;
|
|
11
10
|
constructor(context: {
|
|
12
11
|
gl: WebGL2RenderingContext;
|
|
13
|
-
paint: () => void;
|
|
14
12
|
}, options: TgdTextureCubeOptions);
|
|
15
13
|
delete(): void;
|
|
16
14
|
get width(): number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"texture-cube.d.ts","sourceRoot":"","sources":["../../src/texture/texture-cube.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,qBAAqB,EAAc,MAAM,YAAY,CAAA;AAE9D,qBAAa,cAAc;aAOH,OAAO,EAAE;QACrB,EAAE,EAAE,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"texture-cube.d.ts","sourceRoot":"","sources":["../../src/texture/texture-cube.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,qBAAqB,EAAc,MAAM,YAAY,CAAA;AAE9D,qBAAa,cAAc;aAOH,OAAO,EAAE;QACrB,EAAE,EAAE,sBAAsB,CAAA;KAC7B;IARL,SAAgB,OAAO,EAAE,YAAY,CAAA;IAErC,OAAO,CAAC,MAAM,CAAI;IAClB,OAAO,CAAC,OAAO,CAAI;gBAGC,OAAO,EAAE;QACrB,EAAE,EAAE,sBAAsB,CAAA;KAC7B,EACD,OAAO,EAAE,qBAAqB;IAuBlC,MAAM;IAIN,IAAI,KAAK,WAER;IAED,IAAI,MAAM,WAET;IAED,IAAI;IAKJ,MAAM;IAKN,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM;IAO/D,OAAO,CAAC,SAAS;CA2BpB"}
|
|
@@ -43,6 +43,9 @@ export class TgdTextureCube {
|
|
|
43
43
|
program.uniform1i(uniformName, unit);
|
|
44
44
|
}
|
|
45
45
|
loadImage(target, image) {
|
|
46
|
+
if (typeof target === "string") {
|
|
47
|
+
target = TARGETS[target];
|
|
48
|
+
}
|
|
46
49
|
const { width, height } = image;
|
|
47
50
|
if (width !== height) {
|
|
48
51
|
throw new Error(`Images in a CubeMap must be squares, but we got ${width}×${height}!`);
|
|
@@ -61,4 +64,12 @@ export class TgdTextureCube {
|
|
|
61
64
|
gl.texImage2D(target, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image);
|
|
62
65
|
}
|
|
63
66
|
}
|
|
64
|
-
|
|
67
|
+
const TARGETS = {
|
|
68
|
+
posX: WebGL2RenderingContext.TEXTURE_CUBE_MAP_POSITIVE_X,
|
|
69
|
+
posY: WebGL2RenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Y,
|
|
70
|
+
posZ: WebGL2RenderingContext.TEXTURE_CUBE_MAP_POSITIVE_Z,
|
|
71
|
+
negX: WebGL2RenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_X,
|
|
72
|
+
negY: WebGL2RenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Y,
|
|
73
|
+
negZ: WebGL2RenderingContext.TEXTURE_CUBE_MAP_NEGATIVE_Z,
|
|
74
|
+
};
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGV4dHVyZS1jdWJlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3RleHR1cmUvdGV4dHVyZS1jdWJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE1BQU0sT0FBTyxjQUFjO0lBTXZCLFlBQ29CLE9BRWYsRUFDRCxPQUE4QjtRQUhkLFlBQU8sR0FBUCxPQUFPLENBRXRCO1FBTkcsV0FBTSxHQUFHLENBQUMsQ0FBQTtRQUNWLFlBQU8sR0FBRyxDQUFDLENBQUE7UUFRZixNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFBO1FBQ3RCLE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQyxhQUFhLEVBQUUsQ0FBQTtRQUNsQyxJQUFJLENBQUMsT0FBTztZQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsa0NBQWtDLENBQUMsQ0FBQTtRQUVqRSxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQTtRQUN0QixNQUFNLEtBQUssR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFBO1FBQ3JELElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLDJCQUEyQixFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUNqRSxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQywyQkFBMkIsRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUE7UUFDakUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsMkJBQTJCLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBQ2pFLElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLDJCQUEyQixFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUNqRSxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQywyQkFBMkIsRUFBRSxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUE7UUFDakUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENB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
|
|
@@ -17,7 +17,6 @@ interface TgdTexture2DStorage {
|
|
|
17
17
|
export declare class TgdTexture2D {
|
|
18
18
|
readonly context: {
|
|
19
19
|
gl: WebGL2RenderingContext;
|
|
20
|
-
paint?: () => void;
|
|
21
20
|
};
|
|
22
21
|
name: string;
|
|
23
22
|
readonly gl: WebGL2RenderingContext;
|
|
@@ -30,7 +29,6 @@ export declare class TgdTexture2D {
|
|
|
30
29
|
private static counter;
|
|
31
30
|
constructor(context: {
|
|
32
31
|
gl: WebGL2RenderingContext;
|
|
33
|
-
paint?: () => void;
|
|
34
32
|
}, storage?: Partial<TgdTexture2DStorage>);
|
|
35
33
|
delete(): void;
|
|
36
34
|
get width(): number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"texture2d.d.ts","sourceRoot":"","sources":["../../src/texture/texture2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAgB,UAAU,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAExE,OAAO,EACH,0BAA0B,EAC1B,sBAAsB,EAEzB,MAAM,YAAY,CAAA;AAEnB,UAAU,mBAAmB;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,OAAO,CAAA;IACd;;;OAGG;IACH,kBAAkB,EAAE,OAAO,CAAA;IAC3B,cAAc,EACR,IAAI,GACJ,MAAM,GACN,MAAM,GACN,MAAM,GACN,KAAK,GACL,OAAO,GACP,OAAO,GACP,OAAO,GACP,MAAM,GACN,OAAO,GACP,QAAQ,GACR,gBAAgB,GAChB,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,OAAO,GACP,cAAc,GACd,SAAS,GACT,OAAO,GACP,SAAS,GACT,SAAS,GACT,SAAS,GACT,oBAAoB,GACpB,2BAA2B,GAC3B,qBAAqB,GACrB,4BAA4B,GAC5B,sBAAsB,GACtB,2BAA2B,GAC3B,uBAAuB,GACvB,kCAAkC,GAClC,0CAA0C,GAC1C,2CAA2C,GAC3C,mBAAmB,GACnB,mBAAmB,GACnB,oBAAoB,CAAA;CAC7B;AAED,qBAAa,YAAY;aAoBD,OAAO,EAAE;QACrB,EAAE,EAAE,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"texture2d.d.ts","sourceRoot":"","sources":["../../src/texture/texture2d.ts"],"names":[],"mappings":"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"}
|
|
@@ -101,14 +101,14 @@ gl.texStorage2D(
|
|
|
101
101
|
this.gl.bindTexture(this.gl.TEXTURE_2D, null);
|
|
102
102
|
}
|
|
103
103
|
loadBitmap(bmp, options = {}) {
|
|
104
|
-
var _a
|
|
104
|
+
var _a;
|
|
105
105
|
if (!bmp)
|
|
106
106
|
return this;
|
|
107
107
|
if (typeof bmp === "string") {
|
|
108
108
|
return this.loadBitmap(tgdLoadImage(bmp), options);
|
|
109
109
|
}
|
|
110
110
|
if (!isWebglImage(bmp)) {
|
|
111
|
-
bmp.then(data => this.loadBitmap(data)).catch(error => console.error("Unable to load texture BMP:", error));
|
|
111
|
+
bmp.then((data) => this.loadBitmap(data)).catch((error) => console.error("Unable to load texture BMP:", error));
|
|
112
112
|
return this;
|
|
113
113
|
}
|
|
114
114
|
const { storage, gl } = this;
|
|
@@ -131,8 +131,7 @@ gl.texStorage2D(
|
|
|
131
131
|
})})\ngl.texImage2D(gl.TEXTURE_2D, ${level}, gl.${storage.internalFormat}, gl.${figureOutCompatibleFormat(storage.internalFormat)}, gl.UNSIGNED_BYTE, bmp)\ngenerateMipmap()`);
|
|
132
132
|
}
|
|
133
133
|
this.unbind();
|
|
134
|
-
(
|
|
135
|
-
(_c = options.onLoad) === null || _c === void 0 ? void 0 : _c.call(options);
|
|
134
|
+
(_a = options.onLoad) === null || _a === void 0 ? void 0 : _a.call(options);
|
|
136
135
|
this.eventChange.dispatch(this);
|
|
137
136
|
return this;
|
|
138
137
|
}
|
|
@@ -294,4 +293,4 @@ function printArray(data) {
|
|
|
294
293
|
}
|
|
295
294
|
return JSON.stringify(data);
|
|
296
295
|
}
|
|
297
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"texture2d.js","sourceRoot":"","sources":["../../src/texture/texture2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,OAAO,EAAE,YAAY,EAAiC,MAAM,YAAY,CAAA;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAGH,yBAAyB,GAC5B,MAAM,YAAY,CAAA;AAmDnB,MAAM,OAAO,YAAY;IAmBrB,YACoB,OAGf,EACD,OAAsC;;QAJtB,YAAO,GAAP,OAAO,CAGtB;QApBW,gBAAW,GAAG,IAAI,QAAQ,EAAgB,CAAA;QAElD,aAAQ,GAAwB,IAAI,CAAA;QACpC,WAAM,GAAG,CAAC,CAAC,CAAA;QACX,YAAO,GAAG,CAAC,CAAC,CAAA;QAEZ,WAAM,GAA2B;YACrC,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,QAAQ;YACnB,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,QAAQ;SAClB,CAAA;QAWG,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,IAAI,GAAG,aAAa,YAAY,CAAC,OAAO,EAAE,EAAE,CAAA;QACjD,IAAI,CAAC,OAAO,mBACR,KAAK,EAAE,CAAC,EACR,MAAM,EAAE,CAAC,EACT,cAAc,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,mCAAI,OAAO,EAClD,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,KAAK,EACZ,kBAAkB,EAAE,KAAK,IACtB,OAAO,CACb,CAAA;QACD,MAAM,KAAK,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAA;QAC5B,MAAM,MAAM,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAA;QAC9B,IAAI,OAAO,KAAK,IAAI,QAAQ,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YACzD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC9B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,aAAa,EAAE,CAAA;QACxB,CAAC;IACL,CAAC;IAED,MAAM;QACF,IAAI,IAAI,CAAC,QAAQ;YAAE,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;IACxB,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAEO,aAAa;QACjB,IAAI,CAAC,MAAM,EAAE,CAAA;QACb,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;QACnB,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,EAAE,CAAA;QAClC,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;QAEjE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC/B,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,MAAc;QAChC,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,MAAM,KAAK,IAAI,CAAC,MAAM;YAAE,OAAM;QAE1D,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QAC5B,IAAI,CAAC,aAAa,EAAE,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;QACrB,OAAO,CAAC,MAAM,GAAG,MAAM,CAAA;QACvB,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;QAC/C,IAAI,cAAc,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAC3C,yCAAyC;YACzC,MAAM,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,8BAA8B,CAAC,CAAA;YACjE,IAAI,CAAC,SAAS;gBACV,MAAM,IAAI,KAAK,CACX,wFAAwF,CAC3F,CAAA;QACT,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1D,EAAE,CAAC,WAAW,CACV,EAAE,CAAC,8BAA8B,EACjC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAClC,CAAA;QACD,EAAE,CAAC,YAAY,CACX,EAAE,CAAC,UAAU,EACb,MAAM,EACL,EAAwC,CAAC,cAAc,CAAC,EACzD,KAAK,EACL,MAAM,CACT,CAAA;QACD,IAAI,CAAC,UAAU,CAAC,UAAU,KAAK,KAAK,MAAM;;;MAG5C,MAAM;SACH,cAAc;MACjB,KAAK;MACL,MAAM;EACV,CAAC,CAAA;QACK,IAAI,CAAC,MAAM,EAAE,CAAA;IACjB,CAAC;IAEO,UAAU,CAAC,OAAe;QAC9B,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;QACnB,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAA;QAC3B,IAAI,KAAK,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,CACT,kBAAkB,IAAI,CAAC,IAAI,cAAc,OAAO,GAAG,EACnD,WAAW,CAAC,KAAK,CAAC,EAClB,IAAI,CACP,CAAA;QACL,CAAC;IACL,CAAC;IAED,IAAI,SAAS;QACT,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC,QAAQ,CAAA;QAEvC,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,CAAC,IAAI,qBAAqB,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI;QACA,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IAC3D,CAAC;IAED,MAAM;QACF,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IACjD,CAAC;IAED,UAAU,CACN,GAA4D,EAC5D,UAII,EAAE;;QAEN,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QAErB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAA;QACtD,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAClD,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CACtD,CAAA;YACD,OAAO,IAAI,CAAA;QACf,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;QAC5B,MAAM,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,OAAO,CAAA;QAC7B,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,KAAK,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,MAAM,CAAA;QACzB,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1D,EAAE,CAAC,WAAW,CACV,EAAE,CAAC,8BAA8B,EACjC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAClC,CAAA;QACD,EAAE,CAAC,UAAU,CACT,EAAE,CAAC,UAAU,EACb,KAAK,EACJ,EAAwC,CAAC,OAAO,CAAC,cAAc,CAAC,EACjE,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAW,EAC/D,EAAE,CAAC,aAAa,EAChB,GAAG,CACN,CAAA;QACD,IAAI,CAAC,UAAU,CACX,cAAc,IAAI,CAAC,SAAS,CAAC;YACzB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,MAAM,EAAE,GAAG,CAAC,MAAM;SACrB,CAAC,mCAAmC,KAAK,QACtC,OAAO,CAAC,cACZ,QAAQ,yBAAyB,CAC7B,OAAO,CAAC,cAAc,CACzB,0BAA0B,CAC9B,CAAA;QACD,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,EAAE,CAAA;YACrB,IAAI,CAAC,UAAU,CACX,cAAc,IAAI,CAAC,SAAS,CAAC;gBACzB,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,MAAM,EAAE,GAAG,CAAC,MAAM;aACrB,CAAC,mCAAmC,KAAK,QACtC,OAAO,CAAC,cACZ,QAAQ,yBAAyB,CAC7B,OAAO,CAAC,cAAc,CACzB,4CAA4C,CAChD,CAAA;QACL,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAA;QACb,MAAA,MAAA,IAAI,CAAC,OAAO,EAAC,KAAK,kDAAI,CAAA;QACtB,MAAA,OAAO,CAAC,MAAM,uDAAI,CAAA;QAClB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAA;IACf,CAAC;IAED,QAAQ,CACJ,IAAoC,EACpC,OAeC;QAED,MAAM,EACF,KAAK,GAAG,CAAC,EACT,KAAK,EACL,MAAM,EACN,cAAc,GAAG,KAAK,EACtB,MAAM,GAAG,KAAK;QACd,cAAc;UACjB,GAAG,OAAO,CAAA;QACX,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1D,EAAE,CAAC,WAAW,CACV,EAAE,CAAC,8BAA8B,EACjC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAClC,CAAA;QACD,EAAE,CAAC,UAAU,CACT,EAAE,CAAC,UAAU,EACb,KAAK,EACL,EAAE,CAAC,cAAc,CAAC,EAClB,KAAK,EACL,MAAM,EACN,CAAC,EACD,EAAE,CAAC,MAAM,CAAC,EACV,EAAE,CAAC,aAAa,EAChB,IAAI;QACJ,SAAS;SACZ,CAAA;QACD,IAAI,CAAC,UAAU,CACX,YAAY,UAAU,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAC9D,CAAA;QACD,IAAI,CAAC,MAAM,EAAE,CAAA;QACb,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAA;IACf,CAAC;IAED;;;;;OAKG;IACH,QAAQ,CAAC,IAAY,EAAE,OAAoB,EAAE,WAAoB;QAC7D,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;QACnB,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;QACpC,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,IAAI,OAAO,IAAI,WAAW,EAAE,CAAC;YACzB,OAAO,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;QACxC,CAAC;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAED,cAAc;QACV,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,UAAU,CAAC,CAAA;QAChC,IAAI,CAAC,MAAM,EAAE,CAAA;QACb,OAAO,IAAI,CAAA;IACf,CAAC;IAED,SAAS,CAAC,UAAkC;QACxC,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,yBAAyB,CAAC,IAAI,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;QAC9C,IAAI,CAAC,MAAM,mCACJ,IAAI,CAAC,MAAM,GACX,UAAU,CAChB,CAAA;QACD,IAAI,CAAC,MAAM,EAAE,CAAA;QACb,OAAO,IAAI,CAAA;IACf,CAAC;IAED,IAAI,gBAAgB,CAAC,KAAa;QAC9B,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAA;QAC7D,IAAI,CAAC,MAAM,EAAE,CAAA;IACjB,CAAC;IAED,IAAI,gBAAgB;QAChB,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,MAAM,KAAK,GAAG,EAAE,CAAC,eAAe,CAC5B,EAAE,CAAC,UAAU,EACb,EAAE,CAAC,kBAAkB,CACd,CAAA;QACX,IAAI,CAAC,MAAM,EAAE,CAAA;QACb,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,IAAI,eAAe,CAAC,KAAa;QAC7B,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAA;QAC5D,IAAI,CAAC,MAAM,EAAE,CAAA;IACjB,CAAC;IAED,IAAI,eAAe;QACf,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,MAAM,KAAK,GAAG,EAAE,CAAC,eAAe,CAC5B,EAAE,CAAC,UAAU,EACb,EAAE,CAAC,iBAAiB,CACb,CAAA;QACX,IAAI,CAAC,MAAM,EAAE,CAAA;QACb,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,YAAY,CAAC,SAA4B;QACrC,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,IAAI,EAAE,CAAA;QACX,MAAM,KAAK,GAAG,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,SAAS,CAAC,CAGnD,CAAA;QACV,IAAI,CAAC,MAAM,EAAE,CAAA;QACb,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,KAAc;;QAChB,OAAO,CAAC,GAAG,CACP,MAAA,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,IAAI,mCAAI,cAAc,EACpC,IAAI,EACJ,IAAI,CAAC,KAAK,EACV,GAAG,EACH,IAAI,CAAC,MAAM,CACd,CAAA;QACD,MAAM,UAAU,GAAwB;YACpC,oBAAoB;YACpB,oBAAoB;YACpB,gBAAgB;YAChB,gBAAgB;YAChB,gBAAgB;YAChB,mBAAmB;YACnB,iBAAiB;YACjB,iBAAiB;YACjB,oBAAoB;YACpB,sBAAsB;YACtB,sBAAsB;YACtB,0BAA0B;YAC1B,0BAA0B;SAC7B,CAAA;QACD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;YACrC,OAAO,CAAC,GAAG,CACP,GAAG,EACH,IAAI,EACJ,GAAG,EACH,KAAK,EACL,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAC9D,CAAA;QACL,CAAC;IACL,CAAC;;AAxWc,oBAAO,GAAG,CAAC,AAAJ,CAAI;AA2W9B,MAAM,kBAAkB,GAAuD;IAC3E;QACI,KAAK;QACL,IAAI,GAAG,CAAC;YACJ,KAAK;YACL,MAAM;YACN,QAAQ;YACR,OAAO;YACP,YAAY;YACZ,QAAQ;YACR,gBAAgB;YAChB,SAAS;YACT,QAAQ;YACR,gBAAgB;YAChB,SAAS;YACT,QAAQ;YACR,QAAQ;YACR,gBAAgB;YAChB,SAAS;SACZ,CAAC;KACL;IACD;QACI,MAAM;QACN,IAAI,GAAG,CAAC;YACJ,MAAM;YACN,OAAO;YACP,SAAS;YACT,OAAO;YACP,cAAc;YACd,aAAa;YACb,OAAO;YACP,SAAS;YACT,UAAU;YACV,SAAS;YACT,SAAS;YACT,SAAS;YACT,SAAS;SACZ,CAAC;KACL;IACD,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACxB,CAAC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;CAC3B,CAAA;AAED,SAAS,yBAAyB,CAC9B,cAAsB;IAEtB,KAAK,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,IAAI,kBAAkB,EAAE,CAAC;QACzD,IAAI,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC;YAAE,OAAO,MAAM,CAAA;IAC1D,CAAC;IACD,MAAM,IAAI,KAAK,CACX,qDAAqD,cAAc,6BAA6B,CACnG,CAAA;AACL,CAAC;AAED,SAAS,UAAU,CACf,IAAsE;IAEtE,IAAI,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QACnB,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WACnC,IAAI,CAAC,MACT,YAAY,CAAA;IAChB,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;AAC/B,CAAC"}
|
|
296
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"texture2d.js","sourceRoot":"","sources":["../../src/texture/texture2d.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { TgdColor } from "../color";
|
|
2
|
+
import { TgdVec3, TgdVec4 } from "../math";
|
|
3
|
+
import { ArrayNumber3, ArrayNumber4 } from "../types";
|
|
2
4
|
/**
|
|
3
5
|
* Helper to get a canvas with the given size.
|
|
4
6
|
*/
|
|
@@ -28,10 +30,10 @@ export declare function tgdCanvasFromImage(img: HTMLImageElement): HTMLCanvasEle
|
|
|
28
30
|
* const canvas = tgdCanvasCreatePalette(["#000", "#fff"], 5, 5)
|
|
29
31
|
* ```
|
|
30
32
|
*/
|
|
31
|
-
export declare function tgdCanvasCreatePalette(colors: string[], colums?: number, rows?: number): HTMLCanvasElement;
|
|
32
|
-
export declare function tgdCanvasCreateFill(width: number, height: number, fillColor?: string | TgdColor): HTMLCanvasElement;
|
|
33
|
-
export declare function tgdCanvasCreateGradientHorizontal(size: number, colors: Array<string | TgdColor>): HTMLCanvasElement;
|
|
34
|
-
export declare function tgdCanvasCreateCreateGradientvertical(size: number, colors: Array<string | TgdColor>): HTMLCanvasElement;
|
|
33
|
+
export declare function tgdCanvasCreatePalette(colors: (string | TgdColor | ArrayNumber4 | TgdVec4 | ArrayNumber3 | TgdVec3)[], colums?: number, rows?: number): HTMLCanvasElement;
|
|
34
|
+
export declare function tgdCanvasCreateFill(width: number, height: number, fillColor?: string | TgdColor | ArrayNumber4 | TgdVec4 | ArrayNumber3 | TgdVec3): HTMLCanvasElement;
|
|
35
|
+
export declare function tgdCanvasCreateGradientHorizontal(size: number, colors: Array<string | TgdColor | ArrayNumber4 | TgdVec4 | ArrayNumber3 | TgdVec3>): HTMLCanvasElement;
|
|
36
|
+
export declare function tgdCanvasCreateCreateGradientvertical(size: number, colors: Array<string | TgdColor | ArrayNumber4 | TgdVec4 | ArrayNumber3 | TgdVec3>): HTMLCanvasElement;
|
|
35
37
|
/**
|
|
36
38
|
* Create a canvas with a linear gradient.
|
|
37
39
|
* @param width Width of the resulting canvas.
|
|
@@ -40,5 +42,5 @@ export declare function tgdCanvasCreateCreateGradientvertical(size: number, colo
|
|
|
40
42
|
* @param directionY Y coord of the direction vector.
|
|
41
43
|
* @param colors CSS colors of each step
|
|
42
44
|
*/
|
|
43
|
-
export declare function tgdCanvasCreateGradient(width: number, height: number, directionX: number, directionY: number, colors: Array<string | TgdColor>): HTMLCanvasElement;
|
|
45
|
+
export declare function tgdCanvasCreateGradient(width: number, height: number, directionX: number, directionY: number, colors: Array<string | TgdColor | ArrayNumber4 | TgdVec4 | ArrayNumber3 | TgdVec3>): HTMLCanvasElement;
|
|
44
46
|
//# sourceMappingURL=canvas.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvas.d.ts","sourceRoot":"","sources":["../../src/utils/canvas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"canvas.d.ts","sourceRoot":"","sources":["../../src/utils/canvas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEvD;;GAEG;AACH,wBAAgB,eAAe,CAC3B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACf,iBAAiB,CAKnB;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CACxC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,gCAAgC,GAC5C;IAAE,MAAM,EAAE,iBAAiB,CAAC;IAAC,GAAG,EAAE,wBAAwB,CAAA;CAAE,CAQ9D;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,GAAG,iBAAiB,CAI3E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,sBAAsB,CAClC,MAAM,EAAE,CACF,MAAM,GACN,QAAQ,GACR,YAAY,GACZ,OAAO,GACP,YAAY,GACZ,OAAO,CACZ,EAAE,EACH,MAAM,SAAI,EACV,IAAI,SAAI,qBAcX;AAED,wBAAgB,mBAAmB,CAC/B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,SAAS,GACH,MAAM,GACN,QAAQ,GACR,YAAY,GACZ,OAAO,GACP,YAAY,GACZ,OAAgB,qBAMzB;AAED,wBAAgB,iCAAiC,CAC7C,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,CACT,MAAM,GAAG,QAAQ,GAAG,YAAY,GAAG,OAAO,GAAG,YAAY,GAAG,OAAO,CACtE,qBAGJ;AAED,wBAAgB,qCAAqC,CACjD,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,CACT,MAAM,GAAG,QAAQ,GAAG,YAAY,GAAG,OAAO,GAAG,YAAY,GAAG,OAAO,CACtE,qBAGJ;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACnC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,KAAK,CACT,MAAM,GAAG,QAAQ,GAAG,YAAY,GAAG,OAAO,GAAG,YAAY,GAAG,OAAO,CACtE,qBAiBJ"}
|
package/lib/dist/utils/canvas.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TgdColor } from "./../color/index.js";
|
|
2
2
|
/**
|
|
3
3
|
* Helper to get a canvas with the given size.
|
|
4
4
|
*/
|
|
@@ -49,7 +49,7 @@ export function tgdCanvasCreatePalette(colors, colums = 0, rows = 0) {
|
|
|
49
49
|
let colorIndex = 0;
|
|
50
50
|
for (let y = 0; y < height; y++) {
|
|
51
51
|
for (let x = 0; x < width; x++) {
|
|
52
|
-
ctx.fillStyle = colors[colorIndex % colors.length];
|
|
52
|
+
ctx.fillStyle = colorToString(colors[colorIndex % colors.length]);
|
|
53
53
|
ctx.fillRect(x, y, 1, 1);
|
|
54
54
|
colorIndex++;
|
|
55
55
|
}
|
|
@@ -58,7 +58,7 @@ export function tgdCanvasCreatePalette(colors, colums = 0, rows = 0) {
|
|
|
58
58
|
}
|
|
59
59
|
export function tgdCanvasCreateFill(width, height, fillColor = "#000") {
|
|
60
60
|
const { canvas, ctx } = tgdCanvasCreateWithContext2D(width, height);
|
|
61
|
-
ctx.fillStyle =
|
|
61
|
+
ctx.fillStyle = colorToString(fillColor);
|
|
62
62
|
ctx.fillRect(0, 0, width, height);
|
|
63
63
|
return canvas;
|
|
64
64
|
}
|
|
@@ -81,11 +81,19 @@ export function tgdCanvasCreateGradient(width, height, directionX, directionY, c
|
|
|
81
81
|
const gradient = ctx.createLinearGradient(0, 0, width * directionX, height * directionY);
|
|
82
82
|
for (let colorIndex = 0; colorIndex < colors.length; colorIndex++) {
|
|
83
83
|
const color = colors[colorIndex];
|
|
84
|
-
const cssColor =
|
|
84
|
+
const cssColor = colorToString(color);
|
|
85
85
|
gradient.addColorStop(colorIndex / (colors.length - 1), cssColor);
|
|
86
86
|
}
|
|
87
87
|
ctx.fillStyle = gradient;
|
|
88
88
|
ctx.fillRect(0, 0, width, height);
|
|
89
89
|
return canvas;
|
|
90
90
|
}
|
|
91
|
-
|
|
91
|
+
function colorToString(color) {
|
|
92
|
+
if (typeof color === "string")
|
|
93
|
+
return color;
|
|
94
|
+
if (color instanceof TgdColor)
|
|
95
|
+
return color.toString();
|
|
96
|
+
const [r, g, b, a] = color;
|
|
97
|
+
return new TgdColor(r, b, g, a !== null && a !== void 0 ? a : 1).toString();
|
|
98
|
+
}
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FudmFzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2NhbnZhcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBSXJDOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGVBQWUsQ0FDM0IsS0FBYSxFQUNiLE1BQWM7SUFFZCxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQy9DLE1BQU0sQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFBO0lBQ3BCLE1BQU0sQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFBO0lBQ3RCLE9BQU8sTUFBTSxDQUFBO0FBQ2pCLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsNEJBQTRCLENBQ3hDLEtBQWEsRUFDYixNQUFjLEVBQ2QsUUFBMkM7SUFFM0MsTUFBTSxNQUFNLEdBQUcsUUFBUSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUMvQyxNQUFNLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQTtJQUNwQixNQUFNLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQTtJQUN0QixNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsQ0FBQTtJQUNqRCxJQUFJLENBQUMsT0FBTztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsOEJBQThCLENBQUMsQ0FBQTtJQUU3RCxPQUFPLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsQ0FBQTtBQUNuQyxDQUFDO0FBRUQsTUFBTSxVQUFVLGtCQUFrQixDQUFDLEdBQXFCO0lBQ3BELE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEdBQUcsNEJBQTRCLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDM0UsR0FBRyxDQUFDLFNBQVMs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
|