@tolokoban/tgd 2.0.36 → 2.0.39

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.
Files changed (53) hide show
  1. package/lib/dist/code/math.d.ts +3 -0
  2. package/lib/dist/code/math.d.ts.map +1 -1
  3. package/lib/dist/code/math.js +13 -2
  4. package/lib/dist/controller/camera/orbit.d.ts +5 -1
  5. package/lib/dist/controller/camera/orbit.d.ts.map +1 -1
  6. package/lib/dist/controller/camera/orbit.js +10 -7
  7. package/lib/dist/filter/blur.d.ts.map +1 -1
  8. package/lib/dist/filter/blur.js +6 -3
  9. package/lib/dist/geometry/geometry.d.ts +1 -1
  10. package/lib/dist/geometry/geometry.d.ts.map +1 -1
  11. package/lib/dist/geometry/geometry.js +6 -4
  12. package/lib/dist/geometry/grid.d.ts +15 -0
  13. package/lib/dist/geometry/grid.d.ts.map +1 -0
  14. package/lib/dist/geometry/grid.js +65 -0
  15. package/lib/dist/geometry/index.d.ts +1 -0
  16. package/lib/dist/geometry/index.d.ts.map +1 -1
  17. package/lib/dist/geometry/index.js +2 -1
  18. package/lib/dist/geometry/plane.js +1 -1
  19. package/lib/dist/loader/image.d.ts +6 -0
  20. package/lib/dist/loader/image.d.ts.map +1 -1
  21. package/lib/dist/loader/image.js +65 -27
  22. package/lib/dist/material/index.d.ts +1 -0
  23. package/lib/dist/material/index.d.ts.map +1 -1
  24. package/lib/dist/material/index.js +2 -1
  25. package/lib/dist/material/normal-map.d.ts +5 -0
  26. package/lib/dist/material/normal-map.d.ts.map +1 -0
  27. package/lib/dist/material/normal-map.js +20 -0
  28. package/lib/dist/painter/background/background.d.ts.map +1 -1
  29. package/lib/dist/painter/background/background.js +12 -3
  30. package/lib/dist/painter/framebuffer-msaa.d.ts.map +1 -1
  31. package/lib/dist/painter/framebuffer-msaa.js +3 -1
  32. package/lib/dist/painter/framebuffer.d.ts.map +1 -1
  33. package/lib/dist/painter/framebuffer.js +3 -1
  34. package/lib/dist/painter/mesh/gltf/gltf.d.ts.map +1 -1
  35. package/lib/dist/painter/mesh/gltf/gltf.js +5 -4
  36. package/lib/dist/parser/gltf/gltf.d.ts.map +1 -1
  37. package/lib/dist/parser/gltf/gltf.js +13 -6
  38. package/lib/dist/utils/canvas.d.ts +1 -0
  39. package/lib/dist/utils/canvas.d.ts.map +1 -1
  40. package/lib/dist/utils/canvas.js +6 -1
  41. package/lib/dist/utils/webgl.d.ts +7 -0
  42. package/lib/dist/utils/webgl.d.ts.map +1 -1
  43. package/lib/dist/utils/webgl.js +17 -1
  44. package/package.json +1 -1
  45. package/lib/dist/painter/fragment-dhader/filter.d.ts +0 -31
  46. package/lib/dist/painter/fragment-dhader/filter.d.ts.map +0 -1
  47. package/lib/dist/painter/fragment-dhader/filter.js +0 -161
  48. package/lib/dist/painter/fragment-dhader/index.d.ts +0 -2
  49. package/lib/dist/painter/fragment-dhader/index.d.ts.map +0 -1
  50. package/lib/dist/painter/fragment-dhader/index.js +0 -2
  51. package/lib/dist/painter/fragment-shader/filter.d.ts +0 -31
  52. package/lib/dist/painter/fragment-shader/filter.d.ts.map +0 -1
  53. package/lib/dist/painter/fragment-shader/filter.js +0 -161
