Frame graph (BabylonJS#15735)

alekop · Nov 4, 2024 · 317ce31 · 317ce31
1 parent eff57de
commit 317ce31
Show file tree

Hide file tree

Showing 248 changed files with 18,637 additions and 1,402 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -206,16 +206,30 @@
             "type": "msedge",
             "request": "launch",
             "name": "Node Geometry Editor development (Edge)",
-            "url": "http://localhost:1340",
+            "url": "http://localhost:1343",
             "preLaunchTask": "Node Geometry Editor Serve (Dev)"
         },
         {
             "type": "chrome",
             "request": "launch",
             "name": "Node Geometry Editor development (Chrome)",
-            "url": "http://localhost:1340",
+            "url": "http://localhost:1343",
             "preLaunchTask": "Node Geometry Editor Serve (Dev)"
         },
+        {
+            "type": "msedge",
+            "request": "launch",
+            "name": "Node Render Graph Editor development (Edge)",
+            "url": "http://localhost:1344",
+            "preLaunchTask": "Node Render Graph Editor Serve (Dev)"
+        },
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Node Render Graph Editor development (Chrome)",
+            "url": "http://localhost:1344",
+            "preLaunchTask": "Node Render Graph Editor Serve (Dev)"
+        },
         {
             /*
             Launch the playground to be use to test changes in dev packages
@@ -243,7 +257,7 @@
             "type": "msedge",
             "request": "launch",
             "name": "Launch Node Geometry Editor (Edge)",
-            "url": "http://localhost:1340",
+            "url": "http://localhost:1343",
             "preLaunchTask": "Node Geometry Editor Serve for core (Dev)"
         },
         {
@@ -253,9 +267,23 @@
             "type": "chrome",
             "request": "launch",
             "name": "Launch Node Geometry Editor (Chrome)",
-            "url": "http://localhost:1340",
+            "url": "http://localhost:1343",
             "preLaunchTask": "Node Geometry Editor Serve for core (Dev)"
         },
+        {
+            "type": "msedge",
+            "request": "launch",
+            "name": "Launch Node Render Graph Editor (Edge)",
+            "url": "http://localhost:1344",
+            "preLaunchTask": "Node Render Graph Editor Serve for core (Dev)"
+        },
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Node Render Graph Editor (Chrome)",
+            "url": "http://localhost:1344",
+            "preLaunchTask": "Node Render Graph Editor Serve for core (Dev)"
+        },
         {
             "type": "msedge",
             "request": "launch",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -431,6 +431,42 @@
             },
             "problemMatcher": ["$ts-webpack-watch", "$tslint-webpack-watch"]
         },
+        {
+            "label": "Node Render Graph Editor Serve for core (Dev)",
+            "type": "shell",
+            "command": "npm",
+            "dependsOn": "CDN Serve and watch (Dev)",
+            "runOptions": {
+                "instanceLimit": 1
+            },
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "args": ["run", "serve", "-w", "@tools/node-render-graph-editor"],
+            "isBackground": true,
+            "presentation": {
+                "group": "serve"
+            },
+            "problemMatcher": ["$ts-webpack-watch", "$tslint-webpack-watch"]
+        },
+        {
+            "label": "Node Render Graph Editor Serve (Dev)",
+            "type": "shell",
+            "command": "npm",
+            "dependsOn": "CDN Serve and watch (Dev)",
+            "runOptions": {
+                "instanceLimit": 1
+            },
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "args": ["run", "serve", "-w", "@tools/node-render-graph-editor"],
+            "isBackground": true,
+            "presentation": {
+                "group": "serve"
+            },
+            "problemMatcher": ["$ts-webpack-watch", "$tslint-webpack-watch"]
+        },
         {
             "label": "VSM Serve for core (Dev)",
             "type": "shell",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -65,8 +65,8 @@
         "build:lts": "npm run build:assets && npm run build:source:lts",
         "build:source": "tsc -b ./tsconfig.devpackages.json",
         "build:source:lts": "npx nx run-many --target=compile --projects=@lts/core,@lts/gui,@lts/loaders,@lts/materials,@lts/post-processes,@lts/procedural-textures,@lts/serializers --parallel=1",
-        "build:umd": "nx run-many --target=build --parallel --maxParallel=6 --projects=babylonjs,babylonjs-gui,babylonjs-inspector,babylonjs-loaders,babylonjs-materials,babylonjs-serializers,babylonjs-post-process,babylonjs-procedural-textures,babylonjs-node-editor,babylonjs-node-geometry-editor,babylonjs-gui-editor,babylonjs-ktx2decoder,babylonjs-viewer-assets,babylonjs-viewer,babylonjs-accessibility",
-        "build:es6": "nx run-many --target=build --parallel --maxParallel=6 --projects=@babylonjs/core,@babylonjs/gui,@babylonjs/loaders,@babylonjs/materials,@babylonjs/serializers,@babylonjs/post-processes,@babylonjs/procedural-textures,@babylonjs/node-editor,@babylonjs/node-geometry-editor,@babylonjs/inspector,@babylonjs/gui-editor,@babylonjs/viewer,@babylonjs/viewer-alpha,@babylonjs/shared-ui-components,@babylonjs/accessibility,@babylonjs/ktx2decoder",
+        "build:umd": "nx run-many --target=build --parallel --maxParallel=6 --projects=babylonjs,babylonjs-gui,babylonjs-inspector,babylonjs-loaders,babylonjs-materials,babylonjs-serializers,babylonjs-post-process,babylonjs-procedural-textures,babylonjs-node-editor,babylonjs-node-geometry-editor,babylonjs-node-render-graph-editor,babylonjs-gui-editor,babylonjs-ktx2decoder,babylonjs-viewer-assets,babylonjs-viewer,babylonjs-accessibility",
+        "build:es6": "nx run-many --target=build --parallel --maxParallel=6 --projects=@babylonjs/core,@babylonjs/gui,@babylonjs/loaders,@babylonjs/materials,@babylonjs/serializers,@babylonjs/post-processes,@babylonjs/procedural-textures,@babylonjs/node-editor,@babylonjs/node-geometry-editor,@babylonjs/node-render-graph-editor,@babylonjs/inspector,@babylonjs/gui-editor,@babylonjs/viewer,@babylonjs/viewer-alpha,@babylonjs/shared-ui-components,@babylonjs/accessibility,@babylonjs/ktx2decoder",
         "watch:shaders": "build-tools -c build-shaders --global --watch",
         "watch:assets": "build-tools -c pa --global --watch",
         "watch:source:dev": "tsc -b ./tsconfig.devpackages.json -w",

diff --git a/packages/dev/buildTools/src/packageMapping.ts b/packages/dev/buildTools/src/packageMapping.ts
@@ -15,6 +15,7 @@ export type DevPackageName =
     | "procedural-textures"
     | "node-editor"
     | "node-geometry-editor"
+    | "node-render-graph-editor"
     | "gui-editor"
     | "accessibility"
     | "viewer"
@@ -31,6 +32,7 @@ export type UMDPackageName =
     | "babylonjs-inspector"
     | "babylonjs-node-editor"
     | "babylonjs-node-geometry-editor"
+    | "babylonjs-node-render-graph-editor"
     | "babylonjs-gui-editor"
     | "babylonjs-accessibility"
     | "babylonjs-viewer"
@@ -48,6 +50,7 @@ export type NamespacePackageName =
     | "BABYLON.Debug"
     | "BABYLON.NodeEditor"
     | "BABYLON.NodeGeometryEditor"
+    | "BABYLON.NodeRenderGraphEditor"
     | "BABYLON.GuiEditor"
     | "BABYLON.Accessibility"
     | "INSPECTOR"
@@ -57,6 +60,7 @@ export type NamespacePackageName =
     | "BABYLON.SharedUIComponents"
     | "BABYLON.NodeEditor.SharedUIComponents"
     | "BABYLON.NodeGeometryEditor.SharedUIComponents"
+    | "BABYLON.NodeRenderGraphEditor.SharedUIComponents"
     | "BABYLON.GuiEditor.SharedUIComponents";
 export type ES6PackageName =
     | "@babylonjs/core"
@@ -68,6 +72,7 @@ export type ES6PackageName =
     | "@babylonjs/inspector"
     | "@babylonjs/node-editor"
     | "@babylonjs/node-geometry-editor"
+    | "@babylonjs/node-render-graph-editor"
     | "@babylonjs/gui-editor"
     | "@babylonjs/accessibility"
     | "@babylonjs/post-processes"
@@ -114,6 +119,10 @@ export const umdPackageMapping: { [key in UMDPackageName]: { baseDir: string; ba
         baseDir: "nodeGeometryEditor",
         baseFilename: "babylon.nodeGeometryEditor",
     },
+    "babylonjs-node-render-graph-editor": {
+        baseDir: "nodeRenderGraphEditor",
+        baseFilename: "babylon.nodeRenderGraphEditor",
+    },
     "babylonjs-gui-editor": {
         baseDir: "guiEditor",
         baseFilename: "babylon.guiEditor",
@@ -175,6 +184,12 @@ const packageMapping: {
             // }
             return "babylonjs-node-geometry-editor";
         },
+        "node-render-graph-editor": (_filePath?: string) => {
+            // if (filePath && filePath.indexOf("sharedUiComponents") !== -1) {
+            //     return "babylonjs-shared-ui-components";
+            // }
+            return "babylonjs-node-render-graph-editor";
+        },
         "gui-editor": (_filePath?: string) => {
             // if (filePath && filePath.indexOf("sharedUiComponents") !== -1) {
             //     return "babylonjs-shared-ui-components";
@@ -198,6 +213,7 @@ const packageMapping: {
         inspector: "@babylonjs/inspector",
         "node-editor": "@babylonjs/node-editor",
         "node-geometry-editor": "@babylonjs/node-geometry-editor",
+        "node-render-graph-editor": "@babylonjs/node-render-graph-editor",
         "gui-editor": "@babylonjs/gui-editor",
         accessibility: "@babylonjs/accessibility",
         "post-processes": "@babylonjs/post-processes",
@@ -216,6 +232,7 @@ const packageMapping: {
         inspector: "@babylonjs/esm",
         "node-editor": "@babylonjs/esm",
         "node-geometry-editor": "@babylonjs/esm",
+        "node-render-graph-editor": "@babylonjs/esm",
         "gui-editor": "@babylonjs/esm",
         accessibility: "@babylonjs/accessibility",
         "post-processes": "@babylonjs/esm",
@@ -296,6 +313,17 @@ const packageMapping: {
             }
             return "BABYLON.NodeGeometryEditor";
         },
+        "node-render-graph-editor": (filePath?: string) => {
+            if (filePath) {
+                if (filePath.includes("shared-ui-components/") || filePath.includes("/sharedUiComponents/")) {
+                    // was .endsWith
+                    return "BABYLON.NodeRenderGraphEditor.SharedUIComponents";
+                } else if (filePath.includes("babylonjs-gltf2interface")) {
+                    return "BABYLON.GLTF2";
+                }
+            }
+            return "BABYLON.NodeRenderGraphEditor";
+        },
         "gui-editor": (filePath?: string) => {
             if (filePath) {
                 if (filePath.includes("shared-ui-components/") || filePath.includes("/sharedUiComponents/")) {

diff --git a/packages/dev/core/src/Cameras/camera.ts b/packages/dev/core/src/Cameras/camera.ts
@@ -439,7 +439,8 @@ export class Camera extends Node {
     public _computedViewMatrix = Matrix.Identity();
     private _doNotComputeProjectionMatrix = false;
     private _transformMatrix = Matrix.Zero();
-    private _frustumPlanes: Plane[];
+    /** @internal */
+    public _frustumPlanes: Plane[];
     private _refreshFrustumPlanes = true;
     private _storedFov: number;
     private _stateStored: boolean;
@@ -1061,7 +1062,8 @@ export class Camera extends Node {
         return (arcRotateCamera.radius || (targetCamera.target ? Vector3.Distance(this.position, targetCamera.target) : this.position.length())) + offset;
     }
 
-    private _updateFrustumPlanes(): void {
+    /** @internal */
+    public _updateFrustumPlanes(): void {
         if (!this._refreshFrustumPlanes) {
             return;
         }

diff --git a/packages/dev/core/src/Decorators/nodeDecorator.ts b/packages/dev/core/src/Decorators/nodeDecorator.ts
@@ -15,6 +15,14 @@ export const enum PropertyTypeForEdition {
     Vector2,
     /** property is a list of values */
     List,
+    /** property is a Color4 */
+    Color4,
+    /** property (int) should be edited as a combo box with a list of sampling modes */
+    SamplingMode,
+    /** property (int) should be edited as a combo box with a list of texture formats */
+    TextureFormat,
+    /** property (int) should be edited as a combo box with a list of texture types */
+    TextureType,
 }
 
 /**