Merge pull request KhronosGroup#29 from needle-tools/feature/various-…

…fixes Various fixes
needle-tools · Nov 13, 2024 · cf356d1 · cf356d1
2 parents 9ef02e5 + e9d8b76
commit cf356d1
Show file tree

Hide file tree

Showing 12 changed files with 93 additions and 17 deletions.
diff --git a/src/BasicBehaveEngine/decorators/BabylonDecorator.ts b/src/BasicBehaveEngine/decorators/BabylonDecorator.ts
@@ -651,6 +651,21 @@ export class BabylonDecorator extends ADecorator {
             }
         }, "bool");
 
+        this.registerJsonPointer(`/nodes/${maxGltfNode}/extensions/KHR_node_visibility/visible`, (path) => {
+            const parts: string[] = path.split("/");
+            const node = this.world.glTFNodes[Number(parts[2])];
+            if (node instanceof AbstractMesh) {
+                return (node as AbstractMesh).isVisible;
+            }
+            return true;
+        }, (path, value) => {
+            const parts: string[] = path.split("/");
+            const node = this.world.glTFNodes[Number(parts[2])];
+            if (node instanceof AbstractMesh) {
+                (node as AbstractMesh).isVisible = value || value === undefined || value === null;
+            }
+        }, "bool");
+
         this.registerJsonPointer(`/nodes/${maxGltfNode}/extensions/KHR_node_hoverability/hoverable`, (path) => {
             const parts: string[] = path.split("/");
             const metadata = this.world.glTFNodes[Number(parts[2])].metadata;

diff --git a/src/BasicBehaveEngine/nodes/experimental/OnSelect.ts b/src/BasicBehaveEngine/nodes/experimental/OnSelect.ts
@@ -66,6 +66,8 @@ export class OnSelect extends BehaveEngineNode {
                 value: [controllerIndex],
             };
 
+            console.log("OnSelect", {node: this._nodeIndex, outValues: this.outValues});
+
             this.addEventToWorkQueue(this.flows.out);
 
             if (!this._stopPropagation) {

diff --git a/src/BasicBehaveEngine/nodes/flow/Sequence.ts b/src/BasicBehaveEngine/nodes/flow/Sequence.ts
@@ -16,8 +16,11 @@ export class Sequence extends BehaveEngineNode {
     override processNode(flowSocket?: string) {
         this.graphEngine.processNodeStarted(this)
 
-        for (let i = 0; i < Number(this._numberOutputFlows); i++) {
-            this.processFlow(this.flows[i]);
+        const flows = Object.keys(this.flows);
+        for (let i = 0; i < flows.length; i++) {
+            const flow = this.flows[flows[i]];
+            if (!flow) continue;
+            this.processFlow(flow);
         }
     }
 }
diff --git a/src/BasicBehaveEngine/nodes/flow/SetDelay.ts b/src/BasicBehaveEngine/nodes/flow/SetDelay.ts
@@ -36,7 +36,7 @@ export class SetDelay extends BehaveEngineNode {
         } else {
             const delayIndex = this.graphEngine.scheduledDelays.length;
             const delayId = setTimeout(() => {
-                this.addEventToWorkQueue(this.flows.completed);
+                this.addEventToWorkQueue(this.flows.done);
             }, duration * 1000);
             this.graphEngine.pushScheduledDelay(delayId);
             this._runningDelayIndices.push(delayIndex);

diff --git a/src/BasicBehaveEngine/nodes/pointer/PointerGet.ts b/src/BasicBehaveEngine/nodes/pointer/PointerGet.ts
@@ -60,7 +60,7 @@ export class PointerGet extends BehaveEngineNode {
             const typeIndex = this.getTypeIndex(typeName!);
 
             return {
-                'val':{id: "val", value: this.graphEngine.getPathValue(populatedPath), type: typeIndex},
+                'value':{id: "value", value: this.graphEngine.getPathValue(populatedPath), type: typeIndex},
                 'isValid':{id: "isValid", value: [true], type: this.getTypeIndex('bool')}
             };
         } else {

diff --git a/src/BasicBehaveEngine/nodes/pointer/PointerSet.ts b/src/BasicBehaveEngine/nodes/pointer/PointerSet.ts
@@ -2,7 +2,7 @@ import {BehaveEngineNode, IBehaviourNodeProps} from "../../BehaveEngineNode";
 
 export class PointerSet extends BehaveEngineNode {
     REQUIRED_CONFIGURATIONS = [{id: "pointer"}]
-    REQUIRED_VALUES = [{id: "val"}]
+    REQUIRED_VALUES = [{id: "value"}]
 
     _pointer: string;
     _pointerVals: { id: string }[];

diff --git a/src/authoring/AuthoringNodeSpecs.ts b/src/authoring/AuthoringNodeSpecs.ts
@@ -87,7 +87,7 @@ export const pointerNodeSpecs: IAuthoringNode[] = [
             flows: [],
             values: [
                 {
-                    id: "val",
+                    id: "value",
                     description: "The value to set",
                     types: ["bool", "int", "float","float2", "float3", "float4"]
                 },
@@ -118,7 +118,7 @@ export const pointerNodeSpecs: IAuthoringNode[] = [
             ],
             values: [
                 {
-                    id: "val",
+                    id: "value",
                     description: "The value to set",
                     types: ["bool", "int", "float", "float2", "float3", "float4"]
                 }
@@ -984,7 +984,7 @@ export const flowNodeSpecs: IAuthoringNode[] = [
         output: {
             flows: [
                 {
-                    id: "completed",
+                    id: "done",
                     description: "The flow to be followed after the delay",
                 },
                 {

diff --git a/src/authoring/BehaveToAuthor.ts b/src/authoring/BehaveToAuthor.ts
@@ -149,7 +149,12 @@ export const behaveToAuthor = (graph: string): [Node[], Edge[], ICustomEvent[],
         const nodeNumbers: number[] = [];
         disjointGraph.forEach((nodeId) => {
           const i = nodes.findIndex((n) => n.id === nodeId);
-          nodeNumbers.push(i);
+          if (i < 0) {
+            console.error(`Node with id ${nodeId} not found in nodes list. This is likely an issue with the graph data.`);
+          }
+          else {
+            nodeNumbers.push(i);
+          }
         });
 
         // Each layer is a vertical column of a disjoint graph. Since we start at the leftmost column where x = -500 (starting point).
@@ -169,7 +174,7 @@ export const behaveToAuthor = (graph: string): [Node[], Edge[], ICustomEvent[],
           const nodeOutEdges: Edge[] = edges.filter(edge => Number(edge.source) === nodeIndex);
           nextLayer.push(...nodeOutEdges.map(edge => Number(edge.target)));
         }
-        nextLayer = [...new Set(nextLayer)]
+        nextLayer = [...new Set(nextLayer.filter(num => Number.isFinite(num)))];
 
         let xOffset = 0;
         while (nextLayer.length > 0) {
@@ -188,7 +193,7 @@ export const behaveToAuthor = (graph: string): [Node[], Edge[], ICustomEvent[],
             const nodeOutEdges: Edge[] = edges.filter(edge => Number(edge.source) === nodeIndex);
             nextLayer.push(...nodeOutEdges.map(edge => Number(edge.target)));
           }
-          nextLayer = [...new Set(nextLayer)];
+          nextLayer = [...new Set(nextLayer.filter(num => Number.isFinite(num)))];
           xOffset += 500;
         }
         layerYAdditive = 800 + lastMaxY;

diff --git a/src/components/engineViews/BabylonEngineComponent.tsx b/src/components/engineViews/BabylonEngineComponent.tsx
@@ -15,6 +15,7 @@ import {Scene} from "@babylonjs/core/scene";
 import "@babylonjs/loaders/glTF";
 import {Spacer} from "../Spacer";
 import {KHR_interactivity, KHR_INTERACTIVITY_EXTENSION_NAME} from "../../loaderExtensions/KHR_interactivity";
+import {KHR_node_visibility, KHR_NODE_VISIBILITY_EXTENSION_NAME} from "../../loaderExtensions/KHR_node_visibility";
 import {GLTFLoader} from "@babylonjs/loaders/glTF/2.0";
 import {BabylonDecorator} from "../../BasicBehaveEngine/decorators/BabylonDecorator";
 import {BasicBehaveEngine} from "../../BasicBehaveEngine/BasicBehaveEngine";
@@ -24,10 +25,15 @@ enum BabylonEngineModal {
     CUSTOM_EVENT = "CUSTOM_EVENT",
     NONE = "NONE"
 }
+
 GLTFLoader.RegisterExtension(KHR_INTERACTIVITY_EXTENSION_NAME, (loader) => {
     return new KHR_interactivity(loader);
 });
 
+GLTFLoader.RegisterExtension(KHR_NODE_VISIBILITY_EXTENSION_NAME, (loader) => {
+    return new KHR_node_visibility(loader);
+});
+
 export const BabylonEngineComponent = (props: {behaveGraphRef: any, setBehaveGraphFromGlTF: any}) => {
     const canvasRef = useRef<HTMLCanvasElement | null>(null);
     const engineRef = useRef<Engine | null>(null);
@@ -179,7 +185,7 @@ export const BabylonEngineComponent = (props: {behaveGraphRef: any, setBehaveGra
 
             glTF['extensions'] = glTF['extensions'] || {};
             glTF['extensions']['KHR_interactivity'] = {
-                graph: props.behaveGraphRef.current
+                ...props.behaveGraphRef.current
             }
             glTF['extensionsUsed'] = glTF['extensionsUsed'] || []
             if (!glTF['extensionsUsed'].includes('KHR_interactivity')) {

diff --git a/src/loaderExtensions/KHR_interactivity.ts b/src/loaderExtensions/KHR_interactivity.ts
@@ -23,10 +23,10 @@ export class KHR_interactivity implements IGLTFLoaderExtension {
         return GLTFLoader.LoadExtensionAsync(context, scene, this.name, (extensionContext, extension) => {
             const promises = new Array<Promise<any>>();
             promises.push(this._loader.loadSceneAsync(context, scene));
-            if (scene.extensions && scene.extensions.KHR_interactivity && scene.extensions.KHR_interactivity.graph) {
+            if (scene.extensions && scene.extensions.KHR_interactivity && scene.extensions.KHR_interactivity) {
                 const p = async () => {
                     this._loader.babylonScene.extras = this._loader.babylonScene.extras || {};
-                    this._loader.babylonScene.extras.behaveGraph = scene.extensions!.KHR_interactivity.graph;
+                    this._loader.babylonScene.extras.behaveGraph = scene.extensions!.KHR_interactivity;
                 };
                 promises.push(p());
             }

diff --git a/src/loaderExtensions/KHR_node_visibility.ts b/src/loaderExtensions/KHR_node_visibility.ts
@@ -0,0 +1,45 @@
+import { IGLTFLoaderExtension } from "@babylonjs/loaders";
+import { GLTFLoader } from "@babylonjs/loaders/glTF/2.0";
+import { AbstractMesh } from "@babylonjs/core";
+
+// See also: Commit that adds KHR_node_visibility to BabylonJS 7.x
+//   https://github.com/BabylonJS/Babylon.js/commit/01f82d0092d804c75ec9010dded2e8df86a84287#diff-98704e8dc53eb8405b18072a7c7b6d9d0bb37826de8b4a376e48bf433cbae6e7R51
+// See also: inheritVisibility in core BabylonJS
+//   https://github.com/BabylonJS/Babylon.js/blob/master/packages/dev/core/src/Meshes/abstractMesh.ts#L555
+
+export const KHR_NODE_VISIBILITY_EXTENSION_NAME = 'KHR_node_visibility';
+export class KHR_node_visibility implements IGLTFLoaderExtension {
+    name = KHR_NODE_VISIBILITY_EXTENSION_NAME;
+    enabled: boolean;
+    private _loader: GLTFLoader | null = null;
+
+    constructor(loader: GLTFLoader) {
+        this._loader = loader;
+        this.enabled = this._loader.isExtensionUsed(this.name);
+    }
+
+    public async onReady(): Promise<void> {
+        if (!this._loader) return;
+        this._loader.gltf.nodes?.forEach((node) => {
+            node._primitiveBabylonMeshes?.forEach((_mesh) => {
+                // TODO this is available in a later Babylon version.
+                // mesh.inheritVisibility = true;
+            });
+            // When the JSON Pointer is used we need to change both the transform node and the primitive meshes to the new value.
+            if (node.extensions?.KHR_node_visibility) {
+                if (node.extensions?.KHR_node_visibility.visible === false) {
+                    if (node._babylonTransformNode) {
+                        (node._babylonTransformNode as AbstractMesh).isVisible = false;
+                    }
+                    node._primitiveBabylonMeshes?.forEach((mesh) => {
+                        mesh.isVisible = false;
+                    });
+                }
+            }
+        });
+    }
+
+    dispose(): void {
+        this._loader = null;
+    }
+}
diff --git a/tst/nodes.test.ts b/tst/nodes.test.ts
@@ -490,15 +490,15 @@ describe('nodes', () => {
         );
 
         const res  = pointerGet.processNode();
-        expect(res['val']!.value[0]).toBe(2);
+        expect(res['value']!.value[0]).toBe(2);
 
         const pointerGetCustomPtr: PointerGet = new PointerGet({
             ...defaultProps,
             configuration: [{ id: 'pointer', value: '/nodes/0/value' }],
         });
 
         const resCustom = await pointerGetCustomPtr.processNode();
-        expect(resCustom['val']!.value[0]).toBe(1);
+        expect(resCustom['value']!.value[0]).toBe(1);
     });
 
     it('pointer/set', async () => {
@@ -522,7 +522,7 @@ describe('nodes', () => {
             ],
             values: [
                 { id: 'index', value: [0], type: 1 },
-                { id: 'val', value: [42], type: 1 },
+                { id: 'value', value: [42], type: 1 },
             ],
         });