@tolokoban/tgd 2.0.100 → 2.0.102

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 (164) hide show
  1. package/lib/dist/color/color.d.ts +4 -0
  2. package/lib/dist/color/color.d.ts.map +1 -1
  3. package/lib/dist/color/color.js +21 -1
  4. package/lib/dist/context/context.d.ts +3 -0
  5. package/lib/dist/context/context.d.ts.map +1 -1
  6. package/lib/dist/context/context.js +10 -7
  7. package/lib/dist/context/logic.d.ts +2 -2
  8. package/lib/dist/context/logic.js +2 -2
  9. package/lib/dist/context/ubo-manager.d.ts +10 -0
  10. package/lib/dist/context/ubo-manager.d.ts.map +1 -0
  11. package/lib/dist/context/ubo-manager.js +23 -0
  12. package/lib/dist/dataset/dataset.d.ts +8 -3
  13. package/lib/dist/dataset/dataset.d.ts.map +1 -1
  14. package/lib/dist/dataset/dataset.js +35 -12
  15. package/lib/dist/filter/blur.d.ts +1 -0
  16. package/lib/dist/filter/blur.d.ts.map +1 -1
  17. package/lib/dist/filter/blur.js +3 -1
  18. package/lib/dist/filter/filter.d.ts +4 -1
  19. package/lib/dist/filter/filter.d.ts.map +1 -1
  20. package/lib/dist/filter/filter.js +4 -1
  21. package/lib/dist/filter/hue-rotation.d.ts +2 -1
  22. package/lib/dist/filter/hue-rotation.d.ts.map +1 -1
  23. package/lib/dist/filter/hue-rotation.js +3 -2
  24. package/lib/dist/index.d.ts +1 -0
  25. package/lib/dist/index.d.ts.map +1 -1
  26. package/lib/dist/index.js +2 -1
  27. package/lib/dist/interface/transformable.d.ts +1 -1
  28. package/lib/dist/loader/image.d.ts +3 -3
  29. package/lib/dist/loader/image.d.ts.map +1 -1
  30. package/lib/dist/loader/image.js +10 -22
  31. package/lib/dist/material/glass.js +3 -3
  32. package/lib/dist/material/material.d.ts +3 -7
  33. package/lib/dist/material/material.d.ts.map +1 -1
  34. package/lib/dist/material/material.js +1 -1
  35. package/lib/dist/painter/background-with-depth/background-with-depth.d.ts +1 -1
  36. package/lib/dist/painter/background-with-depth/background-with-depth.js +2 -2
  37. package/lib/dist/painter/filter/filter.d.ts +7 -9
  38. package/lib/dist/painter/filter/filter.d.ts.map +1 -1
  39. package/lib/dist/painter/filter/filter.js +41 -47
  40. package/lib/dist/painter/fragment-shader/fragment-shader.d.ts +2 -2
  41. package/lib/dist/painter/fragment-shader/fragment-shader.js +2 -2
  42. package/lib/dist/painter/framebuffer-msaa.d.ts +23 -12
  43. package/lib/dist/painter/framebuffer-msaa.d.ts.map +1 -1
  44. package/lib/dist/painter/framebuffer-msaa.js +60 -9
  45. package/lib/dist/painter/framebuffer.d.ts +19 -18
  46. package/lib/dist/painter/framebuffer.d.ts.map +1 -1
  47. package/lib/dist/painter/framebuffer.js +76 -19
  48. package/lib/dist/painter/gizmo/gizmo.d.ts +31 -0
  49. package/lib/dist/painter/gizmo/gizmo.d.ts.map +1 -0
  50. package/lib/dist/painter/gizmo/gizmo.js +186 -0
  51. package/lib/dist/painter/gizmo/index.d.ts +2 -0
  52. package/lib/dist/painter/gizmo/index.d.ts.map +1 -0
  53. package/lib/dist/painter/gizmo/index.js +2 -0
  54. package/lib/dist/painter/gizmo/painters/axes.1.d.ts +14 -0
  55. package/lib/dist/painter/gizmo/painters/axes.1.d.ts.map +1 -0
  56. package/lib/dist/painter/gizmo/painters/axes.1.js +50 -0
  57. package/lib/dist/painter/gizmo/painters/axes.d.ts +16 -0
  58. package/lib/dist/painter/gizmo/painters/axes.d.ts.map +1 -0
  59. package/lib/dist/painter/gizmo/painters/axes.js +81 -0
  60. package/lib/dist/painter/gizmo/painters/consts.d.ts +4 -0
  61. package/lib/dist/painter/gizmo/painters/consts.d.ts.map +1 -0
  62. package/lib/dist/painter/gizmo/painters/consts.js +4 -0
  63. package/lib/dist/painter/gizmo/painters/mask.d.ts +14 -0
  64. package/lib/dist/painter/gizmo/painters/mask.d.ts.map +1 -0
  65. package/lib/dist/painter/gizmo/painters/mask.js +90 -0
  66. package/lib/dist/painter/gizmo/painters/normal.1.d.ts +21 -0
  67. package/lib/dist/painter/gizmo/painters/normal.1.d.ts.map +1 -0
  68. package/lib/dist/painter/gizmo/painters/normal.1.js +111 -0
  69. package/lib/dist/painter/gizmo/painters/normal.d.ts +17 -0
  70. package/lib/dist/painter/gizmo/painters/normal.d.ts.map +1 -0
  71. package/lib/dist/painter/gizmo/painters/normal.js +87 -0
  72. package/lib/dist/painter/gizmo/painters/tips.d.ts +18 -0
  73. package/lib/dist/painter/gizmo/painters/tips.d.ts.map +1 -0
  74. package/lib/dist/painter/gizmo/painters/tips.js +44 -0
  75. package/lib/dist/painter/gizmo/tips.d.ts +22 -0
  76. package/lib/dist/painter/gizmo/tips.d.ts.map +1 -0
  77. package/lib/dist/painter/gizmo/tips.js +51 -0
  78. package/lib/dist/painter/group-camera.d.ts +4 -2
  79. package/lib/dist/painter/group-camera.d.ts.map +1 -1
  80. package/lib/dist/painter/group-camera.js +7 -3
  81. package/lib/dist/painter/group.d.ts +6 -6
  82. package/lib/dist/painter/group.d.ts.map +1 -1
  83. package/lib/dist/painter/group.js +19 -13
  84. package/lib/dist/painter/index.d.ts +3 -0
  85. package/lib/dist/painter/index.d.ts.map +1 -1
  86. package/lib/dist/painter/index.js +4 -1
  87. package/lib/dist/painter/lod/lod.d.ts +1 -1
  88. package/lib/dist/painter/lod/lod.js +2 -2
  89. package/lib/dist/painter/logic.d.ts +2 -2
  90. package/lib/dist/painter/logic.js +2 -2
  91. package/lib/dist/painter/mesh/gltf/gltf.d.ts +2 -8
  92. package/lib/dist/painter/mesh/gltf/gltf.d.ts.map +1 -1
  93. package/lib/dist/painter/mesh/gltf/gltf.js +1 -1
  94. package/lib/dist/painter/mesh/mesh/mesh.d.ts +7 -16
  95. package/lib/dist/painter/mesh/mesh/mesh.d.ts.map +1 -1
  96. package/lib/dist/painter/mesh/mesh/mesh.js +21 -9
  97. package/lib/dist/painter/node/node.d.ts +3 -3
  98. package/lib/dist/painter/node/node.js +4 -4
  99. package/lib/dist/painter/overlay/index.d.ts +2 -0
  100. package/lib/dist/painter/overlay/index.d.ts.map +1 -0
  101. package/lib/dist/painter/overlay/index.js +2 -0
  102. package/lib/dist/painter/overlay/overlay.d.ts +77 -0
  103. package/lib/dist/painter/overlay/overlay.d.ts.map +1 -0
  104. package/lib/dist/painter/overlay/overlay.js +196 -0
  105. package/lib/dist/painter/painter.d.ts +1 -1
  106. package/lib/dist/painter/program.d.ts +70 -0
  107. package/lib/dist/painter/program.d.ts.map +1 -0
  108. package/lib/dist/painter/program.js +250 -0
  109. package/lib/dist/painter/scissor.d.ts +1 -1
  110. package/lib/dist/painter/scissor.js +2 -2
  111. package/lib/dist/painter/segments/segments-morphing.d.ts +4 -13
  112. package/lib/dist/painter/segments/segments-morphing.d.ts.map +1 -1
  113. package/lib/dist/painter/segments/segments-morphing.js +3 -3
  114. package/lib/dist/painter/segments/segments.d.ts +4 -13
  115. package/lib/dist/painter/segments/segments.d.ts.map +1 -1
  116. package/lib/dist/painter/segments/segments.js +3 -3
  117. package/lib/dist/painter/sprites/sprites.d.ts +5 -0
  118. package/lib/dist/painter/sprites/sprites.d.ts.map +1 -1
  119. package/lib/dist/painter/sprites/sprites.js +20 -9
  120. package/lib/dist/painter/state/state.js +4 -4
  121. package/lib/dist/painter/tubes/tubes.d.ts +4 -13
  122. package/lib/dist/painter/tubes/tubes.d.ts.map +1 -1
  123. package/lib/dist/painter/tubes/tubes.js +2 -2
  124. package/lib/dist/painter/x-ray/x-ray.d.ts +3 -11
  125. package/lib/dist/painter/x-ray/x-ray.d.ts.map +1 -1
  126. package/lib/dist/painter/x-ray/x-ray.js +3 -3
  127. package/lib/dist/parser/gltf/gltf.d.ts +2 -5
  128. package/lib/dist/parser/gltf/gltf.d.ts.map +1 -1
  129. package/lib/dist/parser/gltf/gltf.js +1 -1
  130. package/lib/dist/program/program.d.ts +2 -0
  131. package/lib/dist/program/program.d.ts.map +1 -1
  132. package/lib/dist/program/program.js +43 -8
  133. package/lib/dist/shader/fragment.d.ts.map +1 -1
  134. package/lib/dist/shader/fragment.js +3 -3
  135. package/lib/dist/shader/vertex.d.ts +3 -1
  136. package/lib/dist/shader/vertex.d.ts.map +1 -1
  137. package/lib/dist/shader/vertex.js +8 -6
  138. package/lib/dist/texture/texture-depth.d.ts +3 -11
  139. package/lib/dist/texture/texture-depth.d.ts.map +1 -1
  140. package/lib/dist/texture/texture-depth.js +1 -1
  141. package/lib/dist/texture/texture2d.d.ts +5 -11
  142. package/lib/dist/texture/texture2d.d.ts.map +1 -1
  143. package/lib/dist/texture/texture2d.js +3 -3
  144. package/lib/dist/time/interval/interval.d.ts +3 -3
  145. package/lib/dist/time/interval/interval.js +6 -6
  146. package/lib/dist/types/painter.d.ts +1 -1
  147. package/lib/dist/types/program.d.ts +3 -2
  148. package/lib/dist/types/program.d.ts.map +1 -1
  149. package/lib/dist/uniform/index.d.ts +3 -0
  150. package/lib/dist/uniform/index.d.ts.map +1 -0
  151. package/lib/dist/uniform/index.js +3 -0
  152. package/lib/dist/uniform/ubo-camera.d.ts +9 -0
  153. package/lib/dist/uniform/ubo-camera.d.ts.map +1 -0
  154. package/lib/dist/uniform/ubo-camera.js +20 -0
  155. package/lib/dist/uniform/uniform-buffer-object.d.ts +56 -0
  156. package/lib/dist/uniform/uniform-buffer-object.d.ts.map +1 -0
  157. package/lib/dist/uniform/uniform-buffer-object.js +347 -0
  158. package/lib/dist/utils/array.d.ts +2 -0
  159. package/lib/dist/utils/array.d.ts.map +1 -0
  160. package/lib/dist/utils/array.js +6 -0
  161. package/lib/dist/utils/index.d.ts +1 -0
  162. package/lib/dist/utils/index.d.ts.map +1 -1
  163. package/lib/dist/utils/index.js +2 -1
  164. package/package.json +2 -2
