@adobe/data 0.4.5 → 0.4.6
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/dist/ecs/database/database-schema/create-database-schema-test.js +2 -2
- package/dist/ecs/database/database-schema/create-database-schema-test.js.map +1 -1
- package/dist/ecs/database/database-schema/create-database-schema.d.ts +1 -4
- package/dist/ecs/database/database-schema/create-database-schema.js +2 -2
- package/dist/ecs/database/database-schema/create-database-schema.js.map +1 -1
- package/dist/ecs/database/database-schema/create-store-schema-test.d.ts +1 -0
- package/dist/ecs/database/database-schema/create-store-schema-test.js +36 -0
- package/dist/ecs/database/database-schema/create-store-schema-test.js.map +1 -0
- package/dist/ecs/database/database-schema/create-store-schema.d.ts +9 -0
- package/dist/ecs/database/database-schema/create-store-schema.js +26 -0
- package/dist/ecs/database/database-schema/create-store-schema.js.map +1 -0
- package/dist/ecs/database/database-schema/database-schema.d.ts +2 -5
- package/dist/ecs/database/database-schema/index.d.ts +2 -2
- package/dist/ecs/database/database-schema/index.js +2 -2
- package/dist/ecs/database/database-schema/index.js.map +1 -1
- package/dist/ecs/database/database-schema/store-schema.d.ts +12 -0
- package/dist/ecs/database/database-schema/store-schema.js +23 -0
- package/dist/ecs/database/database-schema/store-schema.js.map +1 -0
- package/dist/ecs/database/database.d.ts +3 -3
- package/dist/ecs/database/index.d.ts +0 -1
- package/dist/ecs/database/index.js +0 -1
- package/dist/ecs/database/index.js.map +1 -1
- package/dist/ecs/database/store-schema/create-store-schema-test.d.ts +1 -0
- package/dist/ecs/database/store-schema/create-store-schema-test.js +36 -0
- package/dist/ecs/database/store-schema/create-store-schema-test.js.map +1 -0
- package/dist/ecs/database/store-schema/create-store-schema.d.ts +9 -0
- package/dist/ecs/database/store-schema/create-store-schema.js +26 -0
- package/dist/ecs/database/store-schema/create-store-schema.js.map +1 -0
- package/dist/ecs/database/store-schema/index.d.ts +2 -0
- package/dist/ecs/database/store-schema/index.js +24 -0
- package/dist/ecs/database/store-schema/index.js.map +1 -0
- package/dist/ecs/database/store-schema/store-schema.d.ts +12 -0
- package/dist/ecs/database/store-schema/store-schema.js +23 -0
- package/dist/ecs/database/store-schema/store-schema.js.map +1 -0
- package/dist/ecs/database/transactional-store/apply-operations.d.ts +2 -2
- package/dist/ecs/database/transactional-store/apply-operations.js.map +1 -1
- package/dist/ecs/database/transactional-store/create-test-transaction.d.ts +0 -1
- package/dist/ecs/database/transactional-store/create-test-transaction.js.map +1 -1
- package/dist/ecs/database/transactional-store/create-transactional-store.js +5 -6
- package/dist/ecs/database/transactional-store/create-transactional-store.js.map +1 -1
- package/dist/ecs/database/transactional-store/index.d.ts +0 -1
- package/dist/ecs/database/transactional-store/index.js +0 -1
- package/dist/ecs/database/transactional-store/index.js.map +1 -1
- package/dist/ecs/database/transactional-store/transactional-store.d.ts +1 -6
- package/dist/ecs/store/create-store.js.map +1 -1
- package/dist/ecs/store/index.d.ts +1 -0
- package/dist/ecs/store/index.js +1 -0
- package/dist/ecs/store/index.js.map +1 -1
- package/dist/ecs/store/store-schema/create-store-schema-test.d.ts +1 -0
- package/dist/ecs/store/store-schema/create-store-schema-test.js +36 -0
- package/dist/ecs/store/store-schema/create-store-schema-test.js.map +1 -0
- package/dist/ecs/store/store-schema/create-store-schema.d.ts +9 -0
- package/dist/ecs/store/store-schema/create-store-schema.js +26 -0
- package/dist/ecs/store/store-schema/create-store-schema.js.map +1 -0
- package/dist/ecs/store/store-schema/index.d.ts +2 -0
- package/dist/ecs/store/store-schema/index.js +24 -0
- package/dist/ecs/store/store-schema/index.js.map +1 -0
- package/dist/ecs/store/store-schema/store-schema.d.ts +12 -0
- package/dist/ecs/store/store-schema/store-schema.js +23 -0
- package/dist/ecs/store/store-schema/store-schema.js.map +1 -0
- package/dist/ecs/store/store.d.ts +6 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/typed-buffer/structs/get-struct-layout.js +7 -10
- package/dist/typed-buffer/structs/get-struct-layout.js.map +1 -1
- package/dist/typed-buffer/structs/get-struct-layout.test.js +148 -11
- package/dist/typed-buffer/structs/get-struct-layout.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -33,12 +33,8 @@ const getStructFieldAlignment = (type) => {
|
|
|
33
33
|
if (typeof type === "string") {
|
|
34
34
|
return 4;
|
|
35
35
|
}
|
|
36
|
-
// Arrays are aligned to vec4 (16 bytes)
|
|
37
|
-
|
|
38
|
-
return VEC4_SIZE;
|
|
39
|
-
}
|
|
40
|
-
// Structs are aligned to 4 bytes within other structs
|
|
41
|
-
return 4;
|
|
36
|
+
// Arrays and structs are aligned to vec4 (16 bytes)
|
|
37
|
+
return VEC4_SIZE;
|
|
42
38
|
};
|
|
43
39
|
/**
|
|
44
40
|
* Gets size in bytes for a field type
|
|
@@ -47,6 +43,7 @@ const getFieldSize = (type) => {
|
|
|
47
43
|
if (typeof type === "string") {
|
|
48
44
|
return 4; // All primitives are 4 bytes
|
|
49
45
|
}
|
|
46
|
+
// For arrays and structs, use their actual size
|
|
50
47
|
return type.size;
|
|
51
48
|
};
|
|
52
49
|
/**
|
|
@@ -111,8 +108,8 @@ const getStructLayoutInternal = memoizeFactory((schema) => {
|
|
|
111
108
|
if (schema.minItems !== schema.maxItems || !schema.minItems) {
|
|
112
109
|
throw new Error("Array must have fixed length");
|
|
113
110
|
}
|
|
114
|
-
if (schema.minItems <
|
|
115
|
-
throw new Error("Array length must be at least
|
|
111
|
+
if (schema.minItems < 1) {
|
|
112
|
+
throw new Error("Array length must be at least 1");
|
|
116
113
|
}
|
|
117
114
|
// Special case for vec3
|
|
118
115
|
const primitiveType = getPrimitiveType(schema.items);
|
|
@@ -126,7 +123,7 @@ const getStructLayoutInternal = memoizeFactory((schema) => {
|
|
|
126
123
|
}
|
|
127
124
|
return {
|
|
128
125
|
type: "array",
|
|
129
|
-
size:
|
|
126
|
+
size: 12, // vec3 is 12 bytes, not padded to vec4
|
|
130
127
|
fields
|
|
131
128
|
};
|
|
132
129
|
}
|
|
@@ -180,7 +177,7 @@ const getStructLayoutInternal = memoizeFactory((schema) => {
|
|
|
180
177
|
};
|
|
181
178
|
currentOffset += getFieldSize(fieldType);
|
|
182
179
|
}
|
|
183
|
-
// Round up total size to vec4
|
|
180
|
+
// Round up total size to vec4 (std140 requirement)
|
|
184
181
|
const size = roundUpToAlignment(currentOffset, VEC4_SIZE);
|
|
185
182
|
return {
|
|
186
183
|
type: "object",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-struct-layout.js","sourceRoot":"","sources":["../../../src/typed-buffer/structs/get-struct-layout.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;WAoBW;AACX,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,8BAA8B;AAC9B,MAAM,SAAS,GAAG,EAAE,CAAC,CAAE,gBAAgB;AAEvC;;;GAGG;AACH,MAAM,uBAAuB,GAAG,CAAC,IAA6C,EAAU,EAAE;IACtF,qCAAqC;IACrC,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC3B,OAAO,CAAC,CAAC;IACb,CAAC;IACD,
|
|
1
|
+
{"version":3,"file":"get-struct-layout.js","sourceRoot":"","sources":["../../../src/typed-buffer/structs/get-struct-layout.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,7 @@ describe("getStructLayout", () => {
|
|
|
50
50
|
};
|
|
51
51
|
const layout = getStructLayout(schema);
|
|
52
52
|
expect(layout.type).toBe("array");
|
|
53
|
-
expect(layout.size).toBe(
|
|
53
|
+
expect(layout.size).toBe(12); // vec3 is 12 bytes, not padded to vec4
|
|
54
54
|
expect(layout.fields["0"].offset).toBe(0);
|
|
55
55
|
expect(layout.fields["1"].offset).toBe(4);
|
|
56
56
|
expect(layout.fields["2"].offset).toBe(8);
|
|
@@ -76,17 +76,17 @@ describe("getStructLayout", () => {
|
|
|
76
76
|
};
|
|
77
77
|
const layout = getStructLayout(schema);
|
|
78
78
|
expect(layout.type).toBe("object");
|
|
79
|
-
// transform (
|
|
80
|
-
// rounded up to largest member alignment (16 bytes) =
|
|
81
|
-
expect(layout.size).toBe(
|
|
79
|
+
// transform (16 bytes) + active (4 bytes) = 20 bytes
|
|
80
|
+
// rounded up to largest member alignment (16 bytes) = 32 bytes
|
|
81
|
+
expect(layout.size).toBe(32);
|
|
82
82
|
const transform = layout.fields.transform.type;
|
|
83
83
|
expect(typeof transform).not.toBe("string");
|
|
84
84
|
if (typeof transform !== "string") {
|
|
85
|
-
// position (vec3 =
|
|
86
|
-
//
|
|
87
|
-
expect(transform.size).toBe(
|
|
85
|
+
// position (vec3 = 12 bytes) + scale (4 bytes) = 16 bytes
|
|
86
|
+
// no padding needed, struct alignment is 16 bytes
|
|
87
|
+
expect(transform.size).toBe(16);
|
|
88
88
|
const position = transform.fields.position.type;
|
|
89
|
-
expect(typeof position !== "string" && position.size).toBe(
|
|
89
|
+
expect(typeof position !== "string" && position.size).toBe(12);
|
|
90
90
|
}
|
|
91
91
|
});
|
|
92
92
|
it("should handle array of structs", () => {
|
|
@@ -108,6 +108,143 @@ describe("getStructLayout", () => {
|
|
|
108
108
|
expect(layout.fields["0"].offset).toBe(0);
|
|
109
109
|
expect(layout.fields["1"].offset).toBe(16); // aligned to vec4
|
|
110
110
|
});
|
|
111
|
+
it("should demonstrate std140 vec4 + f32 + f32 alignment issue", () => {
|
|
112
|
+
const schema = {
|
|
113
|
+
type: "object",
|
|
114
|
+
properties: {
|
|
115
|
+
// vec4 (16 bytes, offset 0)
|
|
116
|
+
viewProjection: {
|
|
117
|
+
type: "array",
|
|
118
|
+
items: { type: "number", precision: 1 },
|
|
119
|
+
minItems: 4,
|
|
120
|
+
maxItems: 4
|
|
121
|
+
},
|
|
122
|
+
// f32 (4 bytes, offset 16)
|
|
123
|
+
lightDirection: {
|
|
124
|
+
type: "array",
|
|
125
|
+
items: { type: "number", precision: 1 },
|
|
126
|
+
minItems: 3,
|
|
127
|
+
maxItems: 3
|
|
128
|
+
},
|
|
129
|
+
// f32 (4 bytes, offset 32) - CORRECT for std140!
|
|
130
|
+
lightColor: {
|
|
131
|
+
type: "array",
|
|
132
|
+
items: { type: "number", precision: 1 },
|
|
133
|
+
minItems: 3,
|
|
134
|
+
maxItems: 3
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
};
|
|
138
|
+
const layout = getStructLayout(schema);
|
|
139
|
+
expect(layout.type).toBe("object");
|
|
140
|
+
// The getStructLayout function is actually working correctly for std140!
|
|
141
|
+
// It's properly padding vec3s to 16-byte boundaries
|
|
142
|
+
expect(layout.fields.lightColor.offset).toBe(32); // This is correct!
|
|
143
|
+
// The correct std140 layout is:
|
|
144
|
+
// - viewProjection: offset 0, size 16 bytes
|
|
145
|
+
// - lightDirection: offset 16, size 16 bytes (padded to vec4)
|
|
146
|
+
// - lightColor: offset 32, size 16 bytes (padded to vec4)
|
|
147
|
+
// Total size: 48 bytes
|
|
148
|
+
expect(layout.size).toBe(48); // This is correct
|
|
149
|
+
});
|
|
150
|
+
it("should handle vec3<f32> + f32 struct layout correctly", () => {
|
|
151
|
+
const schema = {
|
|
152
|
+
type: "object",
|
|
153
|
+
properties: {
|
|
154
|
+
// vec3<f32> (12 bytes, padded to 16 bytes, offset 0)
|
|
155
|
+
position: {
|
|
156
|
+
type: "array",
|
|
157
|
+
items: { type: "number", precision: 1 },
|
|
158
|
+
minItems: 3,
|
|
159
|
+
maxItems: 3
|
|
160
|
+
},
|
|
161
|
+
// f32 (4 bytes, offset 16)
|
|
162
|
+
scale: { type: "number", precision: 1 }
|
|
163
|
+
}
|
|
164
|
+
};
|
|
165
|
+
const layout = getStructLayout(schema);
|
|
166
|
+
expect(layout.type).toBe("object");
|
|
167
|
+
// vec3<f32> should be 16-byte aligned and take 12 bytes
|
|
168
|
+
expect(layout.fields.position.offset).toBe(0);
|
|
169
|
+
const positionType = layout.fields.position.type;
|
|
170
|
+
if (typeof positionType !== "string") {
|
|
171
|
+
expect(positionType.size).toBe(12);
|
|
172
|
+
}
|
|
173
|
+
// f32 should follow immediately at offset 12
|
|
174
|
+
expect(layout.fields.scale.offset).toBe(12);
|
|
175
|
+
// Total size should be 12 bytes (vec3) + 4 bytes (f32) = 16 bytes
|
|
176
|
+
// no padding needed, struct alignment is 16 bytes
|
|
177
|
+
expect(layout.size).toBe(16);
|
|
178
|
+
});
|
|
179
|
+
// This sample was pulled from here: https://webgpufundamentals.org/webgpu/lessons/webgpu-memory-layout.html
|
|
180
|
+
it("should handle complex struct with arrays and nested structs (std140 example)", () => {
|
|
181
|
+
const schema = {
|
|
182
|
+
type: "object",
|
|
183
|
+
properties: {
|
|
184
|
+
// Main struct fields in expected order
|
|
185
|
+
orientation: {
|
|
186
|
+
type: "array",
|
|
187
|
+
items: { type: "number", precision: 1 },
|
|
188
|
+
minItems: 3,
|
|
189
|
+
maxItems: 3
|
|
190
|
+
},
|
|
191
|
+
size: { type: "number", precision: 1 },
|
|
192
|
+
direction: {
|
|
193
|
+
type: "array",
|
|
194
|
+
items: {
|
|
195
|
+
type: "array",
|
|
196
|
+
items: { type: "number", precision: 1 },
|
|
197
|
+
minItems: 3,
|
|
198
|
+
maxItems: 3
|
|
199
|
+
},
|
|
200
|
+
minItems: 1,
|
|
201
|
+
maxItems: 1
|
|
202
|
+
},
|
|
203
|
+
scale: { type: "number", precision: 1 },
|
|
204
|
+
// Ex4a struct
|
|
205
|
+
info: {
|
|
206
|
+
type: "object",
|
|
207
|
+
properties: {
|
|
208
|
+
velocity: {
|
|
209
|
+
type: "array",
|
|
210
|
+
items: { type: "number", precision: 1 },
|
|
211
|
+
minItems: 3,
|
|
212
|
+
maxItems: 3
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
},
|
|
216
|
+
friction: { type: "number", precision: 1 }
|
|
217
|
+
}
|
|
218
|
+
};
|
|
219
|
+
const layout = getStructLayout(schema);
|
|
220
|
+
expect(layout.type).toBe("object");
|
|
221
|
+
// orientation: vec3f at offset 0, size 12 bytes
|
|
222
|
+
expect(layout.fields.orientation.offset).toBe(0);
|
|
223
|
+
const orientationType = layout.fields.orientation.type;
|
|
224
|
+
if (typeof orientationType !== "string") {
|
|
225
|
+
expect(orientationType.size).toBe(12);
|
|
226
|
+
}
|
|
227
|
+
// size: f32 at offset 12 (fits right after vec3f)
|
|
228
|
+
expect(layout.fields.size.offset).toBe(12);
|
|
229
|
+
// direction: array<vec3f, 1> at offset 16 (aligned to vec4)
|
|
230
|
+
expect(layout.fields.direction.offset).toBe(16);
|
|
231
|
+
const directionType = layout.fields.direction.type;
|
|
232
|
+
if (typeof directionType !== "string") {
|
|
233
|
+
expect(directionType.size).toBe(16); // vec3f padded to vec4
|
|
234
|
+
}
|
|
235
|
+
// scale: f32 at offset 32 (after array)
|
|
236
|
+
expect(layout.fields.scale.offset).toBe(32);
|
|
237
|
+
// info: Ex4a struct at offset 48 (aligned to vec4)
|
|
238
|
+
expect(layout.fields.info.offset).toBe(48);
|
|
239
|
+
const infoType = layout.fields.info.type;
|
|
240
|
+
if (typeof infoType !== "string") {
|
|
241
|
+
expect(infoType.size).toBe(16); // vec3f padded to vec4
|
|
242
|
+
}
|
|
243
|
+
// friction: f32 at offset 64 (after struct)
|
|
244
|
+
expect(layout.fields.friction.offset).toBe(64);
|
|
245
|
+
// Total size should be 68 bytes, rounded up to vec4 = 80 bytes
|
|
246
|
+
expect(layout.size).toBe(80);
|
|
247
|
+
});
|
|
111
248
|
it("should reject invalid schemas", () => {
|
|
112
249
|
// Non-fixed length array
|
|
113
250
|
expect(() => getStructLayout({
|
|
@@ -121,12 +258,12 @@ describe("getStructLayout", () => {
|
|
|
121
258
|
a: { type: "string" }
|
|
122
259
|
}
|
|
123
260
|
})).toThrow();
|
|
124
|
-
// Array length <
|
|
261
|
+
// Array length < 1
|
|
125
262
|
expect(() => getStructLayout({
|
|
126
263
|
type: "array",
|
|
127
264
|
items: { type: "number", precision: 1 },
|
|
128
|
-
minItems:
|
|
129
|
-
maxItems:
|
|
265
|
+
minItems: 0,
|
|
266
|
+
maxItems: 0
|
|
130
267
|
})).toThrow();
|
|
131
268
|
});
|
|
132
269
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-struct-layout.test.js","sourceRoot":"","sources":["../../../src/typed-buffer/structs/get-struct-layout.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;WAoBW;AACX,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACrC,MAAM,MAAM,GAAW;YACnB,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACR,CAAC,EAAE,SAAS;gBACZ,CAAC,EAAE,SAAS;gBACZ,CAAC,EAAE,SAAS;aACf;SACJ,CAAC;QAEF,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAE,kBAAkB;QACjD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAC9C,MAAM,MAAM,GAAW;YACnB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAE;YACvC,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,CAAC;SACd,CAAC;QAEF,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAE,CAAC;QACxC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAE,
|
|
1
|
+
{"version":3,"file":"get-struct-layout.test.js","sourceRoot":"","sources":["../../../src/typed-buffer/structs/get-struct-layout.test.ts"],"names":[],"mappings":"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"}
|