@lv-x-software-house/x_view 1.2.8-dev.15 → 1.2.8-dev.17

package/dist/index.js

@@ -1378,7 +1378,12 @@ var userActionHandlers = {
           )
         );
         targetFinalPositions.push(endPosition);
-        const targetMesh = createNodeMesh(nodeData, startPosition, glowTexture);
+        const targetMesh = createNodeMesh(
+          nodeData,
+          startPosition,
+          glowTexture,
+          !!nodeData.is_quest
+        );
         targetMesh.scale.set(0.01, 0.01, 0.01);
         graphGroup.add(targetMesh);
         if (targetMesh.userData.labelObject) {
@@ -16174,11 +16179,19 @@ function XViewScene({
       }
     }
     Object.values(nodeObjects).forEach((mesh) => {
-      const oldLabel = mesh.getObjectByName("timelineLabel");
-      if (oldLabel) {
-        mesh.remove(oldLabel);
-        if (oldLabel.material.map) oldLabel.material.map.dispose();
-        oldLabel.material.dispose();
+      const oldTimelineLabel = mesh.getObjectByName("timelineLabel");
+      if (oldTimelineLabel) {
+        mesh.remove(oldTimelineLabel);
+        if (oldTimelineLabel.material.map)
+          oldTimelineLabel.material.map.dispose();
+        oldTimelineLabel.material.dispose();
+      }
+      const oldQuestDateLabel = mesh.getObjectByName("questDateLabel");
+      if (oldQuestDateLabel) {
+        mesh.remove(oldQuestDateLabel);
+        if (oldQuestDateLabel.material.map)
+          oldQuestDateLabel.material.map.dispose();
+        oldQuestDateLabel.material.dispose();
       }
       delete mesh.userData.timelineIntervalBar;
       delete mesh.userData.timelineEndLabel;
@@ -16239,10 +16252,10 @@ function XViewScene({
       timelineNodes.push(nodeInfo);
     });
     if (timelineNodes.length === 0) return;
-    const sortedTimePoints = Array.from(allTimePoints).sort((a, b) => a - b);
-    const maxTimeIndex = sortedTimePoints.length - 1;
+    const sortedTimePoints2 = Array.from(allTimePoints).sort((a, b) => a - b);
+    const maxTimeIndex = sortedTimePoints2.length - 1;
     const timeToYMap = new Map(
-      sortedTimePoints.map((time, index) => [
+      sortedTimePoints2.map((time, index) => [
         time,
         (index - maxTimeIndex) * TIMELINE_LAYER_SPACING_Y
       ])
@@ -16400,11 +16413,11 @@ function XViewScene({
       }
     });
     if (timelineNodes.length === 0) return;
-    const sortedTimePoints = Array.from(allTimePoints).sort((a, b) => a - b);
+    const maxTimeIndex = sortedTimePoints.length - 1;
     const timeToYMap = new Map(
       sortedTimePoints.map((time, index) => [
         time,
-        index * TIMELINE_LAYER_SPACING_Y
+        (index - maxTimeIndex) * TIMELINE_LAYER_SPACING_Y
       ])
     );
     timelineNodes.sort(
@@ -16412,18 +16425,36 @@ function XViewScene({
     );
     const baseX = sourceMesh.position.x + TIMELINE_NODE_SPACING_X;
     const baseY = sourceMesh.position.y;
-    const maxNodeIndex = timelineNodes.length - 1;
-    timelineNodes.forEach((node, index) => {
+    const columns = [];
+    timelineNodes.forEach((node) => {
       const { mesh, type, startDate, endDate, label } = node;
-      const y = baseY + (index - maxNodeIndex) * TIMELINE_LAYER_SPACING_Y;
-      const versionTween = new import_tween2.Tween(mesh.position).to({ x: baseX, y, z: 0 }, 1500).easing(import_tween2.Easing.Cubic.InOut);
+      const startY = timeToYMap.get(startDate.getTime());
+      const endY = timeToYMap.get(endDate.getTime()) || startY;
+      let foundColumn = false;
+      for (let i = 0; i < columns.length; i++) {
+        if (columns[i].endY < startY) {
+          node.columnIndex = i;
+          columns[i].endY = endY;
+          foundColumn = true;
+          break;
+        }
+      }
+      if (!foundColumn) {
+        node.columnIndex = columns.length;
+        columns.push({ endY });
+      }
+      const x = baseX + node.columnIndex * TIMELINE_NODE_SPACING_X;
+      const y = baseY + startY;
+      const versionTween = new import_tween2.Tween(mesh.position).to({ x, y, z: 0 }, 1500).easing(import_tween2.Easing.Cubic.InOut);
       tweenGroup.add(versionTween);
       versionTween.start();
-      const startLabelText = type === "interval" ? startDate.getFullYear().toString() : label;
-      const startLabel = createTextSprite(startLabelText, 48);
-      startLabel.name = "timelineLabel";
-      startLabel.position.set(0, -2.5, 0);
-      mesh.add(startLabel);
+      if (!mesh.getObjectByName("questDateLabel")) {
+        const startLabelText = type === "interval" ? startDate.getFullYear().toString() : label;
+        const startLabel = createTextSprite(startLabelText, 48);
+        startLabel.name = "timelineLabel";
+        startLabel.position.set(0, -2.5, 0);
+        mesh.add(startLabel);
+      }
       if (type === "interval") {
         const relativeEndY = timeToYMap.get(endDate.getTime()) - timeToYMap.get(startDate.getTime());
         if (relativeEndY > 0) {
@@ -16782,11 +16813,11 @@ function XViewScene({
           }
         }
       });
-      const sortedTimePoints = Array.from(allActiveTimePoints).sort(
+      const sortedTimePoints2 = Array.from(allActiveTimePoints).sort(
         (a, b) => a - b
       );
       const timeToYMap = /* @__PURE__ */ new Map();
-      sortedTimePoints.forEach((ms, idx) => {
+      sortedTimePoints2.forEach((ms, idx) => {
         timeToYMap.set(ms, idx * TIMELINE_LAYER_SPACING_Y);
       });
       const startX = -((QUEST_STATUS_ORDER.length - 1) * QUEST_LENS_COLUMN_SPACING) / 2;
@@ -16805,7 +16836,7 @@ function XViewScene({
           if (!timeInfo.isUndated) {
             nodeY = timeToYMap.get(timeInfo.startDate.getTime());
           } else {
-            const undatedOffset = sortedTimePoints.length > 0 ? sortedTimePoints.length * 5 : 0;
+            const undatedOffset = sortedTimePoints2.length > 0 ? sortedTimePoints2.length * 5 : 0;
             nodeY = -40 - rowIndex * QUEST_LENS_ROW_SPACING - undatedOffset;
           }
           const posKey = `${statusName}_${nodeY}`;
@@ -16888,7 +16919,7 @@ function XViewScene({
           if (!timeInfo.isUndated) {
             targetY = timeToYMap.get(timeInfo.startDate.getTime());
           } else {
-            const undatedOffset = sortedTimePoints.length > 0 ? sortedTimePoints.length * 5 : 0;
+            const undatedOffset = sortedTimePoints2.length > 0 ? sortedTimePoints2.length * 5 : 0;
             targetY = -40 - rowIndex * QUEST_LENS_ROW_SPACING - undatedOffset;
           }
           const posKey = `${statusName}_${targetY}`;

package/dist/index.mjs

@@ -1339,7 +1339,12 @@ var userActionHandlers = {
           )
         );
         targetFinalPositions.push(endPosition);
-        const targetMesh = createNodeMesh(nodeData, startPosition, glowTexture);
+        const targetMesh = createNodeMesh(
+          nodeData,
+          startPosition,
+          glowTexture,
+          !!nodeData.is_quest
+        );
         targetMesh.scale.set(0.01, 0.01, 0.01);
         graphGroup.add(targetMesh);
         if (targetMesh.userData.labelObject) {
@@ -16237,11 +16242,19 @@ function XViewScene({
       }
     }
     Object.values(nodeObjects).forEach((mesh) => {
-      const oldLabel = mesh.getObjectByName("timelineLabel");
-      if (oldLabel) {
-        mesh.remove(oldLabel);
-        if (oldLabel.material.map) oldLabel.material.map.dispose();
-        oldLabel.material.dispose();
+      const oldTimelineLabel = mesh.getObjectByName("timelineLabel");
+      if (oldTimelineLabel) {
+        mesh.remove(oldTimelineLabel);
+        if (oldTimelineLabel.material.map)
+          oldTimelineLabel.material.map.dispose();
+        oldTimelineLabel.material.dispose();
+      }
+      const oldQuestDateLabel = mesh.getObjectByName("questDateLabel");
+      if (oldQuestDateLabel) {
+        mesh.remove(oldQuestDateLabel);
+        if (oldQuestDateLabel.material.map)
+          oldQuestDateLabel.material.map.dispose();
+        oldQuestDateLabel.material.dispose();
       }
       delete mesh.userData.timelineIntervalBar;
       delete mesh.userData.timelineEndLabel;
@@ -16302,10 +16315,10 @@ function XViewScene({
       timelineNodes.push(nodeInfo);
     });
     if (timelineNodes.length === 0) return;
-    const sortedTimePoints = Array.from(allTimePoints).sort((a, b) => a - b);
-    const maxTimeIndex = sortedTimePoints.length - 1;
+    const sortedTimePoints2 = Array.from(allTimePoints).sort((a, b) => a - b);
+    const maxTimeIndex = sortedTimePoints2.length - 1;
     const timeToYMap = new Map(
-      sortedTimePoints.map((time, index) => [
+      sortedTimePoints2.map((time, index) => [
         time,
         (index - maxTimeIndex) * TIMELINE_LAYER_SPACING_Y
       ])
@@ -16463,11 +16476,11 @@ function XViewScene({
       }
     });
     if (timelineNodes.length === 0) return;
-    const sortedTimePoints = Array.from(allTimePoints).sort((a, b) => a - b);
+    const maxTimeIndex = sortedTimePoints.length - 1;
     const timeToYMap = new Map(
       sortedTimePoints.map((time, index) => [
         time,
-        index * TIMELINE_LAYER_SPACING_Y
+        (index - maxTimeIndex) * TIMELINE_LAYER_SPACING_Y
       ])
     );
     timelineNodes.sort(
@@ -16475,18 +16488,36 @@ function XViewScene({
     );
     const baseX = sourceMesh.position.x + TIMELINE_NODE_SPACING_X;
     const baseY = sourceMesh.position.y;
-    const maxNodeIndex = timelineNodes.length - 1;
-    timelineNodes.forEach((node, index) => {
+    const columns = [];
+    timelineNodes.forEach((node) => {
       const { mesh, type, startDate, endDate, label } = node;
-      const y = baseY + (index - maxNodeIndex) * TIMELINE_LAYER_SPACING_Y;
-      const versionTween = new Tween2(mesh.position).to({ x: baseX, y, z: 0 }, 1500).easing(Easing2.Cubic.InOut);
+      const startY = timeToYMap.get(startDate.getTime());
+      const endY = timeToYMap.get(endDate.getTime()) || startY;
+      let foundColumn = false;
+      for (let i = 0; i < columns.length; i++) {
+        if (columns[i].endY < startY) {
+          node.columnIndex = i;
+          columns[i].endY = endY;
+          foundColumn = true;
+          break;
+        }
+      }
+      if (!foundColumn) {
+        node.columnIndex = columns.length;
+        columns.push({ endY });
+      }
+      const x = baseX + node.columnIndex * TIMELINE_NODE_SPACING_X;
+      const y = baseY + startY;
+      const versionTween = new Tween2(mesh.position).to({ x, y, z: 0 }, 1500).easing(Easing2.Cubic.InOut);
       tweenGroup.add(versionTween);
       versionTween.start();
-      const startLabelText = type === "interval" ? startDate.getFullYear().toString() : label;
-      const startLabel = createTextSprite(startLabelText, 48);
-      startLabel.name = "timelineLabel";
-      startLabel.position.set(0, -2.5, 0);
-      mesh.add(startLabel);
+      if (!mesh.getObjectByName("questDateLabel")) {
+        const startLabelText = type === "interval" ? startDate.getFullYear().toString() : label;
+        const startLabel = createTextSprite(startLabelText, 48);
+        startLabel.name = "timelineLabel";
+        startLabel.position.set(0, -2.5, 0);
+        mesh.add(startLabel);
+      }
       if (type === "interval") {
         const relativeEndY = timeToYMap.get(endDate.getTime()) - timeToYMap.get(startDate.getTime());
         if (relativeEndY > 0) {
@@ -16845,11 +16876,11 @@ function XViewScene({
           }
         }
       });
-      const sortedTimePoints = Array.from(allActiveTimePoints).sort(
+      const sortedTimePoints2 = Array.from(allActiveTimePoints).sort(
         (a, b) => a - b
       );
       const timeToYMap = /* @__PURE__ */ new Map();
-      sortedTimePoints.forEach((ms, idx) => {
+      sortedTimePoints2.forEach((ms, idx) => {
         timeToYMap.set(ms, idx * TIMELINE_LAYER_SPACING_Y);
       });
       const startX = -((QUEST_STATUS_ORDER.length - 1) * QUEST_LENS_COLUMN_SPACING) / 2;
@@ -16868,7 +16899,7 @@ function XViewScene({
           if (!timeInfo.isUndated) {
             nodeY = timeToYMap.get(timeInfo.startDate.getTime());
           } else {
-            const undatedOffset = sortedTimePoints.length > 0 ? sortedTimePoints.length * 5 : 0;
+            const undatedOffset = sortedTimePoints2.length > 0 ? sortedTimePoints2.length * 5 : 0;
             nodeY = -40 - rowIndex * QUEST_LENS_ROW_SPACING - undatedOffset;
           }
           const posKey = `${statusName}_${nodeY}`;
@@ -16951,7 +16982,7 @@ function XViewScene({
           if (!timeInfo.isUndated) {
             targetY = timeToYMap.get(timeInfo.startDate.getTime());
           } else {
-            const undatedOffset = sortedTimePoints.length > 0 ? sortedTimePoints.length * 5 : 0;
+            const undatedOffset = sortedTimePoints2.length > 0 ? sortedTimePoints2.length * 5 : 0;
             targetY = -40 - rowIndex * QUEST_LENS_ROW_SPACING - undatedOffset;
           }
           const posKey = `${statusName}_${targetY}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lv-x-software-house/x_view",
-  "version": "1.2.8-dev.15",
+  "version": "1.2.8-dev.17",
   "description": "Pacote privado contendo os componentes e lógica de renderização 3D do X View.",
   "author": "iv.x - Engenharia de Software - ivxsoftwarehouse@gmail.com",
   "license": "UNLICENSED",