From 2351c65179f1e3f1f79bc848e4fbf4fb2b8de886 Mon Sep 17 00:00:00 2001
From: Max Richter <jim-x@web.de>
Date: Mon, 6 May 2024 01:38:59 +0200
Subject: [PATCH] fix: some small issues

---
 app/src/lib/result-viewer/Viewer.svelte       | 33 ++++++++-
 app/src/lib/result-viewer/geometryPool.ts     | 15 ++++
 nodes/max/plantarium/instance/src/input.json  |  7 ++
 nodes/max/plantarium/instance/src/lib.rs      | 69 ++++---------------
 .../src/worker-runtime-executor-backend.ts    |  2 +-
 5 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/app/src/lib/result-viewer/Viewer.svelte b/app/src/lib/result-viewer/Viewer.svelte
index b610c7a..61c591d 100644
--- a/app/src/lib/result-viewer/Viewer.svelte
+++ b/app/src/lib/result-viewer/Viewer.svelte
@@ -1,14 +1,43 @@
 <script lang="ts">
   import { Canvas } from "@threlte/core";
   import Scene from "./Scene.svelte";
-  import { Group, Vector3 } from "three";
+  import { Vector3 } from "three";
 
-  import { updateGeometries } from "./updateGeometries";
   import { decodeFloat, splitNestedArray } from "@nodes/utils";
   import type { PerformanceStore } from "@nodes/utils";
   import { AppSettings } from "$lib/settings/app-settings";
   import SmallPerformanceViewer from "$lib/performance/SmallPerformanceViewer.svelte";
 
+  import { MeshMatcapMaterial, TextureLoader, type Group } from "three";
+  import {
+    createGeometryPool,
+    createInstancedGeometryPool,
+  } from "./geometryPool";
+
+  const loader = new TextureLoader();
+  const matcap = loader.load("/matcap_green.jpg");
+  matcap.colorSpace = "srgb";
+  const material = new MeshMatcapMaterial({
+    color: 0xffffff,
+    matcap,
+  });
+
+  let geometryPool: ReturnType<typeof createGeometryPool>;
+  let instancePool: ReturnType<typeof createInstancedGeometryPool>;
+
+  export function updateGeometries(inputs: Int32Array[], group: Group) {
+    geometryPool = geometryPool || createGeometryPool(group, material);
+    instancePool = instancePool || createInstancedGeometryPool(group, material);
+
+    let meshes = geometryPool.update(inputs.filter((i) => i[0] === 1));
+    let faces = instancePool.update(inputs.filter((i) => i[0] === 2));
+
+    return {
+      totalFaces: meshes.totalFaces + faces.totalFaces,
+      totalVertices: meshes.totalVertices + faces.totalVertices,
+    };
+  }
+
   export let centerCamera: boolean = true;
   export let perf: PerformanceStore;
   export let scene: Group;
