stpete2 commited on
Commit
1e6f719
·
verified ·
1 Parent(s): 50a4594

Upload preprocess_manual.js

Browse files
Files changed (1) hide show
  1. preprocess_manual.js +32 -20
preprocess_manual.js CHANGED
@@ -528,6 +528,11 @@ function createManualUI(scene, camera, renderer) {
528
  // Line 527-742 を置き換え
529
  // ========================================
530
 
 
 
 
 
 
531
  function filterSplatsByBox(plyData, boxSize, boxPosition, boxRotation = { x: 0, y: 0, z: 0 }) {
532
  console.log('[filterSplatsByBox] ===== FILTERING START =====');
533
  console.log('[filterSplatsByBox] Input parameters:');
@@ -546,7 +551,11 @@ function filterSplatsByBox(plyData, boxSize, boxPosition, boxRotation = { x: 0,
546
  const halfY = boxSize.y / 2;
547
  const halfZ = boxSize.z / 2;
548
 
 
 
 
549
  console.log('[filterSplatsByBox] Box half-extents:', { halfX, halfY, halfZ });
 
550
 
551
  // 回転行列の作成と逆行列
552
  const rotationMatrix = new THREE.Matrix4();
@@ -570,9 +579,9 @@ function filterSplatsByBox(plyData, boxSize, boxPosition, boxRotation = { x: 0,
570
  localPos.applyMatrix4(inverseRotationMatrix);
571
 
572
  const inside = (
573
- localPos.x >= -(halfX + 0.0001) && localPos.x <= (halfX + 0.0001) &&
574
- localPos.y >= -(halfY + 0.0001) && localPos.y <= (halfY + 0.0001) &&
575
- localPos.z >= -(halfZ + 0.0001) && localPos.z <= (halfZ + 0.0001)
576
  );
577
 
578
  if (inside) {
@@ -624,15 +633,26 @@ function filterSplatsByBox(plyData, boxSize, boxPosition, boxRotation = { x: 0,
624
  localPos.applyMatrix4(inverseRotationMatrix);
625
 
626
  const inside = (
627
- localPos.x >= -(halfX + 0.0001) && localPos.x <= (halfX + 0.0001) &&
628
- localPos.y >= -(halfY + 0.0001) && localPos.y <= (halfY + 0.0001) &&
629
- localPos.z >= -(halfZ + 0.0001) && localPos.z <= (halfZ + 0.0001)
630
  );
631
 
 
 
 
 
 
632
  console.log(` Vertex ${i}:`, {
633
  world: { x: v.x.toFixed(3), y: v.y.toFixed(3), z: v.z.toFixed(3) },
634
  local: { x: localPos.x.toFixed(3), y: localPos.y.toFixed(3), z: localPos.z.toFixed(3) },
635
- inside: inside
 
 
 
 
 
 
636
  });
637
  }
638
 
@@ -647,9 +667,9 @@ function filterSplatsByBox(plyData, boxSize, boxPosition, boxRotation = { x: 0,
647
  localPos.applyMatrix4(inverseRotationMatrix);
648
 
649
  const inside = (
650
- localPos.x >= -(halfX + 0.0001) && localPos.x <= (halfX + 0.0001) &&
651
- localPos.y >= -(halfY + 0.0001) && localPos.y <= (halfY + 0.0001) &&
652
- localPos.z >= -(halfZ + 0.0001) && localPos.z <= (halfZ + 0.0001)
653
  );
654
 
655
  return inside;
@@ -687,15 +707,7 @@ function filterSplatsByBox(plyData, boxSize, boxPosition, boxRotation = { x: 0,
687
  z: ((minZ + maxZ) / 2).toFixed(3)
688
  });
689
 
690
- // 回転がない場合のみ期待値を計算
691
- const hasRotation = Math.abs(boxRotation.x) > 0.01 ||
692
- Math.abs(boxRotation.y) > 0.01 ||
693
- Math.abs(boxRotation.z) > 0.01;
694
-
695
- if (hasRotation) {
696
- console.log('[filterSplatsByBox] ℹ️ Box is rotated - Expected bounds check skipped');
697
- console.log('[filterSplatsByBox] Filtered bounds above show actual world-space result');
698
- }
699
  }
700
 
701
  // 警告
@@ -706,7 +718,7 @@ function filterSplatsByBox(plyData, boxSize, boxPosition, boxRotation = { x: 0,
706
 
707
  if (filteredVertices.length === 0) {
708
  console.error('[filterSplatsByBox] ❌ ERROR: No vertices passed the filter!');
709
- console.error('[filterSplatsByBox] Check box position and size');
710
  }
711
 
712
  // ⭐⭐⭐ 重要: 結果を返す ⭐⭐⭐
 
528
  // Line 527-742 を置き換え
529
  // ========================================
530
 
531
+ // ========================================
532
+ // 修正版 filterSplatsByBox 関数(epsilon調整)
533
+ // Line 527-742 を置き換え
534
+ // ========================================
535
+
536
  function filterSplatsByBox(plyData, boxSize, boxPosition, boxRotation = { x: 0, y: 0, z: 0 }) {
537
  console.log('[filterSplatsByBox] ===== FILTERING START =====');
538
  console.log('[filterSplatsByBox] Input parameters:');
 
551
  const halfY = boxSize.y / 2;
552
  const halfZ = boxSize.z / 2;
553
 
554
+ // ⭐ epsilon を大幅に増やす(回転時の数値誤差を吸収)
555
+ const epsilon = 0.01; // 0.0001 → 0.01 (1cm)
556
+
557
  console.log('[filterSplatsByBox] Box half-extents:', { halfX, halfY, halfZ });
558
+ console.log('[filterSplatsByBox] Using epsilon:', epsilon);
559
 
560
  // 回転行列の作成と逆行列
561
  const rotationMatrix = new THREE.Matrix4();
 
579
  localPos.applyMatrix4(inverseRotationMatrix);
580
 
581
  const inside = (
582
+ localPos.x >= -(halfX + epsilon) && localPos.x <= (halfX + epsilon) &&
583
+ localPos.y >= -(halfY + epsilon) && localPos.y <= (halfY + epsilon) &&
584
+ localPos.z >= -(halfZ + epsilon) && localPos.z <= (halfZ + epsilon)
585
  );
586
 
587
  if (inside) {
 
633
  localPos.applyMatrix4(inverseRotationMatrix);
634
 
635
  const inside = (
636
+ localPos.x >= -(halfX + epsilon) && localPos.x <= (halfX + epsilon) &&
637
+ localPos.y >= -(halfY + epsilon) && localPos.y <= (halfY + epsilon) &&
638
+ localPos.z >= -(halfZ + epsilon) && localPos.z <= (halfZ + epsilon)
639
  );
640
 
641
+ // ⭐ どの軸で除外されているかを表示
642
+ const checkX = localPos.x >= -(halfX + epsilon) && localPos.x <= (halfX + epsilon);
643
+ const checkY = localPos.y >= -(halfY + epsilon) && localPos.y <= (halfY + epsilon);
644
+ const checkZ = localPos.z >= -(halfZ + epsilon) && localPos.z <= (halfZ + epsilon);
645
+
646
  console.log(` Vertex ${i}:`, {
647
  world: { x: v.x.toFixed(3), y: v.y.toFixed(3), z: v.z.toFixed(3) },
648
  local: { x: localPos.x.toFixed(3), y: localPos.y.toFixed(3), z: localPos.z.toFixed(3) },
649
+ inside: inside,
650
+ checks: `X:${checkX} Y:${checkY} Z:${checkZ}`,
651
+ limits: {
652
+ x: `[${-(halfX + epsilon).toFixed(2)}, ${(halfX + epsilon).toFixed(2)}]`,
653
+ y: `[${-(halfY + epsilon).toFixed(2)}, ${(halfY + epsilon).toFixed(2)}]`,
654
+ z: `[${-(halfZ + epsilon).toFixed(2)}, ${(halfZ + epsilon).toFixed(2)}]`
655
+ }
656
  });
657
  }
658
 
 
667
  localPos.applyMatrix4(inverseRotationMatrix);
668
 
669
  const inside = (
670
+ localPos.x >= -(halfX + epsilon) && localPos.x <= (halfX + epsilon) &&
671
+ localPos.y >= -(halfY + epsilon) && localPos.y <= (halfY + epsilon) &&
672
+ localPos.z >= -(halfZ + epsilon) && localPos.z <= (halfZ + epsilon)
673
  );
674
 
675
  return inside;
 
707
  z: ((minZ + maxZ) / 2).toFixed(3)
708
  });
709
 
710
+ console.log('[filterSplatsByBox] ℹ️ Box is rotated - World-space bounds will differ from box size');
 
 
 
 
 
 
 
 
711
  }
712
 
713
  // 警告
 
718
 
719
  if (filteredVertices.length === 0) {
720
  console.error('[filterSplatsByBox] ❌ ERROR: No vertices passed the filter!');
721
+ console.error('[filterSplatsByBox] Check box position, size, and rotation');
722
  }
723
 
724
  // ⭐⭐⭐ 重要: 結果を返す ⭐⭐⭐