Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/core/src/color/lighting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export function shadeWallFace(base: string, face: keyof WallsMask): string {
return shadeColor(base, -delta);
}

export type ShapeType = "ramp" | "wedge" | "spike";
export type ShapeType = "ramp" | "wedge" | "spike" | "triangle" | "polygon";

interface ShapeSurfaceDefinition {
id: string;
Expand All @@ -113,7 +113,9 @@ const SHAPE_SURFACE_DEFINITIONS: Record<ShapeType, ShapeSurfaceDefinition[]> = {
spike: [
{ id: "primary", baseAngle: 0 },
{ id: "secondary", baseAngle: 270 }
]
],
triangle: [{ id: "primary", baseAngle: 0 }],
polygon: [{ id: "primary", baseAngle: 0 }]
};

const SHAPE_LIGHT_SOURCE_ANGLE = 180;
Expand Down
22 changes: 16 additions & 6 deletions packages/core/src/controller/sceneController.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createIsometricCamera, normalizeInvertMultiplier } from "../camera/camera";
import type { CameraHandle, CameraState } from "../camera/camera";
import type { ProjectionMode, SceneDimensions, WallsMask, Voxel, GridContext, VoxelGrid } from "../types";
import type { ProjectionMode, SceneDimensions, WallsMask, Voxel, GridContext, VoxelGrid, FaceAppearanceOverride } from "../types";
import { buildSceneContext, computeWallMask, wallMasksEqual } from "../scene/context";
import { mergeVoxels as mergeVoxelsGrid } from "../merge/mergeVoxels";
import { normalizeMergeVoxelsOption, is2dMerge, is3dMerge } from "../merge/mergeVoxelsOption";
Expand All @@ -15,6 +15,8 @@ export interface SceneState {
showFloor: boolean;
projection: ProjectionMode;
mergeVoxels?: MergeVoxelsOption;
lighting?: (voxel: Voxel, face: string) => FaceAppearanceOverride | undefined;
resolveTexture?: (name: string, face: string) => string | undefined;
}

export type SceneRenderMode = "cubes" | "slice-renderer";
Expand Down Expand Up @@ -135,8 +137,10 @@ export function sceneController(options: SceneControllerOptions = {}): SceneCont
}

const cubeOnly = rawVoxels.every((voxel) => !voxel || (voxel.shape ?? "cube") === "cube");
const shouldPreMerge = is2dMerge(mergeOption);
const grid = shouldPreMerge ? mergeVoxelsGrid(rawVoxels) : rawVoxels;
let grid: VoxelGrid = rawVoxels;
if (is2dMerge(mergeOption)) {
grid = mergeVoxelsGrid(rawVoxels);
}

