Move flow graph math functions into flow graph for now (#17445)

Author: bghgary

packages/dev/core/src/FlowGraph/Blocks/Data/Math/flowGraphVectorMathBlocks.ts

@@ -21,8 +21,8 @@ import type { FlowGraphMatrix, FlowGraphVector } from "core/FlowGraph/utils";
 import { _GetClassNameOf } from "core/FlowGraph/utils";
 import type { FlowGraphDataConnection } from "../../../flowGraphDataConnection";
 import type { FlowGraphContext } from "../../../flowGraphContext";
-import { GetAngleBetweenQuaternions, GetQuaternionFromDirections } from "../../../../Maths/math.vector.functions";
 import type { Nullable } from "../../../../types";
+import { GetAngleBetweenQuaternions, GetQuaternionFromDirections } from "core/FlowGraph/flowGraphMath";
 
 const AxisCacheName = "cachedOperationAxis";
 const AngleCacheName = "cachedOperationAngle";

packages/dev/core/src/FlowGraph/flowGraphMath.ts

@@ -0,0 +1,45 @@
+import type { IQuaternionLike } from "../Maths/math.like";
+import { Clamp } from "../Maths/math.scalar.functions";
+import { Quaternion, Vector3 } from "../Maths/math.vector";
+import { Vector3Dot, Vector4Dot } from "../Maths/math.vector.functions";
+import type { DeepImmutable } from "../types";
+
+// *** NOTE ***
+// These functions should ideally go in math.vector.functions.ts, but they require math.vector.ts to
+// be imported which is big. To avoid the larger bundle size, they are kept inside flow graph for now.
+
+/**
+ * Returns the angle in radians between two quaternions
+ * @param q1 defines the first quaternion
+ * @param q2 defines the second quaternion
+ * @returns the angle in radians between the two quaternions
+ */
+export function GetAngleBetweenQuaternions(q1: DeepImmutable<IQuaternionLike>, q2: DeepImmutable<IQuaternionLike>): number {
+    return Math.acos(Clamp(Vector4Dot(q1, q2), -1, 1)) * 2;
+}
+
+/**
+ * Creates a quaternion from two direction vectors
+ * @param a defines the first direction vector
+ * @param b defines the second direction vector
+ * @returns the target quaternion
+ */
+export function GetQuaternionFromDirections<T extends Vector3>(a: DeepImmutable<T>, b: DeepImmutable<T>): Quaternion {
+    const result = new Quaternion();
+    GetQuaternionFromDirectionsToRef(a, b, result);
+    return result;
+}
+
+/**
+ * Creates a quaternion from two direction vectors
+ * @param a defines the first direction vector
+ * @param b defines the second direction vector
+ * @param result defines the target quaternion
+ * @returns the target quaternion
+ */
+export function GetQuaternionFromDirectionsToRef<T extends Vector3, ResultT extends Quaternion>(a: DeepImmutable<T>, b: DeepImmutable<T>, result: ResultT): ResultT {
+    const axis = Vector3.Cross(a, b);
+    const angle = Math.acos(Clamp(Vector3Dot(a, b), -1, 1));
+    Quaternion.RotationAxisToRef(axis, angle, result);
+    return result;
+}

packages/dev/core/src/Maths/math.vector.functions.ts

@@ -1,7 +1,5 @@
-import { Clamp } from "./math.scalar.functions";
 import type { DeepImmutable } from "../types";
-import type { IQuaternionLike, IVector2Like, IVector3Like, IVector4Like } from "./math.like";
-import { Quaternion, Vector3 } from "./math.vector";
+import type { IVector2Like, IVector3Like, IVector4Like } from "./math.like";
 
 /**
  * Creates a string representation of the IVector2Like
@@ -170,39 +168,3 @@ export function Vector4Dot(a: DeepImmutable<IVector4Like>, b: DeepImmutable<IVec
 export function Vector4ToFixed(vector: DeepImmutable<IVector4Like>, decimalCount: number): string {
     return `{X: ${vector.x.toFixed(decimalCount)} Y: ${vector.y.toFixed(decimalCount)} Z: ${vector.z.toFixed(decimalCount)} W: ${vector.w.toFixed(decimalCount)}}`;
 }
-
-/**
- * Returns the angle in radians between two quaternions
- * @param q1 defines the first quaternion
- * @param q2 defines the second quaternion
- * @returns the angle in radians between the two quaternions
- */
-export function GetAngleBetweenQuaternions(q1: DeepImmutable<IQuaternionLike>, q2: DeepImmutable<IQuaternionLike>): number {
-    return Math.acos(Clamp(Vector4Dot(q1, q2))) * 2;
-}
-
-/**
- * Creates a quaternion from two direction vectors
- * @param a defines the first direction vector
- * @param b defines the second direction vector
- * @returns the target quaternion
- */
-export function GetQuaternionFromDirections<T extends Vector3>(a: DeepImmutable<T>, b: DeepImmutable<T>): Quaternion {
-    const result = new Quaternion();
-    GetQuaternionFromDirectionsToRef(a, b, result);
-    return result;
-}
-
-/**
- * Creates a quaternion from two direction vectors
- * @param a defines the first direction vector
- * @param b defines the second direction vector
- * @param result defines the target quaternion
- * @returns the target quaternion
- */
-export function GetQuaternionFromDirectionsToRef<T extends Vector3, ResultT extends Quaternion>(a: DeepImmutable<T>, b: DeepImmutable<T>, result: ResultT): ResultT {
-    const axis = Vector3.Cross(a, b);
-    const angle = Math.acos(Clamp(Vector3Dot(a, b), -1, 1));
-    Quaternion.RotationAxisToRef(axis, angle, result);
-    return result;
-}

packages/dev/loaders/test/unit/Interactivity/interactivity.math nodes.test.ts

@@ -4,13 +4,13 @@ import { NullEngine } from "core/Engines/nullEngine";
 import { PerformanceConfigurator } from "core/Engines/performanceConfigurator";
 import { FlowGraphCoordinator } from "core/FlowGraph/flowGraphCoordinator";
 import { FlowGraphAction } from "core/FlowGraph/flowGraphLogger";
+import { GetAngleBetweenQuaternions, GetQuaternionFromDirections } from "core/FlowGraph/flowGraphMath";
 import { ParseFlowGraphAsync } from "core/FlowGraph/flowGraphParser";
 import { Quaternion, Vector3 } from "core/Maths/math.vector";
 import { Logger } from "core/Misc/logger";
 import { Scene } from "core/scene";
 import { InteractivityGraphToFlowGraphParser } from "loaders/glTF/2.0/Extensions/KHR_interactivity/interactivityGraphParser";
 import { GetPathToObjectConverter } from "loaders/glTF/2.0/Extensions/objectModelMapping";
-import { GetAngleBetweenQuaternions, GetQuaternionFromDirections } from "../../../../core/src/Maths/math.vector.functions";
 
 const typesAndLengths: {
     [key: string]: number;