ts voronoi
This commit is contained in:
ajuvercr
parent
d6ff2ea1e9
commit
e281a1683d
4 changed files with 466 additions and 4 deletions
|
|
@ -361,4 +361,19 @@ function step(time: number) {
|
|||
}
|
||||
set_loading(true);
|
||||
|
||||
requestAnimationFrame(step);
|
||||
// requestAnimationFrame(step);
|
||||
|
||||
|
||||
import { voronoi, Point } from './voronoi'
|
||||
function test() {
|
||||
const points = [
|
||||
new Point(5,5),
|
||||
new Point(1, 8),
|
||||
new Point(8,8),
|
||||
new Point(10,2),
|
||||
];
|
||||
|
||||
console.log(voronoi(points));
|
||||
}
|
||||
|
||||
test();
|
||||
|
|
|
|||
39
frontend/www/package-lock.json
generated
39
frontend/www/package-lock.json
generated
|
|
@ -5505,8 +5505,7 @@
|
|||
"source-map": {
|
||||
"version": "0.5.7",
|
||||
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
|
||||
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
|
||||
"dev": true
|
||||
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
|
||||
},
|
||||
"source-map-resolve": {
|
||||
"version": "0.5.2",
|
||||
|
|
@ -5681,9 +5680,20 @@
|
|||
"quote-stream": "~0.0.0",
|
||||
"readable-stream": "~1.0.27-1",
|
||||
"shallow-copy": "~0.0.1",
|
||||
"static-eval": "~0.2.0",
|
||||
"through2": "~0.4.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"esprima": {
|
||||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
|
||||
"integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0="
|
||||
},
|
||||
"estraverse": {
|
||||
"version": "1.3.2",
|
||||
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz",
|
||||
"integrity": "sha1-N8K4k+8T1yPydth41g2FNRUqbEI="
|
||||
},
|
||||
"isarray": {
|
||||
"version": "0.0.1",
|
||||
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
|
||||
|
|
@ -5705,6 +5715,26 @@
|
|||
"string_decoder": "~0.10.x"
|
||||
}
|
||||
},
|
||||
"static-eval": {
|
||||
"version": "0.2.4",
|
||||
"resolved": "https://registry.npmjs.org/static-eval/-/static-eval-0.2.4.tgz",
|
||||
"integrity": "sha1-t9NNg4k3uWn5ZBygfUj47eJj6ns=",
|
||||
"requires": {
|
||||
"escodegen": "~0.0.24"
|
||||
},
|
||||
"dependencies": {
|
||||
"escodegen": {
|
||||
"version": "0.0.28",
|
||||
"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz",
|
||||
"integrity": "sha1-Dk/xcV8yh3XWyrUaxEpAbNer/9M=",
|
||||
"requires": {
|
||||
"esprima": "~1.0.2",
|
||||
"estraverse": "~1.3.0",
|
||||
"source-map": ">= 0.1.2"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"string_decoder": {
|
||||
"version": "0.10.31",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
|
||||
|
|
@ -6016,6 +6046,11 @@
|
|||
"integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
|
||||
"dev": true
|
||||
},
|
||||
"ts-heap": {
|
||||
"version": "1.1.3",
|
||||
"resolved": "https://registry.npmjs.org/ts-heap/-/ts-heap-1.1.3.tgz",
|
||||
"integrity": "sha512-SjuxU4q6ulbhkIRp6ye5A7+hG19WGrVWzDCfit6i0FYup2WxcbWtWwdSMmtBaf4zc4kmOPcWNd2fBBtKB6ZH1g=="
|
||||
},
|
||||
"ts-loader": {
|
||||
"version": "6.1.0",
|
||||
"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.1.0.tgz",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@
|
|||
"extract-svg-path": "^2.1.0",
|
||||
"load-svg": "^1.0.0",
|
||||
"planetwars": "file:../pkg",
|
||||
"svg-mesh-3d": "^1.1.0"
|
||||
"svg-mesh-3d": "^1.1.0",
|
||||
"ts-heap": "^1.1.3"
|
||||
},
|
||||
"author": "Arthur Vercruysse <arthur.vercruysse@outlook.com>",
|
||||
"license": "(MIT OR Apache-2.0)",
|
||||
|
|
|
|||
411
frontend/www/voronoi.ts
Normal file
411
frontend/www/voronoi.ts
Normal file
|
|
@ -0,0 +1,411 @@
|
|||
import { Heap } from 'ts-heap'
|
||||
import { handle } from './games';
|
||||
|
||||
interface WithPriority {
|
||||
get_priority(): number;
|
||||
}
|
||||
|
||||
export class Point {
|
||||
x: number;
|
||||
y: number;
|
||||
|
||||
constructor(x: number, y: number) {
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
}
|
||||
|
||||
equals(other: Point): boolean {
|
||||
return Math.abs(this.x - other.x) + Math.abs(this.y - other.y) < 0.00001;
|
||||
}
|
||||
}
|
||||
|
||||
class CircleEvent implements WithPriority {
|
||||
y: number;
|
||||
alive: boolean = true;
|
||||
center: Point;
|
||||
leaf: Leaf;
|
||||
|
||||
from: Point[];
|
||||
|
||||
static
|
||||
from_sites(s1: Point, s2: Point, s3: Point, leaf: Leaf): CircleEvent {
|
||||
const a = s1.x * (s2.y - s3.y) - s1.y*(s2.x - s3.x) + s2.x*s3.y - s3.x * s2.y;
|
||||
const b = (s1.x ** 2 + s1.y ** 2) * (s3.y - s2.y) + (s2.x ** 2 + s2.y ** 2)*(s1.y - s3.y) + (s3.x ** 2 + s3.y ** 2) * (s2.y - s1.y);
|
||||
const c = (s1.x ** 2 + s1.y ** 2) * (s2.x - s3.x) + (s2.x ** 2 + s2.y ** 2)*(s3.x - s1.x) + (s3.x ** 2 + s3.y ** 2) * (s1.x - s2.x);
|
||||
const d = (s1.x ** 2 + s1.y ** 2) * (s3.x*s2.y - s2.x*s3.y) + (s2.x ** 2 + s2.y ** 2)*(s1.x*s3.y - s3.x*s1.y) + (s3.x ** 2 + s3.y ** 2) * (s2.x*s1.y - s1.x*s2.y);
|
||||
|
||||
const center = new Point(-b / (2. * a), -c / (2. * a));
|
||||
const r = Math.sqrt((b ** 2 + c ** 2 - 4. * a * d) / (4. * a ** 2));
|
||||
const y = center.y - r;
|
||||
|
||||
const out = new CircleEvent();
|
||||
out.y = y;
|
||||
out.center = center;
|
||||
out.leaf = leaf;
|
||||
|
||||
out.from = [s1, s2, s3];
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
get_priority(): number {
|
||||
return this.y;
|
||||
}
|
||||
|
||||
print() {
|
||||
console.log(`Circle event at ${this.y} ${JSON.stringify(this.center)}, ${JSON.stringify(this.leaf.point)} from ${JSON.stringify(this.from)}`);
|
||||
}
|
||||
}
|
||||
|
||||
class SiteEvent implements WithPriority{
|
||||
point: Point;
|
||||
|
||||
constructor(point: Point) {
|
||||
this.point = point;
|
||||
}
|
||||
|
||||
get_priority(): number {
|
||||
return this.point.y;
|
||||
}
|
||||
|
||||
print() {
|
||||
console.log(`Site event ${JSON.stringify(this.point)}`);
|
||||
}
|
||||
}
|
||||
|
||||
function calc_x(left: Point, right: Point, y: number): number {
|
||||
const [a1, b1, c1] = from_focus_vertex(left, y);
|
||||
const [a2, b2, c2] = from_focus_vertex(right, y);
|
||||
|
||||
const da = a1 - a2;
|
||||
const db = b1 - b2;
|
||||
const dc = c1 - c2;
|
||||
|
||||
const d = db * db - 4. * da * dc;
|
||||
|
||||
if (d < 0.) {
|
||||
throw new Error(`D is less then 0 ${d}`);
|
||||
}
|
||||
|
||||
const dd = Math.sqrt(d);
|
||||
|
||||
const x = (-db + dd) / (2. * da);
|
||||
|
||||
return x;
|
||||
}
|
||||
|
||||
function from_focus_vertex(focus: Point, y: number): number[] {
|
||||
const a = (focus.y - y) / 2;
|
||||
const h = focus.x;
|
||||
const k = focus.y - a;
|
||||
|
||||
return [1 / (4. * a), -h / (2 * a), (h ** 2 / (4 * a)) + k]
|
||||
}
|
||||
|
||||
function cmp_event(e1: WithPriority, e2: WithPriority) {
|
||||
return e2.get_priority() - e1.get_priority();
|
||||
}
|
||||
|
||||
type Queue = Heap<WithPriority>;
|
||||
|
||||
type Node = Leaf | Breakpoint;
|
||||
|
||||
type Parent = Breakpoint | State;
|
||||
|
||||
class Leaf {
|
||||
point: Point;
|
||||
event: CircleEvent | undefined;
|
||||
|
||||
left: Leaf | undefined;
|
||||
right: Leaf | undefined;
|
||||
parent: Parent;
|
||||
|
||||
constructor(point: Point, parent: Parent) {
|
||||
this.point = point;
|
||||
this.parent = parent;
|
||||
}
|
||||
|
||||
false_alarm() {
|
||||
if(this.event) {
|
||||
console.log(`False alarm ${JSON.stringify(this.event.center)} ${this.event.y}`);
|
||||
this.event.alive = false;
|
||||
}
|
||||
}
|
||||
|
||||
update_left(leaf: Leaf) {
|
||||
if (this.left) {
|
||||
this.left.right = leaf;
|
||||
}
|
||||
leaf.left = this.left;
|
||||
}
|
||||
|
||||
update_right(leaf: Leaf) {
|
||||
if (this.right) {
|
||||
this.right.left = leaf;
|
||||
}
|
||||
leaf.right = this.right;
|
||||
}
|
||||
|
||||
split(point: Point, events: Queue) {
|
||||
this.false_alarm();
|
||||
|
||||
const left = new Leaf(this.point, undefined);
|
||||
left.left = this.left;
|
||||
if (this.left) this.left.right = left;
|
||||
|
||||
const right = new Leaf(this.point, undefined);
|
||||
right.right = this.right;
|
||||
if (this.right) this.right.left = right;
|
||||
|
||||
const middle = new Leaf(point, undefined);
|
||||
middle.left = left;
|
||||
middle.right = right;
|
||||
|
||||
right.left = middle;
|
||||
left.right = middle;
|
||||
|
||||
const br1 = new Breakpoint([this.point, left], [point, middle], undefined);
|
||||
const br2 = new Breakpoint([point, br1], [this.point, right], this.parent);
|
||||
br1.parent = br2;
|
||||
|
||||
if (this.parent instanceof Breakpoint) {
|
||||
this.parent.set_me(this, br2);
|
||||
} else {
|
||||
this.parent.root = br2;
|
||||
}
|
||||
|
||||
const maybe_left = left.check_circles(point.y, events);
|
||||
|
||||
if (maybe_left && maybe_left.center.x < middle.point.x) {
|
||||
console.log(`Adding circle event left ${JSON.stringify(maybe_left.leaf.point)}`);
|
||||
maybe_left.print();
|
||||
left.event = maybe_left;
|
||||
events.add(maybe_left);
|
||||
}
|
||||
|
||||
const maybe_right = right.check_circles(point.y, events);
|
||||
if (maybe_right && maybe_right.center.x >= middle.point.x) {
|
||||
console.log(`Adding circle event right`);
|
||||
maybe_right.print();
|
||||
right.event = maybe_right;
|
||||
events.add(maybe_right);
|
||||
}
|
||||
}
|
||||
|
||||
check_circles(y: number, events: Queue): CircleEvent | undefined {
|
||||
const left = this.left;
|
||||
const right = this.right;
|
||||
|
||||
if (left && right) {
|
||||
const circle = CircleEvent.from_sites(left.point, this.point, right.point, this);
|
||||
console.log(`${circle.y} < ${y}`);
|
||||
if (circle.y < y ) {
|
||||
return circle;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
delete() {
|
||||
if (this.parent instanceof Breakpoint) {
|
||||
this.parent.remove_me(this.point);
|
||||
} else {
|
||||
console.error("Shouldnt be here");
|
||||
}
|
||||
}
|
||||
|
||||
print(indent: string) {
|
||||
console.log(`${indent}Leaf from ${JSON.stringify(this.point)}`);
|
||||
}
|
||||
}
|
||||
|
||||
class Breakpoint {
|
||||
left: [Point, Node];
|
||||
right: [Point, Node];
|
||||
parent: Parent;
|
||||
|
||||
constructor(left: [Point, Node], right: [Point, Node], parent: Parent) {
|
||||
this.left = left;
|
||||
this.right = right;
|
||||
this.left[1].parent = this;
|
||||
this.right[1].parent = this;
|
||||
this.parent = parent;
|
||||
}
|
||||
|
||||
remove_me(point: Point) {
|
||||
const other = this.get_other(point);
|
||||
|
||||
if (this.parent instanceof Breakpoint) {
|
||||
console.log("Parent is still breakpoint");
|
||||
this.parent.set_me(this, other);
|
||||
} else {
|
||||
console.log("Parent is root");
|
||||
this.parent.root = other;
|
||||
}
|
||||
}
|
||||
|
||||
set_me(old_me: Node, new_me: Node) {
|
||||
if (this.left[1] == old_me) {
|
||||
console.log("Setting other left");
|
||||
this.left[1] = new_me;
|
||||
} else {
|
||||
console.log("Setting other right");
|
||||
this.right[1] = new_me;
|
||||
}
|
||||
}
|
||||
|
||||
get(point: Point): Leaf {
|
||||
const { x, y } = point;
|
||||
const test_x = calc_x(this.left[0], this.right[0], y);
|
||||
|
||||
console.log(`${test_x} >= ${x}`);
|
||||
|
||||
if (test_x >= x) {
|
||||
console.log("Going left");
|
||||
if (this.left[1] instanceof Leaf) {
|
||||
return this.left[1];
|
||||
} else {
|
||||
return this.left[1].get(point);
|
||||
}
|
||||
} else {
|
||||
console.log("Going right");
|
||||
if (this.right[1] instanceof Leaf) {
|
||||
return this.right[1];
|
||||
} else {
|
||||
return this.right[1].get(point);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
get_other(point: Point): Node {
|
||||
if (this.left[0].equals(point)) {
|
||||
console.log("Other is right");
|
||||
return this.right[1];
|
||||
} else {
|
||||
console.log("Other is left");
|
||||
return this.left[1];
|
||||
}
|
||||
}
|
||||
|
||||
print(indent: string) {
|
||||
console.log(`${indent}left`);
|
||||
this.left[1].print(indent + ' ');
|
||||
console.log(`${indent}right`);
|
||||
this.right[1].print(indent + ' ');
|
||||
}
|
||||
}
|
||||
|
||||
function get_from_node(root: Node, point: Point): Leaf {
|
||||
if (root instanceof Leaf) {
|
||||
return root;
|
||||
} else {
|
||||
return root.get(point);
|
||||
}
|
||||
}
|
||||
|
||||
class State {
|
||||
root: Node | undefined;
|
||||
|
||||
print() {
|
||||
if (this.root) {
|
||||
this.root.print('');
|
||||
} else {
|
||||
console.log("No root no tree");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export function voronoi(points: Point[]): Point[] {
|
||||
const out = [];
|
||||
const state = new State;
|
||||
const queue = new Heap<WithPriority>(cmp_event);
|
||||
for (let point of points) {
|
||||
queue.add(new SiteEvent(point));
|
||||
}
|
||||
|
||||
let event;
|
||||
while (event = queue.pop()){
|
||||
console.log('---------------------------');
|
||||
event.print();
|
||||
|
||||
if (event instanceof SiteEvent) {
|
||||
handle_site_event(event, queue, state, out);
|
||||
} else {
|
||||
if (!event.alive) {
|
||||
console.log("Dead");
|
||||
continue;
|
||||
}
|
||||
handle_circle_event(event, queue, state, out);
|
||||
}
|
||||
state.print();
|
||||
console.log(queue);
|
||||
print_leaves(get_from_node(state.root, new Point(0, 0)));
|
||||
}
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
function handle_site_event(event: SiteEvent, queue: Queue, state: State, out: Point[]) {
|
||||
if (state.root) {
|
||||
const leaf = get_from_node(state.root, event.point);
|
||||
console.log(`Splitting leaf from ${JSON.stringify(leaf.point)}`);
|
||||
leaf.split(event.point, queue);
|
||||
|
||||
} else {
|
||||
state.root = new Leaf(event.point, state);
|
||||
}
|
||||
}
|
||||
|
||||
function handle_circle_event(event: CircleEvent, queue: Queue, state: State, out: Point[]) {
|
||||
if (!event.alive) return;
|
||||
|
||||
event.leaf.delete();
|
||||
const right = event.leaf.right;
|
||||
const left = event.leaf.left;
|
||||
|
||||
if (right) {
|
||||
right.false_alarm();
|
||||
if (right.right) right.right.false_alarm();
|
||||
|
||||
right.left = left;
|
||||
const maybe_right = right.check_circles(event.y, queue);
|
||||
if (maybe_right){
|
||||
console.log(`Adding circle event`);
|
||||
maybe_right.print();
|
||||
right.event = maybe_right;
|
||||
queue.add(maybe_right);
|
||||
}
|
||||
}
|
||||
|
||||
if (left) {
|
||||
left.false_alarm();
|
||||
if (left.left) left.left.false_alarm();
|
||||
left.right = right;
|
||||
const maybe_left = left.check_circles(event.y, queue);
|
||||
|
||||
if (maybe_left){
|
||||
console.log(`Adding circle event`);
|
||||
maybe_left.print();
|
||||
left.event = maybe_left;
|
||||
queue.add(maybe_left);
|
||||
}
|
||||
}
|
||||
|
||||
out.push(event.center);
|
||||
}
|
||||
|
||||
function print_leaves(start: Leaf) {
|
||||
let current = start;
|
||||
|
||||
while (current.left) {
|
||||
current = current.left;
|
||||
}
|
||||
|
||||
const points = [current.point];
|
||||
|
||||
while (current.right) {
|
||||
current = current.right;
|
||||
points.push(current.point);
|
||||
}
|
||||
|
||||
console.log(JSON.stringify(points));
|
||||
}
|
||||
Loading…
Reference in a new issue