@@ -1,161 +0,0 @@
1
- import { TgdPainter } from "./../painter.js";
2
- import { TgdDataset } from "./../../dataset/dataset.js";
3
- import { TgdVertexArray } from "./../../vao/index.js";
4
- import { TgdShaderVertex } from "./../../shader/vertex.js";
5
- import { TgdShaderFragment } from "./../../shader/fragment.js";
6
- import { TgdProgram } from "./../../program/index.js";
7
- export class TgdPainterFilter extends TgdPainter {
8
- constructor(context, options) {
9
- var _a, _b, _c;
10
- super();
11
- this.context = context;
12
- this.z = 0;
13
- this.textures = null;
14
- this.texturesWith = -1;
15
- this.texturesHeight = -1;
16
- this.z = (_a = options.z) !== null && _a !== void 0 ? _a : 0.999999;
17
- this.texture = options.texture;
18
- const filters = (_b = options.filters) !== null && _b !== void 0 ? _b : [];
19
- if (filters.length === 0) {
20
- throw new Error(`[TgdPainterFilter] filters is expected to have at least one element!`);
21
- }
22
- const programs = filters.map(filter => {
23
- const vert = new TgdShaderVertex({
24
- attributes: {
25
- attPoint: "vec2",
26
- attUV: "vec2",
27
- },
28
- varying: {
29
- varUV: "vec2",
30
- },
31
- uniforms: {
32
- uniZ: "float",
33
- },
34
- mainCode: [
35
- "varUV = attUV;",
36
- "gl_Position = vec4(",
37
- ["attPoint,", "uniZ,", "1.0"],
38
- ");",
39
- ],
40
- }).code;
41
- const frag = new TgdShaderFragment({
42
- uniforms: Object.assign({ uniWidth: "float", uniHeight: "float", uniTexture: "sampler2D" }, filter.uniforms),
43
- varying: {
44
- varUV: "vec2",
45
- },
46
- mainCode: filter.fragmentShaderCode,
47
- functions: filter.extraFunctions,
48
- }).code;
49
- return new TgdProgram(context.gl, { vert, frag });
50
- });
51
- const vaos = programs.map(program => createVAO(context, program, options.flipY ? -1 : +1));
52
- this.program = programs.pop();
53
- this.programs = programs;
54
- this.filter = filters.pop();
55
- this.filters = filters;
56
- const vao = vaos.pop();
57
- this.vaos = vaos;
58
- const count = vaos.length + (options.flipY ? 1 : 0);
59
- this.vao = count % 2 === 0 ? vao : createVAO(context, this.program, -1);
60
- const framebuffer = context.gl.createFramebuffer();
61
- if (!framebuffer)
62
- throw new Error("Unable to create a WebGL Framebuffer!");
63
- this.framebuffer = framebuffer;
64
- this.name = (_c = options.name) !== null && _c !== void 0 ? _c : `Filter/${this.name}`;
65
- }
66
- delete() {
67
- const { context, textures, vaos, vao, framebuffer } = this;
68
- const { gl } = context;
69
- for (const vao of vaos)
70
- vao.delete();
71
- vao.delete();
72
- gl.deleteFramebuffer(framebuffer);
73
- if (textures) {
74
- for (const tex of textures)
75
- gl.deleteTexture(tex);
76
- }
77
- }
78
- paint(time, delay) {
79
- const { vaos, texture, z, context } = this;
80
- const { gl } = this.program;
81
- let inputTexture = texture === null || texture === void 0 ? void 0 : texture.glTexture;
82
- if (!inputTexture) {
83
- console.warn("[TgdPainterFilter] Input texture is undefined!");
84
- return;
85
- }
86
- if (vaos.length > 0) {
87
- const { programs, filters, framebuffer } = this;
88
- const currentFramebuffer = gl.getParameter(gl.FRAMEBUFFER_BINDING);
89
- const textures = this.getTextures(gl);
90
- let texIndex = 0;
91
- let outputTexture = textures[texIndex];
92
- for (const [index, vao] of vaos.entries()) {
93
- gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer);
94
- gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, outputTexture, 0);
95
- paintOneFilter(time, delay, vao, programs[index], filters[index], inputTexture, z, context);
96
- texIndex = 1 - texIndex;
97
- inputTexture = outputTexture;
98
- outputTexture = textures[texIndex];
99
- }
100
- gl.bindFramebuffer(gl.FRAMEBUFFER, currentFramebuffer);
101
- }
102
- paintOneFilter(time, delay, this.vao, this.program, this.filter, inputTexture, z, context);
103
- gl.bindVertexArray(null);
104
- }
105
- getTextures(gl) {
106
- var _a;
107
- const { width, height } = (_a = this.texture) !== null && _a !== void 0 ? _a : { width: 64, height: 64 };
108
- if (this.textures &&
109
- this.texturesWith === width &&
110
- this.texturesHeight === height) {
111
- return [...this.textures];
112
- }
113
- if (this.textures) {
114
- for (const tex of this.textures)
115
- gl.deleteTexture(tex);
116
- }
117
- this.texturesWith = width;
118
- this.texturesHeight = height;
119
- this.textures = [0, 1].map(() => {
120
- const texture = gl.createTexture();
121
- gl.bindTexture(gl.TEXTURE_2D, texture);
122
- gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
123
- gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
124
- gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
125
- gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
126
- gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, width, height, 0, gl.RGBA, gl.UNSIGNED_BYTE, null);
127
- return texture;
128
- });
129
- return this.textures;
130
- }
131
- }
132
- function paintOneFilter(time, delay, vao, program, filter, texture, z, context) {
133
- const { gl } = program;
134
- program.use();
135
- program.uniform1f("uniZ", z);
136
- filter.setUniforms({ context, program, time, delay });
137
- gl.activeTexture(gl.TEXTURE0);
138
- gl.bindTexture(gl.TEXTURE_2D, texture);
139
- program.uniform1i("uniTexture", 0);
140
- vao.bind();
141
- gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
142
- }
143
- function createVAO(context, program, flipY = +1) {
144
- const dataset = new TgdDataset({
145
- attPoint: "vec2",
146
- attUV: "vec2",
147
- });
148
- // prettier-ignore
149
- dataset.set("attPoint", new Float32Array([
150
- -1, +1 * flipY,
151
- +1, +1 * flipY,
152
- -1, -1 * flipY,
153
- +1, -1 * flipY,
154
- ]));
155
- dataset.set("attUV", new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]));
156
- const vao = new TgdVertexArray(context.gl, program, [dataset]);
157
- if (!vao)
158
- throw new Error("Unable to create WebGL VAO!");
159
- return vao;
160
- }
161
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/painter/fragment-shader/filter.ts"],"names":[],"mappings":"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"}