Skip to content

Added EllipticalArc primitive with radiusX, radiusZ, start/end angle … #20

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
nahidmubin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added EllipticalArc primitive with radiusX, radiusZ, start/end angle … #20

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
17 changes: 15 additions & 2 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
{
"rust-analyzer.linkedProjects": [
"./main/opengeometry/Cargo.toml"
]
"./main/opengeometry/Cargo.toml"
],

// "rust-analyzer.server.extraEnv": {
// "RA_MAX_MEMORY": "1536"
// },

// "rust-analyzer.cargo.allFeatures": false,
// "rust-analyzer.cargo.loadOutDirsFromCheck": false,
// "rust-analyzer.cargo.buildScripts.enable": false,

// "rust-analyzer.procMacro.enable": false,

// "rust-analyzer.checkOnSave": true,
// "rust-analyzer.checkOnSave.command": "check",
}
14 changes: 13 additions & 1 deletion main/opengeometry-three/examples-vite/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ <h1 class="og-title">Core examples</h1>
<section id="primitives" class="og-section-card">
<div class="og-section-head">
<h2 class="og-section-title"><a href="#primitives" class="og-anchor">Primitives</a></h2>
<p class="og-section-count">5 core demos</p>
<p class="og-section-count">6 core demos</p>
</div>
<div class="og-grid">
<article class="og-example-card">
Expand All @@ -377,6 +377,18 @@ <h3 class="og-card-title">Curve</h3>
</div>
<a class="og-open" href="./primitives/curve.html">Open example</a>
</article>
<article class="og-example-card">
<div class="og-card-top">
<h3 class="og-card-title">Elliptical Arc</h3>
</div>
<p class="og-card-desc">Elliptical arc with independent X and Z radius, start, end, and segment controls.</p>
<div class="og-tag-row">
<span class="og-tag">Radius X</span>
<span class="og-tag">Radius Z</span>
<span class="og-tag">Angles</span>
</div>
<a class="og-open" href="./primitives/elliptical_arc.html">Open example</a>
</article>
<article class="og-example-card">
<div class="og-card-top">
<h3 class="og-card-title">Line</h3>
Expand Down
268 changes: 268 additions & 0 deletions main/opengeometry-three/examples-vite/primitives/elliptical_arc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,268 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>OpenGeometry Elliptical Arc Example</title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="Simple OpenGeometry elliptical arc example for Three.js." />
<meta name="author" content="Mubin" />
</head>
<body class="og-example-page">
<div class="og-badge-title-card">
<a href="../index.html" class="og-badge-title-link">Back</a>
<span class="og-badge-title">Elliptical Arc</span>
</div>

<aside class="og-controls">
<h3>Elliptical Arc</h3>
<p class="og-control-summary">
An elliptical arc defined by `center`, `radiusX`, `radiusZ`, `startAngle`,
`endAngle`, and `segments`. When radiusX equals radiusZ it becomes a circle.
</p>

<label class="og-control-row" data-control="radiusX">
<div class="og-control-header">
<span class="og-control-label-chip">Radius X</span>
<code class="og-control-value" data-value>2.2</code>
</div>
<div class="og-control-range">
<input data-range type="range" min="0.5" max="4" step="0.1" value="2.2" />
<input data-number type="number" min="0.5" max="4" step="0.1" value="2.2" />
</div>
</label>

<label class="og-control-row" data-control="radiusZ">
<div class="og-control-header">
<span class="og-control-label-chip">Radius Z</span>
<code class="og-control-value" data-value>1.1</code>
</div>
<div class="og-control-range">
<input data-range type="range" min="0.5" max="4" step="0.1" value="1.1" />
<input data-number type="number" min="0.5" max="4" step="0.1" value="1.1" />
</div>
</label>

<label class="og-control-row" data-control="start">
<div class="og-control-header">
<span class="og-control-label-chip">Start (deg)</span>
<code class="og-control-value" data-value>0</code>
</div>
<div class="og-control-range">
<input data-range type="range" min="0" max="360" step="1" value="0" />
<input data-number type="number" min="0" max="360" step="1" value="0" />
</div>
</label>

<label class="og-control-row" data-control="end">
<div class="og-control-header">
<span class="og-control-label-chip">End (deg)</span>
<code class="og-control-value" data-value>270</code>
</div>
<div class="og-control-range">
<input data-range type="range" min="1" max="360" step="1" value="270" />
<input data-number type="number" min="1" max="360" step="1" value="270" />
</div>
</label>

<label class="og-control-row" data-control="segments">
<div class="og-control-header">
<span class="og-control-label-chip">Segments</span>
<code class="og-control-value" data-value>64</code>
</div>
<div class="og-control-range">
<input data-range type="range" min="8" max="96" step="1" value="64" />
<input data-number type="number" min="8" max="96" step="1" value="64" />
</div>
</label>
</aside>

<div id="app"></div>

