@tolokoban/tgd 2.0.43 → 2.0.45
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/material/diffuse.d.ts.map +1 -1
- package/lib/dist/material/diffuse.js +5 -3
- package/lib/dist/math/index.d.ts +1 -0
- package/lib/dist/math/index.d.ts.map +1 -1
- package/lib/dist/math/index.js +2 -1
- package/lib/dist/math/random.d.ts +50 -0
- package/lib/dist/math/random.d.ts.map +1 -0
- package/lib/dist/math/random.js +41 -0
- package/lib/dist/painter/segments/segments.d.ts.map +1 -1
- package/lib/dist/painter/segments/segments.js +7 -12
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diffuse.d.ts","sourceRoot":"","sources":["../../src/material/diffuse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAwC,MAAM,YAAY,CAAA;AAC/E,OAAO,EAAW,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,MAAM,cAAc,CAAA;AAG3C,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC;IAC5C,KAAK,EAAE,OAAO,GAAG,YAAY,GAAG,YAAY,CAAA;IAC5C,KAAK,EAAE,QAAQ,CAAA;IACf,OAAO,EAAE,QAAQ,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;CAC5B,CAAC,CAAA;AAIF,qBAAa,kBAAmB,SAAQ,WAAW;IACxC,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,yBAA8B;
|
|
1
|
+
{"version":3,"file":"diffuse.d.ts","sourceRoot":"","sources":["../../src/material/diffuse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAwC,MAAM,YAAY,CAAA;AAC/E,OAAO,EAAW,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,MAAM,cAAc,CAAA;AAG3C,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC;IAC5C,KAAK,EAAE,OAAO,GAAG,YAAY,GAAG,YAAY,CAAA;IAC5C,KAAK,EAAE,QAAQ,CAAA;IACf,OAAO,EAAE,QAAQ,CAAA;IACjB,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;CAC5B,CAAC,CAAA;AAIF,qBAAa,kBAAmB,SAAQ,WAAW;IACxC,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,yBAA8B;CAsFtD"}
|
|
@@ -38,14 +38,16 @@ export class TgdMaterialDiffuse extends TgdMaterial {
|
|
|
38
38
|
const varyings = {
|
|
39
39
|
varNormal: "vec3",
|
|
40
40
|
};
|
|
41
|
+
if (hasTexture) {
|
|
42
|
+
varyings.varUV = "vec2";
|
|
43
|
+
uniforms.texDiffuse = "sampler2D";
|
|
44
|
+
}
|
|
41
45
|
const vertexShaderCode = () => {
|
|
42
46
|
const code = [
|
|
43
47
|
`varNormal = mat3(uniTransfoMatrix) * ${this.attNormal};`,
|
|
44
48
|
];
|
|
45
49
|
if (hasTexture) {
|
|
46
50
|
code.push(`varUV = ${this.attUV};`);
|
|
47
|
-
varyings.varUV = "vec2";
|
|
48
|
-
uniforms.texDiffuse = "sampler2D";
|
|
49
51
|
}
|
|
50
52
|
return code;
|
|
51
53
|
};
|
|
@@ -90,4 +92,4 @@ export class TgdMaterialDiffuse extends TgdMaterial {
|
|
|
90
92
|
}
|
|
91
93
|
}
|
|
92
94
|
}
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlmZnVzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tYXRlcmlhbC9kaWZmdXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFeEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNyQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBVzNDLE1BQU0sYUFBYSxHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFBO0FBRW5ELE1BQU0sT0FBTyxrQkFBbUIsU0FBUSxXQUFXO0lBVS9DLFlBQVksVUFBcUMsRUFBRTs7UUFDL0MsTUFBTSxLQUFLLEdBQ1AsT0FBTyxDQUFDLEtBQUssWUFBWSxZQUFZO1lBQ2pDLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSztZQUNmLENBQUMsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxNQUFBLE9BQU8sQ0FBQyxLQUFLLG1DQUFJLGFBQWEsQ0FBQyxDQUFBO1FBQ3JELE1BQU0sVUFBVSxHQUFHLENBQUMsQ0FBQyxLQUFLLFlBQVksT0FBTyxDQUFDLENBQUE7UUFDOUMsTUFBTSxRQUFRLEdBQXlDO1lBQ25ELFFBQVEsRUFBRSxNQUFNO1lBQ2hCLFdBQVcsRUFBRSxNQUFNO1lBQ25CLFVBQVUsRUFBRSxNQUFNO1lBQ2xCLG1CQUFtQixFQUFFLE9BQU87WUFDNUIsb0JBQW9CLEVBQUUsT0FBTztZQUM3QixrQkFBa0IsRUFBRSxNQUFNO1NBQzdCLENBQUE7UUFDRCxNQUFNLGtCQUFrQixHQUFnQjtZQUNwQyxxQ0FBcUM7WUFDckMsK0NBQStDO1lBQy9DLFVBQVU7Z0JBQ04sQ0FBQyxDQUFDLDBDQUEwQztnQkFDNUMsQ0FBQyxDQUFDLHFCQUFx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
|
package/lib/dist/math/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/math/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,WAAW,CAAA;AACzB,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/math/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA"}
|
package/lib/dist/math/index.js
CHANGED
|
@@ -2,8 +2,9 @@ export * from "./mat2.js";
|
|
|
2
2
|
export * from "./mat3.js";
|
|
3
3
|
export * from "./mat4.js";
|
|
4
4
|
export * from "./quat.js";
|
|
5
|
+
export * from "./random.js";
|
|
5
6
|
export * from "./transfo.js";
|
|
6
7
|
export * from "./vec2.js";
|
|
7
8
|
export * from "./vec3.js";
|
|
8
9
|
export * from "./vec4.js";
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWF0aC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLFFBQVEsQ0FBQTtBQUN0QixjQUFjLFFBQVEsQ0FBQTtBQUN0QixjQUFjLFFBQVEsQ0FBQTtBQUN0QixjQUFjLFFBQVEsQ0FBQTtBQUN0QixjQUFjLFVBQVUsQ0FBQTtBQUN4QixjQUFjLFdBQVcsQ0FBQTtBQUN6QixjQUFjLFFBQVEsQ0FBQTtBQUN0QixjQUFjLFFBQVEsQ0FBQTtBQUN0QixjQUFjLFFBQVEsQ0FBQSJ9
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { ArrayNumber2, ArrayNumber3, ArrayNumber4 } from "../types";
|
|
2
|
+
/**
|
|
3
|
+
* @return Random float between 0 and 1
|
|
4
|
+
*/
|
|
5
|
+
export declare function tgdRandom(): number;
|
|
6
|
+
/**
|
|
7
|
+
* @return Random float between 0 and `max`
|
|
8
|
+
*/
|
|
9
|
+
export declare function tgdRandom(max: number): number;
|
|
10
|
+
/**
|
|
11
|
+
* @return Random float between `min` and `max`
|
|
12
|
+
*/
|
|
13
|
+
export declare function tgdRandom(min: number, max: number): number;
|
|
14
|
+
/**
|
|
15
|
+
* @return Random vector of 3 floats between 0 and 1
|
|
16
|
+
*/
|
|
17
|
+
export declare function tgdRandom2(): ArrayNumber2;
|
|
18
|
+
/**
|
|
19
|
+
* @return Random vector of 3 floats between 0 and `max`
|
|
20
|
+
*/
|
|
21
|
+
export declare function tgdRandom2(max: number): ArrayNumber2;
|
|
22
|
+
/**
|
|
23
|
+
* @return Random vector of 3 floats between `min` and `max`
|
|
24
|
+
*/
|
|
25
|
+
export declare function tgdRandom2(min: number, max: number): ArrayNumber2;
|
|
26
|
+
/**
|
|
27
|
+
* @return Random vector of 2 floats between 0 and 1
|
|
28
|
+
*/
|
|
29
|
+
export declare function tgdRandom3(): ArrayNumber3;
|
|
30
|
+
/**
|
|
31
|
+
* @return Random vector of 2 floats between 0 and `max`
|
|
32
|
+
*/
|
|
33
|
+
export declare function tgdRandom3(max: number): ArrayNumber3;
|
|
34
|
+
/**
|
|
35
|
+
* @return Random vector of 2 floats between `min` and `max`
|
|
36
|
+
*/
|
|
37
|
+
export declare function tgdRandom3(min: number, max: number): ArrayNumber3;
|
|
38
|
+
/**
|
|
39
|
+
* @return Random vector of 4 floats between 0 and 1
|
|
40
|
+
*/
|
|
41
|
+
export declare function tgdRandom4(): ArrayNumber4;
|
|
42
|
+
/**
|
|
43
|
+
* @return Random vector of 4 floats between 0 and `max`
|
|
44
|
+
*/
|
|
45
|
+
export declare function tgdRandom4(max: number): ArrayNumber4;
|
|
46
|
+
/**
|
|
47
|
+
* @return Random vector of 4 floats between `min` and `max`
|
|
48
|
+
*/
|
|
49
|
+
export declare function tgdRandom4(min: number, max: number): ArrayNumber4;
|
|
50
|
+
//# sourceMappingURL=random.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"random.d.ts","sourceRoot":"","sources":["../../src/math/random.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAErE;;GAEG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAAA;AACnC;;GAEG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;AAC9C;;GAEG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;AAS3D;;GAEG;AACH,wBAAgB,UAAU,IAAI,YAAY,CAAA;AAC1C;;GAEG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;AACrD;;GAEG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;AAYlE;;GAEG;AACH,wBAAgB,UAAU,IAAI,YAAY,CAAA;AAC1C;;GAEG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;AACrD;;GAEG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;AAclE;;GAEG;AACH,wBAAgB,UAAU,IAAI,YAAY,CAAA;AAC1C;;GAEG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;AACrD;;GAEG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
export function tgdRandom(a, b) {
|
|
2
|
+
if (typeof a !== "number")
|
|
3
|
+
return Math.random();
|
|
4
|
+
const min = typeof b === "number" ? a : 0;
|
|
5
|
+
const max = typeof b === "number" ? b : a;
|
|
6
|
+
return min + Math.random() * (max - min);
|
|
7
|
+
}
|
|
8
|
+
export function tgdRandom2(a, b) {
|
|
9
|
+
if (typeof a !== "number")
|
|
10
|
+
return [Math.random(), Math.random()];
|
|
11
|
+
const min = typeof b === "number" ? a : 0;
|
|
12
|
+
const max = typeof b === "number" ? b : a;
|
|
13
|
+
return [
|
|
14
|
+
min + Math.random() * (max - min),
|
|
15
|
+
min + Math.random() * (max - min),
|
|
16
|
+
];
|
|
17
|
+
}
|
|
18
|
+
export function tgdRandom3(a, b) {
|
|
19
|
+
if (typeof a !== "number")
|
|
20
|
+
return [Math.random(), Math.random(), Math.random()];
|
|
21
|
+
const min = typeof b === "number" ? a : 0;
|
|
22
|
+
const max = typeof b === "number" ? b : a;
|
|
23
|
+
return [
|
|
24
|
+
min + Math.random() * (max - min),
|
|
25
|
+
min + Math.random() * (max - min),
|
|
26
|
+
min + Math.random() * (max - min),
|
|
27
|
+
];
|
|
28
|
+
}
|
|
29
|
+
export function tgdRandom4(a, b) {
|
|
30
|
+
if (typeof a !== "number")
|
|
31
|
+
return [Math.random(), Math.random(), Math.random(), Math.random()];
|
|
32
|
+
const min = typeof b === "number" ? a : 0;
|
|
33
|
+
const max = typeof b === "number" ? b : a;
|
|
34
|
+
return [
|
|
35
|
+
min + Math.random() * (max - min),
|
|
36
|
+
min + Math.random() * (max - min),
|
|
37
|
+
min + Math.random() * (max - min),
|
|
38
|
+
min + Math.random() * (max - min),
|
|
39
|
+
];
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmFuZG9tLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21hdGgvcmFuZG9tLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWNBLE1BQU0sVUFBVSxTQUFTLENBQUMsQ0FBVSxFQUFFLENBQVU7SUFDNUMsSUFBSSxPQUFPLENBQUMsS0FBSyxRQUFRO1FBQUUsT0FBTyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUE7SUFFL0MsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN6QyxNQUFNLEdBQUcsR0FBRyxPQUFPLENBQUMsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3pDLE9BQU8sR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUMsQ0FBQTtBQUM1QyxDQUFDO0FBY0QsTUFBTSxVQUFVLFVBQVUsQ0FBQyxDQUFVLEVBQUUsQ0FBVTtJQUM3QyxJQUFJLE9BQU8sQ0FBQyxLQUFLLFFBQVE7UUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxFQUFFLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFBO0lBRWhFLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDekMsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN6QyxPQUFPO1FBQ0gsR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDakMsR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7S0FDcEMsQ0FBQTtBQUNMLENBQUM7QUFjRCxNQUFNLFVBQVUsVUFBVSxDQUFDLENBQVUsRUFBRSxDQUFVO0lBQzdDLElBQUksT0FBTyxDQUFDLEtBQUssUUFBUTtRQUNyQixPQUFPLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxFQUFFLElBQUksQ0FBQyxNQUFNLEVBQUUsRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQTtJQUV4RCxNQUFNLEdBQUcsR0FBRyxPQUFPLENBQUMsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3pDLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDekMsT0FBTztRQUNILEdBQUcsR0FBRyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2pDLEdBQUcsR0FBRyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2pDLEdBQUcsR0FBRyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO0tBQ3BDLENBQUE7QUFDTCxDQUFDO0FBY0QsTUFBTSxVQUFVLFVBQVUsQ0FBQyxDQUFVLEVBQUUsQ0FBVTtJQUM3QyxJQUFJLE9BQU8sQ0FBQyxLQUFLLFFBQVE7UUFDckIsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLEVBQUUsSUFBSSxDQUFDLE1BQU0sRUFBRSxFQUFFLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFBO0lBRXZFLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDekMsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN6QyxPQUFPO1FBQ0gsR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDakMsR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDakMsR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDakMsR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7S0FDcEMsQ0FBQTtBQUNMLENBQUMifQ==
|
|
@@ -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;
|
|
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;IAkIL,MAAM,IAAI,IAAI;IAMd,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAyB3C;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"}
|
|
@@ -72,19 +72,16 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
72
72
|
attUV0: "vec2",
|
|
73
73
|
attUV1: "vec2",
|
|
74
74
|
},
|
|
75
|
-
varying: material.varyings,
|
|
76
|
-
functions: {
|
|
77
|
-
applyMaterial: [
|
|
75
|
+
varying: Object.assign(Object.assign({}, material.varyings), { varNormal: "vec3" }),
|
|
76
|
+
functions: Object.assign(Object.assign({}, material.extraVertexShaderFunctions), { applyMaterial: [
|
|
78
77
|
"void applyMaterial() {",
|
|
79
78
|
[material.vertexShaderCode],
|
|
80
79
|
"}",
|
|
81
|
-
],
|
|
82
|
-
getPosition: [
|
|
80
|
+
], getPosition: [
|
|
83
81
|
"vec4 getPosition(vec4 pos) {",
|
|
84
82
|
[(_b = material.vertexShaderCodeForGetPosition) !== null && _b !== void 0 ? _b : "return pos;"],
|
|
85
83
|
"}",
|
|
86
|
-
],
|
|
87
|
-
},
|
|
84
|
+
] }),
|
|
88
85
|
mainCode: [
|
|
89
86
|
`vec3 normal = NORMAL;`,
|
|
90
87
|
`vec3 pos = POSITION;`,
|
|
@@ -122,13 +119,11 @@ export class TgdPainterSegments extends TgdPainter {
|
|
|
122
119
|
uniforms: material.uniforms,
|
|
123
120
|
outputs: { FragColor: "vec4" },
|
|
124
121
|
varying: material.varyings,
|
|
125
|
-
functions: {
|
|
126
|
-
applyMaterial: [
|
|
122
|
+
functions: Object.assign(Object.assign({}, material.extraFragmentShaderFunctions), { applyMaterial: [
|
|
127
123
|
"vec4 applyMaterial() {",
|
|
128
124
|
[material.fragmentShaderCode],
|
|
129
125
|
"}",
|
|
130
|
-
],
|
|
131
|
-
},
|
|
126
|
+
] }),
|
|
132
127
|
mainCode: [`FragColor = applyMaterial();`],
|
|
133
128
|
}).code;
|
|
134
129
|
const prg = new TgdProgram(context.gl, {
|
|
@@ -219,4 +214,4 @@ export class TgdPainterSegmentsData {
|
|
|
219
214
|
this._count++;
|
|
220
215
|
}
|
|
221
216
|
}
|
|
222
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
217
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"segments.js","sourceRoot":"","sources":["../../../src/painter/segments/segments.ts"],"names":[],"mappings":"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"}
|