diff --git a/app/src/lib/result-viewer/geometryPool.ts b/app/src/lib/result-viewer/geometryPool.ts
index 273d912..f0eab68 100644
--- a/app/src/lib/result-viewer/geometryPool.ts
+++ b/app/src/lib/result-viewer/geometryPool.ts
@@ -24,6 +24,9 @@ export function createGeometryPool(parentScene: Group, material: Material) {
 
   let meshes: Mesh[] = [];
 
+  let totalVertices = 0;
+  let totalFaces = 0;
+
   function updateSingleGeometry(data: Int32Array, existingMesh: Mesh | null = null) {
 
     let hash = fastArrayHash(data);
@@ -34,7 +37,9 @@ export function createGeometryPool(parentScene: Group, material: Material) {
     // const geometryType = encodedData[index++];
     let index = 1;
     const vertexCount = data[index++];
+    totalVertices += vertexCount;
     const faceCount = data[index++];
+    totalFaces += faceCount;
 
     if (geometry.userData?.hash === hash) {
       return;
@@ -111,6 +116,8 @@ export function createGeometryPool(parentScene: Group, material: Material) {
     update(
       newData: Int32Array[],
     ) {
+      totalVertices = 0;
+      totalFaces = 0;
       for (let i = 0; i < Math.max(newData.length, meshes.length); i++) {
         const existingMesh = meshes[i];
         let input = newData[i];
@@ -121,6 +128,7 @@ export function createGeometryPool(parentScene: Group, material: Material) {
           scene.remove(existingMesh);
         }
       }
+      return { totalVertices, totalFaces };
     }
   }
 }
@@ -130,6 +138,8 @@ export function createInstancedGeometryPool(parentScene: Group, material: Materi
   parentScene.add(scene);
 
   const instances: InstancedMesh[] = [];
+  let totalVertices = 0;
+  let totalFaces = 0;
 
   function updateSingleInstance(data: Int32Array, existingInstance: InstancedMesh | null = null) {
 
@@ -144,6 +154,8 @@ export function createInstancedGeometryPool(parentScene: Group, material: Materi
     const faceCount = data[index++];
     const instanceCount = data[index++];
     const stemDepth = data[index++];
+    totalVertices += vertexCount * instanceCount;
+    totalFaces += faceCount * instanceCount;
 
     // Indices
     const indicesEnd = index + faceCount * 3;
@@ -237,6 +249,8 @@ export function createInstancedGeometryPool(parentScene: Group, material: Materi
     update(
       newData: Int32Array[],
     ) {
+      totalVertices = 0;
+      totalFaces = 0;
       for (let i = 0; i < Math.max(newData.length, instances.length); i++) {
         const existingMesh = instances[i];
         let input = newData[i];
@@ -247,6 +261,7 @@ export function createInstancedGeometryPool(parentScene: Group, material: Materi
           scene.remove(existingMesh);
         }
       }
+      return { totalVertices, totalFaces };
     }
   }
 }
diff --git a/nodes/max/plantarium/instance/src/input.json b/nodes/max/plantarium/instance/src/input.json
index f82b1a1..6447c51 100644
--- a/nodes/max/plantarium/instance/src/input.json
+++ b/nodes/max/plantarium/instance/src/input.json
@@ -27,6 +27,13 @@
       "max":1,
       "value":1,
       "hidden": true
+    },
+    "depth": {
+      "type":"integer",
+      "min": 1,
+      "max":10,
+      "value": 1,
+      "hidden": true
     }
   }
 }
diff --git a/nodes/max/plantarium/instance/src/lib.rs b/nodes/max/plantarium/instance/src/lib.rs
index d482bee..3b7891c 100644
--- a/nodes/max/plantarium/instance/src/lib.rs
+++ b/nodes/max/plantarium/instance/src/lib.rs
@@ -11,59 +11,6 @@ use wasm_bindgen::prelude::*;
 
 include_definition_file!("src/input.json");
 
-#[rustfmt::skip]
-fn create_geo() -> Vec<i32> {
-    let size = 5.0;
-
-    let p = encode_float(size);
-    let n = encode_float(-size);
-
-    // [[1,3, x, y, z, x, y,z,x,y,z]];
-    wrap_arg(calculate_normals(&mut [
-        1,  // 1: geometry
-        8,  // 8 vertices
-        12, // 12 faces
-        /*
-        Indeces:
-        5----6
-        | 4--+-7
-        0-|--1 |
-          3----2
-
-        */
-        // this are the indeces for the face
-        0, 1, 2, 
-        0, 2, 3, 
-        0, 3, 4, 
-        4, 5, 0, 
-        6, 1, 0, 
-        5, 6, 0, 
-        7, 2, 1, 
-        6, 7, 1, 
-        2, 7, 3, 
-        3, 7, 4, 
-        7, 6, 4, 
-        4, 6, 5, // Bottom plate
-        p, n, n, 
-        p, n, p, 
-        n, n, p, 
-        n, n, n, // Top Plate
-        n, p, n, 
-        p, p, n, 
-        p, p, p, 
-        n, p, p, // this is the normal for every single vert 1065353216 == 1.0f encoded is i32
-        0, 0, 0, 
-        0, 0, 0, 
-        0, 0, 0, 
-        0, 0, 0, 
-        0, 0, 0, 
-        0, 0, 0, 
-        0, 0, 0, 
-        0, 0, 0,
-    ]))
-
-}
-
 #[wasm_bindgen]
 pub fn execute(input: &[i32]) -> Vec<i32> {
     set_panic_hook();
@@ -77,7 +24,21 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
 
     let mut transforms: Vec<Mat4> = Vec::new();
 
+    let mut max_depth = 0;
     for path_data in inputs.iter() {
+        if path_data[2] != 0 {
+            continue;
+        }
+        max_depth = max_depth.max(path_data[3]);
+    }
+
+    let depth = evaluate_int(args[5]);
+
+    for path_data in inputs.iter() {
+        if path_data[3] < (max_depth - depth + 1) {
+            continue;
+        }
+
         let amount = evaluate_int(args[2]);
 
         let lowest_instance = evaluate_float(args[3]);
@@ -93,7 +54,7 @@ pub fn execute(input: &[i32]) -> Vec<i32> {
             let direction = path.get_direction_at(alpha);
 
             let transform = Mat4::from_scale_rotation_translation(
-                Vec3::new(0.1, 0.1, 0.1),
+                Vec3::new(point[3], point[3], point[3]),
                 Quat::from_xyzw(direction[0], direction[1], direction[2], 1.0).normalize(),
                 Vec3::from_slice(&point),
             );
diff --git a/packages/runtime/src/worker-runtime-executor-backend.ts b/packages/runtime/src/worker-runtime-executor-backend.ts
index a8c0cb9..650323a 100644
--- a/packages/runtime/src/worker-runtime-executor-backend.ts
+++ b/packages/runtime/src/worker-runtime-executor-backend.ts
@@ -10,7 +10,7 @@ const nodeRegistry = new RemoteNodeRegistry("");
 nodeRegistry.cache = indexDbCache;
 const executor = new MemoryRuntimeExecutor(nodeRegistry, cache);
 
-const performanceStore = createPerformanceStore("worker");
+const performanceStore = createPerformanceStore();
 executor.perf = performanceStore;
 
 export async function executeGraph(graph: Graph, settings: Record<string, unknown>): Promise<Int32Array> {