@woosh/meep-engine 2.119.51 → 2.119.53

package/package.json

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

package/src/engine/graphics/ecs/highlight/system/ShadedGeometryHighlightSystem.d.ts

@@ -1,5 +1,5 @@
 import {System} from "../../../../ecs/System";
-import {ShadedGeometry} from "../../mesh-v2/ShadedGeometry";
+import {ShadedGeometry} from "../../mesh-v2/ShadedGeometry.js";
 import Highlight from "../Highlight";
 import Engine from "../../../../Engine";
 

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometry.d.ts

@@ -1,26 +1,153 @@
-import {BufferGeometry, Material} from "three";
-import {AABB3} from "../../../../core/geom/3d/aabb/AABB3";
-import {DrawMode} from "./DrawMode";
-
-export class ShadedGeometry {
-    geometry: BufferGeometry
-    material: Material
-    draw_method: number
-    flags: number
-
-    readonly mode: DrawMode
-
-    getBoundingBox(destination: AABB3): void
-
-    from(geometry: BufferGeometry, material: Material, draw_mode?: DrawMode): void
-
-    copy(other: ShadedGeometry): void
-
-    clone(): ShadedGeometry
-
-    equals(other: ShadedGeometry): boolean
-
-    hash(): number
-
-    static from(geometry: BufferGeometry, material: Material, draw_mode?: DrawMode): ShadedGeometry
-}
+/**
+ * Represents a primitive 3d object, a combination of a material and geometry
+ * This is roughly equivalent to single draw call, note that his is not a hierarchical data structure, if you want that - you will need to combine multiple entities, each with a `ShadedGeometry` component
+ */
+export class ShadedGeometry {
+    /**
+     *
+     * @param {THREE.BufferGeometry} geometry
+     * @param {THREE.Material} material
+     * @param {DrawMode} [draw_mode]
+     * @return {ShadedGeometry}
+     */
+    static from(geometry: THREE.BufferGeometry, material: THREE.Material, draw_mode?: DrawMode): ShadedGeometry;
+    /**
+     *
+     * @type {THREE.BufferGeometry|null}
+     */
+    geometry: THREE.BufferGeometry | null;
+    /**
+     *
+     * @type {THREE.Material|null}
+     */
+    material: THREE.Material | null;
+    /**
+     * Optional extra material used for shadowmaps
+     * @type {THREE.Material|null}
+     */
+    depth_material: THREE.Material | null;
+    __bvh_leaf: BvhClient;
+    /**
+     * Transient, assigned in the system
+     * @type {number}
+     * @private
+     */
+    private __entity;
+    /**
+     * Transient, cached for convenience. Associated transform component from the same entity
+     * @type {Transform|null}
+     * @private
+     */
+    private __c_transform;
+    /**
+     *
+     * @type {DrawMode|number}
+     */
+    mode: DrawMode | number;
+    /**
+     * Transient property signifying how to render object, such as using INSTANCED draw
+     * @type {number}
+     */
+    draw_method: number;
+    /**
+     *
+     * @type {number}
+     */
+    flags: number;
+    /**
+     * @deprecated
+     * @private
+     */
+    private get __cached_object();
+    /**
+     *
+     * @param {number|ShadedGeometryFlags} flag
+     * @returns {void}
+     */
+    setFlag(flag: number | ShadedGeometryFlags): void;
+    /**
+     *
+     * @param {number|ShadedGeometryFlags} flag
+     * @returns {void}
+     */
+    clearFlag(flag: number | ShadedGeometryFlags): void;
+    /**
+     *
+     * @param {number|ShadedGeometryFlags} flag
+     * @param {boolean} value
+     */
+    writeFlag(flag: number | ShadedGeometryFlags, value: boolean): void;
+    /**
+     *
+     * @param {number|ShadedGeometryFlags} flag
+     * @returns {boolean}
+     */
+    getFlag(flag: number | ShadedGeometryFlags): boolean;
+    /**
+     *
+     * @return {number}
+     */
+    hash(): number;
+    /**
+     *
+     * @param {ShadedGeometry} other
+     * @returns {boolean}
+     */
+    equals(other: ShadedGeometry): boolean;
+    /**
+     *
+     * @param {ShadedGeometry} other
+     */
+    copy(other: ShadedGeometry): void;
+    /**
+     *
+     * @returns {ShadedGeometry}
+     */
+    clone(): ShadedGeometry;
+    /**
+     * Current cached entity that this component is attached to
+     * @return {number}
+     */
+    get entity(): number;
+    /**
+     * Global transform matrix
+     * 4x4 matrix
+     * @return {null|number[]}
+     */
+    get transform(): number[];
+    /**
+     * @deprecated
+     */
+    get bvh(): void;
+    /**
+     *
+     * @param {AABB3} destination
+     */
+    getBoundingBox(destination: AABB3): void;
+    /**
+     *
+     * @param {THREE.BufferGeometry} geometry
+     * @param {THREE.Material} material
+     * @param {DrawMode} [draw_mode]
+     */
+    from(geometry: THREE.BufferGeometry, material: THREE.Material, draw_mode?: DrawMode): void;
+    updateTransform(): void;
+    update_bounds(): void;
+    /**
+     *
+     * @param {SurfacePoint3} contact if found, contact is written here
+     * @param {ArrayLike<number>|number[]|Float32Array} ray 6-tuple: [origin_x, origin_y, origin_z, direction_x, direction_y, direction_z]
+     * @param {ArrayLike<number>|number[]|Float32Array} transform_matrix4 transform applied to the geometry
+     * @returns {boolean}
+     */
+    query_raycast_nearest(contact: SurfacePoint3, ray: ArrayLike<number> | number[] | Float32Array, transform_matrix4: ArrayLike<number> | number[] | Float32Array): boolean;
+}
+export namespace ShadedGeometry {
+    let typeName: string;
+    let serializable: boolean;
+}
+import { BvhClient } from "../../../../core/bvh2/bvh3/BvhClient.js";
+import { DrawMode } from "./DrawMode.js";
+import { ShadedGeometryFlags } from "./ShadedGeometryFlags.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
+//# sourceMappingURL=ShadedGeometry.d.ts.map

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometrySystem.d.ts

