Upload preprocess_manual.js

preprocess_manual.js

@@ -1090,46 +1090,30 @@ parser.parsePLY(gsPath, true).then((plyData) => {
           // 2. 点群を分析
           const pcaResult = computePCA(plyData.vertices);
           
-          //////////////////////1095-1210 start
+
+          // 3. 回転が必要な場合、ユーザーに通知////1095-1290
 
           // 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' +
-              'Do you want to automatically align the PLY to world axes?\n\n' +
-              '(Recommended: Yes)'
-            );
-      
- ///////////////10:32 start
-
-            if (shouldNormalize) {
-
+            // ⭐ ユーザー確認を削除し、自動的に正規化を実行
             console.log('[preprocessManual] ===== STARTING AUTO-ALIGNMENT =====');
-
+            
             const { center } = pcaResult;
-
-            // ========================================
-            // ⭐ 変数を最初に宣言（常に定義される）
-            // ========================================
-            let sizeX, sizeY, sizeZ;
-            let minX, maxX, minY, maxY, minZ, maxZ;
-
+            
             // ========================================
-            // STEP 1: 中心化（常に実行）
+            // 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,
@@ -1145,13 +1129,13 @@ parser.parsePLY(gsPath, true).then((plyData) => {
               
               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;
@@ -1161,29 +1145,28 @@ parser.parsePLY(gsPath, true).then((plyData) => {
             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: バウンディングボックスを再計算（常に実行）
+            // STEP 2: バウンディングボックスを再計算
             // ========================================
             console.log('[preprocessManual] Step 2: Recalculating bounding box...');
-
-            minX = Infinity; minY = Infinity; minZ = Infinity;
-            maxX = -Infinity; maxY = -Infinity; maxZ = -Infinity;
-
+            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);
@@ -1192,28 +1175,28 @@ parser.parsePLY(gsPath, true).then((plyData) => {
               maxY = Math.max(maxY, v.y);
               maxZ = Math.max(maxZ, v.z);
             });
-
-            sizeX = maxX - minX;
-            sizeY = maxY - minY;
-            sizeZ = maxZ - minZ;
-
+            
+            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 & 4: 回転処理（条件付き）
+            // 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);
@@ -1225,7 +1208,10 @@ parser.parsePLY(gsPath, true).then((plyData) => {
             } 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...');
               
@@ -1245,44 +1231,6 @@ parser.parsePLY(gsPath, true).then((plyData) => {
               console.log('[preprocessManual] ✓ Alignment matrix saved for GS display');
             } else {
               console.log('[preprocessManual] Step 4: Skipped (no rotation needed)');
-            }            
-
-//////////////////// 10:32 end
-
-              // ========================================
-              // 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');
-                
-                // ⭐ 重要: GSにも同じ変換を適用するためフラグを立てる
-                window.plyAlignmentApplied = true;
-                window.plyAlignmentMatrix = rotationNeeded.clone();
-                
-                console.log('[preprocessManual] ✓ Alignment matrix saved for GS display');
-                console.log('[preprocessManual] Matrix elements:', rotationNeeded.elements.slice(0, 4));
-                
-              } else {
-                console.log('[preprocessManual] Step 4: Skipped (no rotation needed)');
-              }
-              
-              // ========================================
-              // STEP 5: 最終確認（サイズの再計算） 不要なため削除された
-              // ========================================
-              
-            } else {
-              console.log('[preprocessManual] User chose to keep original orientation');
-              console.log('[preprocessManual] Box rotation sliders should be used to match PLY orientation');
             }
             
           } else {
@@ -1290,13 +1238,7 @@ parser.parsePLY(gsPath, true).then((plyData) => {
           }
 
 
-
-          ////////////////////1095-1210 end
-
-
-          // ========================================
-          // 元のコードを続ける
-          // ========================================
+          ////////////////////////1095-1290
 
 
           // ========================================
@@ -1372,26 +1314,39 @@ parser.parsePLY(gsPath, true).then((plyData) => {
           // ⭐ 4. カメラをPLYに合わせて調整（cameraControls初期化後）
           // ========================================
           
-          //////////////////////10:10
+          //////////////////////Line 1377-1391 (カメラ調整部分)
 
           console.log('[preprocessManual] Auto-aligning camera to PLY...');
 
-          // ⭐⭐⭐ センタリング後の中心は常に 0,0,0 ⭐⭐⭐
-          const center = { x: 0, y: 0, z: 0 };
+          // ⭐ サイズを再計算（if ブロックの外なので）
+          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 center = {
+            x: (maxX + minX) / 2,
+            y: (maxY + minY) / 2,
+            z: (maxZ + minZ) / 2
+          };
 
-          // Step 2 で計算したサイズを使用
           const size = {
-            x: sizeX,  // Step 2 で計算済み
-            y: sizeY,
-            z: sizeZ
+            x: maxX - minX,
+            y: maxY - minY,
+            z: maxZ - minZ
           };
 
           console.log('[preprocessManual] Camera alignment - PLY center:', center);
           console.log('[preprocessManual] Camera alignment - PLY size:', size);
 
           const maxDim = Math.max(size.x, size.y, size.z);
-
-          // カメラ位置を計算
           const distance = maxDim * 2.0;
 
           camera.position.set(
@@ -1403,6 +1358,9 @@ parser.parsePLY(gsPath, true).then((plyData) => {
           camera.lookAt(center.x, center.y, center.z);
           camera.updateProjectionMatrix();
 
+          ///////////////////////////Line 1377-1391 (カメラ調整部分)
+
+
           console.log('[preprocessManual] Camera positioned at:', {
             x: camera.position.x.toFixed(2),
             y: camera.position.y.toFixed(2),
@@ -1417,28 +1375,6 @@ parser.parsePLY(gsPath, true).then((plyData) => {
           
           //////////////////////ここまで
 
-
-          camera.position.set(
-            center.x,
-            center.y + maxDim * 0.3,
-            center.z + distance
-          );
-          
-          camera.lookAt(center.x, center.y, center.z);
-          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:', center);
-          
-          // ⭐ OrbitControlsのターゲットを設定（cameraControlsが存在することを確認済み）
-          cameraControls.controls.target.set(center.x, center.y, center.z);
-          cameraControls.controls.update();
-          console.log('[preprocessManual] OrbitControls target set to PLY center');
-          
           // ========================================
           // ⭐ 5. Scene bounds の計算と表示
           // ========================================