@woosh/meep-engine 2.57.0 → 2.58.0

package/editor/Editor.js

@@ -17,7 +17,7 @@ import { SelectionVisualizer } from "./SelectionVisualizer.js";
 import { ProcessEngine } from "./process/ProcessEngine.js";
 import { MeshLibrary } from "./library/MeshLibrary.js";
 import { TransformerMode } from "./tools/TransformTool.js";
-import EntityBuilder from "../src/engine/ecs/EntityBuilder.js";
+import Entity from "../src/engine/ecs/Entity.js";
 import { Camera } from "../src/engine/graphics/ecs/camera/Camera.js";
 import EditorEntitySystem from "./ecs/EditorEntitySystem.js";
 import EditorEntity from "./ecs/EditorEntity.js";
@@ -26,7 +26,6 @@ import { Transform } from "../src/engine/ecs/transform/Transform.js";
 import TopDownCameraControllerSystem, {
     setCameraControllerFromTransform
 } from "../src/engine/graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
-import { downloadAsFile } from "../src/core/binary/ByteArrayTools.js";
 import BinaryBufferSerializer from "../src/engine/ecs/storage/BinaryBufferSerializer.js";
 import { EncodingBinaryBuffer } from "../src/core/binary/EncodingBinaryBuffer.js";
 import { EntityComponentDataset } from "../src/engine/ecs/EntityComponentDataset.js";
@@ -73,6 +72,7 @@ import '../../../../css/editor/EntityEditorView.scss';
 import '../../../../css/editor/EditorView.scss';
 import { ParameterTrackSet } from "../src/engine/graphics/particles/particular/engine/parameter/ParameterTrackSet.js";
 import { ParameterTrackSetEditor } from "./ecs/component/editors/ecs/ParameterTrackSetEditor.js";
+import {downloadAsFile} from "../src/core/binary/downloadAsFile.js";
 
 /**
  * @template T
@@ -250,7 +250,7 @@ function pasteEntities(editor) {
 }
 
 function buildEditorCamera() {
-    const cameraEntity = new EntityBuilder();
+    const cameraEntity = new Entity();
     const camera = new Camera();
 
     camera.projectionType.set(Camera.ProjectionType.Perspective);
@@ -274,7 +274,7 @@ function buildEditorCamera() {
 
 /**
  *
- * @param {EntityBuilder} cameraEntity
+ * @param {Entity} cameraEntity
  * @param {EntityComponentDataset} dataset
  * @param {Editor} editor
  */

package/editor/process/symbolic/buildThreeJSHelperEntity.js

@@ -1,4 +1,4 @@
-import EntityBuilder from "../../../src/engine/ecs/EntityBuilder.js";
+import Entity from "../../../src/engine/ecs/Entity.js";
 import Renderable from "../../../src/engine/ecs/renderable/Renderable.js";
 import { Transform } from "../../../src/engine/ecs/transform/Transform.js";
 import EditorEntity from "../../ecs/EditorEntity.js";
@@ -9,12 +9,12 @@ import Script from "../../../src/engine/ecs/components/Script.js";
  *
  * @param {Object3D} helper
  * @param {number} sourceEntity
