Upload preprocess_manual.js

preprocess_manual.js

@@ -1097,14 +1097,20 @@ parser.parsePLY(gsPath, true).then((plyData) => {
 // PCAではなく単純な重心で中心化
 // ========================================
 
+//preprocess_manual.js の Line 1100-1290付近
+
+// ========================================
+// 完全修正版: PLY中心化（Line 1100-1290を置き換え）
+// イミュータブルなオブジェクト生成で確実に中心化
+// ========================================
+
 console.log('[preprocessManual] ===== STARTING AUTO-ALIGNMENT =====');
 
 // ========================================
-// STEP 1: 単純な重心で中心化（1回だけ）
+// STEP 1: 重心計算
 // ========================================
-console.log('[preprocessManual] Step 1: Centering PLY using center of mass...');
+console.log('[preprocessManual] Step 1: Calculating center of mass...');
 
-// 重心を計算
 let sumX = 0, sumY = 0, sumZ = 0;
 plyData.vertices.forEach(v => {
   sumX += v.x;
@@ -1119,102 +1125,131 @@ const center = {
 };
 
 console.log('[DEBUG] Center of mass:', {
-  x: center.x.toFixed(3),
-  y: center.y.toFixed(3),
-  z: center.z.toFixed(3)
+  x: center.x.toFixed(6),
+  y: center.y.toFixed(6),
+  z: center.z.toFixed(6)
 });
 
 console.log('[DEBUG] First vertex BEFORE centering:', {
-  x: plyData.vertices[0].x.toFixed(3),
-  y: plyData.vertices[0].y.toFixed(3),
-  z: plyData.vertices[0].z.toFixed(3)
+  x: plyData.vertices[0].x.toFixed(6),
+  y: plyData.vertices[0].y.toFixed(6),
+  z: plyData.vertices[0].z.toFixed(6)
 });
 
-// 中心化実行
-plyData.vertices = plyData.vertices.map(v => {
-  const centered = {
-    x: v.x - center.x,
-    y: v.y - center.y,
-    z: v.z - center.z
-  };
+// ========================================
+// STEP 2: 中心化（完全に新しいオブジェクトを作成）
+// ========================================
+console.log('[preprocessManual] Step 2: Centering PLY (creating new objects)...');
+
+const centeredVertices = [];
+
+for (let i = 0; i < plyData.vertices.length; i++) {
+  const v = plyData.vertices[i];
+  
+  // ⭐ 完全に新しいオブジェクトを作成
+  const newVertex = {};
   
-  // 他のプロパティをコピー
-  Object.keys(v).forEach(key => {
+  // 座標を中心化
+  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') {
-      centered[key] = v[key];
+      newVertex[key] = v[key];
     }
-  });
+  }
   
-  return centered;
-});
+  centeredVertices.push(newVertex);
+}
+
+// ⭐ 配列を完全に置き換え
+plyData.vertices = centeredVertices;
 
 console.log('[DEBUG] First vertex AFTER centering:', {
-  x: plyData.vertices[0].x.toFixed(3),
-  y: plyData.vertices[0].y.toFixed(3),
-  z: plyData.vertices[0].z.toFixed(3)
+  x: plyData.vertices[0].x.toFixed(6),
+  y: plyData.vertices[0].y.toFixed(6),
+  z: plyData.vertices[0].z.toFixed(6)
 });
 
-// 検証: 平均を再計算
+// ========================================
+// STEP 3: 検証（平均を再計算）
+// ========================================
+console.log('[preprocessManual] Step 3: Verifying centering...');
+
 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 avgX = sumX / plyData.vertices.length;
 const avgY = sumY / plyData.vertices.length;
 const avgZ = sumZ / plyData.vertices.length;
 
 console.log('[DEBUG] Average after centering:', {
-  x: avgX.toFixed(6),
-  y: avgY.toFixed(6),
-  z: avgZ.toFixed(6)
+  x: avgX.toFixed(9),
+  y: avgY.toFixed(9),
+  z: avgZ.toFixed(9)
 });
 
-if (Math.abs(avgX) > 0.001 || Math.abs(avgY) > 0.001 || Math.abs(avgZ) > 0.001) {
+if (Math.abs(avgX) > 1e-6 || Math.abs(avgY) > 1e-6 || Math.abs(avgZ) > 1e-6) {
   console.error('[DEBUG] ❌ ERROR: Centering FAILED!');
-  console.error('[DEBUG] Average should be ~0 but got:', { avgX, avgY, avgZ });
-  alert('❌ PLY Centering Failed!\n\nPlease reload and try again.');
+  console.error('[DEBUG] Average should be ~0 but got:', { 
+    avgX: avgX.toFixed(9), 
+    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;
-} else {
-  console.log('[DEBUG] ✓ Centering SUCCESS! Average is ~0');
 }
 
+console.log('[DEBUG] ✓ Centering SUCCESS! Average is effectively zero');
 console.log('[preprocessManual] ✓ PLY centered at origin');
 
 // ========================================
-// STEP 2: バウンディングボックスを再計算
+// STEP 4: バウンディングボックスを計算
 // ========================================
-console.log('[preprocessManual] Step 2: Recalculating bounding box...');
+console.log('[preprocessManual] Step 4: Calculating bounding box...');
+
 let minX = Infinity, minY = Infinity, minZ = Infinity;
 let maxX = -Infinity, maxY = -Infinity, maxZ = -Infinity;
 
-plyData.vertices.forEach(v => {
+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);
-});
+}
 
 const sizeX = maxX - minX;
 const sizeY = maxY - minY;
 const sizeZ = maxZ - minZ;
 
-console.log('[preprocessManual] Centered sizes:', {
-  sizeX: sizeX.toFixed(2),
-  sizeY: sizeY.toFixed(2),
-  sizeZ: sizeZ.toFixed(2)
+console.log('[preprocessManual] Centered 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) }
 });
 
 // ========================================
-// STEP 3: Y軸が最長になるように回転
+// STEP 5: 回転が必要か確認
 // ========================================
-console.log('[preprocessManual] Step 3: Checking if rotation is needed...');
+console.log('[preprocessManual] Step 5: Checking if rotation is needed...');
 console.log('[preprocessManual] Longest axis:', 
-  sizeX > sizeY && sizeX > sizeZ ? 'X' : 
-  sizeZ > sizeY ? 'Z' : 'Y');
+  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;
@@ -1232,47 +1267,49 @@ if (sizeX > sizeY && sizeX > sizeZ) {
 }
 
 // ========================================
-// STEP 4: 回転を適用（必要な場合のみ）
+// STEP 6: 回転を適用（必要な場合のみ）
 // ========================================
 if (rotationApplied) {
-  console.log('[preprocessManual] Step 4: Applying rotation to all vertices...');
+  console.log('[preprocessManual] Step 6: Applying rotation...');
   
-  plyData.vertices.forEach(v => {
+  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] ✓ PLY rotated to align with world axes');
+  console.log('[preprocessManual] ✓ Rotation applied');
   
   window.plyAlignmentApplied = true;
   window.plyAlignmentMatrix = rotationNeeded.clone();
   
   console.log('[preprocessManual] ✓ Alignment matrix saved for GS display');
 } else {
-  console.log('[preprocessManual] Step 4: Skipped (no rotation needed)');
+  console.log('[preprocessManual] Step 6: Skipped (no rotation needed)');
   window.plyAlignmentApplied = false;
 }
 
 // ========================================
-// STEP 5: 最終検証
+// STEP 7: 最終検証
 // ========================================
-console.log('[preprocessManual] Step 5: Final verification...');
+console.log('[preprocessManual] Step 7: Final verification...');
 
-// 最終的な範囲を再計算
 minX = Infinity; minY = Infinity; minZ = Infinity;
 maxX = -Infinity; maxY = -Infinity; maxZ = -Infinity;
 
-plyData.vertices.forEach(v => {
+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);
-});
+}
 
 const finalCenter = {
   x: (minX + maxX) / 2,
@@ -1280,23 +1317,51 @@ const finalCenter = {
   z: (minZ + maxZ) / 2
 };
 
-console.log('[preprocessManual] Final PLY 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(3), y: finalCenter.y.toFixed(3), z: finalCenter.z.toFixed(3) }
+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) 
+  }
 });
 
-if (Math.abs(finalCenter.x) > 0.01 || Math.abs(finalCenter.y) > 0.01 || Math.abs(finalCenter.z) > 0.01) {
+// ⭐ より厳密な検証（1mm以内）
+const tolerance = 0.001; // 1mm
+if (Math.abs(finalCenter.x) > tolerance || 
+    Math.abs(finalCenter.y) > tolerance || 
+    Math.abs(finalCenter.z) > tolerance) {
   console.error('[preprocessManual] ❌ ERROR: Final center is not at origin!');
-  console.error('[preprocessManual] Got:', finalCenter);
-  alert('❌ PLY Alignment Error!\n\nFinal center is not at origin.\nPlease reload and try again.');
+  console.error('[preprocessManual] Expected: (0, 0, 0)');
+  console.error('[preprocessManual] Got:', {
+    x: finalCenter.x.toFixed(6),
+    y: finalCenter.y.toFixed(6),
+    z: finalCenter.z.toFixed(6)
+  });
+  console.error('[preprocessManual] Tolerance:', tolerance, 'm');
+  
+  alert('❌ PLY Alignment Error!\n\n' +
+        'Final center is not at origin:\n' +
+        'X: ' + finalCenter.x.toFixed(6) + ' m\n' +
+        'Y: ' + finalCenter.y.toFixed(6) + ' m\n' +
+        'Z: ' + finalCenter.z.toFixed(6) + ' m\n\n' +
+        'Expected: < ' + (tolerance * 1000) + ' mm\n\n' +
+        'Please check the browser console and report this issue.');
   return;
 }
 
+console.log('[preprocessManual] ✓ Final verification PASSED');
 console.log('[preprocessManual] ✓ PLY is properly centered and aligned');
+console.log('[preprocessManual] Center deviation: ' + 
+            Math.max(Math.abs(finalCenter.x), Math.abs(finalCenter.y), Math.abs(finalCenter.z)).toFixed(6) + 
+            ' m (< ' + tolerance + ' m tolerance)');
+
+
+//preprocess_manual.js の Line 1100-1290付近
 
-console.log('[preprocessManual] ✓ PLY rotated to align with world axes');
-              
 window.plyAlignmentApplied = true;
 window.plyAlignmentMatrix = rotationNeeded.clone();