@onerjs/loaders 8.33.3 → 8.33.4

package/glTF/2.0/Extensions/KHR_interactivity/declarationMapper.d.ts

@@ -3,7 +3,7 @@ import { FlowGraphBlockNames } from "@onerjs/core/FlowGraph/Blocks/flowGraphBloc
 import type { ISerializedFlowGraphBlock, ISerializedFlowGraphContext } from "@onerjs/core/FlowGraph/typeDefinitions.js";
 import type { InteractivityGraphToFlowGraphParser } from "./interactivityGraphParser.js";
 import type { IGLTF } from "../../glTFLoaderInterfaces.js";
-interface IGLTFToFlowGraphMappingObject<I = any, O = any> {
+interface IGLTFToFlowGraphMappingObject {
     /**
      * The name of the property in the FlowGraph block.
      */
@@ -21,16 +21,15 @@ interface IGLTFToFlowGraphMappingObject<I = any, O = any> {
     /**
      * A function that transforms the data from the glTF to the FlowGraph block.
      */
-    dataTransformer?: (data: I[], parser: InteractivityGraphToFlowGraphParser) => O[];
+    dataTransformer?: (data: any, parser: InteractivityGraphToFlowGraphParser) => any;
     /**
-     * If the property is in the options passed to the constructor of the block.
+     * If the property can contain multiple values.
      */
-    inOptions?: boolean;
+    isArray?: boolean;
     /**
-     * If the property is a pointer to a value.
-     * This will add an extra JsonPointerParser block to the graph.
+     * If the property is in the options passed to the constructor of the block.
      */
-    isPointer?: boolean;
+    inOptions?: boolean;
     /**
      * If the property is an index to a value.
      * if defined this will be the name of the array to find the object in.
@@ -45,7 +44,7 @@ interface IGLTFToFlowGraphMappingObject<I = any, O = any> {
     /**
      * Used in configuration values. If defined, this will be the default value, if no value is provided.
      */
-    defaultValue?: O;
+    defaultValue?: any;
 }
 export interface IGLTFToFlowGraphMapping {
     /**

package/glTF/2.0/Extensions/KHR_interactivity/declarationMapper.js

@@ -103,7 +103,7 @@ const gltfToFlowGraphMapping = {
                 throw new Error("Receive event should have a single configuration object, the event itself");
             }
             const eventConfiguration = gltfBlock.configuration["event"];
-            const eventId = eventConfiguration.value[0];
+            const eventId = eventConfiguration.value?.[0];
             if (typeof eventId !== "number") {
                 throw new Error("Event id should be a number");
             }
@@ -132,7 +132,7 @@ const gltfToFlowGraphMapping = {
                 Logger.Error("Receive event should have a single configuration object, the event itself");
                 return { valid: false, error: "Receive event should have a single configuration object, the event itself" };
             }
-            const eventId = eventConfiguration.value[0];
+            const eventId = eventConfiguration.value?.[0];
             if (typeof eventId !== "number") {
                 Logger.Error("Event id should be a number");
                 return { valid: false, error: "Event id should be a number" };
@@ -151,7 +151,7 @@ const gltfToFlowGraphMapping = {
                 throw new Error("Receive event should have a single configuration object, the event itself");
             }
             const eventConfiguration = gltfBlock.configuration["event"];
-            const eventId = eventConfiguration.value[0];
+            const eventId = eventConfiguration.value?.[0];
             if (typeof eventId !== "number") {
                 throw new Error("Event id should be a number");
             }
@@ -795,7 +795,7 @@ const gltfToFlowGraphMapping = {
     "flow/switch": {
         blocks: ["FlowGraphSwitchBlock" /* FlowGraphBlockNames.Switch */],
         configuration: {
-            cases: { name: "cases", inOptions: true, defaultValue: [] },
+            cases: { name: "cases", isArray: true, inOptions: true, defaultValue: [] },
         },
         inputs: {
             values: {
@@ -804,20 +804,20 @@ const gltfToFlowGraphMapping = {
             },
         },
         validation(gltfBlock) {
-            if (gltfBlock.configuration && gltfBlock.configuration.cases) {
-                const cases = gltfBlock.configuration.cases.value;
-                const onlyIntegers = cases.every((caseValue) => {
+            const cases = gltfBlock.configuration?.cases;
+            if (cases && cases.value) {
+                const onlyIntegers = cases.value.every((caseValue) => {
                     // case value should be an integer. Since Number.isInteger(1.0) is true, we need to check if toString has only digits.
                     return typeof caseValue === "number" && /^-?\d+$/.test(caseValue.toString());
                 });
                 if (!onlyIntegers) {
                     Logger.Warn("Switch cases should be integers. Using empty array instead.");
-                    gltfBlock.configuration.cases.value = [];
+                    cases.value = [];
                     return { valid: true };
                 }
                 // check for duplicates
-                const uniqueCases = new Set(cases);
-                gltfBlock.configuration.cases.value = Array.from(uniqueCases);
+                const uniqueCases = new Set(cases.value);
+                cases.value = Array.from(uniqueCases);
             }
             return { valid: true };
         },
@@ -915,7 +915,7 @@ const gltfToFlowGraphMapping = {
         },
         validation(gltfBlock) {
             // check that the configuration value is an integer
-            if (typeof gltfBlock.configuration?.inputFlows?.value[0] !== "number") {
+            if (typeof gltfBlock.configuration?.inputFlows?.value?.[0] !== "number") {
                 gltfBlock.configuration = gltfBlock.configuration || {
                     inputFlows: { value: [0] },
                 };
@@ -960,27 +960,12 @@ const gltfToFlowGraphMapping = {
                 inOptions: true,
                 isVariable: true,
                 dataTransformer(index, parser) {
-                    return [parser.getVariableName(index[0])];
+                    return parser.getVariableName(index);
                 },
             },
         },
     },
     "variable/set": {
-        blocks: ["FlowGraphSetVariableBlock" /* FlowGraphBlockNames.SetVariable */],
-        configuration: {
-            variable: {
-                name: "variable",
-                gltfType: "number",
-                flowGraphType: "string",
-                inOptions: true,
-                isVariable: true,
-                dataTransformer(index, parser) {
-                    return [parser.getVariableName(index[0])];
-                },
-            },
-        },
-    },
-    "variable/setMultiple": {
         blocks: ["FlowGraphSetVariableBlock" /* FlowGraphBlockNames.SetVariable */],
         configuration: {
             variables: {
@@ -988,8 +973,9 @@ const gltfToFlowGraphMapping = {
                 gltfType: "number",
                 flowGraphType: "string",
                 inOptions: true,
+                isArray: true,
                 dataTransformer(index, parser) {
-                    return [index[0].map((i) => parser.getVariableName(i))];
+                    return index.map((i) => parser.getVariableName(i));
                 },
             },
         },
@@ -1016,20 +1002,15 @@ const gltfToFlowGraphMapping = {
                 inOptions: true,
                 isVariable: true,
                 dataTransformer(index, parser) {
-                    return [parser.getVariableName(index[0])];
+                    return parser.getVariableName(index);
                 },
             },
             useSlerp: {
                 name: "animationType",
                 inOptions: true,
                 defaultValue: false,
-                dataTransformer: (value) => {
-                    if (value[0] === true) {
-                        return ["Quaternion" /* FlowGraphTypes.Quaternion */];
-                    }
-                    else {
-                        return [undefined];
-                    }
+                dataTransformer(value) {
+                    return value === true ? "Quaternion" /* FlowGraphTypes.Quaternion */ : undefined;
                 },
             },
         },
@@ -1085,25 +1066,23 @@ const gltfToFlowGraphMapping = {
             var _a, _b;
             // is useSlerp is used, animationType should be set to be quaternion!
             const serializedValueInterpolation = serializedObjects[0];
-            const propertyIndex = gltfBlock.configuration?.variable.value[0];
+            const propertyIndex = gltfBlock.configuration?.variable.value?.[0];
             if (typeof propertyIndex !== "number") {
                 Logger.Error("Variable index is not defined for variable interpolation block");
                 throw new Error("Variable index is not defined for variable interpolation block");
             }
             const variable = parser.arrays.staticVariables[propertyIndex];
             // if not set by useSlerp
-            if (typeof serializedValueInterpolation.config.animationType.value === "undefined") {
-                // get the value type
-                parser.arrays.staticVariables;
+            if (typeof serializedValueInterpolation.config?.animationType?.value === "undefined") {
+                serializedValueInterpolation.config || (serializedValueInterpolation.config = {});
+                (_a = serializedValueInterpolation.config).animationType || (_a.animationType = {});
                 serializedValueInterpolation.config.animationType.value = getAnimationTypeByFlowGraphType(variable.type);
             }
             // variable/get configuration
             const serializedGetVariable = serializedObjects[4];
             serializedGetVariable.config || (serializedGetVariable.config = {});
-            (_a = serializedGetVariable.config).variable || (_a.variable = {});
+            (_b = serializedGetVariable.config).variable || (_b.variable = {});
             serializedGetVariable.config.variable.value = parser.getVariableName(propertyIndex);
-            // get the control points from the easing block
-            (_b = serializedObjects[3]).config || (_b.config = {});
             return serializedObjects;
         },
     },
@@ -1411,7 +1390,7 @@ const gltfToFlowGraphMapping = {
     "math/switch": {
         blocks: ["FlowGraphDataSwitchBlock" /* FlowGraphBlockNames.DataSwitch */],
         configuration: {
-            cases: { name: "cases", inOptions: true, defaultValue: [] },
+            cases: { name: "cases", isArray: true, inOptions: true, defaultValue: [] },
         },
         inputs: {
             values: {
@@ -1419,20 +1398,20 @@ const gltfToFlowGraphMapping = {
             },
         },
         validation(gltfBlock) {
-            if (gltfBlock.configuration && gltfBlock.configuration.cases) {
-                const cases = gltfBlock.configuration.cases.value;
-                const onlyIntegers = cases.every((caseValue) => {
+            const cases = gltfBlock.configuration?.cases;
+            if (cases && cases.value) {
+                const onlyIntegers = cases.value.every((caseValue) => {
                     // case value should be an integer. Since Number.isInteger(1.0) is true, we need to check if toString has only digits.
                     return typeof caseValue === "number" && /^-?\d+$/.test(caseValue.toString());
                 });
                 if (!onlyIntegers) {
                     Logger.Warn("Switch cases should be integers. Using empty array instead.");
-                    gltfBlock.configuration.cases.value = [];
+                    cases.value = [];
                     return { valid: true };
                 }
                 // check for duplicates
-                const uniqueCases = new Set(cases);
-                gltfBlock.configuration.cases.value = Array.from(uniqueCases);
+                const uniqueCases = new Set(cases.value);
+                cases.value = Array.from(uniqueCases);
             }
             return { valid: true };
         },