@tolokoban/tgd 2.0.100 → 2.0.103
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/canvas/gizmo/painter/tips.d.ts +1 -1
- package/lib/dist/canvas/gizmo/painter/tips.d.ts.map +1 -1
- package/lib/dist/canvas/gizmo/painter/tips.js +1 -1
- package/lib/dist/color/color.d.ts +4 -0
- package/lib/dist/color/color.d.ts.map +1 -1
- package/lib/dist/color/color.js +21 -1
- package/lib/dist/context/context.d.ts +3 -0
- package/lib/dist/context/context.d.ts.map +1 -1
- package/lib/dist/context/context.js +10 -7
- package/lib/dist/context/logic.d.ts +2 -2
- package/lib/dist/context/logic.js +2 -2
- package/lib/dist/context/ubo-manager.d.ts +10 -0
- package/lib/dist/context/ubo-manager.d.ts.map +1 -0
- package/lib/dist/context/ubo-manager.js +23 -0
- package/lib/dist/dataset/dataset.d.ts +8 -3
- package/lib/dist/dataset/dataset.d.ts.map +1 -1
- package/lib/dist/dataset/dataset.js +35 -12
- package/lib/dist/filter/blur.d.ts +1 -0
- package/lib/dist/filter/blur.d.ts.map +1 -1
- package/lib/dist/filter/blur.js +3 -1
- package/lib/dist/filter/filter.d.ts +4 -1
- package/lib/dist/filter/filter.d.ts.map +1 -1
- package/lib/dist/filter/filter.js +4 -1
- package/lib/dist/filter/hue-rotation.d.ts +2 -1
- package/lib/dist/filter/hue-rotation.d.ts.map +1 -1
- package/lib/dist/filter/hue-rotation.js +3 -2
- package/lib/dist/index.d.ts +2 -0
- package/lib/dist/index.d.ts.map +1 -1
- package/lib/dist/index.js +3 -1
- package/lib/dist/interface/transformable.d.ts +1 -1
- package/lib/dist/loader/image.d.ts +3 -3
- package/lib/dist/loader/image.d.ts.map +1 -1
- package/lib/dist/loader/image.js +10 -22
- package/lib/dist/material/glass.js +3 -3
- package/lib/dist/material/material.d.ts +3 -7
- package/lib/dist/material/material.d.ts.map +1 -1
- package/lib/dist/material/material.js +1 -1
- package/lib/dist/painter/background-with-depth/background-with-depth.d.ts +2 -2
- package/lib/dist/painter/background-with-depth/background-with-depth.d.ts.map +1 -1
- package/lib/dist/painter/background-with-depth/background-with-depth.js +3 -3
- package/lib/dist/painter/debug/point/point.d.ts +1 -1
- package/lib/dist/painter/debug/point/point.d.ts.map +1 -1
- package/lib/dist/painter/debug/point/point.js +1 -1
- package/lib/dist/painter/debug/stencil/stencil.d.ts +1 -1
- package/lib/dist/painter/debug/stencil/stencil.d.ts.map +1 -1
- package/lib/dist/painter/debug/stencil/stencil.js +1 -1
- package/lib/dist/painter/filter/filter.d.ts +8 -10
- package/lib/dist/painter/filter/filter.d.ts.map +1 -1
- package/lib/dist/painter/filter/filter.js +41 -47
- package/lib/dist/painter/fragment-shader/fragment-shader.d.ts +3 -3
- package/lib/dist/painter/fragment-shader/fragment-shader.d.ts.map +1 -1
- package/lib/dist/painter/fragment-shader/fragment-shader.js +3 -3
- package/lib/dist/painter/framebuffer-msaa.d.ts +24 -13
- package/lib/dist/painter/framebuffer-msaa.d.ts.map +1 -1
- package/lib/dist/painter/framebuffer-msaa.js +60 -9
- package/lib/dist/painter/framebuffer.d.ts +20 -19
- package/lib/dist/painter/framebuffer.d.ts.map +1 -1
- package/lib/dist/painter/framebuffer.js +76 -19
- package/lib/dist/painter/gizmo/gizmo.d.ts +31 -0
- package/lib/dist/painter/gizmo/gizmo.d.ts.map +1 -0
- package/lib/dist/painter/gizmo/gizmo.js +186 -0
- package/lib/dist/painter/gizmo/index.d.ts +2 -0
- package/lib/dist/painter/gizmo/index.d.ts.map +1 -0
- package/lib/dist/painter/gizmo/index.js +2 -0
- package/lib/dist/painter/gizmo/painters/axes.1.d.ts +14 -0
- package/lib/dist/painter/gizmo/painters/axes.1.d.ts.map +1 -0
- package/lib/dist/painter/gizmo/painters/axes.1.js +50 -0
- package/lib/dist/painter/gizmo/painters/axes.d.ts +16 -0
- package/lib/dist/painter/gizmo/painters/axes.d.ts.map +1 -0
- package/lib/dist/painter/gizmo/painters/axes.js +81 -0
- package/lib/dist/painter/gizmo/painters/consts.d.ts +4 -0
- package/lib/dist/painter/gizmo/painters/consts.d.ts.map +1 -0
- package/lib/dist/painter/gizmo/painters/consts.js +4 -0
- package/lib/dist/painter/gizmo/painters/mask.d.ts +14 -0
- package/lib/dist/painter/gizmo/painters/mask.d.ts.map +1 -0
- package/lib/dist/painter/gizmo/painters/mask.js +90 -0
- package/lib/dist/painter/gizmo/painters/normal.1.d.ts +21 -0
- package/lib/dist/painter/gizmo/painters/normal.1.d.ts.map +1 -0
- package/lib/dist/painter/gizmo/painters/normal.1.js +111 -0
- package/lib/dist/painter/gizmo/painters/normal.d.ts +17 -0
- package/lib/dist/painter/gizmo/painters/normal.d.ts.map +1 -0
- package/lib/dist/painter/gizmo/painters/normal.js +87 -0
- package/lib/dist/painter/gizmo/painters/tips.d.ts +18 -0
- package/lib/dist/painter/gizmo/painters/tips.d.ts.map +1 -0
- package/lib/dist/painter/gizmo/painters/tips.js +44 -0
- package/lib/dist/painter/gizmo/tips.d.ts +22 -0
- package/lib/dist/painter/gizmo/tips.d.ts.map +1 -0
- package/lib/dist/painter/gizmo/tips.js +51 -0
- package/lib/dist/painter/group-camera.d.ts +5 -3
- package/lib/dist/painter/group-camera.d.ts.map +1 -1
- package/lib/dist/painter/group-camera.js +7 -3
- package/lib/dist/painter/group.d.ts +6 -6
- package/lib/dist/painter/group.d.ts.map +1 -1
- package/lib/dist/painter/group.js +19 -13
- package/lib/dist/painter/index.d.ts +3 -0
- package/lib/dist/painter/index.d.ts.map +1 -1
- package/lib/dist/painter/index.js +4 -1
- package/lib/dist/painter/lod/lod.d.ts +1 -1
- package/lib/dist/painter/lod/lod.js +2 -2
- package/lib/dist/painter/logic.d.ts +2 -2
- package/lib/dist/painter/logic.js +2 -2
- package/lib/dist/painter/mesh/gltf/gltf.d.ts +2 -8
- package/lib/dist/painter/mesh/gltf/gltf.d.ts.map +1 -1
- package/lib/dist/painter/mesh/gltf/gltf.js +1 -1
- package/lib/dist/painter/mesh/mesh/mesh.d.ts +7 -16
- package/lib/dist/painter/mesh/mesh/mesh.d.ts.map +1 -1
- package/lib/dist/painter/mesh/mesh/mesh.js +21 -9
- package/lib/dist/painter/mesh/normals/normals.d.ts +1 -1
- package/lib/dist/painter/mesh/normals/normals.d.ts.map +1 -1
- package/lib/dist/painter/mesh/normals/normals.js +1 -1
- package/lib/dist/painter/node/node.d.ts +3 -3
- package/lib/dist/painter/node/node.js +4 -4
- package/lib/dist/painter/overlay/index.d.ts +2 -0
- package/lib/dist/painter/overlay/index.d.ts.map +1 -0
- package/lib/dist/painter/overlay/index.js +2 -0
- package/lib/dist/painter/overlay/overlay.d.ts +77 -0
- package/lib/dist/painter/overlay/overlay.d.ts.map +1 -0
- package/lib/dist/painter/overlay/overlay.js +196 -0
- package/lib/dist/painter/painter.d.ts +1 -1
- package/lib/dist/painter/program.d.ts +70 -0
- package/lib/dist/painter/program.d.ts.map +1 -0
- package/lib/dist/painter/program.js +250 -0
- package/lib/dist/painter/scissor.d.ts +1 -1
- package/lib/dist/painter/scissor.js +2 -2
- package/lib/dist/painter/segments/segments-morphing.d.ts +4 -13
- package/lib/dist/painter/segments/segments-morphing.d.ts.map +1 -1
- package/lib/dist/painter/segments/segments-morphing.js +3 -3
- package/lib/dist/painter/segments/segments.d.ts +4 -13
- package/lib/dist/painter/segments/segments.d.ts.map +1 -1
- package/lib/dist/painter/segments/segments.js +3 -3
- package/lib/dist/painter/skybox/skybox.d.ts +1 -1
- package/lib/dist/painter/skybox/skybox.d.ts.map +1 -1
- package/lib/dist/painter/skybox/skybox.js +1 -1
- package/lib/dist/painter/sprites/sprites.d.ts +5 -0
- package/lib/dist/painter/sprites/sprites.d.ts.map +1 -1
- package/lib/dist/painter/sprites/sprites.js +20 -9
- package/lib/dist/painter/state/state.js +4 -4
- package/lib/dist/painter/tubes/tubes.d.ts +4 -13
- package/lib/dist/painter/tubes/tubes.d.ts.map +1 -1
- package/lib/dist/painter/tubes/tubes.js +2 -2
- package/lib/dist/painter/x-ray/x-ray.d.ts +4 -12
- package/lib/dist/painter/x-ray/x-ray.d.ts.map +1 -1
- package/lib/dist/painter/x-ray/x-ray.js +3 -3
- package/lib/dist/parser/gltf/gltf.d.ts +2 -5
- package/lib/dist/parser/gltf/gltf.d.ts.map +1 -1
- package/lib/dist/parser/gltf/gltf.js +1 -1
- package/lib/dist/program/program.d.ts +2 -0
- package/lib/dist/program/program.d.ts.map +1 -1
- package/lib/dist/program/program.js +43 -8
- package/lib/dist/shader/fragment.d.ts.map +1 -1
- package/lib/dist/shader/fragment.js +3 -3
- package/lib/dist/shader/vertex.d.ts +3 -1
- package/lib/dist/shader/vertex.d.ts.map +1 -1
- package/lib/dist/shader/vertex.js +8 -6
- package/lib/dist/texture/texture-depth.d.ts +3 -11
- package/lib/dist/texture/texture-depth.d.ts.map +1 -1
- package/lib/dist/texture/texture-depth.js +1 -1
- package/lib/dist/texture/texture2d.d.ts +5 -11
- package/lib/dist/texture/texture2d.d.ts.map +1 -1
- package/lib/dist/texture/texture2d.js +3 -3
- package/lib/dist/time/interval/interval.d.ts +3 -3
- package/lib/dist/time/interval/interval.js +6 -6
- package/lib/dist/types/painter.d.ts +1 -1
- package/lib/dist/types/program.d.ts +3 -2
- package/lib/dist/types/program.d.ts.map +1 -1
- package/lib/dist/uniform/index.d.ts +3 -0
- package/lib/dist/uniform/index.d.ts.map +1 -0
- package/lib/dist/uniform/index.js +3 -0
- package/lib/dist/uniform/ubo-camera.d.ts +9 -0
- package/lib/dist/uniform/ubo-camera.d.ts.map +1 -0
- package/lib/dist/uniform/ubo-camera.js +20 -0
- package/lib/dist/uniform/uniform-buffer-object.d.ts +56 -0
- package/lib/dist/uniform/uniform-buffer-object.d.ts.map +1 -0
- package/lib/dist/uniform/uniform-buffer-object.js +347 -0
- package/lib/dist/utils/array.d.ts +2 -0
- package/lib/dist/utils/array.d.ts.map +1 -0
- package/lib/dist/utils/array.js +6 -0
- package/lib/dist/utils/index.d.ts +1 -0
- package/lib/dist/utils/index.d.ts.map +1 -1
- package/lib/dist/utils/index.js +2 -1
- package/lib/dist/version.d.ts +2 -0
- package/lib/dist/version.d.ts.map +1 -0
- package/lib/dist/version.js +2 -0
- package/package.json +4 -4
|
@@ -0,0 +1,347 @@
|
|
|
1
|
+
import { TgdVec2, TgdVec3, TgdVec4 } from "./../math/index.js";
|
|
2
|
+
import { TgdProgram } from "./../program/index.js";
|
|
3
|
+
import { tgdCodeStringify } from "./../shader/index.js";
|
|
4
|
+
import { TgdConsole } from "./../debug/index.js";
|
|
5
|
+
export class TgdUniformBufferObject {
|
|
6
|
+
constructor(context, { uniforms, values }) {
|
|
7
|
+
this.context = context;
|
|
8
|
+
this.values = {};
|
|
9
|
+
this.dirty = true;
|
|
10
|
+
this.bindingPoint = context.uniformBufferObjects.add(this);
|
|
11
|
+
this.uniforms = uniforms;
|
|
12
|
+
// Offset in floats (not bytes).
|
|
13
|
+
let offsetInFloats = 0;
|
|
14
|
+
for (const name of Object.keys(uniforms)) {
|
|
15
|
+
const type = uniforms[name];
|
|
16
|
+
const { modulo, length } = LAYOUTS[type];
|
|
17
|
+
// Word alignment.
|
|
18
|
+
while (offsetInFloats % modulo !== 0)
|
|
19
|
+
offsetInFloats++;
|
|
20
|
+
this.makeAccessor(name, type, offsetInFloats);
|
|
21
|
+
offsetInFloats += length;
|
|
22
|
+
}
|
|
23
|
+
const bytesLength = Float32Array.BYTES_PER_ELEMENT * 4 * Math.ceil(offsetInFloats / 4);
|
|
24
|
+
this.data = new ArrayBuffer(bytesLength);
|
|
25
|
+
this.view = new DataView(this.data);
|
|
26
|
+
if (values) {
|
|
27
|
+
const keys = Object.keys(values);
|
|
28
|
+
for (const key of keys) {
|
|
29
|
+
const val = values[key];
|
|
30
|
+
if (val === undefined)
|
|
31
|
+
continue;
|
|
32
|
+
this.values[key] = val;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
const { gl } = context;
|
|
36
|
+
this.buffer = gl.createBuffer();
|
|
37
|
+
gl.bindBufferBase(gl.UNIFORM_BUFFER, this.bindingPoint, this.buffer);
|
|
38
|
+
gl.bufferData(gl.UNIFORM_BUFFER, this.data.byteLength, gl.DYNAMIC_DRAW);
|
|
39
|
+
context.checkError("TgdUniformBufferObject");
|
|
40
|
+
}
|
|
41
|
+
get names() {
|
|
42
|
+
return Object.keys(this.uniforms);
|
|
43
|
+
}
|
|
44
|
+
delete() {
|
|
45
|
+
const { context } = this;
|
|
46
|
+
context.uniformBufferObjects.remove(this);
|
|
47
|
+
const { gl } = context;
|
|
48
|
+
gl.deleteBuffer(this.buffer);
|
|
49
|
+
}
|
|
50
|
+
bindToProgram(program, blockName) {
|
|
51
|
+
const { gl } = this.context;
|
|
52
|
+
const glPrg = program instanceof TgdProgram ? program.program : program;
|
|
53
|
+
gl.uniformBlockBinding(glPrg, gl.getUniformBlockIndex(glPrg, blockName), this.bindingPoint);
|
|
54
|
+
}
|
|
55
|
+
updateData() {
|
|
56
|
+
if (!this.dirty)
|
|
57
|
+
return;
|
|
58
|
+
const { data } = this;
|
|
59
|
+
const { gl } = this.context;
|
|
60
|
+
gl.bindBuffer(gl.UNIFORM_BUFFER, this.buffer);
|
|
61
|
+
gl.bufferSubData(gl.UNIFORM_BUFFER, 0, data);
|
|
62
|
+
this.dirty = false;
|
|
63
|
+
}
|
|
64
|
+
toShaderCode(blockName, instanceName) {
|
|
65
|
+
const { uniforms } = this;
|
|
66
|
+
return [
|
|
67
|
+
`/* Binding point: ${this.bindingPoint} */`,
|
|
68
|
+
`layout(std140) uniform ${blockName} {`,
|
|
69
|
+
Object.keys(uniforms).map((key) => `${uniforms[key]} ${key};`),
|
|
70
|
+
instanceName ? `} ${instanceName};` : "};",
|
|
71
|
+
];
|
|
72
|
+
}
|
|
73
|
+
debug(caption) {
|
|
74
|
+
const out = new TgdConsole({ text: caption !== null && caption !== void 0 ? caption : "TgdUniformBufferObject", bold: true });
|
|
75
|
+
out.add(tgdCodeStringify(this.toShaderCode("myUniformBlock")));
|
|
76
|
+
const array = new Float32Array(this.data);
|
|
77
|
+
for (let i = 0; i < array.length; i++) {
|
|
78
|
+
if (i % 4 === 0)
|
|
79
|
+
out.nl();
|
|
80
|
+
out.add(`${array[i]}`.slice(0, 8).padStart(10, " "));
|
|
81
|
+
}
|
|
82
|
+
out.nl();
|
|
83
|
+
out.debug();
|
|
84
|
+
}
|
|
85
|
+
makeAccessor(name, type, offsetInFloats) {
|
|
86
|
+
const { values } = this;
|
|
87
|
+
const byteOffset = offsetInFloats * 4;
|
|
88
|
+
switch (type) {
|
|
89
|
+
case "bool":
|
|
90
|
+
Object.defineProperty(values, name, {
|
|
91
|
+
set: (value) => {
|
|
92
|
+
this.view.setUint8(byteOffset, value ? 1 : 0);
|
|
93
|
+
this.dirty = true;
|
|
94
|
+
},
|
|
95
|
+
get: () => this.view.getUint8(byteOffset) !== 0,
|
|
96
|
+
});
|
|
97
|
+
break;
|
|
98
|
+
case "int":
|
|
99
|
+
Object.defineProperty(values, name, {
|
|
100
|
+
set: (value) => {
|
|
101
|
+
this.view.setInt32(byteOffset, value, true);
|
|
102
|
+
this.dirty = true;
|
|
103
|
+
},
|
|
104
|
+
get: () => this.view.getInt32(byteOffset, true),
|
|
105
|
+
});
|
|
106
|
+
break;
|
|
107
|
+
case "uint":
|
|
108
|
+
Object.defineProperty(values, name, {
|
|
109
|
+
set: (value) => {
|
|
110
|
+
this.view.setUint32(byteOffset, value, true);
|
|
111
|
+
this.dirty = true;
|
|
112
|
+
},
|
|
113
|
+
get: () => this.view.getUint32(byteOffset, true),
|
|
114
|
+
});
|
|
115
|
+
break;
|
|
116
|
+
case "float":
|
|
117
|
+
Object.defineProperty(values, name, {
|
|
118
|
+
set: (value) => {
|
|
119
|
+
this.view.setFloat32(byteOffset, value, true);
|
|
120
|
+
this.dirty = true;
|
|
121
|
+
},
|
|
122
|
+
get: () => this.view.getFloat32(byteOffset, true),
|
|
123
|
+
});
|
|
124
|
+
break;
|
|
125
|
+
case "double":
|
|
126
|
+
Object.defineProperty(values, name, {
|
|
127
|
+
set: (value) => {
|
|
128
|
+
this.view.setFloat64(byteOffset, value, true);
|
|
129
|
+
this.dirty = true;
|
|
130
|
+
},
|
|
131
|
+
get: () => this.view.getFloat64(byteOffset, true),
|
|
132
|
+
});
|
|
133
|
+
break;
|
|
134
|
+
case "vec2":
|
|
135
|
+
Object.defineProperty(values, name, {
|
|
136
|
+
set: ([x, y]) => {
|
|
137
|
+
this.view.setFloat32(byteOffset, x, true);
|
|
138
|
+
this.view.setFloat32(byteOffset + 4, y, true);
|
|
139
|
+
this.dirty = true;
|
|
140
|
+
},
|
|
141
|
+
get: () => new TgdVec2(this.view.getFloat32(byteOffset, true), this.view.getFloat32(byteOffset + 4, true)),
|
|
142
|
+
});
|
|
143
|
+
break;
|
|
144
|
+
case "vec3":
|
|
145
|
+
Object.defineProperty(values, name, {
|
|
146
|
+
set: ([x, y, z]) => {
|
|
147
|
+
this.view.setFloat32(byteOffset, x, true);
|
|
148
|
+
this.view.setFloat32(byteOffset + 4, y, true);
|
|
149
|
+
this.view.setFloat32(byteOffset + 8, z, true);
|
|
150
|
+
this.dirty = true;
|
|
151
|
+
},
|
|
152
|
+
get: () => new TgdVec3(this.view.getFloat32(byteOffset, true), this.view.getFloat32(byteOffset + 4, true), this.view.getFloat32(byteOffset + 8, true)),
|
|
153
|
+
});
|
|
154
|
+
break;
|
|
155
|
+
case "vec4":
|
|
156
|
+
Object.defineProperty(values, name, {
|
|
157
|
+
set: ([x, y, z, w]) => {
|
|
158
|
+
this.view.setFloat32(byteOffset, x, true);
|
|
159
|
+
this.view.setFloat32(byteOffset + 4, y, true);
|
|
160
|
+
this.view.setFloat32(byteOffset + 8, z, true);
|
|
161
|
+
this.view.setFloat32(byteOffset + 12, z, true);
|
|
162
|
+
this.dirty = true;
|
|
163
|
+
},
|
|
164
|
+
get: () => new TgdVec4(this.view.getFloat32(byteOffset, true), this.view.getFloat32(byteOffset + 4, true), this.view.getFloat32(byteOffset + 8, true), this.view.getFloat32(byteOffset + 12, true)),
|
|
165
|
+
});
|
|
166
|
+
break;
|
|
167
|
+
case "dvec2":
|
|
168
|
+
Object.defineProperty(values, name, {
|
|
169
|
+
set: ([x, y]) => {
|
|
170
|
+
this.view.setFloat64(byteOffset, x, true);
|
|
171
|
+
this.view.setFloat64(byteOffset + 4, y, true);
|
|
172
|
+
this.dirty = true;
|
|
173
|
+
},
|
|
174
|
+
get: () => new TgdVec2(this.view.getFloat64(byteOffset, true), this.view.getFloat64(byteOffset + 4, true)),
|
|
175
|
+
});
|
|
176
|
+
break;
|
|
177
|
+
case "dvec3":
|
|
178
|
+
Object.defineProperty(values, name, {
|
|
179
|
+
set: ([x, y, z]) => {
|
|
180
|
+
this.view.setFloat64(byteOffset, x, true);
|
|
181
|
+
this.view.setFloat64(byteOffset + 4, y, true);
|
|
182
|
+
this.view.setFloat64(byteOffset + 8, z, true);
|
|
183
|
+
this.dirty = true;
|
|
184
|
+
},
|
|
185
|
+
get: () => new TgdVec3(this.view.getFloat64(byteOffset, true), this.view.getFloat64(byteOffset + 4, true), this.view.getFloat64(byteOffset + 8, true)),
|
|
186
|
+
});
|
|
187
|
+
break;
|
|
188
|
+
case "dvec4":
|
|
189
|
+
Object.defineProperty(values, name, {
|
|
190
|
+
set: ([x, y, z, w]) => {
|
|
191
|
+
this.view.setFloat64(byteOffset, x, true);
|
|
192
|
+
this.view.setFloat64(byteOffset + 4, y, true);
|
|
193
|
+
this.view.setFloat64(byteOffset + 8, z, true);
|
|
194
|
+
this.view.setFloat64(byteOffset + 12, w, true);
|
|
195
|
+
this.dirty = true;
|
|
196
|
+
},
|
|
197
|
+
get: () => new TgdVec4(this.view.getFloat64(byteOffset, true), this.view.getFloat64(byteOffset + 4, true), this.view.getFloat64(byteOffset + 8, true), this.view.getFloat64(byteOffset + 12, true)),
|
|
198
|
+
});
|
|
199
|
+
break;
|
|
200
|
+
case "ivec2":
|
|
201
|
+
Object.defineProperty(values, name, {
|
|
202
|
+
set: ([x, y]) => {
|
|
203
|
+
this.view.setInt32(byteOffset, x, true);
|
|
204
|
+
this.view.setInt32(byteOffset + 4, y, true);
|
|
205
|
+
this.dirty = true;
|
|
206
|
+
},
|
|
207
|
+
get: () => new TgdVec2(this.view.getInt32(byteOffset, true), this.view.getInt32(byteOffset + 4, true)),
|
|
208
|
+
});
|
|
209
|
+
break;
|
|
210
|
+
case "ivec3":
|
|
211
|
+
Object.defineProperty(values, name, {
|
|
212
|
+
set: ([x, y, z]) => {
|
|
213
|
+
this.view.setInt32(byteOffset, x, true);
|
|
214
|
+
this.view.setInt32(byteOffset + 4, y, true);
|
|
215
|
+
this.view.setInt32(byteOffset + 8, z, true);
|
|
216
|
+
this.dirty = true;
|
|
217
|
+
},
|
|
218
|
+
get: () => new TgdVec3(this.view.getInt32(byteOffset, true), this.view.getInt32(byteOffset + 4, true), this.view.getInt32(byteOffset + 8, true)),
|
|
219
|
+
});
|
|
220
|
+
break;
|
|
221
|
+
case "ivec4":
|
|
222
|
+
Object.defineProperty(values, name, {
|
|
223
|
+
set: ([x, y, z, w]) => {
|
|
224
|
+
this.view.setInt32(byteOffset, x, true);
|
|
225
|
+
this.view.setInt32(byteOffset + 4, y, true);
|
|
226
|
+
this.view.setInt32(byteOffset + 8, z, true);
|
|
227
|
+
this.view.setInt32(byteOffset + 12, z, true);
|
|
228
|
+
this.dirty = true;
|
|
229
|
+
},
|
|
230
|
+
get: () => new TgdVec4(this.view.getInt32(byteOffset, true), this.view.getInt32(byteOffset + 4, true), this.view.getInt32(byteOffset + 8, true), this.view.getInt32(byteOffset + 12, true)),
|
|
231
|
+
});
|
|
232
|
+
break;
|
|
233
|
+
case "uvec2":
|
|
234
|
+
Object.defineProperty(values, name, {
|
|
235
|
+
set: ([x, y]) => {
|
|
236
|
+
this.view.setUint32(byteOffset, x, true);
|
|
237
|
+
this.view.setUint32(byteOffset + 4, y, true);
|
|
238
|
+
this.dirty = true;
|
|
239
|
+
},
|
|
240
|
+
get: () => new TgdVec2(this.view.getUint32(byteOffset, true), this.view.getUint32(byteOffset + 4, true)),
|
|
241
|
+
});
|
|
242
|
+
break;
|
|
243
|
+
case "uvec3":
|
|
244
|
+
Object.defineProperty(values, name, {
|
|
245
|
+
set: ([x, y, z]) => {
|
|
246
|
+
this.view.setUint32(byteOffset, x, true);
|
|
247
|
+
this.view.setUint32(byteOffset + 4, y, true);
|
|
248
|
+
this.view.setUint32(byteOffset + 8, z, true);
|
|
249
|
+
this.dirty = true;
|
|
250
|
+
},
|
|
251
|
+
get: () => new TgdVec3(this.view.getUint32(byteOffset, true), this.view.getUint32(byteOffset + 4, true), this.view.getUint32(byteOffset + 8, true)),
|
|
252
|
+
});
|
|
253
|
+
break;
|
|
254
|
+
case "uvec4":
|
|
255
|
+
Object.defineProperty(values, name, {
|
|
256
|
+
set: ([x, y, z, w]) => {
|
|
257
|
+
this.view.setUint32(byteOffset, x, true);
|
|
258
|
+
this.view.setUint32(byteOffset + 4, y, true);
|
|
259
|
+
this.view.setUint32(byteOffset + 8, z, true);
|
|
260
|
+
this.view.setUint32(byteOffset + 12, w, true);
|
|
261
|
+
this.dirty = true;
|
|
262
|
+
},
|
|
263
|
+
get: () => new TgdVec4(this.view.getUint32(byteOffset, true), this.view.getUint32(byteOffset + 4, true), this.view.getUint32(byteOffset + 8, true), this.view.getUint32(byteOffset + 12, true)),
|
|
264
|
+
});
|
|
265
|
+
break;
|
|
266
|
+
case "mat2":
|
|
267
|
+
Object.defineProperty(values, name, {
|
|
268
|
+
set: (mat2) => {
|
|
269
|
+
let src = 0;
|
|
270
|
+
let dst = byteOffset;
|
|
271
|
+
for (let row = 0; row < 2; row++) {
|
|
272
|
+
for (let col = 0; col < 2; col++) {
|
|
273
|
+
this.view.setFloat32(dst, mat2[src++], true);
|
|
274
|
+
dst += 4;
|
|
275
|
+
}
|
|
276
|
+
dst += 8;
|
|
277
|
+
}
|
|
278
|
+
this.dirty = true;
|
|
279
|
+
},
|
|
280
|
+
});
|
|
281
|
+
break;
|
|
282
|
+
case "mat3":
|
|
283
|
+
Object.defineProperty(values, name, {
|
|
284
|
+
set: (mat3) => {
|
|
285
|
+
let src = 0;
|
|
286
|
+
let dst = byteOffset;
|
|
287
|
+
for (let row = 0; row < 3; row++) {
|
|
288
|
+
for (let col = 0; col < 3; col++) {
|
|
289
|
+
this.view.setFloat32(dst, mat3[src++], true);
|
|
290
|
+
dst += 4;
|
|
291
|
+
}
|
|
292
|
+
dst += 4;
|
|
293
|
+
}
|
|
294
|
+
this.dirty = true;
|
|
295
|
+
},
|
|
296
|
+
});
|
|
297
|
+
break;
|
|
298
|
+
case "mat4":
|
|
299
|
+
Object.defineProperty(values, name, {
|
|
300
|
+
set: (mat4) => {
|
|
301
|
+
let src = 0;
|
|
302
|
+
let dst = byteOffset;
|
|
303
|
+
for (let row = 0; row < 4; row++) {
|
|
304
|
+
for (let col = 0; col < 4; col++) {
|
|
305
|
+
this.view.setFloat32(dst, mat4[src++], true);
|
|
306
|
+
dst += 4;
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
this.dirty = true;
|
|
310
|
+
},
|
|
311
|
+
});
|
|
312
|
+
break;
|
|
313
|
+
default:
|
|
314
|
+
throw new Error(`[TgdUniformBufferObject] Type "${type}" has been implemented yet!`);
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
/**
|
|
319
|
+
* Modulo is used for the padding necessary with Layout std140.
|
|
320
|
+
* The length is in floats.
|
|
321
|
+
*/
|
|
322
|
+
const LAYOUTS = {
|
|
323
|
+
bool: { modulo: 1, length: 1, rows: 1 },
|
|
324
|
+
int: { modulo: 1, length: 1, rows: 1 },
|
|
325
|
+
uint: { modulo: 1, length: 1, rows: 1 },
|
|
326
|
+
float: { modulo: 1, length: 1, rows: 1 },
|
|
327
|
+
double: { modulo: 2, length: 2, rows: 1 },
|
|
328
|
+
vec2: { modulo: 2, length: 2, rows: 1 },
|
|
329
|
+
bvec2: { modulo: 2, length: 2, rows: 1 },
|
|
330
|
+
ivec2: { modulo: 2, length: 2, rows: 1 },
|
|
331
|
+
uvec2: { modulo: 2, length: 2, rows: 1 },
|
|
332
|
+
dvec2: { modulo: 2, length: 2, rows: 1 },
|
|
333
|
+
vec3: { modulo: 4, length: 3, rows: 1 },
|
|
334
|
+
bvec3: { modulo: 4, length: 3, rows: 1 },
|
|
335
|
+
ivec3: { modulo: 4, length: 3, rows: 1 },
|
|
336
|
+
uvec3: { modulo: 4, length: 3, rows: 1 },
|
|
337
|
+
dvec3: { modulo: 4, length: 3, rows: 1 },
|
|
338
|
+
vec4: { modulo: 4, length: 4, rows: 1 },
|
|
339
|
+
bvec4: { modulo: 4, length: 4, rows: 1 },
|
|
340
|
+
ivec4: { modulo: 4, length: 4, rows: 1 },
|
|
341
|
+
uvec4: { modulo: 4, length: 4, rows: 1 },
|
|
342
|
+
dvec4: { modulo: 4, length: 4, rows: 1 },
|
|
343
|
+
mat2: { modulo: 4, length: 8, rows: 2 },
|
|
344
|
+
mat3: { modulo: 4, length: 12, rows: 3 },
|
|
345
|
+
mat4: { modulo: 4, length: 16, rows: 4 },
|
|
346
|
+
};
|
|
347
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"uniform-buffer-object.js","sourceRoot":"","sources":["../../src/uniform/uniform-buffer-object.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../../src/utils/array.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,SAAS,GAAG,CAAC,EAAE,CAG9D"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export function ensureArray(items) {
|
|
2
|
+
if (items === undefined)
|
|
3
|
+
return [];
|
|
4
|
+
return Array.isArray(items) ? items : [items];
|
|
5
|
+
}
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJyYXkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvYXJyYXkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxVQUFVLFdBQVcsQ0FBSSxLQUEwQjtJQUN4RCxJQUFJLEtBQUssS0FBSyxTQUFTO1FBQUUsT0FBTyxFQUFFLENBQUE7SUFDbEMsT0FBTyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7QUFDOUMsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,UAAU,CAAA;AACxB,cAAc,QAAQ,CAAA;AACtB,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,QAAQ,CAAA;AACtB,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA;AACvB,cAAc,SAAS,CAAA"}
|
package/lib/dist/utils/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from "./action/index.js";
|
|
2
2
|
export * from "./animation/index.js";
|
|
3
|
+
export * from "./array.js";
|
|
3
4
|
export * from "./assert.js";
|
|
4
5
|
export * from "./bbox.js";
|
|
5
6
|
export * from "./canvas.js";
|
|
@@ -10,4 +11,4 @@ export * from "./fullscreen.js";
|
|
|
10
11
|
export * from "./pbo.js";
|
|
11
12
|
export * from "./state/index.js";
|
|
12
13
|
export * from "./webgl.js";
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxVQUFVLENBQUE7QUFDeEIsY0FBYyxhQUFhLENBQUE7QUFDM0IsY0FBYyxTQUFTLENBQUE7QUFDdkIsY0FBYyxVQUFVLENBQUE7QUFDeEIsY0FBYyxRQUFRLENBQUE7QUFDdEIsY0FBYyxVQUFVLENBQUE7QUFDeEIsY0FBYyxpQkFBaUIsQ0FBQTtBQUMvQixjQUFjLG1CQUFtQixDQUFBO0FBQ2pDLGNBQWMsZUFBZSxDQUFBO0FBQzdCLGNBQWMsY0FBYyxDQUFBO0FBQzVCLGNBQWMsT0FBTyxDQUFBO0FBQ3JCLGNBQWMsU0FBUyxDQUFBO0FBQ3ZCLGNBQWMsU0FBUyxDQUFBIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,YAAY,CAAA"}
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export const version = "2.0.103";
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy92ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxTQUFTLENBQUEifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tolokoban/tgd",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.103",
|
|
4
4
|
"description": "ToloGameDev library for WebGL2",
|
|
5
5
|
"homepage": "https://tolokoban.github.io/tgd2",
|
|
6
6
|
"main": "./lib/dist/index.js",
|
|
@@ -14,12 +14,12 @@
|
|
|
14
14
|
"ci": "cd lib && npm install && npm run build && npm run doc",
|
|
15
15
|
"doc": "cd lib && npm run doc && cd ../doc && npm run deploy",
|
|
16
16
|
"test": "cd lib && npm test",
|
|
17
|
-
"build": "clear && cd lib && npm run
|
|
17
|
+
"build": "clear && cd lib && npm run dev && cd ../doc && npm run dev",
|
|
18
18
|
"predeploy": "npm run ci && cd doc",
|
|
19
19
|
"deploy": "npm run ci && npm publish --access=public",
|
|
20
20
|
"deploy:lib": "cd lib && npm install && npm run build && cd .. && npm publish --access=public",
|
|
21
|
-
"minor": "npm version minor --no-git-tag-version &&
|
|
22
|
-
"patch": "npm version patch --no-git-tag-version &&
|
|
21
|
+
"minor": "npm version minor --no-git-tag-version && node version.mjs",
|
|
22
|
+
"patch": "npm version patch --no-git-tag-version && node version.mjs",
|
|
23
23
|
"prestart": "npm run build",
|
|
24
24
|
"start": "http-server doc/build/ -p 0 -o"
|
|
25
25
|
},
|