@@ -0,0 +1,196 @@
1
+ import { TgdPainter } from "../painter.js";
2
+ import { TgdDataset } from "./../../dataset/index.js";
3
+ import { TgdProgram } from "./../../program/index.js";
4
+ import { TgdShaderFragment, TgdShaderVertex } from "./../../shader/index.js";
5
+ import { TgdVertexArray } from "./../../vao/index.js";
6
+ import { TgdEvent } from "./../../event/index.js";
7
+ export class TgdPainterOverlay extends TgdPainter {
8
+ constructor(context, { alignX = +1, alignY = +1, scaleX = 1, scaleY = 1, width, height, margin = 0, z = 0, texture, } = {}) {
9
+ super();
10
+ this.context = context;
11
+ this.eventResize = new TgdEvent();
12
+ this.eventPointerTap = new TgdEvent();
13
+ this.eventPointerHover = new TgdEvent();
14
+ this.lastWidth = 0;
15
+ this.lastHeight = 0;
16
+ this.handleTap = (evtScreen) => {
17
+ const x = this.xScreenToLayout(evtScreen.x);
18
+ const y = this.yScreenToLayout(evtScreen.y);
19
+ if (Math.abs(x) > 1 || Math.abs(y) > 1)
20
+ return;
21
+ const evtOverlay = structuredClone(evtScreen);
22
+ evtOverlay.x = x;
23
+ evtOverlay.y = y;
24
+ this.eventPointerTap.dispatch(evtOverlay);
25
+ };
26
+ this.handleHover = (evtScreen) => {
27
+ const x = this.xScreenToLayout(evtScreen.current.x);
28
+ const y = this.yScreenToLayout(evtScreen.current.y);
29
+ if (Math.abs(x) > 1 || Math.abs(y) > 1)
30
+ return;
31
+ const evtOverlay = structuredClone(evtScreen);
32
+ evtOverlay.current.x = x;
33
+ evtOverlay.current.y = y;
34
+ this.eventPointerHover.dispatch(evtOverlay);
35
+ };
36
+ this.xScreenToLayout = (xScreen) => {
37
+ var _a;
38
+ const { context, alignX, marginLeft, marginRight } = this;
39
+ const marginPx = marginLeft + marginRight;
40
+ const widthPx = (_a = this.width) !== null && _a !== void 0 ? _a : context.width - marginPx;
41
+ const frameWidthPx = context.width - widthPx - marginPx;
42
+ const screenPerPixel = 2 / context.width;
43
+ const center = marginLeft + (widthPx + (1 + alignX) * frameWidthPx - context.width) / 2;
44
+ const factor = context.width / widthPx;
45
+ return (xScreen - center * screenPerPixel) * factor;
46
+ };
47
+ this.xLayoutToScreen = (xLayout) => {
48
+ var _a;
49
+ const { context, alignX, marginLeft, marginRight } = this;
50
+ const marginPx = marginLeft + marginRight;
51
+ const widthPx = (_a = this.width) !== null && _a !== void 0 ? _a : context.width - marginPx;
52
+ const frameWidthPx = context.width - widthPx - marginPx;
53
+ const screenPerPixel = 2 / context.width;
54
+ const center = marginLeft + (widthPx + (1 + alignX) * frameWidthPx - context.width) / 2;
55
+ const factor = widthPx / context.width;
56
+ return xLayout * factor + center * screenPerPixel;
57
+ };
58
+ this.yScreenToLayout = (yScreen) => {
59
+ var _a;
60
+ const { context, alignY, marginTop, marginBottom } = this;
61
+ const marginPx = marginTop + marginBottom;
62
+ const heightPx = (_a = this.height) !== null && _a !== void 0 ? _a : context.height - marginPx;
63
+ const frameHeightPx = context.height - heightPx - marginPx;
64
+ const screenPerPixel = 2 / context.height;
65
+ const center = marginBottom + (heightPx + (1 + alignY) * frameHeightPx - context.height) / 2;
66
+ const factor = context.height / heightPx;
67
+ return (yScreen - center * screenPerPixel) * factor;
68
+ };
69
+ this.yLayoutToScreen = (yLayout) => {
70
+ var _a;
71
+ const { context, alignY, marginTop, marginBottom } = this;
72
+ const marginPx = marginTop + marginBottom;
73
+ const heightPx = (_a = this.height) !== null && _a !== void 0 ? _a : context.height - marginPx;
74
+ const frameHeightPx = context.height - heightPx - marginPx;
75
+ const screenPerPixel = 2 / context.height;
76
+ const center = marginBottom + (heightPx + (1 + alignY) * frameHeightPx - context.height) / 2;
77
+ const factor = heightPx / context.height;
78
+ return yLayout * factor + center * screenPerPixel;
79
+ };
80
+ this.name = `Overlay/${this.name}`;
81
+ this.alignX = alignX;
82
+ this.alignY = alignY;
83
+ this.scaleX = scaleX;
84
+ this.scaleY = scaleY;
85
+ this.width = width;
86
+ this.height = height;
87
+ if (typeof margin === "number") {
88
+ this.marginTop = margin;
89
+ this.marginRight = margin;
90
+ this.marginBottom = margin;
91
+ this.marginLeft = margin;
92
+ }
93
+ else if (margin.length === 2) {
94
+ const [vertical, horizontal] = margin;
95
+ this.marginTop = vertical;
96
+ this.marginRight = horizontal;
97
+ this.marginBottom = vertical;
98
+ this.marginLeft = horizontal;
99
+ }
100
+ else {
101
+ const [top, right, bottom, left] = margin;
102
+ this.marginTop = top;
103
+ this.marginRight = right;
104
+ this.marginBottom = bottom;
105
+ this.marginLeft = left;
106
+ }
107
+ this.z = z;
108
+ this.texture = texture;
109
+ const dataset = new TgdDataset({
110
+ attPos: "vec2",
111
+ attUV: "vec2",
112
+ });
113
+ dataset.set("attPos", new Float32Array([+1, -1, +1, +1, -1, -1, -1, +1]));
114
+ dataset.set("attUV", new Float32Array([1, 1, 1, 0, 0, 1, 0, 0]));
115
+ const prg = new TgdProgram(context.gl, {
116
+ vert: new TgdShaderVertex({
117
+ uniforms: {
118
+ uniCenter: "vec2",
119
+ uniScale: "vec2",
120
+ uniScaleUV: "vec2",
121
+ uniZ: "float",
122
+ },
123
+ varying: {
124
+ varUV: "vec2",
125
+ },
126
+ attributes: {
127
+ attPos: "vec2",
128
+ attUV: "vec2",
129
+ },
130
+ mainCode: [
131
+ "varUV = (attUV - vec2(.5)) * uniScaleUV + vec2(.5);",
132
+ "gl_Position = vec4(attPos * uniScale + uniCenter, uniZ, 1);",
133
+ ],
134
+ }).code,
135
+ frag: new TgdShaderFragment({
136
+ uniforms: {
137
+ uniTexture: "sampler2D",
138
+ },
139
+ varying: {
140
+ varUV: "vec2",
141
+ },
142
+ mainCode: ["FragColor = texture(uniTexture, varUV);"],
143
+ }).code,
144
+ });
145
+ const vao = new TgdVertexArray(context.gl, prg, [dataset]);
146
+ this.prg = prg;
147
+ this.vao = vao;
148
+ const { pointer } = context.inputs;
149
+ pointer.eventTap.addListener(this.handleTap);
150
+ pointer.eventHover.addListener(this.handleHover);
151
+ }
152
+ delete() {
153
+ const { context } = this;
154
+ if (context) {
155
+ this.eventPointerTap.removeListener(this.handleTap);
156
+ }
157
+ this.prg.delete();
158
+ this.vao.delete();
159
+ }
160
+ paint(time, delta) {
161
+ this.checkForResizeEvent();
162
+ const { context, prg, vao, z, scaleX, scaleY, xLayoutToScreen, yLayoutToScreen, texture } = this;
163
+ const { gl } = context;
164
+ prg.use();
165
+ prg.uniform1f("uniZ", z);
166
+ const x0 = xLayoutToScreen(0);
167
+ const y0 = yLayoutToScreen(0);
168
+ prg.uniform2f("uniCenter", x0, y0);
169
+ const x1 = xLayoutToScreen(1);
170
+ const y1 = yLayoutToScreen(1);
171
+ prg.uniform2f("uniScale", x1 - x0, y1 - y0);
172
+ prg.uniform2f("uniScaleUV", scaleX, scaleY);
173
+ if (!texture) {
174
+ throw new Error("[TgdPainterOverlay] texture has not been set!");
175
+ }
176
+ texture.activate(0, prg, "uniTexture");
177
+ vao.bind();
178
+ const cull = context.webglParams.cullFace;
179
+ context.webglParams.cullFace = false;
180
+ gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
181
+ context.webglParams.cullFace = cull;
182
+ vao.unbind();
183
+ }
184
+ checkForResizeEvent() {
185
+ var _a, _b;
186
+ const { context, lastWidth, lastHeight, marginLeft, marginRight, marginTop, marginBottom } = this;
187
+ const width = Math.max(0, (_a = this.width) !== null && _a !== void 0 ? _a : context.width - marginLeft - marginRight);
188
+ const height = Math.max(0, (_b = this.height) !== null && _b !== void 0 ? _b : context.height - marginTop - marginBottom);
189
+ if (width !== lastWidth || height !== lastHeight) {
190
+ this.lastWidth = width;
191
+ this.lastHeight = height;
192
+ this.eventResize.dispatch({ width, height });
193
+ }
194
+ }
195
+ }
196
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"overlay.js","sourceRoot":"","sources":["../../../src/painter/overlay/overlay.ts"],"names":[],"mappings":"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"}
@@ -11,7 +11,7 @@ export declare abstract class TgdPainter {
11
11
  name: string;
12
12
  active: boolean;
13
13
  abstract delete(): void;
14
- abstract paint(time: number, delay: number): void;
14
+ abstract paint(time: number, delta: number): void;
15
15
  get hierarchy(): TgdDebugPainterHierarchy;
16
16
  debug(caption?: string): void;
17
17
  }
