@tolokoban/tgd 2.0.61 → 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/camera/camera.d.ts +1 -0
- package/lib/dist/camera/camera.d.ts.map +1 -1
- package/lib/dist/camera/camera.js +8 -1
- 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
|
@@ -35,6 +35,7 @@ export declare abstract class TgdCamera implements TgdInterfaceTransformable {
|
|
|
35
35
|
private _zoom;
|
|
36
36
|
constructor(options?: TgdCameraOptions);
|
|
37
37
|
getCurrentState(): Readonly<TgdCameraState>;
|
|
38
|
+
setCurrentState(state: Readonly<TgdCameraState>): void;
|
|
38
39
|
get near(): number;
|
|
39
40
|
set near(v: number);
|
|
40
41
|
get far(): number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"camera.d.ts","sourceRoot":"","sources":["../../src/camera/camera.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"camera.d.ts","sourceRoot":"","sources":["../../src/camera/camera.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,13 @@ export class TgdCamera {
|
|
|
32
32
|
zoom: this.zoom,
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
|
+
setCurrentState(state) {
|
|
36
|
+
this.transfo.distance = state.distance;
|
|
37
|
+
this.transfo.orientation = state.orientation.clone();
|
|
38
|
+
this.spaceHeightAtTarget = state.spaceHeightAtTarget;
|
|
39
|
+
this.transfo.position = state.position.clone();
|
|
40
|
+
this.zoom = state.zoom;
|
|
41
|
+
}
|
|
35
42
|
get near() {
|
|
36
43
|
return this._near;
|
|
37
44
|
}
|
|
@@ -181,4 +188,4 @@ export class TgdCamera {
|
|
|
181
188
|
}
|
|
182
189
|
}
|
|
183
190
|
TgdCamera.incrementalId = 1;
|
|
184
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
191
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FtZXJhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NhbWVyYS9jYW1lcmEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUdILE9BQU8sRUFDUCxVQUFVLEdBRWIsTUFBTSxXQUFXLENBQUE7QUFvQmxCLE1BQU0sT0FBZ0IsU0FBUztJQXlCM0IsWUFBWSxVQUE0QixFQUFFOztRQW5CbEMsaUJBQVksR0FBRyxJQUFJLENBQUE7UUFDbkIsa0JBQWEsR0FBRyxJQUFJLENBQUE7UUFDcEIsdUJBQWtCLEdBQUcsSUFBSSxHQUFHLElBQUksQ0FBQTtRQUV4QyxnQ0FBZ0M7UUFDeEIsb0JBQWUsR0FBRyxJQUFJLENBQUE7UUFDdEIsMEJBQXFCLEdBQUcsSUFBSSxDQUFBO1FBQzVCLGVBQVUsR0FBRyxJQUFJLENBQUE7UUFDZixxQkFBZ0IsR0FBRyxJQUFJLENBQUE7UUFDdkIsMkJBQXNCLEdBQUcsSUFBSSxDQUFBO1FBRTdCLFVBQUssR0FBRyxJQUFJLENBQUE7UUFDWixTQUFJLEdBQUcsUUFBUSxDQUFBO1FBRXpCLGlCQUFpQjtRQUNBLHFCQUFnQixHQUFHLElBQUksT0FBTyxFQUFFLENBQUE7UUFDaEMsNkJBQXdCLEdBQUcsSUFBSSxPQUFPLEVBQUUsQ0FBQTtRQUNqRCxVQUFLLEdBQUcsQ0FBQyxDQUFBO1FBR2IsSUFBSSxDQUFDLElBQUksR0FBRyxNQUFBLE9BQU8sQ0FBQyxJQUFJLG1DQUFJLGFBQWEsU0FBUyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUE7UUFDcEUsSUFBSSxDQUFDLEtBQUssR0FBRyxNQUFBLE9BQU8sQ0FBQyxJQUFJLG1DQUFJLElBQUksQ0FBQTtRQUNqQyxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQUEsT0FBTyxDQUFDLEdBQUcsbUNBQUksR0FBRyxDQUFBO1FBQzlCLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxVQUFVLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQzlDLElB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
|
|
@@ -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
|