Upload preprocess_manual.js

preprocess_manual.js

@@ -1090,12 +1090,14 @@ parser.parsePLY(gsPath, true).then((plyData) => {
           // 2. 点群を分析
           const pcaResult = computePCA(plyData.vertices);
           
+          //////////////////////1095-1210 start
+
           // 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');
             
-            // ⭐ オプション: 自動的に座標系を正規化
+            // ⭐ 自動的に座標系を正規化
             const shouldNormalize = confirm(
               '⚠️ Warning: This PLY file has a tilted coordinate system.\n\n' +
               'This may cause the bounding box to appear tilted.\n\n' +
@@ -1104,110 +1106,150 @@ parser.parsePLY(gsPath, true).then((plyData) => {
             );
             
             if (shouldNormalize) {
-              console.log('[preprocessManual] Auto-aligning PLY to world axes...');
-              
-              // 簡易的な方法: バウンディングボックスの主軸に合わせる
-              // より高度な方法: 固有ベクトルを計算して完全に整列
-              
-              // ここでは、Y軸が「上」になるように回転する簡易版
-              // 実際のPLYの傾きに応じて調整が必要
+              console.log('[preprocessManual] ===== STARTING AUTO-ALIGNMENT =====');
               
               const { center } = pcaResult;
               
-              // 中心に移動
+              // ========================================
+              // STEP 1: 中心化（1回だけ実行）
+              // ========================================
+              console.log('[preprocessManual] Step 1: Centering PLY...');
               plyData.vertices.forEach(v => {
                 v.x -= center.x;
                 v.y -= center.y;
                 v.z -= center.z;
               });
-              
               console.log('[preprocessManual] ✓ PLY centered at origin');
               
-////////////////// add 12/16 18:30
-
               // ========================================
-              // ⭐ 完全な座標系正規化
-              // Line 1124 の後に追加
+              // STEP 2: バウンディングボックスを再計算
               // ========================================
-
-              if (shouldNormalize) {
-                console.log('[preprocessManual] Auto-aligning PLY to world axes...');
-                
-                const { center, covarianceMatrix } = pcaResult;
-                
-                // 1. 中心化
-                plyData.vertices.forEach(v => {
-                  v.x -= center.x;
-                  v.y -= center.y;
-                  v.z -= center.z;
-                });
+              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(); // Identity matrix
+              let rotationApplied = false;
+              
+              if (sizeX > sizeY && sizeX > sizeZ) {
+                // X軸が最長 → Y軸に回転
+                console.log('[preprocessManual] ⚙️ Rotating: X → Y (90° around Z axis)');
+                rotationNeeded.makeRotationZ(Math.PI / 2);
+                rotationApplied = true;
                 
-                console.log('[preprocessManual] ✓ PLY centered at origin');
+              } else if (sizeZ > sizeY && sizeZ > sizeX) {
+                // Z軸が最長 → Y軸に回転
+                console.log('[preprocessManual] ⚙️ Rotating: Z → Y (90° around X axis)');
+                rotationNeeded.makeRotationX(Math.PI / 2);
+                rotationApplied = true;
                 
-                // 2. バウンディングボックスの主軸を取得
-                let minX = Infinity, minY = Infinity, minZ = Infinity;
-                let maxX = -Infinity, maxY = -Infinity, maxZ = -Infinity;
+              } else {
+                // Y軸がすでに最長
+                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 => {
-                  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 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;
                 });
                 
-                // 3. Y軸が最も長い軸になるように回転（人体の場合）
-                const sizeX = maxX - minX;
-                const sizeY = maxY - minY;
-                const sizeZ = maxZ - minZ;
-                
-                console.log('[preprocessManual] Original sizes:', { sizeX, sizeY, sizeZ });
+                console.log('[preprocessManual] ✓ PLY rotated to align with world axes');
                 
-                let rotationNeeded = new THREE.Matrix4();
+                // ⭐ 重要: GSにも同じ変換を適用するためフラグを立てる
+                window.plyAlignmentApplied = true;
+                window.plyAlignmentMatrix = rotationNeeded.clone();
                 
-                if (sizeX > sizeY && sizeX > sizeZ) {
-                  // X軸が最長 → Y軸に回転
-                  rotationNeeded.makeRotationZ(Math.PI / 2);
-                  console.log('[preprocessManual] Rotating X→Y (90° around Z)');
-                } else if (sizeZ > sizeY) {
-                  // Z軸が最長 → Y軸に回転
-                  rotationNeeded.makeRotationX(Math.PI / 2);
-                  console.log('[preprocessManual] Rotating Z→Y (90° around X)');
-                }
+                console.log('[preprocessManual] ✓ Alignment matrix saved for GS display');
+                console.log('[preprocessManual] Matrix elements:', rotationNeeded.elements.slice(0, 4));
                 
-                // 4. 回転を適用
-                if (!rotationNeeded.equals(new THREE.Matrix4())) {
-                  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');
-                  
-                  // ⭐ 重要: GSにも同じ変換を適用するためフラグを立てる
-                  window.plyAlignmentApplied = true;
-                  window.plyAlignmentMatrix = rotationNeeded;
-                }
+              } else {
+                console.log('[preprocessManual] Step 4: Skipped (no rotation needed)');
               }
-
-///////////////// add end
-
-              // 注: 完全な整列には固有値分解が必要
-              // ここでは中心化のみ実施
+              
+              // ========================================
+              // STEP 5: 最終確認（サイズの再計算）
+              // ========================================
+              console.log('[preprocessManual] Step 5: Verifying final result...');
+              
+              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 finalSizeX = maxX - minX;
+              const finalSizeY = maxY - minY;
+              const finalSizeZ = maxZ - minZ;
+              
+              console.log('[preprocessManual] Final sizes:', {
+                sizeX: finalSizeX.toFixed(2),
+                sizeY: finalSizeY.toFixed(2),
+                sizeZ: finalSizeZ.toFixed(2)
+              });
+              console.log('[preprocessManual] Final center:', {
+                x: ((minX + maxX) / 2).toFixed(2),
+                y: ((minY + maxY) / 2).toFixed(2),
+                z: ((minZ + maxZ) / 2).toFixed(2)
+              });
+              
+              console.log('[preprocessManual] ===== AUTO-ALIGNMENT COMPLETE =====');
+              
             } else {
               console.log('[preprocessManual] User chose to keep original orientation');
               console.log('[preprocessManual] Box rotation sliders should be used to match PLY orientation');
             }
+            
           } else {
             console.log('[preprocessManual] ✓ PLY coordinate system is already aligned');
           }
-          
+
           console.log('[preprocessManual] ===== PLY ANALYSIS COMPLETE =====');
-          
+
+
+          ////////////////////1095-1210 end
+
           // ========================================
           // 元のコードを続ける
           // ========================================