@@ -0,0 +1,70 @@
1
+ import type { TgdContext } from "../context";
2
+ import { TgdDataset, type TgdDatasetOptions, type TgdDatasetType } from "../dataset";
3
+ import { type TgdCodeBloc, type TgdCodeFunctions, type TgdCodeVariables } from "../shader";
4
+ import type { TgdTypeArrayForElements, WebglAttributeType } from "../types";
5
+ import type { TgdPainterFunction } from "../types/painter";
6
+ import { TgdTexture2D, TgdTextureCube } from "@tolokoban/tgd";
7
+ import { TgdUniformBufferObject, type TgdUniformBufferObjectOptions } from "./../uniform/uniform-buffer-object";
8
+ import { TgdPainter } from "./painter";
9
+ import { type TgdPainterStateOptions } from "./state";
10
+ interface DatasetOptions extends Partial<Omit<TgdDatasetOptions, "data" | "buffer">> {
11
+ attribs: Record<string, {
12
+ type: TgdDatasetType;
13
+ data: ArrayBuffer | Int8Array | Uint8Array | Int16Array | Uint16Array | Uint32Array | Float32Array | {
14
+ buffer: ArrayBuffer;
15
+ };
16
+ }>;
17
+ }
18
+ export interface TgdPainterProgramOptions {
19
+ drawMode: "POINTS" | "LINE_STRIP" | "LINE_LOOP" | "LINES" | "TRIANGLE_STRIP" | "TRIANGLE_FAN" | "TRIANGLES" | WebGL2RenderingContext["POINTS"] | WebGL2RenderingContext["LINE_STRIP"] | WebGL2RenderingContext["LINE_LOOP"] | WebGL2RenderingContext["LINES"] | WebGL2RenderingContext["TRIANGLE_STRIP"] | WebGL2RenderingContext["TRIANGLE_FAN"] | WebGL2RenderingContext["TRIANGLES"];
20
+ uniforms?: Record<string, TgdUniformBufferObject | Omit<TgdUniformBufferObjectOptions, "bindingPoint">>;
21
+ textures?: Record<string, TgdTexture2D | TgdTextureCube>;
22
+ dataset: TgdDataset | DatasetOptions | (TgdDataset | DatasetOptions)[];
23
+ varying?: TgdCodeVariables<WebglAttributeType>;
24
+ vert: Partial<{
25
+ precision: "lowp" | "mediump" | "highp";
26
+ functions: TgdCodeFunctions;
27
+ mainCode: TgdCodeBloc;
28
+ header: TgdCodeBloc;
29
+ }>;
30
+ frag: Partial<{
31
+ precision: "lowp" | "mediump" | "highp";
32
+ outputs: TgdCodeVariables<WebglAttributeType>;
33
+ functions: TgdCodeFunctions | TgdCodeBloc;
34
+ mainCode: TgdCodeBloc;
35
+ header: TgdCodeBloc;
36
+ }>;
37
+ elements?: TgdTypeArrayForElements;
38
+ state?: Partial<Omit<TgdPainterStateOptions, "children">>;
39
+ elementsCount?: number;
40
+ elementsOffset?: number;
41
+ instancesCount?: number;
42
+ onEnter?: TgdPainterFunction;
43
+ onDelete?: () => void;
44
+ }
45
+ export declare class TgdPainterProgram extends TgdPainter {
46
+ private readonly context;
47
+ elementsCount: number;
48
+ elementsOffset: number;
49
+ instancesCount: number;
50
+ readonly textures: Record<string, TgdTexture2D | TgdTextureCube>;
51
+ private readonly uniformBlocks;
52
+ private readonly uniformBlocksToDelete;
53
+ private readonly prg;
54
+ private readonly vao;
55
+ private readonly drawMode;
56
+ private readonly painterState;
57
+ private readonly hasElements;
58
+ private readonly elementsType;
59
+ private readonly onEnter?;
60
+ private readonly onDelete?;
61
+ constructor(context: TgdContext, { onEnter, onDelete, uniforms, textures, varying, vert, frag, dataset, elements, drawMode, state, elementsCount, elementsOffset, instancesCount, }: TgdPainterProgramOptions);
62
+ delete(): void;
63
+ paint(time: number, delta: number): void;
64
+ debug(caption?: string): void;
65
+ private readonly internalPaint;
66
+ private uniformsToCode;
67
+ private resolveUniformBlock;
68
+ }
69
+ export {};
70
+ //# sourceMappingURL=program.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"program.d.ts","sourceRoot":"","sources":["../../src/painter/program.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,250 @@
1
+ import { TgdDataset } from "./../dataset/index.js";
2
+ import { TgdConsole } from "./../debug/index.js";
3
+ import { TgdProgram } from "./../program/index.js";
4
+ import { TgdShaderFragment, TgdShaderVertex, tgdCodeStringify, } from "./../shader/index.js";
5
+ import { ensureArray, webglElementTypeFromTypedArray, webglLookup } from "./../utils/index.js";
6
+ import { TgdPainterLogic, TgdTexture2D, TgdTextureCube, TgdVertexArray } from "./../index.js";
7
+ import { TgdUniformBufferObject } from "./../uniform/uniform-buffer-object.js";
8
+ import { TgdPainter } from "./painter.js";
9
+ import { TgdPainterState } from "./state/index.js";
10
+ export class TgdPainterProgram extends TgdPainter {
11
+ constructor(context, { onEnter, onDelete, uniforms = {}, textures = {}, varying, vert, frag, dataset, elements, drawMode, state, elementsCount, elementsOffset, instancesCount, }) {
12
+ super();
13
+ this.context = context;
14
+ this.elementsCount = 0;
15
+ this.elementsOffset = 0;
16
+ this.instancesCount = 0;
17
+ this.uniformBlocks = [];
18
+ this.uniformBlocksToDelete = [];
19
+ this.internalPaint = (time, delta) => {
20
+ const { context, onEnter, textures, uniformBlocks, prg, vao, elementsType, elementsCount, elementsOffset, instancesCount, drawMode: mode, } = this;
21
+ const { gl } = context;
22
+ prg.use();
23
+ let unit = 0;
24
+ for (const name of Object.keys(textures)) {
25
+ const texture = textures[name];
26
+ texture.activate(unit++, prg, name);
27
+ }
28
+ onEnter === null || onEnter === void 0 ? void 0 : onEnter(time, delta);
29
+ for (const block of uniformBlocks) {
30
+ block.updateData();
31
+ }
32
+ vao.bind();
33
+ if (this.hasElements) {
34
+ if (instancesCount > 0) {
35
+ gl.drawElementsInstanced(mode, elementsCount, elementsType, elementsOffset, instancesCount);
36
+ }
37
+ else {
38
+ gl.drawElements(mode, elementsCount, elementsType, elementsOffset);
39
+ }
40
+ }
41
+ else {
42
+ if (instancesCount > 0) {
43
+ gl.drawArraysInstanced(mode, elementsOffset, elementsCount, instancesCount);
44
+ }
45
+ else {
46
+ gl.drawArrays(mode, elementsOffset, elementsCount);
47
+ }
48
+ }
49
+ vao.unbind();
50
+ };
51
+ this.textures = textures;
52
+ this.onEnter = onEnter;
53
+ this.onDelete = onDelete;
54
+ const datasets = ensureArray(dataset).map((item) => {
55
+ if (item instanceof TgdDataset)
56
+ return item;
57
+ const attributesDefinition = {};
58
+ for (const attribName of Object.keys(item.attribs)) {
59
+ attributesDefinition[attribName] = item.attribs[attribName].type;
60
+ }
61
+ const ds = new TgdDataset(attributesDefinition, item);
62
+ for (const attribName of Object.keys(item.attribs)) {
63
+ ds.set(attribName, item.attribs[attribName].data);
64
+ }
65
+ return ds;
66
+ });
67
+ this.drawMode = typeof drawMode === "number" ? drawMode : context.gl[drawMode];
68
+ const uniformsHeader = ensureArray(this.uniformsToCode(uniforms));
69
+ const uniformsForTextures = texturesToUniforms(textures);
70
+ const vertexShader = new TgdShaderVertex(Object.assign(Object.assign({}, vert), { uniforms: uniformsForTextures, attributes: resolveAttributesFromDataset(datasets), header: [...uniformsHeader, ...ensureArray(vert.header)], varying }));
71
+ const fragmentShader = new TgdShaderFragment(Object.assign(Object.assign({}, frag), { uniforms: uniformsForTextures, header: [...uniformsHeader, ...ensureArray(vert.header)], varying }));
72
+ const program = new TgdProgram(context.gl, {
73
+ vert: vertexShader,
74
+ frag: fragmentShader,
75
+ });
76
+ this.prg = program;
77
+ const vao = new TgdVertexArray(context.gl, program, datasets, elements);
78
+ this.vao = vao;
79
+ this.painterState = new TgdPainterState(context, Object.assign(Object.assign({}, state), { children: [new TgdPainterLogic(this.internalPaint)] }));
80
+ this.elementsCount = elementsCount !== null && elementsCount !== void 0 ? elementsCount : resolveElementsCount(datasets, elements);
81
+ this.elementsOffset = elementsOffset !== null && elementsOffset !== void 0 ? elementsOffset : 0;
82
+ this.instancesCount = instancesCount !== null && instancesCount !== void 0 ? instancesCount : resolveInstancesCount(datasets);
83
+ this.hasElements = !!elements;
84
+ this.elementsType = elements ? webglElementTypeFromTypedArray(elements) : 0;
85
+ const setBindingPoints = new Set();
86
+ Object.keys(uniforms).forEach((blockName, index) => {
87
+ const block = this.uniformBlocks[index];
88
+ if (setBindingPoints.has(block.bindingPoint)) {
89
+ const code = Object.keys(uniforms).map((blockName, index) => this.uniformBlocks[index].toShaderCode(blockName));
90
+ throw new Error(`[TgdPainterProgram] Uniform blocks must have distincts binding points!\n${tgdCodeStringify(code)}`);
91
+ }
92
+ setBindingPoints.add(block.bindingPoint);
93
+ block.bindToProgram(program, blockName);
94
+ });
95
+ }
96
+ delete() {
97
+ var _a;
98
+ (_a = this.onDelete) === null || _a === void 0 ? void 0 : _a.call(this);
99
+ for (const block of this.uniformBlocksToDelete) {
100
+ block.delete();
101
+ }
102
+ this.prg.delete();
103
+ this.vao.delete();
104
+ }
105
+ paint(time, delta) {
106
+ this.painterState.paint(time, delta);
107
+ }
108
+ debug(caption) {
109
+ console.log(caption !== null && caption !== void 0 ? caption : this.name);
110
+ console.log({
111
+ drawMode: webglLookup(this.drawMode),
112
+ elementsCount: this.elementsCount,
113
+ elementsOffset: this.elementsOffset,
114
+ instancesCount: this.instancesCount,
115
+ });
116
+ this.vao.debug();
117
+ }
118
+ uniformsToCode(uniforms) {
119
+ const code = [];
120
+ const setNames = new Set();
121
+ const setDuplicated = new Set();
122
+ const names = {};
123
+ for (const blockName of Object.keys(uniforms)) {
124
+ const block = this.resolveUniformBlock(uniforms[blockName]);
125
+ this.uniformBlocks.push(block);
126
+ names[blockName] = block.names;
127
+ code.push(...ensureArray(block.toShaderCode(blockName)));
128
+ for (const name of block.names) {
129
+ if (setNames.has(name))
130
+ setDuplicated.add(name);
131
+ else
132
+ setNames.add(name);
133
+ }
134
+ }
135
+ if (setDuplicated.size > 0) {
136
+ // There is a duplicate!
137
+ const out = new TgdConsole({
138
+ text: "[TgdPainterProgram] You have duplicated names in your uniform blocks:\n",
139
+ color: "#f33",
140
+ });
141
+ for (const blockName of Object.keys(names)) {
142
+ out.add(` ${blockName}`, { bold: true }).add(": ");
143
+ names[blockName].forEach((name, index) => {
144
+ if (index > 0)
145
+ out.add(", ");
146
+ out.add(name, setDuplicated.has(name)
147
+ ? {
148
+ bold: true,
149
+ color: "#f33",
150
+ }
151
+ : undefined);
152
+ });
153
+ out.nl();
154
+ }
155
+ out.error();
156
+ }
157
+ return code;
158
+ }
159
+ resolveUniformBlock(obj) {
160
+ if (obj instanceof TgdUniformBufferObject)
161
+ return obj;
162
+ return new TgdUniformBufferObject(this.context, obj);
163
+ }
164
+ }
165
+ function resolveAttributesFromDataset(datasets) {
166
+ const attributes = {};
167
+ const setNames = new Set();
168
+ const setDuplicated = new Set();
169
+ for (const dataset of datasets) {
170
+ for (const name of dataset.attributesNames) {
171
+ if (setNames.has(name))
172
+ setDuplicated.add(name);
173
+ else
174
+ setNames.add(name);
175
+ attributes[name] = dataset.getType(name);
176
+ }
177
+ }
178
+ if (setDuplicated.size > 0) {
179
+ // There is a duplicate!
180
+ const out = new TgdConsole({
181
+ text: "[TgdPainterProgram] You have duplicated names in your datasets:\n",
182
+ color: "#f33",
183
+ });
184
+ for (const dataset of datasets) {
185
+ out.add(` ${dataset.name}`, { bold: true }).add(": ");
186
+ dataset.attributesNames.forEach((name, index) => {
187
+ if (index > 0)
188
+ out.add(", ");
189
+ out.add(name, setDuplicated.has(name)
190
+ ? {
191
+ bold: true,
192
+ color: "#f33",
193
+ }
194
+ : undefined);
195
+ });
196
+ out.nl();
197
+ }
198
+ out.error();
199
+ }
200
+ return attributes;
201
+ }
202
+ function resolveElementsCount(datasets, elements) {
203
+ if (elements)
204
+ return elements.length;
205
+ const counts = datasets.filter((ds) => ds.divisor === 0).map((ds) => ds.count);
206
+ if (counts.length === 0) {
207
+ throw new Error("[TgdPainterProgram] You must give at least one Dataset with divisor 0 in the constructor!\nOr you can specify elementsCount.");
208
+ }
209
+ if (counts.length === 1)
210
+ return counts[0];
211
+ counts.sort();
212
+ const [first] = counts;
213
+ const last = counts[counts.length - 1];
214
+ if (first === last)
215
+ return first;
216
+ throw new Error(`[TgdPainterPogram] I cannot resolve elementsCount because your datasets have different counts!\n${datasets
217
+ .filter((ds) => ds.divisor === 0)
218
+ .map((ds) => ` ${ds.name}: count == ${ds.count}`)}`);
219
+ }
220
+ function resolveInstancesCount(datasets) {
221
+ const counts = datasets.filter((ds) => ds.divisor > 0).map((ds) => ds.count / ds.divisor);
222
+ if (counts.length === 0)
223
+ return 0;
224
+ if (counts.length === 1)
225
+ return counts[0];
226
+ counts.sort();
227
+ const [first] = counts;
228
+ const last = counts[counts.length - 1];
229
+ if (first === last)
230
+ return first;
231
+ throw new Error(`[TgdPainterPogram] I cannot resolve elementsCount because your instance datasets have different counts!\n${datasets
232
+ .filter((ds) => ds.divisor > 0)
233
+ .map((ds) => ` ${ds.name}: count == ${ds.count} / ${ds.divisor} == ${ds.count / ds.divisor}`)}`);
234
+ }
235
+ function texturesToUniforms(textures) {
236
+ const uniforms = {};
237
+ for (const name of Object.keys(textures)) {
238
+ uniforms[name] = resolveTextureType(textures[name]);
239
+ }
240
+ return uniforms;
241
+ }
242
+ function resolveTextureType(texture) {
243
+ if (texture instanceof TgdTexture2D)
244
+ return "sampler2D";
245
+ if (texture instanceof TgdTextureCube)
246
+ return "samplerCube";
247
+ console.error("[resolveTextureType] Don't know the type of this texture:", texture);
248
+ throw new Error("[resolveTextureType] Don't know the type of this texture!");
249
+ }
250
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"program.js","sourceRoot":"","sources":["../../src/painter/program.ts"],"names":[],"mappings":"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"}
@@ -41,6 +41,6 @@ export declare class TgdPainterScissor extends TgdPainterGroup {
41
41
  constructor(context: {
42
42
  gl: WebGL2RenderingContext;
43
43
  }, options: TgdPainterScissorOptions);
44
- paint(time: number, delay: number): void;
44
+ paint(time: number, delta: number): void;
45
45
  }
