rails-physics 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails-physics",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A plugin for the matter-js physics library designed to efficiently simulate objects moving in a one-dimensional space whose projection onto the 2-dimensional space of the screen changes over time",
   "keywords": [
     "typescript",

package/ranges/{Segment.ts → Segment.js}

@@ -1,40 +1,29 @@
-//A single point in our object or a single node in our segment tree
-export type Segment = {
-    mass: number;
-    left: number;
-    right: Segment["left"];
-    parent: number;
-    left_child?: Segment["parent"];
-    right_child?: Segment["parent"];
-}
-
-export function center(segment: Segment) : number {
-    return segment.left + ((segment.right - segment.left) >> 1);// + ((segment.right - segment.left) & 1);
-}
-
-//Get the index of the left child of the segment passed as an argument
-export function leftChild(segment: Segment) : number {
-    if (segment.left_child === undefined) {
-        //ToDo: Make this a custom error type
-        throw new Error("The children of leaf nodes should not be queried");
-        return -1;
-    } else {
-        return segment.left_child;
-    }
-}
-
-//Get the index of the right child of the segment passed as an argument
-export function rightChild(segment: Segment) : number {
-    if (segment.right_child === undefined) {
-        //ToDo: Make this a custom error type
-        throw new Error("The children of leaf nodes should not be queried");
-        return -1;
-    } else {
-        return segment.right_child;
-    }
-}
-
-//Return true iff this segment is unit width and should be a leaf.
-export function isLeaf(segment: Segment) : boolean {
-    return (segment.left + 1) === segment.right;
-}
+export function center(segment) {
+    return segment.left + ((segment.right - segment.left) >> 1); // + ((segment.right - segment.left) & 1);
+}
+//Get the index of the left child of the segment passed as an argument
+export function leftChild(segment) {
+    if (segment.left_child === undefined) {
+        //ToDo: Make this a custom error type
+        throw new Error("The children of leaf nodes should not be queried");
+        return -1;
+    }
+    else {
+        return segment.left_child;
+    }
+}
+//Get the index of the right child of the segment passed as an argument
+export function rightChild(segment) {
+    if (segment.right_child === undefined) {
+        //ToDo: Make this a custom error type
+        throw new Error("The children of leaf nodes should not be queried");
+        return -1;
+    }
+    else {
+        return segment.right_child;
+    }
+}
+//Return true iff this segment is unit width and should be a leaf.
+export function isLeaf(segment) {
+    return (segment.left + 1) === segment.right;
+}

package/ranges/segmenttree.js

@@ -0,0 +1,58 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SegmentTree_raw;
+import { center, leftChild, rightChild, isLeaf } from "./segment.js";
+//Implement a segment tree for O(log(n)) updates and O(log(n)) location of center of mass
+export class SegmentTree {
+    constructor(container, element_count, default_density = 0, external_width) {
+        _SegmentTree_raw.set(this, void 0);
+        this.surrounding = container;
+        this.external_width = external_width;
+        this.element_count = element_count;
+        element_count = Math.abs(Math.round(element_count));
+        __classPrivateFieldSet(this, _SegmentTree_raw, [{ mass: default_density * element_count, left: 0, right: element_count, parent: -1 }], "f");
+        let index = 0;
+        while (index < __classPrivateFieldGet(this, _SegmentTree_raw, "f").length) {
+            console.log(index, __classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].left, __classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].right);
+            if (!isLeaf(__classPrivateFieldGet(this, _SegmentTree_raw, "f")[index])) {
+                let middle = center(__classPrivateFieldGet(this, _SegmentTree_raw, "f")[index]);
+                __classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].left_child = __classPrivateFieldGet(this, _SegmentTree_raw, "f").length;
+                __classPrivateFieldGet(this, _SegmentTree_raw, "f").push({ mass: default_density * (middle - __classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].left), left: __classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].left, right: middle, parent: index });
+                __classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].right_child = __classPrivateFieldGet(this, _SegmentTree_raw, "f").length;
+                __classPrivateFieldGet(this, _SegmentTree_raw, "f").push({ mass: default_density * (__classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].right - middle), left: middle, right: __classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].right, parent: index });
+            }
+            index++;
+        }
+    }
+    centerOfMass() {
+        let target = __classPrivateFieldGet(this, _SegmentTree_raw, "f")[0].mass / 2;
+        let index = 0;
+        while (!isLeaf(__classPrivateFieldGet(this, _SegmentTree_raw, "f")[index])) {
+            console.log(target, index, leftChild(__classPrivateFieldGet(this, _SegmentTree_raw, "f")[index]), __classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].mass);
+            if (__classPrivateFieldGet(this, _SegmentTree_raw, "f")[leftChild(__classPrivateFieldGet(this, _SegmentTree_raw, "f")[index])].mass > target) {
+                index = leftChild(__classPrivateFieldGet(this, _SegmentTree_raw, "f")[index]);
+            }
+            else {
+                target -= __classPrivateFieldGet(this, _SegmentTree_raw, "f")[leftChild(__classPrivateFieldGet(this, _SegmentTree_raw, "f")[index])].mass;
+                index = rightChild(__classPrivateFieldGet(this, _SegmentTree_raw, "f")[index]);
+            }
+        }
+        let center = __classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].left;
+        if (target > 0 && __classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].mass > target) {
+            center += (1.0 * target) / __classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].mass;
+        }
+        console.log(target, __classPrivateFieldGet(this, _SegmentTree_raw, "f")[index].left, center, "!");
+        return this.external_width * (center / this.element_count);
+    }
+}
+_SegmentTree_raw = new WeakMap();
+;