<script type="module">
import "../src/styles/theme.css";
import * as THREE from "three";
import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
import Stats from "three/examples/jsm/libs/stats.module.js";
import wasmUrl from "../../../opengeometry/pkg/opengeometry_bg.wasm?url";
import { EllipticalArc, OpenGeometry, Vector3 } from "opengeometry";

const app = document.getElementById("app");
if (!app) {
throw new Error("Missing #app container");
}

let config = null;

function createConfig() {
return {
center: new Vector3(0, 0, 0),
radiusX: 2.2,
radiusZ: 1.1,
startAngle: 0,
endAngle: (270 * Math.PI) / 180,
segments: 64,
color: 0x2563eb,
};
}

let ellipticalArc = null;

function formatNumber(value) {
return Number(value).toFixed(2).replace(/\.?0+$/, "");
}

function degToRad(value) {
return (value * Math.PI) / 180;
}

function radToDeg(value) {
return (value * 180) / Math.PI;
}

function mountStats() {
const stats = new Stats();
stats.showPanel(0);
stats.dom.style.position = "fixed";
stats.dom.style.left = "12px";
stats.dom.style.bottom = "12px";
stats.dom.style.top = "auto";
stats.dom.style.zIndex = "1000";
document.body.appendChild(stats.dom);
return stats;
}

function attachNumberControl(name, onChange) {
const row = document.querySelector(`[data-control="${name}"]`);
const range = row?.querySelector("[data-range]");
const number = row?.querySelector("[data-number]");
const value = row?.querySelector("[data-value]");

if (!row || !range || !number || !value) {
throw new Error(`Missing number control: ${name}`);
}

const commit = (nextValue) => {
const parsed = Number(nextValue);
if (!Number.isFinite(parsed)) {
return;
}

range.value = String(parsed);
number.value = String(parsed);
value.textContent = formatNumber(parsed);
onChange(parsed);
};

range.addEventListener("input", () => commit(range.value));
number.addEventListener("input", () => commit(number.value));
commit(range.value);
}

function updateEllipticalArc() {
if (!ellipticalArc) {
return;
}

ellipticalArc.setConfig({
center: config.center.clone(),
radiusX: config.radiusX,
radiusZ: config.radiusZ,
startAngle: config.startAngle,
endAngle: config.endAngle,
segments: Math.round(config.segments),
color: config.color,
});

console.groupCollapsed("[elliptical-arc] updated");
console.log("Config", config);
console.log("Angles (deg)", {
startAngle: radToDeg(config.startAngle),
endAngle: radToDeg(config.endAngle),
});
console.groupEnd();
}

async function main() {
const scene = new THREE.Scene();
scene.background = new THREE.Color(0xeef2ff);

const camera = new THREE.PerspectiveCamera(
55,
window.innerWidth / window.innerHeight,
0.1,
100
);
camera.position.set(5.5, 4, 6.5);

const renderer = new THREE.WebGLRenderer({ antialias: true });
renderer.setPixelRatio(window.devicePixelRatio);
renderer.setSize(window.innerWidth, window.innerHeight);
app.replaceChildren(renderer.domElement);

const stats = mountStats();
const controls = new OrbitControls(camera, renderer.domElement);
controls.enableDamping = true;
controls.target.set(0, 0.2, 0);
controls.update();

scene.add(new THREE.GridHelper(20, 20, 0x4460ff, 0xd5ddff));
scene.add(new THREE.AmbientLight(0xffffff, 0.8));

const light = new THREE.DirectionalLight(0xffffff, 1.1);
light.position.set(6, 8, 4);
scene.add(light);

await OpenGeometry.create({ wasmURL: wasmUrl });
config = createConfig();

ellipticalArc = new EllipticalArc({
center: config.center.clone(),
radiusX: config.radiusX,
radiusZ: config.radiusZ,
startAngle: config.startAngle,
endAngle: config.endAngle,
segments: Math.round(config.segments),
color: config.color,
});
scene.add(ellipticalArc);

attachNumberControl("radiusX", (value) => {
config.radiusX = value;
updateEllipticalArc();
});
attachNumberControl("radiusZ", (value) => {
config.radiusZ = value;
updateEllipticalArc();
});
attachNumberControl("start", (value) => {
config.startAngle = degToRad(value);
updateEllipticalArc();
});
attachNumberControl("end", (value) => {
config.endAngle = degToRad(value);
updateEllipticalArc();
});
attachNumberControl("segments", (value) => {
config.segments = value;
updateEllipticalArc();
});

updateEllipticalArc();

renderer.setAnimationLoop(() => {
stats.update();
controls.update();
renderer.render(scene, camera);
});

window.addEventListener("resize", () => {
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
renderer.setSize(window.innerWidth, window.innerHeight);
});
}

void main();
</script>
</body>
</html>
1 change: 1 addition & 0 deletions main/opengeometry-three/src/editor/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ export type ParametricEntityType =
| "polyline"
| "arc"
| "curve"
| "elliptical_arc"
| "rectangle"
| "polygon"
| "cuboid"
Expand Down
Loading
Loading