46
46
  //# sourceMappingURL=scissor.d.ts.map
@@ -27,7 +27,7 @@ export class TgdPainterScissor extends TgdPainterGroup {
27
27
  this.width = options.width;
28
28
  this.height = options.height;
29
29
  }
30
- paint(time, delay) {
30
+ paint(time, delta) {
31
31
  const { gl } = this.context;
32
32
  const enabled = gl.getParameter(gl.SCISSOR_TEST);
33
33
  const [curX, curY, curW, curH] = gl.getParameter(gl.SCISSOR_BOX);
@@ -37,7 +37,7 @@ export class TgdPainterScissor extends TgdPainterGroup {
37
37
  const h = Math.round(this.height * gl.drawingBufferHeight);
38
38
  gl.enable(gl.SCISSOR_TEST);
39
39
  gl.scissor(x, y, w, h);
40
- super.paint(time, delay);
40
+ super.paint(time, delta);
41
41
  if (enabled) {
42
42
  gl.enable(gl.SCISSOR_TEST);
43
43
  }
@@ -1,10 +1,9 @@
1
- import type { TgdCamera } from "../../camera";
2
- import type { WebglParams } from "../../context/webgl-params";
3
1
  import type { TgdDataset } from "../../dataset";
4
2
  import { type TgdMaterial } from "../../material";
5
3
  import { TgdTransfo } from "../../math";
6
4
  import { TgdPainter } from "../painter";
7
5
  import { TgdTexture2D } from "../../texture";
6
+ import { TgdContext } from "../../context";
8
7
  type DatasetOption = TgdDataset | (() => TgdDataset);
9
8
  export type TgdPainterSegmentsMorphingOptions = {
10
9
  /**
@@ -55,11 +54,7 @@ export type TgdPainterSegmentsMorphingOptions = {
55
54
  * ```
56
55
  */
57
56
  export declare class TgdPainterSegmentsMorphing extends TgdPainter {
58
- protected readonly context: {
59
- gl: WebGL2RenderingContext;
60
- webglParams: WebglParams;
61
- camera: TgdCamera;
62
- };
57
+ protected readonly context: TgdContext;
63
58
  readonly transfo: TgdTransfo;
64
59
  colorTexture: TgdTexture2D;
65
60
  minRadius: number;
@@ -76,13 +71,9 @@ export declare class TgdPainterSegmentsMorphing extends TgdPainter {
76
71
  private readonly prg;
77
72
  private readonly vertexCount;
78
73
  private readonly material;
79
- constructor(context: {
80
- gl: WebGL2RenderingContext;
81
- webglParams: WebglParams;
82
- camera: TgdCamera;
83
- }, options: TgdPainterSegmentsMorphingOptions);
74
+ constructor(context: TgdContext, options: TgdPainterSegmentsMorphingOptions);
84
75
  delete(): void;
85
- paint(time: number, delay: number): void;
76
+ paint(time: number, delta: number): void;
86
77
  private get vao();
87
78
  }
88
79
  export {};