Upload preprocess_manual.js

preprocess_manual.js

@@ -1090,152 +1090,216 @@ parser.parsePLY(gsPath, true).then((plyData) => {
           // 2. 点群を分析
           const pcaResult = computePCA(plyData.vertices);
           
+// 完全修正版: PLY中心化（Line 1102-1233を置き換え）
 
-          // 3. 回転が必要な場合、ユーザーに通知////1095-1290
+// ========================================
+// 完全修正版: PLY中心化（Line 1102-1233を置き換え）
+// PCAではなく単純な重心で中心化
+// ========================================
 
-          // 3. 回転が必要な場合、ユーザーに通知
-          if (pcaResult.needsRotation) {
-            console.warn('[preprocessManual] ⚠️ PLY coordinate system is NOT aligned with world axes');
-            console.warn('[preprocessManual] This may cause visual mismatch between Box and filtering');
-            
-            // ⭐ ユーザー確認を削除し、自動的に正規化を実行
-            console.log('[preprocessManual] ===== STARTING AUTO-ALIGNMENT =====');
-            
-            const { center } = pcaResult;
-            
-            // ========================================
-            // STEP 1: 中心化（1回だけ実行）
-            // ========================================
-            console.log('[preprocessManual] Step 1: Centering PLY...');
-            
-            console.log('[DEBUG] First vertex BEFORE:', {
-              x: plyData.vertices[0].x.toFixed(3),
-              y: plyData.vertices[0].y.toFixed(3),
-              z: plyData.vertices[0].z.toFixed(3)
-            });
-            
-            plyData.vertices = plyData.vertices.map(v => {
-              const centered = {
-                x: v.x - center.x,
-                y: v.y - center.y,
-                z: v.z - center.z
-              };
-              
-              Object.keys(v).forEach(key => {
-                if (key !== 'x' && key !== 'y' && key !== 'z') {
-                  centered[key] = v[key];
-                }
-              });
-              
-              return centered;
-            });
-            
-            console.log('[DEBUG] First vertex AFTER:', {
-              x: plyData.vertices[0].x.toFixed(3),
-              y: plyData.vertices[0].y.toFixed(3),
-              z: plyData.vertices[0].z.toFixed(3)
-            });
-            
-            let sumX = 0, sumY = 0, sumZ = 0;
-            plyData.vertices.forEach(v => {
-              sumX += v.x;
-              sumY += v.y;
-              sumZ += v.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)
-            });
-            
-            if (Math.abs(avgX) > 0.001 || Math.abs(avgY) > 0.001 || Math.abs(avgZ) > 0.001) {
-              console.error('[DEBUG] ❌ ERROR: Centering FAILED!');
-            } else {
-              console.log('[DEBUG] ✓ Centering SUCCESS! Average is ~0');
-            }
-            
-            console.log('[preprocessManual] ✓ PLY centered at origin');
-            
-            // ========================================
-            // STEP 2: バウンディングボックスを再計算
-            // ========================================
-            console.log('[preprocessManual] Step 2: Recalculating bounding box...');
-            let minX = Infinity, minY = Infinity, minZ = Infinity;
-            let maxX = -Infinity, maxY = -Infinity, maxZ = -Infinity;
-            
-            plyData.vertices.forEach(v => {
-              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)
-            });
-            
-            // ========================================
-            // STEP 3: Y軸が最長になるように回転
-            // ========================================
-            console.log('[preprocessManual] Step 3: Checking if rotation is needed...');
-            console.log('[preprocessManual] Longest axis:', 
-              sizeX > sizeY && sizeX > sizeZ ? 'X' : 
-              sizeZ > sizeY ? 'Z' : 'Y');
-            
-            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 4: 回転を適用（必要な場合のみ）
-            // ========================================
-            if (rotationApplied) {
-              console.log('[preprocessManual] Step 4: Applying rotation to all vertices...');
-              
-              plyData.vertices.forEach(v => {
-                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');
-              
-              window.plyAlignmentApplied = true;
-              window.plyAlignmentMatrix = rotationNeeded.clone();
+console.log('[preprocessManual] ===== STARTING AUTO-ALIGNMENT =====');
+
+// ========================================
+// STEP 1: 単純な重心で中心化（1回だけ）
+// ========================================
+console.log('[preprocessManual] Step 1: Centering PLY using center of mass...');
+
+// 重心を計算
+let sumX = 0, sumY = 0, sumZ = 0;
+plyData.vertices.forEach(v => {
+  sumX += v.x;
+  sumY += v.y;
+  sumZ += v.z;
+});
+
+const center = {
+  x: sumX / plyData.vertices.length,
+  y: sumY / plyData.vertices.length,
+  z: sumZ / plyData.vertices.length
+};
+
+console.log('[DEBUG] Center of mass:', {
+  x: center.x.toFixed(3),
+  y: center.y.toFixed(3),
+  z: center.z.toFixed(3)
+});
+
+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)
+});
+
+// 中心化実行
+plyData.vertices = plyData.vertices.map(v => {
+  const centered = {
+    x: v.x - center.x,
+    y: v.y - center.y,
+    z: v.z - center.z
+  };
+  
+  // 他のプロパティをコピー
+  Object.keys(v).forEach(key => {
+    if (key !== 'x' && key !== 'y' && key !== 'z') {
+      centered[key] = v[key];
+    }
+  });
+  
+  return centered;
+});
+
+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)
+});
+
+// 検証: 平均を再計算
+sumX = 0; sumY = 0; sumZ = 0;
+plyData.vertices.forEach(v => {
+  sumX += v.x;
+  sumY += v.y;
+  sumZ += v.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)
+});
+
+if (Math.abs(avgX) > 0.001 || Math.abs(avgY) > 0.001 || Math.abs(avgZ) > 0.001) {
+  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.');
+  return;
+} else {
+  console.log('[DEBUG] ✓ Centering SUCCESS! Average is ~0');
+}
+
+console.log('[preprocessManual] ✓ PLY centered at origin');
+
+// ========================================
+// STEP 2: バウンディングボックスを再計算
+// ========================================
+console.log('[preprocessManual] Step 2: Recalculating bounding box...');
+let minX = Infinity, minY = Infinity, minZ = Infinity;
+let maxX = -Infinity, maxY = -Infinity, maxZ = -Infinity;
+
+plyData.vertices.forEach(v => {
+  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)
+});
+
+// ========================================
+// STEP 3: Y軸が最長になるように回転
+// ========================================
+console.log('[preprocessManual] Step 3: Checking if rotation is needed...');
+console.log('[preprocessManual] Longest axis:', 
+  sizeX > sizeY && sizeX > sizeZ ? 'X' : 
+  sizeZ > sizeY ? 'Z' : 'Y');
+
+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 4: 回転を適用（必要な場合のみ）
+// ========================================
+if (rotationApplied) {
+  console.log('[preprocessManual] Step 4: Applying rotation to all vertices...');
+  
+  plyData.vertices.forEach(v => {
+    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');
+  
+  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)');
+  window.plyAlignmentApplied = false;
+}
+
+// ========================================
+// STEP 5: 最終検証
+// ========================================
+console.log('[preprocessManual] Step 5: Final verification...');
+
+// 最終的な範囲を再計算
+minX = Infinity; minY = Infinity; minZ = Infinity;
+maxX = -Infinity; maxY = -Infinity; maxZ = -Infinity;
+
+plyData.vertices.forEach(v => {
+  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,
+  y: (minY + maxY) / 2,
+  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) }
+});
+
+if (Math.abs(finalCenter.x) > 0.01 || Math.abs(finalCenter.y) > 0.01 || Math.abs(finalCenter.z) > 0.01) {
+  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.');
+  return;
+}
+
+console.log('[preprocessManual] ✓ PLY is properly centered and aligned');
+
+console.log('[preprocessManual] ✓ PLY rotated to align with world axes');
               
-              console.log('[preprocessManual] ✓ Alignment matrix saved for GS display');
-            } else {
-              console.log('[preprocessManual] Step 4: Skipped (no rotation needed)');
-            }
-            
-          } else {
-            console.log('[preprocessManual] ✓ PLY coordinate system is already aligned');
-          }
+window.plyAlignmentApplied = true;
+window.plyAlignmentMatrix = rotationNeeded.clone();
+
 
 
           ////////////////////////1095-1290