@takram/three-geospatial 0.0.1-alpha.7 → 0.0.1-alpha.8
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/build/index.cjs +1 -1
- package/build/index.cjs.map +1 -1
- package/build/index.js +400 -298
- package/build/index.js.map +1 -1
- package/build/shaders.cjs +17 -26
- package/build/shaders.cjs.map +1 -1
- package/build/shaders.js +27 -35
- package/build/shaders.js.map +1 -1
- package/build/shared.cjs +1 -1
- package/build/shared.cjs.map +1 -1
- package/build/shared.js +104 -111
- package/build/shared.js.map +1 -1
- package/package.json +17 -1
- package/src/DataLoader.ts +4 -8
- package/src/bufferGeometry.ts +5 -4
- package/src/decorators.ts +207 -0
- package/src/index.ts +1 -0
- package/src/r3f/types.ts +3 -1
- package/src/shaders/index.ts +4 -2
- package/src/shaders/interleavedGradientNoise.glsl +6 -0
- package/src/shaders/vogelDisk.glsl +8 -0
- package/types/DataLoader.d.ts +4 -4
- package/types/bufferGeometry.d.ts +2 -1
- package/types/decorators.d.ts +22 -0
- package/types/index.d.ts +1 -0
- package/types/r3f/types.d.ts +1 -1
- package/types/shaders/index.d.ts +2 -1
- package/src/shaders/poissonDisk.glsl +0 -23
package/build/shared.js
CHANGED
@@ -1,28 +1,24 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
function D(p, t, i = new c(), r) {
|
7
|
-
const { x: s, y: n, z: e } = p, a = t.x, o = t.y, y = t.z, d = s * s * a, u = n * n * o, m = e * e * y, l = d + u + m, h = Math.sqrt(1 / l);
|
8
|
-
if (!Number.isFinite(h))
|
1
|
+
import { Vector3 as h, Matrix4 as j, BufferGeometry as B, BufferAttribute as b } from "three";
|
2
|
+
const W = /* @__PURE__ */ new h();
|
3
|
+
function C(E, t, i = new h(), s) {
|
4
|
+
const { x: r, y: e, z: n } = E, o = t.x, a = t.y, y = t.z, u = r * r * o, d = e * e * a, c = n * n * y, l = u + d + c, p = Math.sqrt(1 / l);
|
5
|
+
if (!Number.isFinite(p))
|
9
6
|
return;
|
10
|
-
const
|
11
|
-
if (l < ((
|
12
|
-
return i.copy(
|
13
|
-
const
|
14
|
-
let
|
7
|
+
const x = W.copy(E).multiplyScalar(p);
|
8
|
+
if (l < ((s == null ? void 0 : s.centerTolerance) ?? 0.1))
|
9
|
+
return i.copy(x);
|
10
|
+
const f = x.multiply(t).multiplyScalar(2);
|
11
|
+
let m = (1 - p) * E.length() / (f.length() / 2), I = 0, M, w, g, v;
|
15
12
|
do {
|
16
|
-
|
17
|
-
const
|
18
|
-
|
19
|
-
} while (Math.abs(
|
20
|
-
return i.set(
|
13
|
+
m -= I, M = 1 / (1 + m * o), w = 1 / (1 + m * a), g = 1 / (1 + m * y);
|
14
|
+
const V = M * M, F = w * w, L = g * g, D = V * M, G = F * w, P = L * g;
|
15
|
+
v = u * V + d * F + c * L - 1, I = v / ((u * D * o + d * G * a + c * P * y) * -2);
|
16
|
+
} while (Math.abs(v) > 1e-12);
|
17
|
+
return i.set(r * M, e * w, n * g);
|
21
18
|
}
|
22
|
-
const
|
23
|
-
constructor(t, i,
|
24
|
-
|
25
|
-
this.radii = new c(t, i, r);
|
19
|
+
const A = /* @__PURE__ */ new h(), T = /* @__PURE__ */ new h(), U = /* @__PURE__ */ new h(), S = class S {
|
20
|
+
constructor(t, i, s) {
|
21
|
+
this.radii = new h(t, i, s);
|
26
22
|
}
|
27
23
|
get minimumRadius() {
|
28
24
|
return Math.min(this.radii.x, this.radii.y, this.radii.z);
|
@@ -30,105 +26,102 @@ const N = /* @__PURE__ */ new c(), U = /* @__PURE__ */ new c(), O = /* @__PURE__
|
|
30
26
|
get maximumRadius() {
|
31
27
|
return Math.max(this.radii.x, this.radii.y, this.radii.z);
|
32
28
|
}
|
33
|
-
reciprocalRadii(t = new
|
34
|
-
const { x: i, y:
|
35
|
-
return t.set(1 / i, 1 /
|
29
|
+
reciprocalRadii(t = new h()) {
|
30
|
+
const { x: i, y: s, z: r } = this.radii;
|
31
|
+
return t.set(1 / i, 1 / s, 1 / r);
|
36
32
|
}
|
37
|
-
reciprocalRadiiSquared(t = new
|
38
|
-
const { x: i, y:
|
39
|
-
return t.set(1 / i ** 2, 1 /
|
33
|
+
reciprocalRadiiSquared(t = new h()) {
|
34
|
+
const { x: i, y: s, z: r } = this.radii;
|
35
|
+
return t.set(1 / i ** 2, 1 / s ** 2, 1 / r ** 2);
|
40
36
|
}
|
41
|
-
projectOnSurface(t, i = new
|
42
|
-
return
|
37
|
+
projectOnSurface(t, i = new h(), s) {
|
38
|
+
return C(
|
43
39
|
t,
|
44
40
|
this.reciprocalRadiiSquared(),
|
45
41
|
i,
|
46
|
-
|
42
|
+
s
|
47
43
|
);
|
48
44
|
}
|
49
|
-
getSurfaceNormal(t, i = new
|
50
|
-
return i.multiplyVectors(this.reciprocalRadiiSquared(
|
45
|
+
getSurfaceNormal(t, i = new h()) {
|
46
|
+
return i.multiplyVectors(this.reciprocalRadiiSquared(A), t).normalize();
|
51
47
|
}
|
52
|
-
getEastNorthUpVectors(t, i = new
|
53
|
-
this.getSurfaceNormal(t,
|
48
|
+
getEastNorthUpVectors(t, i = new h(), s = new h(), r = new h()) {
|
49
|
+
this.getSurfaceNormal(t, r), i.set(-t.y, t.x, 0).normalize(), s.crossVectors(r, i).normalize();
|
54
50
|
}
|
55
|
-
getEastNorthUpFrame(t, i = new
|
56
|
-
const
|
57
|
-
return this.getEastNorthUpVectors(t,
|
51
|
+
getEastNorthUpFrame(t, i = new j()) {
|
52
|
+
const s = A, r = T, e = U;
|
53
|
+
return this.getEastNorthUpVectors(t, s, r, e), i.makeBasis(s, r, e).setPosition(t);
|
58
54
|
}
|
59
|
-
getIntersection(t, i = new
|
60
|
-
const
|
61
|
-
if (
|
55
|
+
getIntersection(t, i = new h()) {
|
56
|
+
const s = this.reciprocalRadii(A), r = T.copy(s).multiply(t.origin), e = U.copy(s).multiply(t.direction), n = r.lengthSq(), o = e.lengthSq(), a = r.dot(e), y = a ** 2 - o * (n - 1);
|
57
|
+
if (n === 1)
|
62
58
|
return i.copy(t.origin);
|
63
|
-
if (
|
64
|
-
if (
|
59
|
+
if (n > 1) {
|
60
|
+
if (a >= 0 || y < 0)
|
65
61
|
return;
|
66
|
-
const
|
67
|
-
return t.at(Math.min(
|
62
|
+
const u = Math.sqrt(y), d = (-a - u) / o, c = (-a + u) / o;
|
63
|
+
return t.at(Math.min(d, c), i);
|
68
64
|
}
|
69
|
-
if (
|
70
|
-
const
|
71
|
-
return t.at(
|
65
|
+
if (n < 1) {
|
66
|
+
const u = a ** 2 - o * (n - 1), d = Math.sqrt(u), c = (-a + d) / o;
|
67
|
+
return t.at(c, i);
|
72
68
|
}
|
73
|
-
if (
|
74
|
-
return t.at(-
|
69
|
+
if (a < 0)
|
70
|
+
return t.at(-a / o, i);
|
75
71
|
}
|
76
|
-
getOsculatingSphereCenter(t, i,
|
77
|
-
const
|
78
|
-
t.x /
|
79
|
-
t.y /
|
72
|
+
getOsculatingSphereCenter(t, i, s = new h()) {
|
73
|
+
const r = this.radii.x ** 2, e = A.set(
|
74
|
+
t.x / r,
|
75
|
+
t.y / r,
|
80
76
|
t.z / this.radii.z ** 2
|
81
77
|
).normalize();
|
82
|
-
return
|
78
|
+
return s.copy(e.multiplyScalar(-i).add(t));
|
83
79
|
}
|
84
80
|
};
|
85
|
-
|
81
|
+
S.WGS84 = /* @__PURE__ */ new S(
|
86
82
|
6378137,
|
87
83
|
6378137,
|
88
84
|
6356752314245179e-9
|
89
|
-
)
|
90
|
-
let
|
91
|
-
class
|
92
|
-
constructor(
|
93
|
-
super()
|
94
|
-
|
95
|
-
|
96
|
-
this.parameters = {
|
97
|
-
radii: i,
|
98
|
-
longitudeSegments: r,
|
85
|
+
);
|
86
|
+
let N = S;
|
87
|
+
class Q extends B {
|
88
|
+
constructor(t = new h(1, 1, 1), i = 32, s = 16) {
|
89
|
+
super(), this.type = "EllipsoidGeometry", this.parameters = {
|
90
|
+
radii: t,
|
91
|
+
longitudeSegments: i,
|
99
92
|
latitudeSegments: s
|
100
|
-
},
|
101
|
-
const
|
102
|
-
for (let
|
103
|
-
const
|
104
|
-
let
|
105
|
-
|
106
|
-
for (let
|
107
|
-
const
|
108
|
-
e.x =
|
93
|
+
}, i = Math.max(3, Math.floor(i)), s = Math.max(2, Math.floor(s));
|
94
|
+
const r = (i + 1) * (s + 1), e = new h(), n = new h(), o = new Float32Array(r * 3), a = new Float32Array(r * 3), y = new Float32Array(r * 2), u = [], d = [];
|
95
|
+
for (let c = 0, l = 0, p = 0, x = 0; c <= s; ++c) {
|
96
|
+
const f = [], m = c / s, I = m * Math.PI;
|
97
|
+
let M = 0;
|
98
|
+
c === 0 ? M = 0.5 / i : c === s && (M = -0.5 / i);
|
99
|
+
for (let w = 0; w <= i; ++w, l += 3, p += 2, ++x) {
|
100
|
+
const g = w / i, v = g * Math.PI * 2;
|
101
|
+
e.x = t.x * Math.cos(v) * Math.sin(I), e.y = t.y * Math.sin(v) * Math.sin(I), e.z = t.z * Math.cos(I), o[l] = e.x, o[l + 1] = e.y, o[l + 2] = e.z, n.copy(e).normalize(), a[l] = n.x, a[l + 1] = n.y, a[l + 2] = n.z, y[p] = g + M, y[p + 1] = 1 - m, f.push(x);
|
109
102
|
}
|
110
|
-
u.push(
|
103
|
+
u.push(f);
|
111
104
|
}
|
112
|
-
for (let
|
113
|
-
for (let
|
114
|
-
const
|
115
|
-
|
105
|
+
for (let c = 0; c < s; ++c)
|
106
|
+
for (let l = 0; l < i; ++l) {
|
107
|
+
const p = u[c][l + 1], x = u[c][l], f = u[c + 1][l], m = u[c + 1][l + 1];
|
108
|
+
c !== 0 && d.push(p, x, m), c !== s - 1 && d.push(x, f, m);
|
116
109
|
}
|
117
|
-
this.setIndex(
|
110
|
+
this.setIndex(d), this.setAttribute("position", new b(o, 3)), this.setAttribute("normal", new b(a, 3)), this.setAttribute("uv", new b(y, 2));
|
118
111
|
}
|
119
|
-
copy(
|
120
|
-
return super.copy(
|
112
|
+
copy(t) {
|
113
|
+
return super.copy(t), this.parameters = { ...t.parameters }, this;
|
121
114
|
}
|
122
115
|
}
|
123
|
-
const
|
124
|
-
constructor(t = 0, i = 0,
|
125
|
-
this.longitude = t, this.latitude = i, this.height =
|
116
|
+
const q = /* @__PURE__ */ new h(), O = /* @__PURE__ */ new h(), z = class z {
|
117
|
+
constructor(t = 0, i = 0, s = 0) {
|
118
|
+
this.longitude = t, this.latitude = i, this.height = s;
|
126
119
|
}
|
127
|
-
set(t, i,
|
128
|
-
return this.longitude = t, this.latitude = i,
|
120
|
+
set(t, i, s) {
|
121
|
+
return this.longitude = t, this.latitude = i, s != null && (this.height = s), this;
|
129
122
|
}
|
130
123
|
clone() {
|
131
|
-
return new
|
124
|
+
return new z(this.longitude, this.latitude, this.height);
|
132
125
|
}
|
133
126
|
copy(t) {
|
134
127
|
return this.longitude = t.longitude, this.latitude = t.latitude, this.height = t.height, this;
|
@@ -146,38 +139,38 @@ const S = /* @__PURE__ */ new c(), R = /* @__PURE__ */ new c(), v = class v {
|
|
146
139
|
return this.height = t, this;
|
147
140
|
}
|
148
141
|
normalize() {
|
149
|
-
return this.longitude <
|
142
|
+
return this.longitude < z.MIN_LONGITUDE && (this.longitude += Math.PI * 2), this;
|
150
143
|
}
|
151
144
|
// See: https://en.wikipedia.org/wiki/Geographic_coordinate_conversion
|
152
145
|
// Reference: https://github.com/CesiumGS/cesium/blob/1.122/packages/engine/Source/Core/Geodetic.js#L119
|
153
146
|
setFromECEF(t, i) {
|
154
|
-
const
|
147
|
+
const r = ((i == null ? void 0 : i.ellipsoid) ?? N.WGS84).reciprocalRadiiSquared(q), e = C(
|
155
148
|
t,
|
156
|
-
|
157
|
-
|
149
|
+
r,
|
150
|
+
O,
|
158
151
|
i
|
159
152
|
);
|
160
|
-
if (
|
153
|
+
if (e == null)
|
161
154
|
throw new Error(
|
162
155
|
`Could not project position to ellipsoid surface: ${t.toArray()}`
|
163
156
|
);
|
164
|
-
const
|
165
|
-
this.longitude = Math.atan2(
|
166
|
-
const
|
167
|
-
return this.height = Math.sign(
|
157
|
+
const n = q.multiplyVectors(e, r).normalize();
|
158
|
+
this.longitude = Math.atan2(n.y, n.x), this.latitude = Math.asin(n.z);
|
159
|
+
const o = q.subVectors(t, e);
|
160
|
+
return this.height = Math.sign(o.dot(t)) * o.length(), this;
|
168
161
|
}
|
169
162
|
// See: https://en.wikipedia.org/wiki/Geographic_coordinate_conversion
|
170
163
|
// Reference: https://github.com/CesiumGS/cesium/blob/1.122/packages/engine/Source/Core/Cartesian3.js#L916
|
171
|
-
toECEF(t = new
|
172
|
-
const
|
173
|
-
|
174
|
-
|
175
|
-
),
|
176
|
-
|
177
|
-
|
164
|
+
toECEF(t = new h(), i) {
|
165
|
+
const s = (i == null ? void 0 : i.ellipsoid) ?? N.WGS84, r = q.multiplyVectors(
|
166
|
+
s.radii,
|
167
|
+
s.radii
|
168
|
+
), e = Math.cos(this.latitude), n = O.set(
|
169
|
+
e * Math.cos(this.longitude),
|
170
|
+
e * Math.sin(this.longitude),
|
178
171
|
Math.sin(this.latitude)
|
179
172
|
).normalize();
|
180
|
-
return t.multiplyVectors(
|
173
|
+
return t.multiplyVectors(r, n), t.divideScalar(Math.sqrt(n.dot(t))).add(n.multiplyScalar(this.height));
|
181
174
|
}
|
182
175
|
fromArray(t, i = 0) {
|
183
176
|
return this.longitude = t[i], this.latitude = t[i + 1], this.height = t[i + 2], this;
|
@@ -189,11 +182,11 @@ const S = /* @__PURE__ */ new c(), R = /* @__PURE__ */ new c(), v = class v {
|
|
189
182
|
yield this.longitude, yield this.latitude, yield this.height;
|
190
183
|
}
|
191
184
|
};
|
192
|
-
z
|
193
|
-
let
|
185
|
+
z.MIN_LONGITUDE = -Math.PI, z.MAX_LONGITUDE = Math.PI, z.MIN_LATITUDE = -Math.PI / 2, z.MAX_LATITUDE = Math.PI / 2;
|
186
|
+
let R = z;
|
194
187
|
export {
|
195
|
-
|
196
|
-
|
197
|
-
|
188
|
+
N as E,
|
189
|
+
R as G,
|
190
|
+
Q as a
|
198
191
|
};
|
199
192
|
//# sourceMappingURL=shared.js.map
|
package/build/shared.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"shared.js","sources":["../src/helpers/projectOnEllipsoidSurface.ts","../src/Ellipsoid.ts","../src/EllipsoidGeometry.ts","../src/Geodetic.ts"],"sourcesContent":null,"names":["vectorScratch","Vector3","projectOnEllipsoidSurface","position","reciprocalRadiiSquared","result","options","x","y","z","rx","ry","rz","x2","y2","z2","normSquared","ratio","intersection","gradient","lambda","correction","sx","sy","sz","error","sx2","sy2","sz2","sx3","sy3","sz3","vectorScratch1","vectorScratch2","vectorScratch3","_Ellipsoid","
|
1
|
+
{"version":3,"file":"shared.js","sources":["../src/helpers/projectOnEllipsoidSurface.ts","../src/Ellipsoid.ts","../src/EllipsoidGeometry.ts","../src/Geodetic.ts"],"sourcesContent":null,"names":["vectorScratch","Vector3","projectOnEllipsoidSurface","position","reciprocalRadiiSquared","result","options","x","y","z","rx","ry","rz","x2","y2","z2","normSquared","ratio","intersection","gradient","lambda","correction","sx","sy","sz","error","sx2","sy2","sz2","sx3","sy3","sz3","vectorScratch1","vectorScratch2","vectorScratch3","_Ellipsoid","east","north","up","Matrix4","ray","reciprocalRadii","p","d","p2","d2","pd","discriminant","Q","t1","t2","t","surfacePosition","radius","xySquared","normal","Ellipsoid","EllipsoidGeometry","BufferGeometry","radii","longitudeSegments","latitudeSegments","elementCount","vertex","vertices","normals","uvs","grid","indices","vertexIndex","uvIndex","rowIndex","rowIndices","v","phi","uOffset","u","theta","a","b","c","BufferAttribute","source","_Geodetic","longitude","latitude","height","other","value","projection","ellipsoid","radiiSquared","cosLatitude","array","offset","Geodetic"],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,7 +1,22 @@
|
|
1
1
|
{
|
2
2
|
"name": "@takram/three-geospatial",
|
3
|
-
"version": "0.0.1-alpha.
|
3
|
+
"version": "0.0.1-alpha.8",
|
4
|
+
"description": "Provides fundamental functions for rendering GIS data in Three.js and R3F",
|
5
|
+
"keywords": [
|
6
|
+
"three",
|
7
|
+
"three.js",
|
8
|
+
"geospatial"
|
9
|
+
],
|
10
|
+
"homepage": "https://github.com/takram-design-engineering/three-geospatial/tree/main/packages/core",
|
11
|
+
"bugs": {
|
12
|
+
"url": "https://github.com/takram-design-engineering/three-geospatial/issues"
|
13
|
+
},
|
14
|
+
"repository": {
|
15
|
+
"type": "git",
|
16
|
+
"url": "https://github.com/takram-design-engineering/three-geospatial.git"
|
17
|
+
},
|
4
18
|
"license": "MIT",
|
19
|
+
"author": "Shota Matsuda <shota@takram.com>",
|
5
20
|
"type": "module",
|
6
21
|
"exports": {
|
7
22
|
".": {
|
@@ -24,6 +39,7 @@
|
|
24
39
|
"module": "./build/index.js",
|
25
40
|
"types": "./types/index.d.ts",
|
26
41
|
"files": [
|
42
|
+
"assets",
|
27
43
|
"build",
|
28
44
|
"src",
|
29
45
|
"types",
|
package/src/DataLoader.ts
CHANGED
@@ -30,18 +30,14 @@ type ParameterProperties<T> = {
|
|
30
30
|
[K in WritableKeysOf<T> as T[K] extends Callable ? never : K]: T[K]
|
31
31
|
}
|
32
32
|
|
33
|
-
export
|
34
|
-
Partial<ParameterProperties<DataTexture>>,
|
35
|
-
'image'
|
36
|
-
> & {
|
33
|
+
export interface DataTextureParameters
|
34
|
+
extends Omit<Partial<ParameterProperties<DataTexture>>, 'image'> {
|
37
35
|
width?: number
|
38
36
|
height?: number
|
39
37
|
}
|
40
38
|
|
41
|
-
export
|
42
|
-
Partial<ParameterProperties<Data3DTexture>>,
|
43
|
-
'image'
|
44
|
-
> & {
|
39
|
+
export interface Data3DTextureParameters
|
40
|
+
extends Omit<Partial<ParameterProperties<Data3DTexture>>, 'image'> {
|
45
41
|
width?: number
|
46
42
|
height?: number
|
47
43
|
depth?: number
|
package/src/bufferGeometry.ts
CHANGED
@@ -1,9 +1,10 @@
|
|
1
1
|
import { Box3, BufferAttribute, BufferGeometry, Sphere, Vector3 } from 'three'
|
2
2
|
|
3
|
-
export
|
4
|
-
|
5
|
-
|
6
|
-
|
3
|
+
export interface BufferGeometryLike
|
4
|
+
extends Pick<
|
5
|
+
BufferGeometry,
|
6
|
+
'attributes' | 'index' | 'boundingBox' | 'boundingSphere'
|
7
|
+
> {}
|
7
8
|
|
8
9
|
export function toBufferGeometryLike(
|
9
10
|
geometry: BufferGeometry
|
@@ -0,0 +1,207 @@
|
|
1
|
+
import { Material } from 'three'
|
2
|
+
|
3
|
+
import { clamp } from './math'
|
4
|
+
|
5
|
+
interface EffectLike {
|
6
|
+
defines: Map<string, string>
|
7
|
+
}
|
8
|
+
|
9
|
+
export function define(name: string) {
|
10
|
+
return <T extends Material | EffectLike, K extends keyof T>(
|
11
|
+
target: T[K] extends boolean ? T : never,
|
12
|
+
propertyKey: K
|
13
|
+
) => {
|
14
|
+
if (target instanceof Material) {
|
15
|
+
Object.defineProperty(target, propertyKey, {
|
16
|
+
enumerable: true,
|
17
|
+
get(this: Extract<T, Material>): boolean {
|
18
|
+
return this.defines?.[name] != null
|
19
|
+
},
|
20
|
+
set(this: Extract<T, Material>, value: boolean) {
|
21
|
+
if (value !== this[propertyKey]) {
|
22
|
+
if (value) {
|
23
|
+
this.defines ??= {}
|
24
|
+
this.defines[name] = '1'
|
25
|
+
} else {
|
26
|
+
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
|
27
|
+
delete this.defines?.[name]
|
28
|
+
}
|
29
|
+
this.needsUpdate = true
|
30
|
+
}
|
31
|
+
}
|
32
|
+
})
|
33
|
+
} else {
|
34
|
+
Object.defineProperty(target, propertyKey, {
|
35
|
+
enumerable: true,
|
36
|
+
get(this: Extract<T, EffectLike>): boolean {
|
37
|
+
return this.defines.has(name)
|
38
|
+
},
|
39
|
+
set(this: Extract<T, EffectLike>, value: boolean) {
|
40
|
+
if (value !== this[propertyKey]) {
|
41
|
+
if (value) {
|
42
|
+
this.defines.set(name, '1')
|
43
|
+
} else {
|
44
|
+
this.defines.delete(name)
|
45
|
+
}
|
46
|
+
;(this as any).setChanged() // Bypass protected privilege
|
47
|
+
}
|
48
|
+
}
|
49
|
+
})
|
50
|
+
}
|
51
|
+
}
|
52
|
+
}
|
53
|
+
|
54
|
+
export interface DefineIntDecoratorOptions {
|
55
|
+
min?: number
|
56
|
+
max?: number
|
57
|
+
}
|
58
|
+
|
59
|
+
export function defineInt(
|
60
|
+
name: string,
|
61
|
+
{
|
62
|
+
min = Number.MIN_SAFE_INTEGER,
|
63
|
+
max = Number.MAX_SAFE_INTEGER
|
64
|
+
}: DefineIntDecoratorOptions = {}
|
65
|
+
) {
|
66
|
+
return <T extends Material | EffectLike, K extends keyof T>(
|
67
|
+
target: T[K] extends number ? T : never,
|
68
|
+
propertyKey: K
|
69
|
+
) => {
|
70
|
+
if (target instanceof Material) {
|
71
|
+
Object.defineProperty(target, propertyKey, {
|
72
|
+
enumerable: true,
|
73
|
+
get(this: Extract<T, Material>): number {
|
74
|
+
const value = this.defines?.[name]
|
75
|
+
return value != null ? parseInt(value) : 0
|
76
|
+
},
|
77
|
+
set(this: Extract<T, Material>, value: number) {
|
78
|
+
const prevValue = this[propertyKey]
|
79
|
+
if (value !== prevValue) {
|
80
|
+
this.defines ??= {}
|
81
|
+
this.defines[name] = clamp(value, min, max).toFixed(0)
|
82
|
+
this.needsUpdate = true
|
83
|
+
}
|
84
|
+
}
|
85
|
+
})
|
86
|
+
} else {
|
87
|
+
Object.defineProperty(target, propertyKey, {
|
88
|
+
enumerable: true,
|
89
|
+
get(this: Extract<T, EffectLike>): number {
|
90
|
+
const value = this.defines.get(name)
|
91
|
+
return value != null ? parseInt(value) : 0
|
92
|
+
},
|
93
|
+
set(this: Extract<T, EffectLike>, value: number) {
|
94
|
+
const prevValue = this[propertyKey]
|
95
|
+
if (value !== prevValue) {
|
96
|
+
this.defines.set(name, clamp(value, min, max).toFixed(0))
|
97
|
+
;(this as any).setChanged() // Bypass protected privilege
|
98
|
+
}
|
99
|
+
}
|
100
|
+
})
|
101
|
+
}
|
102
|
+
}
|
103
|
+
}
|
104
|
+
|
105
|
+
export interface DefineFloatDecoratorOptions {
|
106
|
+
min?: number
|
107
|
+
max?: number
|
108
|
+
precision?: number
|
109
|
+
}
|
110
|
+
|
111
|
+
export function defineFloat(
|
112
|
+
name: string,
|
113
|
+
{
|
114
|
+
min = -Infinity,
|
115
|
+
max = Infinity,
|
116
|
+
precision = 7
|
117
|
+
}: DefineFloatDecoratorOptions = {}
|
118
|
+
) {
|
119
|
+
return <T extends Material | EffectLike, K extends keyof T>(
|
120
|
+
target: T[K] extends number ? T : never,
|
121
|
+
propertyKey: K
|
122
|
+
) => {
|
123
|
+
if (target instanceof Material) {
|
124
|
+
Object.defineProperty(target, propertyKey, {
|
125
|
+
enumerable: true,
|
126
|
+
get(this: Extract<T, Material>): number {
|
127
|
+
const value = this.defines?.[name]
|
128
|
+
return value != null ? parseFloat(value) : 0
|
129
|
+
},
|
130
|
+
set(this: Extract<T, Material>, value: number) {
|
131
|
+
const prevValue = this[propertyKey]
|
132
|
+
if (value !== prevValue) {
|
133
|
+
this.defines ??= {}
|
134
|
+
this.defines[name] = clamp(value, min, max).toFixed(precision)
|
135
|
+
this.needsUpdate = true
|
136
|
+
}
|
137
|
+
}
|
138
|
+
})
|
139
|
+
} else {
|
140
|
+
Object.defineProperty(target, propertyKey, {
|
141
|
+
enumerable: true,
|
142
|
+
get(this: Extract<T, EffectLike>): number {
|
143
|
+
const value = this.defines.get(name)
|
144
|
+
return value != null ? parseFloat(value) : 0
|
145
|
+
},
|
146
|
+
set(this: Extract<T, EffectLike>, value: number) {
|
147
|
+
const prevValue = this[propertyKey]
|
148
|
+
if (value !== prevValue) {
|
149
|
+
this.defines.set(name, clamp(value, min, max).toFixed(precision))
|
150
|
+
;(this as any).setChanged() // Bypass protected privilege
|
151
|
+
}
|
152
|
+
}
|
153
|
+
})
|
154
|
+
}
|
155
|
+
}
|
156
|
+
}
|
157
|
+
|
158
|
+
export interface DefineExpressionDecoratorOptions {
|
159
|
+
validate?: (value: string) => boolean
|
160
|
+
}
|
161
|
+
|
162
|
+
export function defineExpression(
|
163
|
+
name: string,
|
164
|
+
{ validate }: DefineExpressionDecoratorOptions = {}
|
165
|
+
) {
|
166
|
+
return <T extends Material | EffectLike, K extends keyof T>(
|
167
|
+
target: T[K] extends string ? T : never,
|
168
|
+
propertyKey: K
|
169
|
+
) => {
|
170
|
+
if (target instanceof Material) {
|
171
|
+
Object.defineProperty(target, propertyKey, {
|
172
|
+
enumerable: true,
|
173
|
+
get(this: Extract<T, Material>): string {
|
174
|
+
return this.defines?.[name] ?? ''
|
175
|
+
},
|
176
|
+
set(this: Extract<T, Material>, value: string) {
|
177
|
+
if (value !== this[propertyKey]) {
|
178
|
+
if (validate?.(value) === false) {
|
179
|
+
console.error(`Expression validation failed: ${value}`)
|
180
|
+
return
|
181
|
+
}
|
182
|
+
this.defines ??= {}
|
183
|
+
this.defines[name] = value
|
184
|
+
this.needsUpdate = true
|
185
|
+
}
|
186
|
+
}
|
187
|
+
})
|
188
|
+
} else {
|
189
|
+
Object.defineProperty(target, propertyKey, {
|
190
|
+
enumerable: true,
|
191
|
+
get(this: Extract<T, EffectLike>): string {
|
192
|
+
return this.defines.get(name) ?? ''
|
193
|
+
},
|
194
|
+
set(this: Extract<T, EffectLike>, value: string) {
|
195
|
+
if (value !== this[propertyKey]) {
|
196
|
+
if (validate?.(value) === false) {
|
197
|
+
console.error(`Expression validation failed: ${value}`)
|
198
|
+
return
|
199
|
+
}
|
200
|
+
this.defines.set(name, value)
|
201
|
+
;(this as any).setChanged() // Bypass protected privilege
|
202
|
+
}
|
203
|
+
}
|
204
|
+
})
|
205
|
+
}
|
206
|
+
}
|
207
|
+
}
|
package/src/index.ts
CHANGED
package/src/r3f/types.ts
CHANGED
@@ -59,5 +59,7 @@ export type PassThoughInstanceProps<
|
|
59
59
|
>
|
60
60
|
|
61
61
|
export type ExpandNestedProps<T, Prop extends keyof T & string> = {
|
62
|
-
[K in keyof T[Prop] as K extends string
|
62
|
+
[K in keyof NonNullable<T[Prop]> as K extends string
|
63
|
+
? `${Prop}-${K}`
|
64
|
+
: 'never']: NonNullable<T[Prop]>[K]
|
63
65
|
}
|