webgl2-sdf 0.0.3 → 0.0.5
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/README.md +76 -65
- package/browser/index.min.js +1 -1
- package/node/bezier/bezier-curves-to-line-segs.d.ts +1 -1
- package/node/bezier/bezier-curves-to-line-segs.js +2 -2
- package/node/bezier/bezier-curves-to-line-segs.js.map +1 -1
- package/node/bezier/split-into-line-segments.d.ts +1 -1
- package/node/bezier/split-into-line-segments.js +5 -4
- package/node/bezier/split-into-line-segments.js.map +1 -1
- package/node/generate-sdf.d.ts +21 -15
- package/node/generate-sdf.js +30 -26
- package/node/generate-sdf.js.map +1 -1
- package/node/index.d.ts +3 -1
- package/node/index.js +3 -1
- package/node/index.js.map +1 -1
- package/node/main-program.d.ts +1 -1
- package/node/main-program.js +3 -3
- package/node/main-program.js.map +1 -1
- package/node/prepare-buffers.d.ts +1 -1
- package/node/prepare-buffers.js +6 -8
- package/node/prepare-buffers.js.map +1 -1
- package/node/shaders/fragment.d.ts +2 -0
- package/node/shaders/{main.fragment.js → fragment.js} +5 -4
- package/node/shaders/fragment.js.map +1 -0
- package/node/shaders/vertex.d.ts +2 -0
- package/node/shaders/{main.vertex.js → vertex.js} +9 -6
- package/node/shaders/vertex.js.map +1 -0
- package/node/types/gl-context.d.ts +0 -1
- package/node/types/program.d.ts +2 -0
- package/node/utils/calc-circs.js.map +1 -1
- package/node/utils/clip-line-segment-to-grid.d.ts +1 -1
- package/node/utils/clip-line-segment-to-grid.js +1 -4
- package/node/utils/clip-line-segment-to-grid.js.map +1 -1
- package/node/utils/clip-line-segment-to-strips.d.ts +2 -3
- package/node/utils/clip-line-segment-to-strips.js +5 -57
- package/node/utils/clip-line-segment-to-strips.js.map +1 -1
- package/node/utils/find-close-cells.js +14 -70
- package/node/utils/find-close-cells.js.map +1 -1
- package/node/utils/find-crossing-cells.js +0 -15
- package/node/utils/find-crossing-cells.js.map +1 -1
- package/node/utils/jump-idx.js +20 -18
- package/node/utils/jump-idx.js.map +1 -1
- package/node/utils/seg-box-x.js +27 -17
- package/node/utils/seg-box-x.js.map +1 -1
- package/node/webgl-utils/free-gl-context.d.ts +3 -0
- package/node/webgl-utils/free-gl-context.js +26 -0
- package/node/webgl-utils/free-gl-context.js.map +1 -0
- package/node/webgl-utils/{get-gl-context.d.ts → get-web-gl-context.d.ts} +2 -2
- package/node/webgl-utils/{get-gl-context.js → get-web-gl-context.js} +7 -10
- package/node/webgl-utils/get-web-gl-context.js.map +1 -0
- package/node/webgl-utils/set-attribute.js +1 -1
- package/node/webgl-utils/set-attribute.js.map +1 -1
- package/node/webgl-utils/set-uniform-block.js +1 -3
- package/node/webgl-utils/set-uniform-block.js.map +1 -1
- package/node/webgl-utils/use-program.js +13 -3
- package/node/webgl-utils/use-program.js.map +1 -1
- package/package.json +3 -3
- package/src/bezier/bezier-curves-to-line-segs.ts +2 -3
- package/src/bezier/split-into-line-segments.ts +7 -5
- package/src/generate-sdf.ts +36 -30
- package/src/index.ts +3 -1
- package/src/main-program.ts +4 -3
- package/src/prepare-buffers.ts +6 -8
- package/src/shaders/{main.fragment.ts → fragment.ts} +4 -3
- package/src/shaders/{main.vertex.ts → vertex.ts} +8 -5
- package/src/types/gl-context.ts +0 -1
- package/src/types/program.ts +2 -0
- package/src/utils/calc-circs.ts +0 -2
- package/src/utils/clip-line-segment-to-grid.ts +1 -5
- package/src/utils/clip-line-segment-to-strips.ts +6 -73
- package/src/utils/find-close-cells.ts +27 -87
- package/src/utils/find-crossing-cells.ts +1 -18
- package/src/utils/jump-idx.ts +25 -20
- package/src/utils/seg-box-x.ts +30 -17
- package/src/webgl-utils/free-gl-context.ts +35 -0
- package/src/webgl-utils/{get-gl-context.ts → get-web-gl-context.ts} +6 -9
- package/src/webgl-utils/set-attribute.ts +1 -1
- package/src/webgl-utils/set-uniform-block.ts +1 -3
- package/src/webgl-utils/use-program.ts +14 -3
- package/node/debug-shaders.d.ts +0 -9
- package/node/shaders/main.fragment.d.ts +0 -2
- package/node/shaders/main.fragment.js.map +0 -1
- package/node/shaders/main.vertex.d.ts +0 -2
- package/node/shaders/main.vertex.js.map +0 -1
- package/node/types/strip.d.ts +0 -8
- package/node/types/strip.js +0 -2
- package/node/types/strip.js.map +0 -1
- package/node/utils/create-empty-strips.d.ts +0 -7
- package/node/utils/create-empty-strips.js +0 -16
- package/node/utils/create-empty-strips.js.map +0 -1
- package/node/utils/distance-seg-to-p.d.ts +0 -5
- package/node/utils/distance-seg-to-p.js +0 -35
- package/node/utils/distance-seg-to-p.js.map +0 -1
- package/node/webgl-utils/get-gl-context.js.map +0 -1
- package/node/webgl2.d.ts +0 -2
- package/src/types/strip.ts +0 -11
- package/src/utils/create-empty-strips.ts +0 -21
|
@@ -20,21 +20,17 @@ function clipLineSegmentToGrid(
|
|
|
20
20
|
grid: Cell[][],
|
|
21
21
|
width: number,
|
|
22
22
|
height: number,
|
|
23
|
-
colCount: number,
|
|
24
23
|
cellSize: number,
|
|
25
24
|
seg: number[][],
|
|
26
25
|
padCount: number): void {
|
|
27
26
|
|
|
28
|
-
/** `cellSize` *must* be a power of two */
|
|
29
|
-
// const cellSize = width/ROW_COUNT;
|
|
30
|
-
|
|
31
27
|
const padding = cellSize*padCount;
|
|
32
28
|
|
|
33
29
|
const [[x0,y0],[x1,y1]] = seg;
|
|
34
30
|
|
|
35
31
|
const paddedWidth = width + padding;
|
|
36
32
|
const paddedHeight = height + padding;
|
|
37
|
-
|
|
33
|
+
|
|
38
34
|
const ps = segBoxX(seg, [[-padding,-padding],[paddedWidth,paddedHeight]]);
|
|
39
35
|
|
|
40
36
|
const p0IsInBox = x0 > -padding && x0 < paddedWidth && y0 > -padding && y0 < paddedHeight;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { Strip } from "../types/strip.js";
|
|
2
1
|
import { segStripX } from "./seg-strip-x.js";
|
|
3
2
|
|
|
4
3
|
|
|
@@ -11,12 +10,12 @@ const { floor, ceil } = Math;
|
|
|
11
10
|
* * modifies strips by adding line segments to each strip
|
|
12
11
|
* * size/count *must* be a power of 2
|
|
13
12
|
*
|
|
14
|
-
* @param
|
|
13
|
+
* @param strips array of strips - each contains an array line segments
|
|
15
14
|
* @param height the height of a strip
|
|
16
15
|
* @param seg the line segment (array of 2 points)
|
|
17
16
|
*/
|
|
18
17
|
function clipLineSegmentToStrips(
|
|
19
|
-
strips:
|
|
18
|
+
strips: number[][][][],
|
|
20
19
|
height: number,
|
|
21
20
|
seg: number[][]): void {
|
|
22
21
|
|
|
@@ -93,7 +92,7 @@ function clipLineSegmentToStrips(
|
|
|
93
92
|
// if we're past the line endpoint
|
|
94
93
|
if ((tX > 1 || dX === 0) && tY > 1) {
|
|
95
94
|
const v = floor(p1[1]/cellSize);
|
|
96
|
-
strips[v]?.
|
|
95
|
+
strips[v]?.push([[x,y],p1]);
|
|
97
96
|
break;
|
|
98
97
|
}
|
|
99
98
|
|
|
@@ -109,7 +108,7 @@ function clipLineSegmentToStrips(
|
|
|
109
108
|
} else {
|
|
110
109
|
const v = fY(y/cellSize) - (btt ? 0 : 1); // previous v
|
|
111
110
|
const seg_ = [[x,y],ps[i]];
|
|
112
|
-
strips[v]?.
|
|
111
|
+
strips[v]?.push(seg_);
|
|
113
112
|
break;
|
|
114
113
|
}
|
|
115
114
|
}
|
|
@@ -117,7 +116,7 @@ function clipLineSegmentToStrips(
|
|
|
117
116
|
// previous v
|
|
118
117
|
const v = fY(y/cellSize) - (btt ? 0 : 1);
|
|
119
118
|
|
|
120
|
-
strips[v]?.
|
|
119
|
+
strips[v]?.push([[x,y], [xX,xY]]);
|
|
121
120
|
|
|
122
121
|
// update current position
|
|
123
122
|
x = xX;
|
|
@@ -127,70 +126,4 @@ function clipLineSegmentToStrips(
|
|
|
127
126
|
|
|
128
127
|
|
|
129
128
|
export { clipLineSegmentToStrips }
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
// Quokka tests - https://www.desmos.com/calculator/uyqsdkviih
|
|
133
|
-
// import { createEmptyStrips } from "./create-empty-strips";
|
|
134
|
-
|
|
135
|
-
// {
|
|
136
|
-
// const strips = createEmptyStrips(8);
|
|
137
|
-
// const seg = [[0, 100], [0, 400]];
|
|
138
|
-
|
|
139
|
-
// toDesmosStr(seg);
|
|
140
|
-
// clipLineSegmentToStrips(strips, 512, seg);
|
|
141
|
-
// testAllEmptyExcept(strips,[1,2,3,4,5,6]);
|
|
142
|
-
// }
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
// {
|
|
146
|
-
// const strips = createEmptyStrips(8);
|
|
147
|
-
// const seg = [[83, 166], [-90, 440]];
|
|
148
|
-
|
|
149
|
-
// toDesmosStr(seg);
|
|
150
|
-
// clipLineSegmentToStrips(strips, 512, seg);
|
|
151
|
-
// testAllEmptyExcept(strips,[4,5,6]);
|
|
152
|
-
// }
|
|
153
|
-
|
|
154
|
-
// {
|
|
155
|
-
// const strips = createEmptyStrips(8);
|
|
156
|
-
// const seg = [[-570, 236], [-392, 546]];
|
|
157
|
-
|
|
158
|
-
// toDesmosStr(seg);
|
|
159
|
-
// clipLineSegmentToStrips(strips, 512, seg);
|
|
160
|
-
// testAllEmptyExcept(strips,[3,4,5,6,7]);
|
|
161
|
-
// }
|
|
162
|
-
|
|
163
|
-
// {
|
|
164
|
-
// const strips = createEmptyStrips(8);
|
|
165
|
-
// const seg = [[-462, 632], [-152, 611]];
|
|
166
|
-
|
|
167
|
-
// toDesmosStr(seg);
|
|
168
|
-
// clipLineSegmentToStrips(strips, 512, seg);
|
|
169
|
-
// testAllEmptyExcept(strips,[]);
|
|
170
|
-
// }
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
// function toDesmosStr(seg: number[][]) {
|
|
174
|
-
// const [[x0,y0],[x1,y1]] = seg;
|
|
175
|
-
// return `\\left(\\left(1-t\\right)\\cdot${x0.toFixed(2)}+t\\cdot\\left(${x1.toFixed(2)}\\right),\\left(1-t\\right)\\cdot${y0.toFixed(2)}+t\\cdot${y1.toFixed(2)}\\right)`;
|
|
176
|
-
// }
|
|
177
|
-
// function testAllEmptyExcept(
|
|
178
|
-
// strips: Strip[],
|
|
179
|
-
// exceptions: number[]) {
|
|
180
|
-
|
|
181
|
-
// for (let i=0; i<strips.length; i++) {
|
|
182
|
-
// const strip = strips[i];
|
|
183
|
-
// const idx = exceptions.findIndex(v => v === i);
|
|
184
|
-
// const exception = exceptions[idx];
|
|
185
|
-
// const len = strip.lineSegs.length;
|
|
186
|
-
// if (exception === undefined) {
|
|
187
|
-
// if (len !== 0) {
|
|
188
|
-
// throw new Error(`Strip ${i} must be empty`);
|
|
189
|
-
// }
|
|
190
|
-
// } else {
|
|
191
|
-
// if (len !== 1) {
|
|
192
|
-
// throw new Error(`Strip ${i} must contain 1 segments, found ${len}`);
|
|
193
|
-
// }
|
|
194
|
-
// }
|
|
195
|
-
// }
|
|
196
|
-
// }
|
|
129
|
+
var a = [[1,1], [1,1]]
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import type { Cell } from "../types/cell.js";
|
|
2
2
|
import { ROW_COUNT } from "../row-count.js";
|
|
3
3
|
import { circsCache } from "./calc-circs.js";
|
|
4
|
-
import { distanceSegToP } from "./distance-seg-to-p.js";
|
|
5
4
|
import { jumpIdx } from "./jump-idx.js";
|
|
6
5
|
|
|
7
6
|
|
|
8
|
-
const { min, SQRT2 } = Math;
|
|
7
|
+
const { min, max, SQRT2 } = Math;
|
|
9
8
|
|
|
10
9
|
|
|
11
10
|
function findCloseCells(
|
|
@@ -44,57 +43,47 @@ function findCloseCellsFor(
|
|
|
44
43
|
// reduce current circle search range since we moved one square
|
|
45
44
|
let k = jumpIdx((_minD - SQRT2*cellSize) / cellSize);
|
|
46
45
|
let minD = Number.POSITIVE_INFINITY;
|
|
47
|
-
while (
|
|
48
|
-
|
|
46
|
+
while (true) {
|
|
47
|
+
if (k >= circsCache.length) {
|
|
48
|
+
minD = cellSize*(circsCache[circsCache.length - 1].from - SQRT2);
|
|
49
|
+
break;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
const { u, v, from } = circsCache[k];
|
|
49
53
|
|
|
50
54
|
// `SQRT2` to account for diagonal
|
|
51
55
|
if (cellSize*from > maxDistance + SQRT2*cellSize) {
|
|
56
|
+
minD = cellSize*(from - 2*SQRT2);
|
|
52
57
|
break;
|
|
53
58
|
}
|
|
54
59
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
for (let l=0; l<lineSegs.length; l++) {
|
|
68
|
-
// center of square
|
|
69
|
-
const c = [(i - padCount + 0.5)*cellSize, (j - padCount + 0.5)*cellSize];
|
|
70
|
-
const d = distanceSegToP(lineSegs[l], c);
|
|
71
|
-
if (d < minD) {
|
|
72
|
-
minD = d;
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
k++;
|
|
77
|
-
// }
|
|
78
|
-
|
|
79
|
-
if (minD !== Number.POSITIVE_INFINITY) {
|
|
60
|
+
const u_ = u + i;
|
|
61
|
+
const v_ = v + j;
|
|
62
|
+
if (u_ < 0 || u_ >= colCount + 2*padCount ||
|
|
63
|
+
v_ < 0 || v_ >= ROW_COUNT + 2*padCount) {
|
|
64
|
+
|
|
65
|
+
k++; continue;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
const { lineSegs } = grid[u_][v_];
|
|
69
|
+
|
|
70
|
+
if (lineSegs.length > 0) {
|
|
71
|
+
minD = cellSize*(from - SQRT2);
|
|
80
72
|
break;
|
|
81
73
|
}
|
|
82
|
-
}
|
|
83
74
|
|
|
84
|
-
|
|
85
|
-
return min(
|
|
86
|
-
maxDistance + SQRT2*cellSize,
|
|
87
|
-
cellSize * circsCache[circsCache.length - 1].from
|
|
88
|
-
);
|
|
75
|
+
k++;
|
|
89
76
|
}
|
|
90
77
|
|
|
78
|
+
|
|
91
79
|
const { closeCells } = grid[i][j];
|
|
92
|
-
|
|
80
|
+
|
|
81
|
+
let l = max(0, k - 1);
|
|
93
82
|
while (l < circsCache.length) {
|
|
94
83
|
const { from, u, v } = circsCache[l];
|
|
95
84
|
|
|
96
|
-
// `SQRT2` to account for diagonal
|
|
97
|
-
if (cellSize*from > min(minD, maxDistance) + SQRT2*cellSize) {
|
|
85
|
+
// `SQRT2` to account for diagonal (times 2 since we minused it off earlier)
|
|
86
|
+
if (cellSize*from > min(minD, maxDistance) + 2*SQRT2*cellSize) {
|
|
98
87
|
break;
|
|
99
88
|
}
|
|
100
89
|
|
|
@@ -120,52 +109,3 @@ function findCloseCellsFor(
|
|
|
120
109
|
|
|
121
110
|
|
|
122
111
|
export { findCloseCells }
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
// Quokka tests
|
|
126
|
-
// const grid: Cell[][] = [
|
|
127
|
-
// [
|
|
128
|
-
// { u: 0, v: 0, lineSegs: [], closeCells: [], crossingCells: [] },
|
|
129
|
-
// { u: 0, v: 1, lineSegs: [], closeCells: [], crossingCells: [] },
|
|
130
|
-
// { u: 0, v: 2, lineSegs: [], closeCells: [], crossingCells: [] },
|
|
131
|
-
// { u: 0, v: 3, lineSegs: [], closeCells: [], crossingCells: [] }
|
|
132
|
-
// ],
|
|
133
|
-
// [
|
|
134
|
-
// { u: 1, v: 0, lineSegs: [], closeCells: [], crossingCells: [] },
|
|
135
|
-
// {
|
|
136
|
-
// u: 1, v: 1,
|
|
137
|
-
// lineSegs: [[[175, 163], [175, 355]]],
|
|
138
|
-
// closeCells: [], crossingCells: []
|
|
139
|
-
// },
|
|
140
|
-
// {
|
|
141
|
-
// u: 1, v: 2,
|
|
142
|
-
// lineSegs: [[[175, 355], [335, 355]]],
|
|
143
|
-
// closeCells: [], crossingCells: []
|
|
144
|
-
// },
|
|
145
|
-
// { u: 1, v: 3, lineSegs: [], closeCells: [], crossingCells: [] }
|
|
146
|
-
// ],
|
|
147
|
-
// [
|
|
148
|
-
// { u: 2, v: 0, lineSegs: [], closeCells: [], crossingCells: [] },
|
|
149
|
-
// {
|
|
150
|
-
// u: 2, v: 1,
|
|
151
|
-
// lineSegs: [[[335, 163], [175, 163]]],
|
|
152
|
-
// closeCells: [], crossingCells: []
|
|
153
|
-
// },
|
|
154
|
-
// {
|
|
155
|
-
// u: 2, v: 2,
|
|
156
|
-
// lineSegs: [[[335, 355], [335, 163]]],
|
|
157
|
-
// closeCells: [], crossingCells: []
|
|
158
|
-
// },
|
|
159
|
-
// { u: 2, v: 3, lineSegs: [], closeCells: [], crossingCells: [] }
|
|
160
|
-
// ],
|
|
161
|
-
// [
|
|
162
|
-
// { u: 3, v: 0, lineSegs: [], closeCells: [], crossingCells: [] },
|
|
163
|
-
// { u: 3, v: 1, lineSegs: [], closeCells: [], crossingCells: [] },
|
|
164
|
-
// { u: 3, v: 2, lineSegs: [], closeCells: [], crossingCells: [] },
|
|
165
|
-
// { u: 3, v: 3, lineSegs: [], closeCells: [], crossingCells: [] }
|
|
166
|
-
// ]
|
|
167
|
-
// ];
|
|
168
|
-
|
|
169
|
-
// findCloseCells(grid);
|
|
170
|
-
// const v = grid.map(cells => cells.map(c => ({ u: c.u, v: c.v, closeCells: c.closeCells })));
|
|
171
|
-
// v;//?
|
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
import { ROW_COUNT } from "../row-count.js";
|
|
2
1
|
import type { Cell } from "../types/cell.js";
|
|
2
|
+
import { ROW_COUNT } from "../row-count.js";
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
// TODO - simplify?
|
|
6
|
-
// TODO - could be made much faster by also checking intersections here
|
|
7
|
-
// and passing the result to the next cell
|
|
8
5
|
function findCrossingCells(
|
|
9
6
|
grid: Cell[][],
|
|
10
7
|
colCount: number,
|
|
@@ -24,17 +21,3 @@ function findCrossingCells(
|
|
|
24
21
|
|
|
25
22
|
|
|
26
23
|
export { findCrossingCells }
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
// Quokka tests
|
|
30
|
-
// import { createEmptyGrid } from "./create-empty-grid";
|
|
31
|
-
// // const g = createEmptyGrid(0);
|
|
32
|
-
// const g = createEmptyGrid(0);
|
|
33
|
-
// // g[0][0].lineSegs.push([[]]);
|
|
34
|
-
// g[2][0].lineSegs.push([[]]);
|
|
35
|
-
// g[2][2].lineSegs.push([[]]);
|
|
36
|
-
// findCrossingCells(g);
|
|
37
|
-
// let r = 2;
|
|
38
|
-
// // g.map(r => r.map(c => c.crossingCells))[r].map(v => v);//?
|
|
39
|
-
// g.map(r => r.map(c => c.crossingCells))[r].map(v => v.map(r => r[1]));//?
|
|
40
|
-
// g;//?
|
package/src/utils/jump-idx.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { circsCache } from "./calc-circs.js";
|
|
2
2
|
|
|
3
|
-
const {
|
|
3
|
+
const { max, E } = Math;
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
/**
|
|
@@ -14,10 +14,9 @@ function binarySearchRange<T>(
|
|
|
14
14
|
|
|
15
15
|
let mid = 0;
|
|
16
16
|
while (min <= max) {
|
|
17
|
-
mid = (min + max) >>> 1
|
|
17
|
+
mid = (min + max) >>> 1;
|
|
18
18
|
const midVal = circsCache[mid].from;
|
|
19
19
|
if (midVal === v) {
|
|
20
|
-
// return [min,mid,max];
|
|
21
20
|
return mid;
|
|
22
21
|
} else if (v > midVal) {
|
|
23
22
|
min = mid + 1;
|
|
@@ -26,11 +25,26 @@ function binarySearchRange<T>(
|
|
|
26
25
|
}
|
|
27
26
|
}
|
|
28
27
|
|
|
29
|
-
// return [min,mid,max];
|
|
30
28
|
return mid;
|
|
31
29
|
}
|
|
32
30
|
|
|
33
31
|
|
|
32
|
+
function jumpIdx(
|
|
33
|
+
c: number) {
|
|
34
|
+
|
|
35
|
+
let idx = binarySearchRange(c);
|
|
36
|
+
|
|
37
|
+
c = max(0, c);
|
|
38
|
+
if (idx === 0) { return 0; }
|
|
39
|
+
|
|
40
|
+
while (circsCache[idx].from === circsCache[idx - 1].from) {
|
|
41
|
+
idx--;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
return idx;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
|
|
34
48
|
// const [Q,R] = [10.606601717798213, 35.531676008879735];
|
|
35
49
|
// const [A1,B1,F1] = [102.42126, 0.153169, -117.56077];
|
|
36
50
|
// const [A2,B2,C2,D2,F2] = [-0.000660087, 0.388148, 841.25744, -0.0529616, -1089.49916];
|
|
@@ -55,30 +69,21 @@ function binarySearchRange<T>(
|
|
|
55
69
|
// }
|
|
56
70
|
|
|
57
71
|
|
|
58
|
-
function jumpIdx(
|
|
59
|
-
c: number) {
|
|
60
|
-
|
|
61
|
-
let idx = binarySearchRange(c);
|
|
62
|
-
|
|
63
|
-
c = max(0, c);
|
|
64
|
-
while (idx !== 0 && circsCache[idx].from >= c) { idx--; }
|
|
65
|
-
while (idx < circsCache.length - 2 && circsCache[idx + 1].from < c) { idx++; }
|
|
66
|
-
|
|
67
|
-
return idx;
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
|
|
71
72
|
export { jumpIdx }
|
|
72
73
|
|
|
73
74
|
|
|
74
75
|
// Quokka tests
|
|
75
|
-
//
|
|
76
|
+
// circsCache.slice(0,10);//?
|
|
77
|
+
// circsCache.slice(0,30).map(c => c.from);//?
|
|
78
|
+
// circsCache[5].from;//?
|
|
76
79
|
// circsCache[12].from;//?
|
|
77
80
|
// circsCache[15].from;//?
|
|
78
81
|
// // circsCache.length;//?
|
|
79
82
|
|
|
80
|
-
//
|
|
81
|
-
//
|
|
83
|
+
// jumpIdxOld(1.5811388300841898);//?
|
|
84
|
+
// const v = (53.08771209782213 - Math.SQRT2*24.09375)/24.09375;//?
|
|
85
|
+
// jumpIdx(v);//?
|
|
86
|
+
// circsCache[8].from;//?
|
|
82
87
|
// binarySearchRange(1.5811388300841898);//?
|
|
83
88
|
|
|
84
89
|
|
package/src/utils/seg-box-x.ts
CHANGED
|
@@ -23,8 +23,12 @@ function segBoxX(
|
|
|
23
23
|
|
|
24
24
|
// Parametric line equation: P(t) = P1 + t*(P2-P1), where 0 <= t <= 1
|
|
25
25
|
|
|
26
|
-
const ts: number[] = [];
|
|
27
|
-
const ps: number[][] = [];
|
|
26
|
+
// const ts: number[] = [];
|
|
27
|
+
// const ps: number[][] = [];
|
|
28
|
+
const xs: {
|
|
29
|
+
t: number,
|
|
30
|
+
p: number[]
|
|
31
|
+
}[] = [];
|
|
28
32
|
|
|
29
33
|
if (dx !== 0) {
|
|
30
34
|
// Check intersection with left edge (x = minX)
|
|
@@ -32,8 +36,9 @@ function segBoxX(
|
|
|
32
36
|
if (tL >= 0 && tL <= 1) {
|
|
33
37
|
const y = y0 + tL*dy;
|
|
34
38
|
if (y >= minY && y <= maxY) {
|
|
35
|
-
ts.push(tL);
|
|
36
|
-
ps.push([minX, y]);
|
|
39
|
+
// ts.push(tL);
|
|
40
|
+
// ps.push([minX, y]);
|
|
41
|
+
xs.push({ t: tL, p: [minX, y] });
|
|
37
42
|
}
|
|
38
43
|
}
|
|
39
44
|
|
|
@@ -42,8 +47,9 @@ function segBoxX(
|
|
|
42
47
|
if (tR >= 0 && tR <= 1) {
|
|
43
48
|
const y = y0 + tR*dy;
|
|
44
49
|
if (y >= minY && y <= maxY) {
|
|
45
|
-
ts.push(tR);
|
|
46
|
-
ps.push([maxX, y]);
|
|
50
|
+
// ts.push(tR);
|
|
51
|
+
// ps.push([maxX, y]);
|
|
52
|
+
xs.push({ t: tR, p: [maxX, y] });
|
|
47
53
|
}
|
|
48
54
|
}
|
|
49
55
|
}
|
|
@@ -54,8 +60,9 @@ function segBoxX(
|
|
|
54
60
|
if (tT >= 0 && tT <= 1) {
|
|
55
61
|
const x = x0 + tT*dx;
|
|
56
62
|
if (x >= minX && x <= maxX) {
|
|
57
|
-
ts.push(tT);
|
|
58
|
-
ps.push([x, minY]);
|
|
63
|
+
// ts.push(tT);
|
|
64
|
+
// ps.push([x, minY]);
|
|
65
|
+
xs.push({ t: tT, p: [x, minY] });
|
|
59
66
|
}
|
|
60
67
|
}
|
|
61
68
|
|
|
@@ -64,20 +71,26 @@ function segBoxX(
|
|
|
64
71
|
if (tB >= 0 && tB <= 1) {
|
|
65
72
|
const x = x0 + tB*dx;
|
|
66
73
|
if (x >= minX && x <= maxX) {
|
|
67
|
-
ts.push(tB);
|
|
68
|
-
ps.push([x, maxY]);
|
|
74
|
+
// ts.push(tB);
|
|
75
|
+
// ps.push([x, maxY]);
|
|
76
|
+
xs.push({ t: tB, p: [x, maxY] });
|
|
69
77
|
}
|
|
70
78
|
}
|
|
71
79
|
}
|
|
72
80
|
|
|
73
|
-
// TODO might be more than 2!!
|
|
74
|
-
if (ts.length === 2) {
|
|
75
|
-
return ts[0] < ts[1]
|
|
76
|
-
? ps
|
|
77
|
-
: [ps[1],ps[0]];
|
|
78
|
-
}
|
|
79
81
|
|
|
80
|
-
|
|
82
|
+
const seen = new Set<number>(); // Store unique t values
|
|
83
|
+
const xs_ = xs.filter(x => {
|
|
84
|
+
const { t } = x;
|
|
85
|
+
if (seen.has(t)) {
|
|
86
|
+
return false;
|
|
87
|
+
} else {
|
|
88
|
+
seen.add(t);
|
|
89
|
+
return true;
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
return xs_.sort((a,b) => a.t - b.t).map(x => x.p);
|
|
81
94
|
}
|
|
82
95
|
|
|
83
96
|
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { GlContext } from '../types/gl-context.js';
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
function freeGlContext(
|
|
5
|
+
glContext: GlContext | undefined) {
|
|
6
|
+
|
|
7
|
+
if (glContext === undefined) { return; }
|
|
8
|
+
|
|
9
|
+
const { gl, programs, textures } = glContext;
|
|
10
|
+
|
|
11
|
+
for (let key in programs) {
|
|
12
|
+
const { attributes, fragmentShader, vertexShader, uniformBlocks, program } = programs[key];
|
|
13
|
+
|
|
14
|
+
for (let key in uniformBlocks) {
|
|
15
|
+
const { buf } = uniformBlocks[key];
|
|
16
|
+
gl.deleteBuffer(buf);
|
|
17
|
+
}
|
|
18
|
+
for (let key in attributes) {
|
|
19
|
+
const { buf } = attributes[key];
|
|
20
|
+
gl.deleteBuffer(buf);
|
|
21
|
+
}
|
|
22
|
+
gl.deleteShader(fragmentShader);
|
|
23
|
+
gl.deleteShader(vertexShader);
|
|
24
|
+
gl.deleteProgram(program);
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
for (let key in textures) {
|
|
28
|
+
const { tex } = textures[key];
|
|
29
|
+
gl.deleteTexture(tex);
|
|
30
|
+
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
export { freeGlContext }
|
|
@@ -13,7 +13,7 @@ const cache = new WeakMap<WebGL2RenderingContext, GlContext>();
|
|
|
13
13
|
* @param gl the `WebGL2RenderingContext` context to wrap
|
|
14
14
|
* @param callback
|
|
15
15
|
*/
|
|
16
|
-
function
|
|
16
|
+
function getWebGlContext(
|
|
17
17
|
gl: WebGL2RenderingContext): GlContext {
|
|
18
18
|
|
|
19
19
|
{
|
|
@@ -23,19 +23,17 @@ function getWebGLContext<T>(
|
|
|
23
23
|
|
|
24
24
|
const programs: { [index:string]: Program } = {};
|
|
25
25
|
const textures: { [index:string]: Texture } = {};
|
|
26
|
-
const framebufferStack: WebGLFramebuffer[] = [];
|
|
27
26
|
|
|
28
27
|
gl.canvas.addEventListener('webglcontextlost', e => {
|
|
29
|
-
|
|
28
|
+
onContextLoss();
|
|
30
29
|
e.preventDefault();
|
|
31
30
|
}, false);
|
|
32
31
|
|
|
33
32
|
const glContext: GlContext = {
|
|
34
33
|
gl,
|
|
35
|
-
onContextLoss
|
|
34
|
+
onContextLoss,
|
|
36
35
|
textures,
|
|
37
|
-
programs
|
|
38
|
-
framebufferStack
|
|
36
|
+
programs
|
|
39
37
|
};
|
|
40
38
|
|
|
41
39
|
cache.set(gl, glContext);
|
|
@@ -45,10 +43,9 @@ function getWebGLContext<T>(
|
|
|
45
43
|
|
|
46
44
|
////////////////////////
|
|
47
45
|
|
|
48
|
-
function
|
|
46
|
+
function onContextLoss() {
|
|
49
47
|
deleteAllProps(programs);
|
|
50
48
|
deleteAllProps(textures);
|
|
51
|
-
framebufferStack.length = 0;
|
|
52
49
|
}
|
|
53
50
|
}
|
|
54
51
|
|
|
@@ -58,4 +55,4 @@ function deleteAllProps(o: { [key:string] : unknown }) {
|
|
|
58
55
|
}
|
|
59
56
|
|
|
60
57
|
|
|
61
|
-
export {
|
|
58
|
+
export { getWebGlContext }
|
|
@@ -45,7 +45,7 @@ function setAttribute(
|
|
|
45
45
|
const { gl, attributes } = program;
|
|
46
46
|
|
|
47
47
|
const attr = attributes[name] = attributes[name] ?? {
|
|
48
|
-
buf: gl.createBuffer(),
|
|
48
|
+
buf: gl.createBuffer(),
|
|
49
49
|
loc: gl.getAttribLocation(program.program, name),
|
|
50
50
|
data: null
|
|
51
51
|
}
|
|
@@ -34,10 +34,8 @@ function setUniformBlock(
|
|
|
34
34
|
|
|
35
35
|
const { buf } = uniformBlock;
|
|
36
36
|
|
|
37
|
-
gl.bufferData(gl.UNIFORM_BUFFER, buffer, gl.
|
|
38
|
-
// gl.bindBuffer(gl.UNIFORM_BUFFER, null);
|
|
37
|
+
gl.bufferData(gl.UNIFORM_BUFFER, buffer, gl.STATIC_DRAW);
|
|
39
38
|
gl.bindBufferBase(gl.UNIFORM_BUFFER, bindingPoint, buf);
|
|
40
|
-
// gl.bindBufferRange(gl.UNIFORM_BUFFER, bindingPoint, ubo, 0, sizeInBytes);
|
|
41
39
|
}
|
|
42
40
|
}
|
|
43
41
|
|
|
@@ -35,11 +35,22 @@ function initProgram(
|
|
|
35
35
|
const uniformBlocks: { [index:string]: UniformBlock } = {};
|
|
36
36
|
|
|
37
37
|
const program = gl.createProgram();
|
|
38
|
-
|
|
39
|
-
|
|
38
|
+
const vertexShader = compileShader(gl, vert, gl.VERTEX_SHADER);
|
|
39
|
+
const fragmentShader = compileShader(gl, frag, gl.FRAGMENT_SHADER);
|
|
40
|
+
|
|
41
|
+
gl.attachShader(program, vertexShader);
|
|
42
|
+
gl.attachShader(program, fragmentShader);
|
|
40
43
|
gl.linkProgram(program);
|
|
41
44
|
|
|
42
|
-
programs[name] = {
|
|
45
|
+
programs[name] = {
|
|
46
|
+
gl,
|
|
47
|
+
program,
|
|
48
|
+
attributes,
|
|
49
|
+
uniforms,
|
|
50
|
+
uniformBlocks,
|
|
51
|
+
vertexShader,
|
|
52
|
+
fragmentShader
|
|
53
|
+
};
|
|
43
54
|
|
|
44
55
|
return programs[name];
|
|
45
56
|
}
|
package/node/debug-shaders.d.ts
DELETED
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
*
|
|
3
|
-
* @param gl
|
|
4
|
-
* @param type `gl.VERTEX_SHADER | gl.FRAGMENT_SHADER`
|
|
5
|
-
* @param shaderStr
|
|
6
|
-
*/
|
|
7
|
-
declare function debugGlsl(gl: WebGL2RenderingContext, type: typeof gl.VERTEX_SHADER | typeof gl.FRAGMENT_SHADER, shaderStr: string): void;
|
|
8
|
-
declare function debugShaders(gl: WebGL2RenderingContext): void;
|
|
9
|
-
export { debugShaders, debugGlsl };
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"main.fragment.js","sourceRoot":"","sources":["../../src/shaders/main.fragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,MAAM,KAAK,GAAkD,EAAE,CAAC;AAGhE,SAAS,eAAe,CAChB,QAAgB,EAChB,QAAgB;IAEpB,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,GAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC;IACjD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,QAAQ,CAAC;IAAC,CAAC;IAEpD,MAAM,aAAa;IACnB,QAAQ,CAAA;;;;;;;;;;;;gCAYwB,CAAC,SAAS,GAAG,CAAC,GAAC,QAAQ,CAAC,GAAC,CAAC,QAAQ,GAAG,CAAC,GAAC,QAAQ,CAAC,GAAG,CAAC;;;iCAGnD,SAAS,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sCAuDR,SAAS;;kEAEmB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8CAsD7B,SAAS;;;;;;;;;CAStD,CAAA;IAEG,KAAK,CAAC,IAAI,GAAC,QAAQ,GAAG,QAAQ,CAAC,GAAG,aAAa,CAAC;IAChD,OAAO,aAAa,CAAC;AACzB,CAAC;AAGD,OAAO,EAAE,eAAe,EAAE,CAAA"}
|
|
@@ -1,2 +0,0 @@
|
|
|
1
|
-
declare const main_Vertex = "#version 300 es\n\nprecision highp float;\n\nuniform vec2 uWidthHeight;\nuniform float uStretch;\nin vec2 aUV;\nin ivec2 aCloseCellIdxRangePerCell;\nin ivec2 aCrossIdxRangePerCell;\nout vec2 vXY;\nflat out int instanceId;\nflat out ivec2 closeCellIdxRange;\nflat out ivec2 crossCellIdxRange;\n\n\nvoid main() {\n instanceId = gl_InstanceID;\n closeCellIdxRange = aCloseCellIdxRangePerCell;\n crossCellIdxRange = aCrossIdxRangePerCell;\n\n // drawn column-by-column\n float i = float(instanceId / 32); // column index\n float j = float(instanceId % 32); // row index\n\n vec2 trans = vec2(\n i / float(32),\n j / float(32)\n );\n\n vec2 uv = aUV + trans;\n\n float width = uWidthHeight.x;\n float height = uWidthHeight.y;\n\n vXY = vec2(\n height * uv.x,\n height * uv.y\n );\n\n float aspectRatio = width / height;\n\n gl_Position = vec4(\n vec2(\n (2.0*(uv.x / aspectRatio) - 1.0),\n 2.0*uv.y - 1.0\n ),\n 0.0, 1.0\n );\n}\n";
|
|
2
|
-
export { main_Vertex };
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"main.vertex.js","sourceRoot":"","sources":["../../src/shaders/main.vertex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,WAAW,GAAG,QAAQ,CAAA;;;;;;;;;;;;;;;;;;;;;mCAqBO,SAAS;mCACT,SAAS;;;oBAGxB,SAAS;oBACT,SAAS;;;;;;;;;;;;;;;;;;;;;;;CAuB5B,CAAC;AAGF,OAAO,EAAE,WAAW,EAAE,CAAA"}
|
package/node/types/strip.d.ts
DELETED
package/node/types/strip.js
DELETED
package/node/types/strip.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"strip.js","sourceRoot":"","sources":["../../src/types/strip.ts"],"names":[],"mappings":""}
|