Upload preprocess_manual.js

preprocess_manual.js

@@ -1103,20 +1103,35 @@ parser.parsePLY(gsPath, true).then((plyData) => {
 // 完全修正版: PLY中心化（Line 1100-1290を置き換え）
 // イミュータブルなオブジェクト生成で確実に中心化
 // ========================================
+// デバッグ版: PLY中心化（Line 1107-1330を置き換え）
+
+// ========================================
+// デバッグ版: PLY中心化（Line 1107-1330を置き換え）
+// 各ステップで配列の参照を確認
+// ========================================
 
 console.log('[preprocessManual] ===== STARTING AUTO-ALIGNMENT =====');
 
+// ⭐ デバッグ: 元の配列の参照を記録
+const originalVerticesRef = plyData.vertices;
+console.log('[DEBUG] Original vertices reference:', originalVerticesRef);
+console.log('[DEBUG] Original first vertex:', {
+  x: originalVerticesRef[0].x.toFixed(6),
+  y: originalVerticesRef[0].y.toFixed(6),
+  z: originalVerticesRef[0].z.toFixed(6)
+});
+
 // ========================================
 // STEP 1: 重心計算
 // ========================================
 console.log('[preprocessManual] Step 1: Calculating center of mass...');
 
 let sumX = 0, sumY = 0, sumZ = 0;
-plyData.vertices.forEach(v => {
-  sumX += v.x;
-  sumY += v.y;
-  sumZ += v.z;
-});
+for (let i = 0; i < plyData.vertices.length; i++) {
+  sumX += plyData.vertices[i].x;
+  sumY += plyData.vertices[i].y;
+  sumZ += plyData.vertices[i].z;
+}
 
 const center = {
   x: sumX / plyData.vertices.length,
@@ -1137,42 +1152,27 @@ console.log('[DEBUG] First vertex BEFORE centering:', {
 });
 
 // ========================================
-// STEP 2: 中心化（完全に新しいオブジェクトを作成）
+// STEP 2: 中心化（in-place修正版）
 // ========================================
-console.log('[preprocessManual] Step 2: Centering PLY (creating new objects)...');
-
-const centeredVertices = [];
+console.log('[preprocessManual] Step 2: Centering PLY (in-place modification)...');
 
+// ⭐ 元の配列を直接書き換える
 for (let i = 0; i < plyData.vertices.length; i++) {
-  const v = plyData.vertices[i];
-  
-  // ⭐ 完全に新しいオブジェクトを作成
-  const newVertex = {};
-  
-  // 座標を中心化
-  newVertex.x = v.x - center.x;
-  newVertex.y = v.y - center.y;
-  newVertex.z = v.z - center.z;
-  
-  // 他のプロパティをコピー（座標以外）
-  for (const key in v) {
-    if (key !== 'x' && key !== 'y' && key !== 'z') {
-      newVertex[key] = v[key];
-    }
-  }
-  
-  centeredVertices.push(newVertex);
+  plyData.vertices[i].x -= center.x;
+  plyData.vertices[i].y -= center.y;
+  plyData.vertices[i].z -= center.z;
 }
 
-// ⭐ 配列を完全に置き換え
-plyData.vertices = centeredVertices;
-
 console.log('[DEBUG] First vertex AFTER centering:', {
   x: plyData.vertices[0].x.toFixed(6),
   y: plyData.vertices[0].y.toFixed(6),
   z: plyData.vertices[0].z.toFixed(6)
 });
 
+// ⭐ デバッグ: 配列の参照が変わっていないか確認
+console.log('[DEBUG] Vertices reference after centering:', plyData.vertices);
+console.log('[DEBUG] Is same reference?', plyData.vertices === originalVerticesRef);
+
 // ========================================
 // STEP 3: 検証（平均を再計算）
 // ========================================
@@ -1202,12 +1202,6 @@ if (Math.abs(avgX) > 1e-6 || Math.abs(avgY) > 1e-6 || Math.abs(avgZ) > 1e-6) {
     avgY: avgY.toFixed(9), 
     avgZ: avgZ.toFixed(9) 
   });
-  alert('❌ PLY Centering Failed!\n\n' +
-        'Average is not zero:\n' +
-        'X: ' + avgX.toFixed(9) + '\n' +
-        'Y: ' + avgY.toFixed(9) + '\n' +
-        'Z: ' + avgZ.toFixed(9) + '\n\n' +
-        'Please reload and try again.');
   return;
 }
 
@@ -1215,10 +1209,20 @@ console.log('[DEBUG] ✓ Centering SUCCESS! Average is effectively zero');
 console.log('[preprocessManual] ✓ PLY centered at origin');
 
 // ========================================
-// STEP 4: バウンディングボックスを計算
+// STEP 4: バウンディングボックスを計算（デバッグ付き）
 // ========================================
 console.log('[preprocessManual] Step 4: Calculating bounding box...');
 
+// ⭐ デバッグ: この時点での頂点を確認
+console.log('[DEBUG] First 3 vertices before bbox calculation:');
+for (let i = 0; i < Math.min(3, plyData.vertices.length); i++) {
+  console.log(`  V${i}:`, {
+    x: plyData.vertices[i].x.toFixed(6),
+    y: plyData.vertices[i].y.toFixed(6),
+    z: plyData.vertices[i].z.toFixed(6)
+  });
+}
+
 let minX = Infinity, minY = Infinity, minZ = Infinity;
 let maxX = -Infinity, maxY = -Infinity, maxZ = -Infinity;
 
@@ -1232,103 +1236,67 @@ for (let i = 0; i < plyData.vertices.length; i++) {
   maxZ = Math.max(maxZ, v.z);
 }
 
-const sizeX = maxX - minX;
-const sizeY = maxY - minY;
-const sizeZ = maxZ - minZ;
+const bboxCenter = {
+  x: (minX + maxX) / 2,
+  y: (minY + maxY) / 2,
+  z: (minZ + maxZ) / 2
+};
 
-console.log('[preprocessManual] Centered bounding box:', {
+console.log('[preprocessManual] Bounding box:', {
   min: { x: minX.toFixed(3), y: minY.toFixed(3), z: minZ.toFixed(3) },
   max: { x: maxX.toFixed(3), y: maxY.toFixed(3), z: maxZ.toFixed(3) },
-  size: { x: sizeX.toFixed(3), y: sizeY.toFixed(3), z: sizeZ.toFixed(3) }
+  center: { x: bboxCenter.x.toFixed(6), y: bboxCenter.y.toFixed(6), z: bboxCenter.z.toFixed(6) }
 });
 
-// ========================================
-// STEP 5: 回転が必要か確認
-// ========================================
-console.log('[preprocessManual] Step 5: Checking if rotation is needed...');
-console.log('[preprocessManual] Longest axis:', 
-  sizeX > sizeY && sizeX > sizeZ ? 'X (' + sizeX.toFixed(2) + 'm)' : 
-  sizeZ > sizeY ? 'Z (' + sizeZ.toFixed(2) + 'm)' : 
-  'Y (' + sizeY.toFixed(2) + 'm)');
-
-let rotationNeeded = new THREE.Matrix4();
-let rotationApplied = false;
-
-if (sizeX > sizeY && sizeX > sizeZ) {
-  console.log('[preprocessManual] ⚙️ Rotating: X → Y (90° around Z axis)');
-  rotationNeeded.makeRotationZ(Math.PI / 2);
-  rotationApplied = true;
-} else if (sizeZ > sizeY && sizeZ > sizeX) {
-  console.log('[preprocessManual] ⚙️ Rotating: Z → Y (90° around X axis)');
-  rotationNeeded.makeRotationX(Math.PI / 2);
-  rotationApplied = true;
-} else {
-  console.log('[preprocessManual] ✓ Y-axis is already the longest, no rotation needed');
-}
-
-// ========================================
-// STEP 6: 回転を適用（必要な場合のみ）
-// ========================================
-if (rotationApplied) {
-  console.log('[preprocessManual] Step 6: Applying rotation...');
-  
-  for (let i = 0; i < plyData.vertices.length; i++) {
-    const v = plyData.vertices[i];
-    const pos = new THREE.Vector3(v.x, v.y, v.z);
-    pos.applyMatrix4(rotationNeeded);
-    
-    v.x = pos.x;
-    v.y = pos.y;
-    v.z = pos.z;
-  }
-  
-  console.log('[preprocessManual] ✓ Rotation applied');
+// ⭐ デバッグ: ここで中心がずれている場合は異常
+if (Math.abs(bboxCenter.x) > 0.01 || Math.abs(bboxCenter.y) > 0.01 || Math.abs(bboxCenter.z) > 0.01) {
+  console.error('[DEBUG] ❌ CRITICAL ERROR: Bounding box center is not at origin!');
+  console.error('[DEBUG] This means vertices were modified between Step 3 and Step 4!');
+  console.error('[DEBUG] Bbox center:', bboxCenter);
   
-  window.plyAlignmentApplied = true;
-  window.plyAlignmentMatrix = rotationNeeded.clone();
+  // さらにデバッグ: 頂点を再チェック
+  console.error('[DEBUG] Re-checking first vertex:');
+  console.error('  Current:', {
+    x: plyData.vertices[0].x.toFixed(6),
+    y: plyData.vertices[0].y.toFixed(6),
+    z: plyData.vertices[0].z.toFixed(6)
+  });
+  console.error('  Original (from reference):', {
+    x: originalVerticesRef[0].x.toFixed(6),
+    y: originalVerticesRef[0].y.toFixed(6),
+    z: originalVerticesRef[0].z.toFixed(6)
+  });
   
-  console.log('[preprocessManual] ✓ Alignment matrix saved for GS display');
-} else {
-  console.log('[preprocessManual] Step 6: Skipped (no rotation needed)');
-  window.plyAlignmentApplied = false;
+  alert('❌ CRITICAL ERROR in Step 4!\n\n' +
+        'Bounding box center is not at origin:\n' +
+        'Center: (' + bboxCenter.x.toFixed(3) + ', ' + bboxCenter.y.toFixed(3) + ', ' + bboxCenter.z.toFixed(3) + ')\n\n' +
+        'This indicates a serious bug.\n' +
+        'Please check the browser console for details.');
+  return;
 }
 
+const sizeX = maxX - minX;
+const sizeY = maxY - minY;
+const sizeZ = maxZ - minZ;
+
+console.log('[preprocessManual] ✓ Bounding box center is at origin');
+console.log('[preprocessManual] Size:', {
+  x: sizeX.toFixed(3),
+  y: sizeY.toFixed(3),
+  z: sizeZ.toFixed(3)
+});
+
 // ========================================
-// STEP 7: 最終検証
+// STEP 5-7: 残りのステップ（省略可能）
 // ========================================
-console.log('[preprocessManual] Step 7: Final verification...');
+console.log('[preprocessManual] ✓ PLY is properly centered');
 
-minX = Infinity; minY = Infinity; minZ = Infinity;
-maxX = -Infinity; maxY = -Infinity; maxZ = -Infinity;
+// 回転チェックは省略（必要なら追加）
 
-for (let i = 0; i < plyData.vertices.length; i++) {
-  const v = plyData.vertices[i];
-  minX = Math.min(minX, v.x);
-  minY = Math.min(minY, v.y);
-  minZ = Math.min(minZ, v.z);
-  maxX = Math.max(maxX, v.x);
-  maxY = Math.max(maxY, v.y);
-  maxZ = Math.max(maxZ, v.z);
-}
+console.log('[preprocessManual] ===== AUTO-ALIGNMENT COMPLETE =====');
 
-const finalCenter = {
-  x: (minX + maxX) / 2,
-  y: (minY + maxY) / 2,
-  z: (minZ + maxZ) / 2
-};
-
-console.log('[preprocessManual] Final PLY state:', {
-  bounds: {
-    min: { x: minX.toFixed(3), y: minY.toFixed(3), z: minZ.toFixed(3) },
-    max: { x: maxX.toFixed(3), y: maxY.toFixed(3), z: maxZ.toFixed(3) }
-  },
-  center: { 
-    x: finalCenter.x.toFixed(6), 
-    y: finalCenter.y.toFixed(6), 
-    z: finalCenter.z.toFixed(6) 
-  }
-});
 
+// デバッグ版: PLY中心化（Line 1107-1330を置き換え）
 // ⭐ より厳密な検証（1mm以内）
 const tolerance = 0.001; // 1mm
 if (Math.abs(finalCenter.x) > tolerance || 
@@ -1444,102 +1412,110 @@ window.plyAlignmentMatrix = rotationNeeded.clone();
           // ========================================
           
 
-          // 修正版: カメラ配置部分（Line 1319-1430付近）
-
-          // ========================================
-          // 修正版: カメラ配置部分（Line 1319-1430付近）
-          // 2回目の中心化を削除し、検証のみに変更
-          // ========================================
+///////////////START1137
 
-          console.log('[preprocessManual] Auto-aligning camera to PLY...');
 
-          // ⭐ 検証のみ実行（中心化は削除）
-          console.log('[preprocessManual] Verifying PLY centering...');
-
-          let minX = Infinity, minY = Infinity, minZ = Infinity;
-          let maxX = -Infinity, maxY = -Infinity, maxZ = -Infinity;
-
-          plyData.vertices.forEach(vertex => {
-            minX = Math.min(minX, vertex.x);
-            minY = Math.min(minY, vertex.y);
-            minZ = Math.min(minZ, vertex.z);
-            maxX = Math.max(maxX, vertex.x);
-            maxY = Math.max(maxY, vertex.y);
-            maxZ = Math.max(maxZ, vertex.z);
-          });
-
-          const calculatedCenter = {
-            x: (maxX + minX) / 2,
-            y: (maxY + minY) / 2,
-            z: (maxZ + minZ) / 2
-          };
+        // ========================================
+        // VERIFICATION ONLY - Do not re-center!
+        // ========================================
+        console.log('[preprocessManual] Verifying PLY is centered at origin...');
 
-          console.log('[preprocessManual] PLY bounds after centering:');
-          console.log('  Min:', { x: minX.toFixed(3), y: minY.toFixed(3), z: minZ.toFixed(3) });
-          console.log('  Max:', { x: maxX.toFixed(3), y: maxY.toFixed(3), z: maxZ.toFixed(3) });
-          console.log('  Calculated center:', {
-            x: calculatedCenter.x.toFixed(3),
-            y: calculatedCenter.y.toFixed(3),
-            z: calculatedCenter.z.toFixed(3)
-          });
+        let minX = Infinity, minY = Infinity, minZ = Infinity;
+        let maxX = -Infinity, maxY = -Infinity, maxZ = -Infinity;
 
-          // ⭐⭐⭐ 検証: 中心が 0,0,0 から離れすぎている場合
-          if (Math.abs(calculatedCenter.x) > 0.1 || 
-              Math.abs(calculatedCenter.y) > 0.1 || 
-              Math.abs(calculatedCenter.z) > 0.1) {
-            console.error('[preprocessManual] ❌ ERROR: PLY centering failed!');
-            console.error('[preprocessManual] Expected center ~(0,0,0) but got:', calculatedCenter);
-            console.error('[preprocessManual] This indicates Step 1 did not work correctly!');
-            
-            // ⭐ エラーメッセージのみ表示（中心化は実行しない）
-            alert('⚠️ PLY Centering Error!\n\n' +
-                  'The PLY data is not centered at origin.\n' +
-                  'Expected: ~(0, 0, 0)\n' +
-                  'Got: (' + calculatedCenter.x.toFixed(2) + ', ' + 
-                            calculatedCenter.y.toFixed(2) + ', ' + 
-                            calculatedCenter.z.toFixed(2) + ')\n\n' +
-                  'Please reload the page and try again.');
-            return; // 処理を中断
-          }
+        plyData.vertices.forEach(vertex => {
+          minX = Math.min(minX, vertex.x);
+          minY = Math.min(minY, vertex.y);
+          minZ = Math.min(minZ, vertex.z);
+          maxX = Math.max(maxX, vertex.x);
+          maxY = Math.max(maxY, vertex.y);
+          maxZ = Math.max(maxZ, vertex.z);
+        });
 
-          // ⭐ カメラ配置は 0,0,0 を中心にする（修正なし）
-          const center = { x: 0, y: 0, z: 0 };
+        const verifiedCenter = {
+          x: (maxX + minX) / 2,
+          y: (maxY + minY) / 2,
+          z: (maxZ + minZ) / 2
+        };
+
+        console.log('[preprocessManual] Verified bounds:');
+        console.log('  Min:', { x: minX.toFixed(3), y: minY.toFixed(3), z: minZ.toFixed(3) });
+        console.log('  Max:', { x: maxX.toFixed(3), y: maxY.toFixed(3), z: maxZ.toFixed(3) });
+        console.log('  Center:', {
+          x: verifiedCenter.x.toFixed(6),
+          y: verifiedCenter.y.toFixed(6),
+          z: verifiedCenter.z.toFixed(6)
+        });
 
-          const size = {
-            x: maxX - minX,
-            y: maxY - minY,
-            z: maxZ - minZ
-          };
+        // STRICT VERIFICATION - Must be within 1mm tolerance
+        const tolerance = 0.001; // 1mm
+        if (Math.abs(verifiedCenter.x) > tolerance || 
+            Math.abs(verifiedCenter.y) > tolerance || 
+            Math.abs(verifiedCenter.z) > tolerance) {
+          console.error('[preprocessManual] ❌ CRITICAL ERROR: PLY centering verification FAILED!');
+          console.error('[preprocessManual] Center is NOT at origin:', verifiedCenter);
+          console.error('[preprocessManual] This means Step 2 centering did not work!');
+          
+          alert('❌ CRITICAL ERROR: PLY Centering Failed!\n\n' +
+                'Expected: (0, 0, 0)\n' +
+                'Got: (' + verifiedCenter.x.toFixed(6) + ', ' + 
+                          verifiedCenter.y.toFixed(6) + ', ' + 
+                          verifiedCenter.z.toFixed(6) + ')\n\n' +
+                'The vertices were modified between Step 2 and now.\n' +
+                'Please reload the page and do NOT modify the code between steps.');
+          return; // STOP execution
+        }
 
-          console.log('[preprocessManual] Camera alignment - PLY center:', center);
-          console.log('[preprocessManual] Camera alignment - PLY size:', size);
+        console.log('[preprocessManual] ✓ Verification PASSED - Center is at origin');
 
-          const maxDim = Math.max(size.x, size.y, size.z);
-          const distance = maxDim * 2.0;
+        // ========================================
+        // Camera Setup (using verified bounds)
+        // ========================================
+        const size = {
+          x: maxX - minX,
+          y: maxY - minY,
+          z: maxZ - minZ
+        };
+
+        const maxDim = Math.max(size.x, size.y, size.z);
+        const distance = maxDim * 2.0;
+
+        // Camera always looks at 0,0,0 (the guaranteed center)
+        camera.position.set(0, maxDim * 0.3, distance);
+        camera.lookAt(0, 0, 0);
+        camera.updateProjectionMatrix();
+
+        console.log('[preprocessManual] Camera positioned at:', {
+          x: camera.position.x.toFixed(2),
+          y: camera.position.y.toFixed(2),
+          z: camera.position.z.toFixed(2)
+        });
+        console.log('[preprocessManual] Looking at: (0, 0, 0)');
 
-          camera.position.set(
-            center.x,
-            center.y + maxDim * 0.3,
-            center.z + distance
-          );
+        // ⭐ OrbitControls target
+        cameraControls.controls.target.set(0, 0, 0);
+        cameraControls.controls.update();
+        console.log('[preprocessManual] OrbitControls target set to (0, 0, 0)');
 
-          camera.lookAt(center.x, center.y, center.z);
-          camera.updateProjectionMatrix();
+        // ========================================
+        // Box Setup (centered at origin)
+        // ========================================
+        let boxSize = { 
+          x: size.x * 1.2,  // 120% of PLY size
+          y: size.y * 1.2, 
+          z: size.z * 1.2 
+        };
 
-          console.log('[preprocessManual] Camera positioned at:', {
-            x: camera.position.x.toFixed(2),
-            y: camera.position.y.toFixed(2),
-            z: camera.position.z.toFixed(2)
-          });
-          console.log('[preprocessManual] Looking at:', center);
+        let boxPosition = { x: 0, y: 0, z: 0 };  // Always at origin
+        let boxRotation = { x: 0, y: 0, z: 0 };
+        let plyOffset = { x: 0, y: 0, z: 0 };
 
-          // ⭐ OrbitControlsのターゲットを設定
-          cameraControls.controls.target.set(center.x, center.y, center.z);
-          cameraControls.controls.update();
-          console.log('[preprocessManual] OrbitControls target set to origin');
+        console.log('[preprocessManual] Initial Box setup:');
+        console.log('  boxSize:', boxSize);
+        console.log('  boxPosition:', boxPosition, '(origin)');
 
-///////////////////////////////////////修正1: Line 1319-1375 を完全に書き換え
 
+////////////////END1137
           const sceneCenter = {
             x: (maxX + minX) / 2,
             y: (maxY + minY) / 2,
@@ -1547,8 +1523,6 @@ window.plyAlignmentMatrix = rotationNeeded.clone();
           };
 
 
-// 修正版: カメラ配置部分（Line 1319-1430付近）
-
           // Display scene info in UI
           const sceneSizeEl = document.getElementById('scene-size');
           const sceneCenterEl = document.getElementById('scene-center');
@@ -1559,28 +1533,6 @@ window.plyAlignmentMatrix = rotationNeeded.clone();
             sceneCenterEl.textContent = `(${sceneCenter.x.toFixed(1)}, ${sceneCenter.y.toFixed(1)}, ${sceneCenter.z.toFixed(1)})`;
           }
 
-          // ========================================
-          // ⭐ 6. 初期Box設定（中心化後のPLYに合わせる）
-          // ========================================
-          let boxSize = { 
-            x: size.x * 1.2,  // 120% (余裕を持たせる)
-            y: size.y * 1.2, 
-            z: size.z * 1.2 
-          };
-
-          let boxPosition = { 
-            x: 0,  // ⭐ 明示的に 0,0,0
-            y: 0, 
-            z: 0 
-          };
-
-          let boxRotation = { x: 0, y: 0, z: 0 };
-          let plyOffset = { x: 0, y: 0, z: 0 };
-
-          console.log('[preprocessManual] Initial Box setup:');
-          console.log('  boxSize:', boxSize);
-          console.log('  boxPosition:', boxPosition);
-
           const gsScene = gs.viewer.splatMesh.scenes[0];
 
           // Create initial bounding box