package/tests/{SegmentTreeTest.ts → SegmentTreeTest.js}

@@ -1,5 +1,5 @@
-import {SegmentTree} from "../ranges/segmenttree.js"
-import Matter from "matter-js";
-let test = new SegmentTree(Matter.Bodies.circle(20, 20, 90), 27, 1, 50.7);
-console.log(test);
-console.log(test.centerOfMass());
+import { SegmentTree } from "../ranges/segmenttree.js";
+import Matter from "matter-js";
+let test = new SegmentTree(Matter.Bodies.circle(20, 20, 90), 27, 1, 50.7);
+console.log(test);
+console.log(test.centerOfMass());

package/ranges/SegmentTree.ts

@@ -1,60 +0,0 @@
-import type { Segment } from "./segment.js"
-import { center, leftChild, rightChild, isLeaf} from "./segment.js"
-import Matter from "matter-js";
-//Implement a segment tree for O(log(n)) updates and O(log(n)) location of center of mass
-export class SegmentTree {
-    #raw: Segment[];
-    //external_width stores the width of the object in an external unit, such as pixels (px).
-    readonly external_width: number;
-    //Stores the number of unit sized segments used to simulate the object. NOT equal to #raw.length
-    readonly element_count: number;
-    //The "forward" axis along which the block or other massive object slides
-    slide_axis: Matter.Vector;
-
-    transverse_axis: Matter.Vector;
-
-    constructor(container: Matter.Body, element_count: number, external_width: number) {
-        this.external_width = external_width;
-        this.element_count = element_count;
-        this.slide_axis = Matter.Vector.create(0, 1);
-        this.transverse_axis  = Matter.Vector.create(1, 0);
-        element_count = Math.abs(Math.round(element_count));
-        let default_density = container.density;
-        this.#raw = [{ mass: default_density * element_count,  left: 0, right: element_count, parent: -1}];
-        let index = 0;
-        while(index < this.#raw.length) {
-            console.log(index, this.#raw[index].left, this.#raw[index].right);
-            if(!isLeaf(this.#raw[index])) {
-                let middle = center(this.#raw[index]);
-                this.#raw[index].left_child = this.#raw.length;
-                this.#raw.push({mass: default_density * (middle - this.#raw[index].left), left: this.#raw[index].left, right: middle, parent: index});                
-                this.#raw[index].right_child = this.#raw.length;
-                this.#raw.push({mass: default_density * (this.#raw[index].right - middle), left: middle, right: this.#raw[index].right, parent: index});
-
-            }
-            index++;
-        }
-    }
-
-    centerOfMass(): number {
-        let target = this.#raw[0].mass / 2;
-        let index = 0;
-        while(!isLeaf(this.#raw[index])) {
-            console.log(target, index, leftChild(this.#raw[index]), this.#raw[index].mass);
-            if(this.#raw[leftChild(this.#raw[index])].mass > target) {
-                index = leftChild(this.#raw[index]);
-            } else {
-                target -= this.#raw[leftChild(this.#raw[index])].mass;
-                index = rightChild(this.#raw[index]);
-            }
-        }
-        let center = this.#raw[index].left;
-        if(target > 0 && this.#raw[index].mass > target) {
-            center += (1.0 * target) / this.#raw[index].mass;
-        }
-        console.log(target, this.#raw[index].left, center, "!");
-        return this.external_width * (center / this.element_count);
-    }
-
-
-};