Skip to content

feat(sketch): add brep-io solver engine #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tarikjabiri wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(sketch): add brep-io solver engine #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"dependencies": {
"@malgorithms/m3": "^0.0.1",
"@tarikjabiri/dxf": "^2.8.9",
"brep-io-2d-solver": "^1.0.0",
"html2canvas": "^1.4.1",
"jspdf": "^4.2.0",
"jszip": "^3.10.1",
Expand Down
37 changes: 37 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions src/SketchSolver2D.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
// Standalone 2D sketch solver entry point
export { ConstraintSolver, ConstraintEngine } from './features/sketch/sketchSolver2D/ConstraintEngine.js';
export { constraints } from './features/sketch/sketchSolver2D/constraintDefinitions.js';
export {
BrepIoConstraintEngine,
} from './features/sketch/sketchSolver2D/engines/BrepIoConstraintEngine.js';
export {
DEFAULT_SKETCH_SOLVER_ENGINE,
SKETCH_SOLVER_ENGINES,
SKETCH_SOLVER_ENGINE_OPTIONS,
normalizeSketchSolverEngine,
} from './features/sketch/sketchSolver2D/engines/solverEngines.js';
74 changes: 73 additions & 1 deletion src/UI/sketcher/SketchMode3D.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
import * as THREE from "three";
import { Line2, LineGeometry, LineMaterial } from "three/examples/jsm/Addons.js";
import { ConstraintSolver } from "../../features/sketch/sketchSolver2D/ConstraintEngine.js";
import {
DEFAULT_SKETCH_SOLVER_ENGINE,
SKETCH_SOLVER_ENGINE_OPTIONS,
normalizeSketchSolverEngine,
} from "../../features/sketch/sketchSolver2D/engines/solverEngines.js";
import { deepClone } from "../../utils/deepClone.js";
import { AccordionWidget } from "../AccordionWidget.js";
import { renderDimensions as dimsRender } from "./dimensions.js";
Expand Down Expand Up @@ -156,8 +161,16 @@ export class SketchMode3D {

// Init solver with persisted sketch
const initialSketch = feature?.persistentData?.sketch || null;
const persistedSolverEngine = normalizeSketchSolverEngine(
feature?.persistentData?.sketchSolverEngine
?? feature?.persistentData?.sketchSolverBackend
?? feature?.persistentData?.sketchSolverSettings?.engine
?? feature?.persistentData?.sketchSolverSettings?.backend
?? DEFAULT_SKETCH_SOLVER_ENGINE,
);
this._solver = new ConstraintSolver({
sketch: initialSketch || undefined,
solverEngine: persistedSolverEngine,
getSelectionItems: () => Array.from(this._selection),
updateCanvas: () => this.#rebuildSketchGraphics(),
notifyUser: (_m) => {},
Expand All @@ -167,6 +180,7 @@ export class SketchMode3D {

// Initialize solver settings
this._solverSettings = {
engine: persistedSolverEngine,
maxIterations: 500,
tolerance: 0.00001,
decimalPlaces: 6,
Expand Down Expand Up @@ -486,6 +500,13 @@ export class SketchMode3D {
: null;
if (f) {
f.persistentData = f.persistentData || {};
const persistedEngine = this._solver?.getSolverEngine?.()
|| normalizeSketchSolverEngine(this._solverSettings?.engine);
f.persistentData.sketchSolverEngine = persistedEngine;
f.persistentData.sketchSolverSettings = {
...(f.persistentData.sketchSolverSettings || {}),
engine: persistedEngine,
};
const obj = {};
for (const [cid, off] of this._dimOffsets.entries()) {
if (off && typeof off.d === "number") {
Expand Down Expand Up @@ -2104,6 +2125,7 @@ export class SketchMode3D {
// Initialize default solver settings if not already set
if (!this._solverSettings) {
this._solverSettings = {
engine: this._solver?.getSolverEngine?.() || DEFAULT_SKETCH_SOLVER_ENGINE,
maxIterations: 500,
tolerance: 0.00001,
decimalPlaces: 6,
Expand All @@ -2113,6 +2135,42 @@ export class SketchMode3D {
}

// Create input fields for solver settings
const createSelectRow = (label, key, options = []) => {
const row = document.createElement("div");
row.style.display = "flex";
row.style.alignItems = "center";
row.style.gap = "6px";
row.style.margin = "4px 0";
row.style.fontSize = "12px";

const labelEl = document.createElement("label");
labelEl.textContent = label;
labelEl.style.color = "#ddd";
labelEl.style.flex = "1";
labelEl.style.minWidth = "80px";
row.appendChild(labelEl);

const select = document.createElement("select");
select.style.background = "#2a3441";
select.style.border = "1px solid #364053";
select.style.borderRadius = "4px";
select.style.color = "#ddd";
select.style.padding = "4px 8px";
select.style.width = "150px";
for (const option of options) {
const opt = document.createElement("option");
opt.value = option.value;
opt.textContent = option.label;
select.appendChild(opt);
}
select.value = normalizeSketchSolverEngine(this._solverSettings[key]);
select.onchange = () => {
this._solverSettings[key] = normalizeSketchSolverEngine(select.value);
this.#applySolverSettings({ reSolve: true });
};
row.appendChild(select);
return row;
};
const createSettingRow = (label, key, type = "number", step = null, min = null, max = null) => {
const row = document.createElement("div");
row.style.display = "flex";
Expand Down Expand Up @@ -2175,6 +2233,7 @@ export class SketchMode3D {
return row;
};

wrap.appendChild(createSelectRow("Solver Engine:", "engine", SKETCH_SOLVER_ENGINE_OPTIONS));
wrap.appendChild(createSettingRow("Max Iterations:", "maxIterations", "number", "1", "1", "10000"));
wrap.appendChild(createSettingRow("Tolerance:", "tolerance", "number", "0.000001", "0.000001", "0.1"));
wrap.appendChild(createSettingRow("Decimal Places:", "decimalPlaces", "number", "1", "1", "10"));
Expand All @@ -2195,6 +2254,7 @@ export class SketchMode3D {
resetBtn.style.width = "100%";
resetBtn.onclick = () => {
this._solverSettings = {
engine: DEFAULT_SKETCH_SOLVER_ENGINE,
maxIterations: 500,
tolerance: 0.00001,
decimalPlaces: 6,
Expand Down Expand Up @@ -2282,9 +2342,13 @@ export class SketchMode3D {
}

// Apply solver settings to the actual solver
#applySolverSettings() {
#applySolverSettings({ reSolve = false } = {}) {
if (!this._solver || !this._solverSettings) return;

if (typeof this._solver.setSolverEngine === "function") {
this._solver.setSolverEngine(this._solverSettings.engine);
}

// Update the solver's default methods
this._solver.defaultLoops = () => this._solverSettings.maxIterations;
this._solver.fullSolve = () => this._solverSettings.maxIterations;
Expand All @@ -2299,6 +2363,14 @@ export class SketchMode3D {
.catch(error => {
console.warn('Could not update solver tolerance:', error);
});

if (reSolve) {
try { this._solver.solveSketch("full"); } catch { }
try { this.#rebuildSketchGraphics(); } catch { }
try { this.#renderDimensions(); } catch { }
try { this.#refreshContextBar(); } catch { }
try { this.#pushSketchSnapshot(); } catch { }
}
}

// Helper: get current Sketch feature object
Expand Down
Loading