Candidate {candidateIndex + 1}
@@ -23337,8 +23339,8 @@ export function App({
Edit authored point positions directly. Keep at least{" "}
{MIN_SCENE_PATH_POINT_COUNT} points. Shift+W{" "}
adds a point after the selected control point, or appends
- to the end when the whole path is selected. When a point is
- selected, Shift+D adds one and starts grab
+ to the end when the whole path is selected. When a point
+ is selected, Shift+D adds one and starts grab
mode.
{selectedPathPointIndex === null ? null : (
diff --git a/tests/domain/terrains.test.ts b/tests/domain/terrains.test.ts
index 7989c371..cf50b664 100644
--- a/tests/domain/terrains.test.ts
+++ b/tests/domain/terrains.test.ts
@@ -100,12 +100,12 @@ describe("terrain grid resizing", () => {
cellSize: 0.5
});
- expect(sampleTerrainHeightAtLocalPosition(resizedTerrain, 2.5, 3.5)).toBeCloseTo(
- sampleTerrainHeightAtLocalPosition(terrain, 2.5, 3.5) ?? 0
- );
- expect(sampleTerrainHeightAtLocalPosition(resizedTerrain, 6, 1)).toBeCloseTo(
- sampleTerrainHeightAtLocalPosition(terrain, 6, 1) ?? 0
- );
+ expect(
+ sampleTerrainHeightAtLocalPosition(resizedTerrain, 2.5, 3.5)
+ ).toBeCloseTo(sampleTerrainHeightAtLocalPosition(terrain, 2.5, 3.5) ?? 0);
+ expect(
+ sampleTerrainHeightAtLocalPosition(resizedTerrain, 6, 1)
+ ).toBeCloseTo(sampleTerrainHeightAtLocalPosition(terrain, 6, 1) ?? 0);
});
it("preserves paint weights at representative local positions when Cell Size changes", () => {
@@ -123,7 +123,11 @@ describe("terrain grid resizing", () => {
cellSize: 0.5
});
const originalOffset = getTerrainPaintWeightSampleOffset(terrain, 4, 2);
- const resizedOffset = getTerrainPaintWeightSampleOffset(resizedTerrain, 8, 4);
+ const resizedOffset = getTerrainPaintWeightSampleOffset(
+ resizedTerrain,
+ 8,
+ 4
+ );
expect(resizedTerrain.paintWeights[resizedOffset]).toBeCloseTo(
terrain.paintWeights[originalOffset] ?? 0
@@ -292,20 +296,7 @@ describe("terrain material layers", () => {
id: "terrain-add-layer",
sampleCountX: 2,
sampleCountZ: 2,
- paintWeights: [
- 0.2,
- 0.3,
- 0.1,
- 0.4,
- 0.1,
- 0,
- 0,
- 0.5,
- 0,
- 0.25,
- 0.25,
- 0.25
- ]
+ paintWeights: [0.2, 0.3, 0.1, 0.4, 0.1, 0, 0, 0.5, 0, 0.25, 0.25, 0.25]
});
const nextTerrain = createTerrainWithAddedLayer(terrain, "road-material");
@@ -322,18 +313,12 @@ describe("terrain material layers", () => {
expect(nextTerrain.layers).toHaveLength(5);
expect(nextTerrain.layers[4]).toEqual({ materialId: "road-material" });
- expect(nextTerrain.paintWeights.slice(firstSampleOffset, firstSampleOffset + 4)).toEqual([
- 0.2,
- 0.3,
- 0.1,
- 0
- ]);
- expect(nextTerrain.paintWeights.slice(secondSampleOffset, secondSampleOffset + 4)).toEqual([
- 0.4,
- 0.1,
- 0,
- 0
- ]);
+ expect(
+ nextTerrain.paintWeights.slice(firstSampleOffset, firstSampleOffset + 4)
+ ).toEqual([0.2, 0.3, 0.1, 0]);
+ expect(
+ nextTerrain.paintWeights.slice(secondSampleOffset, secondSampleOffset + 4)
+ ).toEqual([0.4, 0.1, 0, 0]);
});
it("removes non-base layers by compacting explicit weights", () => {
@@ -342,20 +327,7 @@ describe("terrain material layers", () => {
id: "terrain-remove-layer",
sampleCountX: 2,
sampleCountZ: 2,
- paintWeights: [
- 0.2,
- 0.3,
- 0.1,
- 0.4,
- 0.1,
- 0,
- 0,
- 0.5,
- 0,
- 0.25,
- 0.25,
- 0.25
- ]
+ paintWeights: [0.2, 0.3, 0.1, 0.4, 0.1, 0, 0, 0.5, 0, 0.25, 0.25, 0.25]
}),
"fifth-material"
);
@@ -364,18 +336,7 @@ describe("terrain material layers", () => {
expect(nextTerrain.layers).toHaveLength(4);
expect(nextTerrain.paintWeights).toEqual([
- 0.2,
- 0.1,
- 0,
- 0.4,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0.25,
- 0.25,
- 0
+ 0.2, 0.1, 0, 0.4, 0, 0, 0, 0, 0, 0.25, 0.25, 0
]);
});
});
@@ -446,28 +407,13 @@ describe("terrain foliage masks", () => {
expect(clonedTerrain.foliageMasks[foliageLayerId]).not.toBe(mask);
expect(getTerrainFoliageMaskValueAtSample(mask!, 1, 1)).toBe(0.5);
expect(
- sampleTerrainFoliageMaskAtWorldPosition(
- terrain,
- foliageLayerId,
- 11,
- 21
- )
+ sampleTerrainFoliageMaskAtWorldPosition(terrain, foliageLayerId, 11, 21)
).toBeCloseTo(0.375);
expect(
- sampleTerrainFoliageMaskAtWorldPosition(
- terrain,
- "missing-layer",
- 11,
- 21
- )
+ sampleTerrainFoliageMaskAtWorldPosition(terrain, "missing-layer", 11, 21)
).toBe(0);
expect(
- sampleTerrainFoliageMaskAtWorldPosition(
- terrain,
- foliageLayerId,
- 99,
- 99
- )
+ sampleTerrainFoliageMaskAtWorldPosition(terrain, foliageLayerId, 99, 99)
).toBeNull();
});
});
diff --git a/tests/unit/terrain-foundation.integration.test.tsx b/tests/unit/terrain-foundation.integration.test.tsx
index ec332b37..7cb82541 100644
--- a/tests/unit/terrain-foundation.integration.test.tsx
+++ b/tests/unit/terrain-foundation.integration.test.tsx
@@ -173,7 +173,8 @@ describe("Terrain foundation", () => {
fireEvent.click(screen.getByTestId("terrain-grid-apply"));
await waitFor(() => {
- const updatedTerrain = store.getState().document.terrains[createdTerrain.id];
+ const updatedTerrain =
+ store.getState().document.terrains[createdTerrain.id];
expect(updatedTerrain?.sampleCountX).toBe(5);
expect(updatedTerrain?.sampleCountZ).toBe(5);