- * @return {EntityBuilder}
+ * @return {Entity}
  */
 export function buildThreeJSHelperEntity(helper, sourceEntity = -1) {
     helper.frustumCulled = false;
 
-    const entityBuilder = new EntityBuilder();
+    const entityBuilder = new Entity();
 
     const renderable = new Renderable(helper);
     // renderable.matrixAutoUpdate = false;

package/editor/process/symbolic/makeGridPositionSymbolDisplay.js

@@ -2,7 +2,7 @@ import { max2 } from "../../../src/core/math/max2.js";
 import { min2 } from "../../../src/core/math/min2.js";
 import Task from "../../../src/core/process/task/Task.js";
 import { TaskSignal } from "../../../src/core/process/task/TaskSignal.js";
-import EntityBuilder from "../../../src/engine/ecs/EntityBuilder.js";
+import Entity from "../../../src/engine/ecs/Entity.js";
 import { BufferGeometry, Float32BufferAttribute, Line, LineBasicMaterial } from "three";
 import Renderable from "../../../src/engine/ecs/renderable/Renderable.js";
 import { SurfacePoint3 } from "../../../src/core/geom/3d/SurfacePoint3.js";
@@ -48,10 +48,10 @@ export function makeGridPositionSymbolDisplay(engine) {
      *
      * @param {GridPosition} gridPosition
      * @param {Transform} transform
-     * @returns {EntityBuilder}
+     * @returns {Entity}
      */
     function makeHelper(gridPosition, transform) {
-        const builder = new EntityBuilder();
+        const builder = new Entity();
 
         // TODO replace with {@link VisualSymbolLine}
 

package/editor/process/symbolic/makePositionedIconDisplaySymbol.js

@@ -1,7 +1,7 @@
 import { assert } from "../../../src/core/assert.js";
 import { Sprite, SpriteMaterial } from "three";
 import { make3DSymbolicDisplay } from "./make3DSymbolicDisplay.js";
-import EntityBuilder from "../../../src/engine/ecs/EntityBuilder.js";
+import Entity from "../../../src/engine/ecs/Entity.js";
 import Renderable from "../../../src/engine/ecs/renderable/Renderable.js";
 import { Transform } from "../../../src/engine/ecs/transform/Transform.js";
 import { synchronizeTransform } from "./synchronizeTransform.js";
@@ -42,11 +42,11 @@ export function makePositionedIconDisplaySymbol(engine, iconURL, ComponentClass)
          * @param transform
          * @param entity
          * @param {SymbolicDisplayInternalAPI} api
-         * @return {EntityBuilder}
+         * @return {Entity}
          */
         factory([component, transform, entity], api) {
 
-            const b = new EntityBuilder();
+            const b = new Entity();
 
             const sprite = new Sprite(spriteMaterial);
             sprite.frustumCulled = false;

package/editor/tools/v2/prototypeTransformControls.js

@@ -1,5 +1,5 @@
 import { EngineHarness } from "../../../src/engine/EngineHarness.js";
-import EntityBuilder from "../../../src/engine/ecs/EntityBuilder.js";
+import Entity from "../../../src/engine/ecs/Entity.js";
 import { ShadedGeometry } from "../../../src/engine/graphics/ecs/mesh-v2/ShadedGeometry.js";
 import { BoxBufferGeometry, MeshStandardMaterial } from "three";
 import { Transform } from "../../../src/engine/ecs/transform/Transform.js";
@@ -32,7 +32,7 @@ async function main(engine) {
     const ecd = engine.entityManager.dataset;
 
     // create something to drag
-    const cube_entity = new EntityBuilder()
+    const cube_entity = new Entity()
         .add(ShadedGeometry.from(
             new BoxBufferGeometry(1, 1, 1),
             new MeshStandardMaterial({
@@ -60,7 +60,7 @@ async function main(engine) {
     // controls.attach(cube_entity); // make controls target the cube
     controls.attach(entityNode.entity.entity); // make controls target the cube
 
-    new EntityBuilder()
+    new Entity()
         .add(new InputController([{
             path: 'keyboard/keys/w/down',
             listener() {

package/editor/view/ecs/ComponentControlView.js

@@ -5,7 +5,8 @@ import ObservedBoolean from "../../../src/core/model/ObservedBoolean.js";
 import LabelView from "../../../src/view/common/LabelView.js";
 import ButtonView from "../../../src/view/elements/button/ButtonView.js";
 import EmptyView from "../../../src/view/elements/EmptyView.js";
-import { downloadAsFile } from "../../../src/core/binary/ByteArrayTools.js";
+
+import {downloadAsFile} from "../../../src/core/binary/downloadAsFile.js";
 
 export async function obtainClipBoard() {
     const navigator = globalThis.navigator;

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.57.0",
+  "version": "2.58.0",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/samples/generation/main.js

@@ -8,7 +8,7 @@ import Terrain from "../../src/engine/ecs/terrain/ecs/Terrain.js";
 import { TerrainFlags } from "../../src/engine/ecs/terrain/ecs/TerrainFlags.js";
 import Water from "../../src/engine/graphics/ecs/water/Water.js";
 import GridObstacle from "../../src/engine/grid/obstacle/GridObstacle.js";
-import EntityBuilder from "../../src/engine/ecs/EntityBuilder.js";
+import Entity from "../../src/engine/ecs/Entity.js";
 import GridPosition from "../../src/engine/grid/position/GridPosition.js";
 import { Transform } from "../../src/engine/ecs/transform/Transform.js";
 import { GridData } from "../../src/generation/grid/GridData.js";
@@ -115,7 +115,7 @@ function prepare_gen_task({
     const obstacle = new GridObstacle();
     obstacle.resize(terrain.size.x, terrain.size.y);
 
-    const terrainBuilder = new EntityBuilder();
+    const terrainBuilder = new Entity();
 
     terrainBuilder
         .add(terrain)

package/samples/terrain/from_image.js

@@ -3,7 +3,7 @@ import { EngineHarness } from "../../src/engine/EngineHarness.js";
 import { GameAssetType } from "../../src/engine/asset/GameAssetType.js";
 import { TextureAssetLoader } from "../../src/engine/asset/loaders/texture/TextureAssetLoader.js";
 import Vector3 from "../../src/core/geom/Vector3.js";
-import EntityBuilder from "../../src/engine/ecs/EntityBuilder.js";
+import Entity from "../../src/engine/ecs/Entity.js";
 import Terrain from "../../src/engine/ecs/terrain/ecs/Terrain.js";
 import { ImageRGBADataLoader } from "../../src/engine/asset/loaders/image/ImageRGBADataLoader.js";
 import TerrainSystem from "../../src/engine/ecs/terrain/ecs/TerrainSystem.js";
@@ -261,7 +261,7 @@ async function main(engine) {
     water.shoreDepthTransition.set(0.1, 0.3);
     water.scattering.set(3);
 
-    new EntityBuilder()
+    new Entity()
         .add(terrain)
         // .add(water)
         .build(ecd);

package/samples/terrain/from_image_2.js

@@ -3,7 +3,7 @@ import { EngineHarness } from "../../src/engine/EngineHarness.js";
 import { GameAssetType } from "../../src/engine/asset/GameAssetType.js";
 import { TextureAssetLoader } from "../../src/engine/asset/loaders/texture/TextureAssetLoader.js";
 import Vector3 from "../../src/core/geom/Vector3.js";
-import EntityBuilder from "../../src/engine/ecs/EntityBuilder.js";
+import Entity from "../../src/engine/ecs/Entity.js";
 import Terrain from "../../src/engine/ecs/terrain/ecs/Terrain.js";
 import { ImageRGBADataLoader } from "../../src/engine/asset/loaders/image/ImageRGBADataLoader.js";
 import TerrainSystem from "../../src/engine/ecs/terrain/ecs/TerrainSystem.js";
@@ -15,9 +15,9 @@ import { TerrainLayer } from "../../src/engine/ecs/terrain/ecs/layers/TerrainLay
 import Mesh from "../../src/engine/graphics/ecs/mesh/Mesh.js";
 import { Transform } from "../../src/engine/ecs/transform/Transform.js";
 import { MeshSystem } from "../../src/engine/graphics/ecs/mesh/MeshSystem.js";
-import { downloadAsFile } from "../../src/core/binary/ByteArrayTools.js";
 import { url_to_data_url } from "../../src/core/binary/url_to_data_url.js";
 import ButtonView from "../../src/view/elements/button/ButtonView.js";
+import {downloadAsFile} from "../../src/core/binary/downloadAsFile.js";
 
 const HEIGHT_RANGE = 64;
 
@@ -136,7 +136,7 @@ async function main(engine) {
     water.shoreDepthTransition.set(0.1, 0.3);
     water.scattering.set(3);
 
-    new EntityBuilder()
+    new Entity()
         .add(terrain)
         // .add(water)
         .build(ecd);
@@ -250,7 +250,7 @@ async function load_gltf(path, engine, transform) {
 
     const ecd = em.dataset;
 
-    new EntityBuilder()
+    new Entity()
         .add(Mesh.fromJSON({
             url: path
         }))

package/src/core/binary/byteArrayToString.js

@@ -0,0 +1,28 @@
+/**
+ * Turns an array of numbers into the string given by the concatenation of the
+ * characters to which the numbers correspond.
+ * @param {!Uint8Array|!Array<number>} bytes Array of numbers representing
+ *     characters.
+ * @return {string} Stringification of the array.
+ */
+export function byteArrayToString(bytes) {
+    const numBytes = bytes.length;
+
+    const CHUNK_SIZE = 8192;
+
+    // Special-case the simple case for speed's sake.
+    if (numBytes <= CHUNK_SIZE) {
+        return String.fromCharCode.apply(null, bytes);
+    }
+
+    // The remaining logic splits conversion by chunks since
+    // Function#apply() has a maximum parameter count.
+    // See discussion: http://goo.gl/LrWmZ9
+
+    let str = '';
+    for (let i = 0; i < numBytes; i += CHUNK_SIZE) {
+        const chunk = Array.prototype.slice.call(bytes, i, i + CHUNK_SIZE);
+        str += String.fromCharCode.apply(null, chunk);
+    }
+    return str;
+}

package/src/core/binary/downloadAsFile.js

@@ -0,0 +1,28 @@
+import {downloadUrlAsFile} from "./downloadUrlAsFile.js";
+
+export function downloadAsFile(data, filename, type = 'text/json') {
+
+    let blobContent;
+
+    if (data instanceof ArrayBuffer || data instanceof Uint8Array) {
+        //raw binary data
+        blobContent = [data];
+    } else if (data instanceof Array) {
+        //already an array
+        blobContent = data;
+    } else if (data instanceof Blob) {
+        //already a blob
+        blobContent = [data];
+    } else if (typeof data === "string") {
+        blobContent = [data];
+    } else {
+        blobContent = [data]
+    }
+
+    const blob = new Blob(blobContent, {type});
+    if (window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveBlob(blob, filename);
+    } else {
+        downloadUrlAsFile(window.URL.createObjectURL(blob), filename);
+    }
+}

package/src/core/binary/downloadUrlAsFile.js

@@ -0,0 +1,14 @@
+/**
+ *
+ * @param {string} url
+ * @param {string} filename
+ */
+export function downloadUrlAsFile(url, filename) {
+    const elem = window.document.createElement('a');
+    elem.href = url;
+    elem.download = filename;
+    document.body.appendChild(elem);
+    elem.click();
+    document.body.removeChild(elem);
+}
+

package/src/core/binary/jsonToStringToByteArray.js

@@ -0,0 +1,27 @@
+import {stringifyStream} from "../json/JsonUtils.js";
+
+/**
+ *
+ * @param {Object} json
+ * @returns {number[]}
+ */
+function jsonToStringToByteArray(json) {
+    const output = [];
+    let p = 0;
+
+    function addToOutput(str) {
+        for (let i = 0; i < str.length; i++) {
+            let c = str.charCodeAt(i);
+            while (c > 0xff) {
+                output[p++] = c & 0xff;
+                c >>= 8;
+            }
+            output[p++] = c;
+        }
+    }
+
+    stringifyStream(json, addToOutput);
+    return output;
+}
+
+export {jsonToStringToByteArray};

package/src/core/binary/stringToByteArray.js

@@ -0,0 +1,24 @@
+/**
+ * Turns a string into an array of bytes; a "byte" being a JS number in the
+ * range 0-255.
+ * @param {string} str String value to arrify.
+ * @return {Uint8Array} Array of numbers corresponding to the
+ *     UCS character codes of each character in str.
+ */
+export function stringToByteArray(str) {
+    const length = str.length;
+
+    const output = [];
+    let p = 0;
+
+    for (let i = 0; i < length; i++) {
+        let c = str.charCodeAt(i);
+        while (c > 0xff) {
+            output[p++] = c & 0xff;
+            c >>= 8;
+        }
+        output[p++] = c;
+    }
+
+    return new Uint8Array(output);
+}

package/src/core/bvh2/BinaryNode.spec.js

@@ -1,5 +1,4 @@
 import { BinaryBuffer } from "../binary/BinaryBuffer.js";
-import { byteArrayToString, jsonToStringToByteArray } from "../binary/ByteArrayTools.js";
 import { BinaryNode } from "./BinaryNode.js";
 import { isLeaf, LeafNode } from "./LeafNode.js";
 import { validateNode, validateTree } from "./NodeValidator.js";
@@ -7,6 +6,8 @@ import { deserializeBinaryNode } from "./serialization/deserializeBinaryNode.js"
 import { deserializeBinaryNodeFromBinaryBuffer } from "./serialization/deserializeBinaryNodeFromBinaryBuffer.js";
 import { serializeBinaryNode } from "./serialization/serializeBinaryNode.js";
 import { serializeBinaryNodeToBinaryBuffer } from "./serialization/serializeBinaryNodeToBinaryBuffer.js";
+import {byteArrayToString} from "../binary/byteArrayToString.js";
+import {jsonToStringToByteArray} from "../binary/jsonToStringToByteArray.js";
 
 /**
  *

package/src/core/color/Color.spec.js

@@ -1,4 +1,4 @@
-import { Color } from "./Color.js";
+import {Color} from "./Color.js";
 
 test('toUint', () => {
     const c = new Color();
@@ -146,3 +146,29 @@ test("iterator", () => {
     expect(last.done).toBe(true)
     expect(last.value).toBeUndefined()
 });
+
+test("array-style getters", () => {
+
+    const color = new Color(0.1, 0.3, 0.7, 0.11);
+
+    expect(color[0]).toBe(0.1);
+    expect(color[1]).toBe(0.3);
+    expect(color[2]).toBe(0.7);
+    expect(color[3]).toBe(0.11);
+
+});
+test("array-style setters", () => {
+
+    const color = new Color(0.001, 0.001, 0.001, 0.001);
+
+    color[0] = 0.1;
+    color[1] = 0.3;
+    color[2] = 0.7;
+    color[3] = 0.11;
+
+    expect(color.r).toBe(0.1);
+    expect(color.g).toBe(0.3);
+    expect(color.b).toBe(0.7);
+    expect(color.a).toBe(0.11);
+
+});

package/src/core/color/parse_color.js

@@ -13,7 +13,7 @@ const hsvRegEx = /hsv\(([0-9]+(?:\.[0-9]*)?),\s*([0-9]+(?:\.[0-9]*)?),\s*([0-9]+
 /**
  * Parses most CSS-format colors
  * @param {string|number} c
- * @returns {number[]} Numeric array, values are in Uint8 range (0...255)
+ * @returns {number[]} Numeric array, values are in Uint8 range (0...255) for RGB and 0..1 for Alpha
  */
 export function parse_color(c) {
 

package/src/core/fsm/simple/SimpleStateMachine.spec.js

@@ -1,5 +1,5 @@
-import { SimpleStateMachine } from "./SimpleStateMachine.js";
-import { SimpleStateMachineDescription } from "./SimpleStateMachineDescription.js";
+import {SimpleStateMachine} from "./SimpleStateMachine.js";
+import {SimpleStateMachineDescription} from "./SimpleStateMachineDescription.js";
 
 test("constructor does not throw", () => {
     const description = new SimpleStateMachineDescription();
@@ -31,6 +31,22 @@ test("state entry event handler is fired as expected", () => {
     expect(entry_callback).toHaveBeenCalledWith(b, a);
 });
 
+test("remove entry event handler", () => {
+    const description = new SimpleStateMachineDescription();
+
+    const a = description.createState();
+    const fsm = new SimpleStateMachine(description);
+
+    const handler = () => {
+    };
+
+    fsm.addEventHandlerStateEntry(a, handler);
+
+    expect(fsm.removeEventHandlerStateEntry(a, handler)).toBe(true);
+    expect(fsm.removeEventHandlerStateEntry(a, handler)).toBe(false);
+
+});
+
 test("state exit event handler is fired as expected", () => {
 
     const description = new SimpleStateMachineDescription();
@@ -54,6 +70,22 @@ test("state exit event handler is fired as expected", () => {
     expect(entry_callback).toHaveBeenCalledWith(a, b);
 });
 
+test("remove exit event handler", () => {
+    const description = new SimpleStateMachineDescription();
+
+    const a = description.createState();
+    const fsm = new SimpleStateMachine(description);
+
+    const handler = () => {
+    };
+
+    fsm.addEventHandlerStateExit(a, handler);
+
+    expect(fsm.removeEventHandlerStateExit(a, handler)).toBe(true);
+    expect(fsm.removeEventHandlerStateExit(a, handler)).toBe(false);
+
+});
+
 test("'advance' moves us to the next state in the chain", () => {
 
 

package/src/core/geom/3d/matrix/m4_multiply.js

@@ -1,6 +1,6 @@
 /**
- * Multiplies two mat4s
- * Adapter from gl-matrix
+ * Multiplies two 4x4 matrices
+ * Adapted from gl-matrix
  *
  * @param {ArrayLike<number>|Float32Array} out the receiving matrix
  * @param {ArrayLike<number>|Float32Array} a the first operand

package/src/core/geom/3d/matrix/m4_multiply.spec.js

@@ -0,0 +1,11 @@
+import {MATRIX_4_IDENTITY} from "./MATRIX_4_IDENTITY.js";
+import {m4_multiply} from "./m4_multiply.js";
+
+test("identity multiplication", () => {
+
+    const result = [];
+
+    m4_multiply(result, MATRIX_4_IDENTITY, MATRIX_4_IDENTITY);
+
+    expect(result).toEqual(MATRIX_4_IDENTITY);
+});

package/src/core/geom/3d/matrix/m4_multiply_alphatensor.spec.js

@@ -0,0 +1,11 @@
+import {m4_multiply_alphatensor} from "./m4_multiply_alphatensor.js";
+import {MATRIX_4_IDENTITY} from "./MATRIX_4_IDENTITY.js";
+
+test("identity multiplication", () => {
+
+    const result = [];
+
+    m4_multiply_alphatensor(result, MATRIX_4_IDENTITY, MATRIX_4_IDENTITY);
+
+    expect(result).toEqual(MATRIX_4_IDENTITY);
+});

package/src/core/geom/3d/morton/split_by_2.js

@@ -1,7 +1,7 @@
 /**
  * method to separate bits from a given integer 2 positions apart
  *
- * @example when input is ABC, output bits are A00B00C
+ * @example when input is ABC, output bits are A0B0C
  * @see https://github.com/Forceflow/libmorton/blob/234a443ca8e2c64f6385f1a9d6ee10a70d08a3fa/include/libmorton/morton2D.h#L99
  * @param {number} a
  * @returns {number}

package/src/core/geom/3d/shape/util/shape_to_visual_entity.js

@@ -2,7 +2,7 @@ import { UnionShape3D } from "../UnionShape3D.js";
 import { UnitCubeShape3D } from "../UnitCubeShape3D.js";
 import { UnitSphereShape3D } from "../UnitSphereShape3D.js";
 import { TransformedShape3D } from "../TransformedShape3D.js";
-import EntityBuilder from "../../../../../engine/ecs/EntityBuilder.js";
+import Entity from "../../../../../engine/ecs/Entity.js";
 import { Transform } from "../../../../../engine/ecs/transform/Transform.js";
 import { AttachmentSockets } from "../../../../../engine/ecs/sockets/AttachmentSockets.js";
 import { Attachment } from "../../../../../engine/ecs/attachment/Attachment.js";
@@ -32,11 +32,11 @@ export const SHAPE_VISUAL_ENTITY_TAG = 'util/vis/Shape3D';
  *
  * @param {UnionShape3D} shape
  * @param {EntityComponentDataset} ecd
- * @returns {EntityBuilder}
+ * @returns {Entity}
  */
 function composite_shape_to_entity(shape, ecd) {
 
-    const parent = new EntityBuilder();
+    const parent = new Entity();
     parent
         .add(new Transform())
         .add(AttachmentSockets.fromJSON({
@@ -69,10 +69,10 @@ function composite_shape_to_entity(shape, ecd) {
  *
  * @param {UnitCubeShape3D} shape
  * @param {EntityComponentDataset} ecd
- * @returns {EntityBuilder}
+ * @returns {Entity}
  */
 function cube_shape_to_entity(shape, ecd) {
-    const eb = new EntityBuilder();
+    const eb = new Entity();
 
     eb.add(new Transform());
     eb.add(Tag.fromOne(SHAPE_VISUAL_ENTITY_TAG));
@@ -88,10 +88,10 @@ function cube_shape_to_entity(shape, ecd) {
  *
  * @param {UnitSphereShape3D} shape
  * @param {EntityComponentDataset} ecd
- * @returns {EntityBuilder}
+ * @returns {Entity}
  */
 function sphere_shape_to_entity(shape, ecd) {
-    const eb = new EntityBuilder();
+    const eb = new Entity();
 
     eb.add(new Transform());
     eb.add(Tag.fromOne(SHAPE_VISUAL_ENTITY_TAG));
@@ -107,12 +107,12 @@ function sphere_shape_to_entity(shape, ecd) {
  *
  * @param {TransformedShape3D} shape
  * @param {EntityComponentDataset} ecd
- * @returns {EntityBuilder}
+ * @returns {Entity}
  */
 function transformed_shape_to_entity(shape, ecd) {
     const subject = shape_to_visual_entity(shape.subject, ecd);
 
-    const parent = new EntityBuilder();
+    const parent = new Entity();
     parent
         .add(new Transform())
         .add(AttachmentSockets.fromJSON({
@@ -142,7 +142,7 @@ function transformed_shape_to_entity(shape, ecd) {
  *
  * @param {AbstractShape3D} shape
  * @param {EntityComponentDataset} ecd
- * @returns {EntityBuilder}
+ * @returns {Entity}
  */
 export function shape_to_visual_entity(shape, ecd) {
     if (shape instanceof UnionShape3D) {

package/src/core/geom/3d/tetrahedra/prototypeTetrahedraBuilder.js

@@ -3,7 +3,7 @@ import { compute_delaunay_tetrahedral_mesh } from "./delaunay/compute_delaunay_t
 import { LineBasicMaterial } from "three";
 import { ShadedGeometry } from "../../../../engine/graphics/ecs/mesh-v2/ShadedGeometry.js";
 import { DrawMode } from "../../../../engine/graphics/ecs/mesh-v2/DrawMode.js";
-import EntityBuilder from "../../../../engine/ecs/EntityBuilder.js";
+import Entity from "../../../../engine/ecs/Entity.js";
 import { Transform } from "../../../../engine/ecs/transform/Transform.js";
 import { ShadedGeometrySystem } from "../../../../engine/graphics/ecs/mesh-v2/ShadedGeometrySystem.js";
 import { GizmoRenderingPlugin } from "../../../../engine/graphics/render/gizmo/GizmoRenderingPlugin.js";
@@ -76,7 +76,7 @@ async function main(engine) {
 
 
 
-    new EntityBuilder()
+    new Entity()
         .add(ShadedGeometry.from(geometry, new LineBasicMaterial({ color: 0xFF0000 }), DrawMode.LineSegments))
         .add(Transform.fromJSON({
             position: { x: offset[0], y: offset[1], z: offset[2] },

package/src/core/geom/3d/topology/samples/sampleFloodFill.js

@@ -1,6 +1,6 @@
 import { EngineHarness } from "../../../../../engine/EngineHarness.js";
 import { MeshBasicMaterial, MeshStandardMaterial, OctahedronBufferGeometry } from "three";
-import EntityBuilder from "../../../../../engine/ecs/EntityBuilder.js";
+import Entity from "../../../../../engine/ecs/Entity.js";
 import { ShadedGeometry } from "../../../../../engine/graphics/ecs/mesh-v2/ShadedGeometry.js";
 import { Transform } from "../../../../../engine/ecs/transform/Transform.js";
 import { ShadedGeometrySystem } from "../../../../../engine/graphics/ecs/mesh-v2/ShadedGeometrySystem.js";
@@ -104,7 +104,7 @@ async function main(engine) {
 
     const ecd = engine.entityManager.dataset;
 
-    const entityBuilder = new EntityBuilder();
+    const entityBuilder = new Entity();
     entityBuilder
         .add(SGMesh.fromURL(path))
         .add(Transform.fromJSON({}))
@@ -151,7 +151,7 @@ async function main(engine) {
     makeGeometryIndexed(source_geo);
     source_geo = mergeVertices(source_geo, 0.002);
 
-    const entity_source = new EntityBuilder();
+    const entity_source = new Entity();
     entity_source
         .add(ShadedGeometry.from(source_geo, new MeshStandardMaterial({
             color: '#b60000'