cachedRawVoxels = rawVoxels;
cachedRawVoxelsLength = rawVoxels.length;
Expand All @@ -157,7 +161,9 @@ export function sceneController(options: SceneControllerOptions = {}): SceneCont
showFloor: lastState.showFloor,
projection: lastState.projection,
rotX: camera.state.rotX,
rotY: camera.state.rotY
rotY: camera.state.rotY,
lighting: lastState.lighting,
resolveTexture: lastState.resolveTexture
},
dimensions: dimensionOverride
});
Expand All @@ -176,7 +182,9 @@ export function sceneController(options: SceneControllerOptions = {}): SceneCont
showFloor: state.showFloor,
projection: state.projection,
rotX: camera.state.rotX,
rotY: camera.state.rotY
rotY: camera.state.rotY,
lighting: state.lighting,
resolveTexture: state.resolveTexture
},
dimensions: dimensionOverride
});
Expand Down Expand Up @@ -322,7 +330,9 @@ export function sceneController(options: SceneControllerOptions = {}): SceneCont
prevState.showWalls !== state.showWalls ||
prevState.showFloor !== state.showFloor ||
prevState.projection !== state.projection ||
prevState.mergeVoxels !== state.mergeVoxels;
prevState.mergeVoxels !== state.mergeVoxels ||
prevState.lighting !== state.lighting ||
prevState.resolveTexture !== state.resolveTexture;
if (profile) profile.needsRebuild = needsRebuild;
if (needsRebuild) {
const buildStart = profile ? nowMs() : 0;
Expand Down
34 changes: 31 additions & 3 deletions packages/core/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
// @layoutit/voxcss-core — Pure-math voxel rendering engine (zero browser globals)

export type {
Vec2,
Vec3,
Voxel,
VoxelGrid,
InputVoxel,
InputVoxelGrid,
CubeFace,
DirectionalLight,
GridContext,
WallsMask,
OffsetMap,
Expand All @@ -16,9 +21,24 @@ export {
WALL_CLASS, CEILING_CLASS, STYLE_ID
} from "./types";

export { buildSceneContext, getVoxelBounds, wallMasksEqual, computeWallMask } from "./scene/context";
export { buildSceneContext, normalizeVoxels, getVoxelBounds, getVoxelZBounds, wallMasksEqual, computeWallMask } from "./scene/context";
export type { SceneContextBuildResult } from "./scene/context";
export { computeVisibleFaces } from "./scene/visibility";
export { computeVisibleFaces, computeFacesWithOcclusion } from "./scene/visibility";
export { precomputeOcclusion } from "./scene/occlusion";
export type { OcclusionMap } from "./scene/occlusion";
export { directionBinFromCamera, directionVectorFromBin, OCCLUSION_DIR_BINS, AZIMUTH_BINS, ELEVATION_BINS } from "./scene/occlusionDirection";
export { isCovered, isBottomOccluded, shouldRenderBottom } from "./scene/coverage";
export { voxelToPolygons } from "./scene/polygonModel";
export type { Polygon } from "./scene/polygonModel";
export { findGaps } from "./scene/manifoldCheck";
export type { GapReport } from "./scene/manifoldCheck";
export { extractExteriorSurface } from "./scene/exteriorSurface";
export { findGeometricDefects } from "./scene/geometricCheck";
export type { GeometricDefect } from "./scene/geometricCheck";
export { simulatedAnnealing, score as scoreVoxels } from "./scene/searchSA";
export type { SAOptions, SAResult, ScoreBreakdown } from "./scene/searchSA";
export { computeShapeStyle } from "./shape/shapeStyle";
export { shapeCoversFullyFace, oppositeFace } from "./shape/coverage";

export { createIsometricCamera, normalizeInvertMultiplier } from "./camera/camera";
export type { CameraState, CameraHandle, AutoRotateOption, AutoRotateConfig } from "./camera/camera";
Expand Down Expand Up @@ -49,10 +69,12 @@ export {
export type { CubeFaceAppearance } from "./color/faceAppearance";

export { mergeVoxels } from "./merge/mergeVoxels";
export { mergePolygons } from "./merge/mergePolygons";
export {
normalizeMergeVoxelsOption,
is2dMerge,
is3dMerge
is3dMerge,
isPolyMerge
} from "./merge/mergeVoxelsOption";
export type { MergeVoxelsOption } from "./merge/mergeVoxelsOption";

Expand Down Expand Up @@ -82,6 +104,12 @@ export type {

export { parseMagicaVoxel } from "./parser/parseMagicaVoxel";
export type { MagicaVoxelParseResult } from "./parser/parseMagicaVoxel";
export { parseObj } from "./parser/parseObj";
export type { ObjParseOptions, ObjParseResult } from "./parser/parseObj";
export { parseMtl } from "./parser/parseMtl";
export type { MtlParseResult } from "./parser/parseMtl";
export { parseGltf } from "./parser/parseGltf";
export type { GltfParseOptions, GltfParseResult } from "./parser/parseGltf";

export {
encodeRgbaToPng,
Expand Down
Loading