@@ -2,7 +2,7 @@ import {BVH} from "../../../../core/bvh2/bvh3/BVH";
 import {SurfacePoint3} from "../../../../core/geom/3d/SurfacePoint3";
 import {System} from "../../../ecs/System";
 import Engine from "../../../Engine";
-import {ShadedGeometry} from "./ShadedGeometry";
+import {ShadedGeometry} from "./ShadedGeometry.js";
 
 export class ShadedGeometrySystem extends System<ShadedGeometry> {
     constructor(engine: Engine)

package/src/engine/graphics/sh3/path_tracer/populate_path_traced_scene_from_ecd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"populate_path_traced_scene_from_ecd.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/populate_path_traced_scene_from_ecd.js"],"names":[],"mappings":"AAOA;;;;GAIG;AACH,+GAqCC"}
+{"version":3,"file":"populate_path_traced_scene_from_ecd.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/populate_path_traced_scene_from_ecd.js"],"names":[],"mappings":"AAQA;;;;GAIG;AACH,+GAkDC"}

package/src/engine/graphics/sh3/path_tracer/populate_path_traced_scene_from_ecd.js

@@ -4,6 +4,7 @@ import { Light } from "../../ecs/light/Light.js";
 import { LightType } from "../../ecs/light/LightType.js";
 import { ShadedGeometry } from "../../ecs/mesh-v2/ShadedGeometry.js";
 import { DirectionalLight } from "../../render/forward_plus/model/DirectionalLight.js";
+import { PointLight } from "../../render/forward_plus/model/PointLight.js";
 
 /**
  *
@@ -35,7 +36,8 @@ export function populate_path_traced_scene_from_ecd(ecd, scene) {
          */
         (light, transform) => {
 
-            if (light.type.getValue() === LightType.DIRECTION) {
+            const type = light.type.getValue();
+            if (type === LightType.DIRECTION) {
 
                 const l = new DirectionalLight();
 
@@ -44,6 +46,18 @@ export function populate_path_traced_scene_from_ecd(ecd, scene) {
                 l.intensity.copy(light.intensity);
 
                 scene.addLight(l);
+
+            }else if(type === LightType.POINT){
+
+                const l = new PointLight();
+
+                l.color.copy(light.color);
+                l.position.copy(transform.position);
+                l.intensity.copy(light.intensity);
+                l.radius.copy(light.distance);
+
+                scene.addLight(l);
+
             }
 
         });