bg2e-js 2.3.13 → 2.3.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bg2e-js",
-  "version": "2.3.13",
+  "version": "2.3.14",
   "description": "a graphics engine for productivity applications",
   "main": "./dist/bg2e-js.js",
   "types": "./src/index.ts",

package/src/base/PolyList.ts

@@ -2,7 +2,7 @@ import Vec from "../math/Vec";
 import Mat4 from "../math/Mat4";
 import Color from "./Color";
 import Material from "./Material";
-
+import Drawable from "../scene/Drawable";
 
 export enum BufferType {
     VERTEX		    = 1 << 0,
@@ -188,6 +188,8 @@ export default class PolyList {
     private _selectable: boolean;
     private _renderer?: any;
 
+    private _mainDrawable?: Drawable;
+
     constructor() {
         // The object will be rendered in the default layer for
         // transparent or opaque objects
@@ -310,6 +312,17 @@ export default class PolyList {
         this._selectable = s;
     }
 
+    // The mainDrawable is a reference to the las Drawable object that contains this polyList. Note that
+    // in some circunstances a polyList can be shared by several Drawable objects, but the mainDrawable
+    // will be the last one that was assigned.
+    get mainDrawable(): Drawable | undefined {
+        return this._mainDrawable;
+    }
+
+    set mainDrawable(d: Drawable | undefined) {
+        this._mainDrawable = d;
+    }
+
     // The this._renderer variable is initialized by the polyListRenderer factory
     get renderer(): any {
         return this._renderer

package/src/manipulation/SelectionHighlight.ts

@@ -91,7 +91,6 @@ export default class SelectionHighlight {
             this._renderQueue?.draw(RenderLayer.SELECTION_DEFAULT);
         });
 
-        // TODO: Draw target texture using a border detection shader
         const shader = this._selectionDrawShader;
         this._renderer.presentTexture(this._targetTexture, { clearBuffers: false, shader });
     }

package/src/manipulation/SelectionIdAssignVisitor.ts

@@ -2,12 +2,19 @@ import NodeVisitor from "../scene/NodeVisitor";
 import SelectionMode from "./SelectionMode";
 import Color from "../base/Color";
 import Node from "../scene/Node";
+import PolyList from "../base/PolyList";
+import Drawable from "../scene/Drawable";
 
 const getColor = (comps: number[]) => "" + comps[0] + comps[1] + comps[2];
 
+export type SelectionElement = {
+    polyList: PolyList;
+    drawable: Drawable;
+}
+
 export default class SelectionAssignVisitor extends NodeVisitor {
     protected _selectionMode: SelectionMode;
-    protected _elements: Record<string, any>;
+    protected _elements: Record<string, SelectionElement>;
     protected _r: number = 0;
     protected _g: number = 0;
     protected _b: number = 0;
@@ -56,7 +63,7 @@ export default class SelectionAssignVisitor extends NodeVisitor {
         return new Color([components[0]/255, components[1]/255, components[2]/255, 1]);
     }
 
-    findElement(pickedColor: Uint8Array | undefined | null) {
+    findElement(pickedColor: Uint8Array | undefined | null) : SelectionElement | null {
         if (!pickedColor) {
             return null;
         }
@@ -66,7 +73,7 @@ export default class SelectionAssignVisitor extends NodeVisitor {
             pickedColor[1],
             pickedColor[2]
         ];
-        return this._elements[getColor(color)];
+        return this._elements[getColor(color)] || null;
     }
 
     visit(node: Node) {

package/src/manipulation/SelectionManager.ts

@@ -159,8 +159,12 @@ export default class SelectionManager {
             const pickedColor = this._selectionBuffer!.draw(this.sceneRoot, this.camera, evt.x * pixelRatio, evt.y * pixelRatio);
             const item = this._selectionIdVisitor.findElement(pickedColor);
             const isSelected = () => this._selection.find(s => {
-                return s.polyList === item.polyList && s.drawable === item.drawable
+                return item && s.polyList === item.polyList && s.drawable === item.drawable
             });
+            if (item && this.selectionMode === SelectionMode.OBJECT) {
+                item.drawable.items.forEach(it => it.polyList.selected = true);
+            }
+
             if (item && this._multiSelect && !isSelected()) {
                 this._selection.push(item);
                 this.triggerSelectionChanged();

package/src/scene/Drawable.ts

@@ -78,10 +78,14 @@ export default class Drawable extends Component {
             throw new Error("Error adding polyList to drawable object: transform is not an instance of Mat4");
         }
         this._items.push({ polyList, material, transform });
+        polyList.mainDrawable = this;
     }
 
     removePolyList(plist: PolyList): void {
         this._items = this._items.filter(item => item.polyList != plist);
+        if (plist.mainDrawable === this) {
+            plist.mainDrawable = undefined;
+        }
     }
 
     destroy(): void {