Upload preprocess_manual.js

preprocess_manual.js

@@ -113,25 +113,73 @@ function createManualUI(scene, camera, renderer) {
       • Scroll: Zoom in/out
     </div>
     
-    <!-- Step 0: PLY Position Adjustment -->
+    <!-- Step 0: Adjust PLY and Box -->
     <div id="position-adjustment-section" style="display: none; margin-top: 20px;">
-      <h3>Step 0: Adjust PLY Position</h3>
+      <h3>Step 0: Adjust Position and Bounding Box</h3>
       <p style="font-size: 12px; color: #aaa;">
-        Move the point cloud to center it properly
+        First adjust the bounding box to frame your object, then fine-tune position if needed
       </p>
+      
+      <!-- Bounding Box Info Display -->
+      <div id="bbox-info" style="
+        margin: 10px 0;
+        padding: 10px;
+        background: #1a1a2e;
+        border-radius: 5px;
+        font-size: 11px;
+        color: #aaa;
+      ">
+        <strong>Scene Bounds:</strong><br>
+        Size: <span id="scene-size">-</span><br>
+        Center: <span id="scene-center">-</span>
+      </div>
+      
+      <!-- Bounding Box Controls -->
+      <h4 style="margin: 15px 0 10px 0; color: #4CAF50;">📦 Bounding Box</h4>
+      
+      <div style="margin: 10px 0;">
+        <label>Box X Size: <span id="box-x-value-step0">3.0</span>m</label><br>
+        <input type="range" id="box-x-step0" min="0.5" max="50.0" step="0.1" value="3.0" style="width: 100%;">
+      </div>
+      <div style="margin: 10px 0;">
+        <label>Box Y Size: <span id="box-y-value-step0">3.0</span>m</label><br>
+        <input type="range" id="box-y-step0" min="0.5" max="50.0" step="0.1" value="3.0" style="width: 100%;">
+      </div>
+      <div style="margin: 10px 0;">
+        <label>Box Z Size: <span id="box-z-value-step0">3.0</span>m</label><br>
+        <input type="range" id="box-z-step0" min="0.5" max="50.0" step="0.1" value="3.0" style="width: 100%;">
+      </div>
+      
+      <div style="margin: 10px 0;">
+        <label>Box X Position: <span id="box-x-pos-value-step0">0.0</span>m</label><br>
+        <input type="range" id="box-x-pos-step0" min="-25.0" max="25.0" step="0.1" value="0.0" style="width: 100%;">
+      </div>
+      <div style="margin: 10px 0;">
+        <label>Box Y Position: <span id="box-y-pos-value-step0">1.0</span>m</label><br>
+        <input type="range" id="box-y-pos-step0" min="-25.0" max="25.0" step="0.1" value="1.0" style="width: 100%;">
+      </div>
       <div style="margin: 10px 0;">
-        <label>X Position: <span id="ply-x-value">0.0</span>m</label><br>
+        <label>Box Z Position: <span id="box-z-pos-value-step0">0.0</span>m</label><br>
+        <input type="range" id="box-z-pos-step0" min="-25.0" max="25.0" step="0.1" value="0.0" style="width: 100%;">
+      </div>
+      
+      <!-- PLY Offset Controls (Optional Fine-Tuning) -->
+      <h4 style="margin: 15px 0 10px 0; color: #2196F3;">🎯 Fine-tune PLY Position (Optional)</h4>
+      
+      <div style="margin: 10px 0;">
+        <label>PLY X Offset: <span id="ply-x-value">0.0</span>m</label><br>
         <input type="range" id="ply-x" min="-10.0" max="10.0" step="0.1" value="0.0" style="width: 100%;">
       </div>
       <div style="margin: 10px 0;">
-        <label>Y Position: <span id="ply-y-value">0.0</span>m</label><br>
+        <label>PLY Y Offset: <span id="ply-y-value">0.0</span>m</label><br>
         <input type="range" id="ply-y" min="-10.0" max="10.0" step="0.1" value="0.0" style="width: 100%;">
       </div>
       <div style="margin: 10px 0;">
-        <label>Z Position: <span id="ply-z-value">0.0</span>m</label><br>
+        <label>PLY Z Offset: <span id="ply-z-value">0.0</span>m</label><br>
         <input type="range" id="ply-z" min="-10.0" max="10.0" step="0.1" value="0.0" style="width: 100%;">
       </div>
-      <button id="reset-position-btn" style="
+      
+      <button id="reset-all-btn" style="
         margin-top: 10px;
         padding: 8px 15px;
         background: #FF9800;
@@ -141,8 +189,8 @@ function createManualUI(scene, camera, renderer) {
         cursor: pointer;
         width: 48%;
         margin-right: 2%;
-      ">Reset Position</button>
-      <button id="confirm-position-btn" style="
+      ">Reset All</button>
+      <button id="confirm-box-btn" style="
         margin-top: 10px;
         padding: 8px 15px;
         background: #4CAF50;
@@ -151,9 +199,8 @@ function createManualUI(scene, camera, renderer) {
         border-radius: 5px;
         cursor: pointer;
         width: 48%;
-      ">Confirm Position</button>
+      ">✓ Confirm & Filter</button>
     </div>
-    
 
     <!-- Step 1: Box Adjustment -->
     <div id="manual-controls" style="margin-top: 20px; display: none;">
@@ -838,144 +885,70 @@ export function preprocessManual(vrmPath, gsPath, scene, camera, renderer, stage
       // Keyboard Controls for Camera Movement: Deleted 12/13 13:50
       // ========================================
 
-//////////////
+////////////////////////////12/13 16:20 START
 
-          // ========================================
-          // Step 0: PLY Position Adjustment
-          // ========================================
-          ui.setStatus('Step 0: Adjust PLY position if needed');
-          ui.showPositionAdjustment();
-          
-          let plyOffset = { x: 0, y: 0, z: 0 };
-          const gsScene = gs.viewer.splatMesh.scenes[0];
-          
-          // Position sliders setup
-          const setupPositionSlider = (id, valueId, axis) => {
-            const slider = document.getElementById(id);
-            const valueDisplay = document.getElementById(valueId);
-            
-            if (slider && valueDisplay) {
-              slider.addEventListener('input', (e) => {
-                const value = parseFloat(e.target.value);
-                valueDisplay.textContent = value.toFixed(1);
-                plyOffset[axis] = value;
-                
-                gsScene.position[axis] = value;
-                gsScene.updateMatrixWorld();
-                // No need to call renderer.render here - animation loop handles it
-              });
-            }
-          };
-          
-          setupPositionSlider('ply-x', 'ply-x-value', 'x');
-          setupPositionSlider('ply-y', 'ply-y-value', 'y');
-          setupPositionSlider('ply-z', 'ply-z-value', 'z');
-          
-          // Reset position button
-          const resetPosBtn = document.getElementById('reset-position-btn');
-          if (resetPosBtn) {
-            resetPosBtn.addEventListener('click', () => {
-              plyOffset = { x: 0, y: 0, z: 0 };
-              document.getElementById('ply-x').value = 0;
-              document.getElementById('ply-y').value = 0;
-              document.getElementById('ply-z').value = 0;
-              document.getElementById('ply-x-value').textContent = '0.0';
-              document.getElementById('ply-y-value').textContent = '0.0';
-              document.getElementById('ply-z-value').textContent = '0.0';
-              
-              gsScene.position.set(0, 0, 0);
-              gsScene.updateMatrixWorld();
-              // No need to call renderer.render here - animation loop handles it
-            });
-          }
-          
-          // Confirm position button
-          const confirmPosBtn = document.getElementById('confirm-position-btn');
-          if (confirmPosBtn) {
-            confirmPosBtn.addEventListener('click', async () => {
-              console.log('[preprocessManual] PLY position confirmed:', plyOffset);
-              
-              // ★★★ STOP ANIMATION LOOP ★★★
-              cleanupAnimation();
-              
-              // Apply offset to PLY data if needed
-              if (plyOffset.x !== 0 || plyOffset.y !== 0 || plyOffset.z !== 0) {
-                plyData.vertices.forEach(vertex => {
-                  vertex.x += plyOffset.x;
-                  vertex.y += plyOffset.y;
-                  vertex.z += plyOffset.z;
-                });
-                
-                // Dispose old GS
-                await gs.viewer.dispose();
-                
-                // Create new PLY
-                const newHeader = plyData.header;
-                const newPlyData = parser.createPLYFile(newHeader, plyData.vertices, plyData.vertexSize);
-                const blob = new Blob([newPlyData], { type: 'application/octet-stream' });
-                const adjustedPlyUrl = URL.createObjectURL(blob);
-                
-                // Reload GS
-                gs = await GVRM.initGS(adjustedPlyUrl, undefined, undefined, scene);
-                console.log('[preprocessManual] GS reloaded with adjusted position');
-              }
-              
-              ui.hidePositionAdjustment();
-              ui.setStatus('Step 1: Adjust the bounding box');
-              ui.showControls();
-              
               // ========================================
-              // Step 1: Bounding Box Adjustment
+              // Step 0: PLY Position Adjustment
               // ========================================
-              
-              // ★★★ RESTART ANIMATION FOR BOX ADJUSTMENT ★★★
-              function animateBoxAdjustment() {
-                animationId = requestAnimationFrame(animateBoxAdjustment);
-                updateCameraFromKeys(camera, cameraControls);
-                cameraControls.controls.update();
-                renderer.render(scene, camera);
-              }
-              animateBoxAdjustment();
-              
-             ///////////////////////////////////// 12/13 15:40 START
 
-            // Use calculated bounding box
-            let boxSize = { ...defaultBoxSize };
-            let boxPosition = { ...defaultBoxPosition };
-            ui.createBoundingBox(boxSize, boxPosition);
+              // ========================================
+              // Step 0: Box and PLY Position Adjustment
+              // ========================================
 
-            // Update UI sliders with calculated values
-            const updateSliderRange = (id, valueId, value, size) => {
-              const slider = document.getElementById(id);
-              const valueDisplay = document.getElementById(valueId);
-              
-              if (slider && valueDisplay) {
-                // Set max to 2x the calculated size
-                slider.max = (size * 2).toFixed(1);
-                slider.value = value.toFixed(1);
-                valueDisplay.textContent = value.toFixed(1);
+              ui.setStatus('Step 0: Adjust bounding box to frame your object');
+              ui.showPositionAdjustment();
+
+              // Calculate and display scene bounds
+              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 sceneSize = {
+                x: maxX - minX,
+                y: maxY - minY,
+                z: maxZ - minZ
+              };
+              const sceneCenter = {
+                x: (maxX + minX) / 2,
+                y: (maxY + minY) / 2,
+                z: (maxZ + minZ) / 2
+              };
+
+              console.log('[preprocessManual] Scene bounds:', {
+                size: sceneSize,
+                center: sceneCenter
+              });
+
+              // Display scene info in UI
+              const sceneSizeEl = document.getElementById('scene-size');
+              const sceneCenterEl = document.getElementById('scene-center');
+              if (sceneSizeEl) {
+                sceneSizeEl.textContent = `${sceneSize.x.toFixed(1)}m × ${sceneSize.y.toFixed(1)}m × ${sceneSize.z.toFixed(1)}m`;
               }
-            };
-
-            // Update size sliders
-            updateSliderRange('box-x', 'box-x-value', boxSize.x, defaultBoxSize.x);
-            updateSliderRange('box-y', 'box-y-value', boxSize.y, defaultBoxSize.y);
-            updateSliderRange('box-z', 'box-z-value', boxSize.z, defaultBoxSize.z);
-
-            // Update position slider
-            const boxYPosSlider = document.getElementById('box-y-pos');
-            const boxYPosValue = document.getElementById('box-y-pos-value');
-            if (boxYPosSlider && boxYPosValue) {
-              boxYPosSlider.min = (defaultBoxPosition.y - defaultBoxSize.y).toFixed(1);
-              boxYPosSlider.max = (defaultBoxPosition.y + defaultBoxSize.y).toFixed(1);
-              boxYPosSlider.value = boxPosition.y.toFixed(1);
-              boxYPosValue.textContent = boxPosition.y.toFixed(1);
-            }
+              if (sceneCenterEl) {
+                sceneCenterEl.textContent = `(${sceneCenter.x.toFixed(1)}, ${sceneCenter.y.toFixed(1)}, ${sceneCenter.z.toFixed(1)})`;
+              }
+
+              // Initial box settings (conservative defaults)
+              let boxSize = { x: 3, y: 3, z: 3 };
+              let boxPosition = { x: 0, y: 1, z: 0 };
+              let plyOffset = { x: 0, y: 0, z: 0 };
+
+              const gsScene = gs.viewer.splatMesh.scenes[0];
 
-            ///////////////////////////////////// 12/13 15:40 END
+              // Create initial bounding box
+              ui.createBoundingBox(boxSize, boxPosition);
 
-              // Box sliders setup
-              const setupBoxSlider = (id, valueId, property, isPosition = false) => {
+              // Box size sliders
+              const setupBoxSizeSlider = (id, valueId, axis) => {
                 const slider = document.getElementById(id);
                 const valueDisplay = document.getElementById(valueId);
                 
@@ -983,49 +956,138 @@ export function preprocessManual(vrmPath, gsPath, scene, camera, renderer, stage
                   slider.addEventListener('input', (e) => {
                     const value = parseFloat(e.target.value);
                     valueDisplay.textContent = value.toFixed(1);
-                    
-                    if (isPosition) {
-                      boxPosition[property] = value;
-                    } else {
-                      boxSize[property] = value;
-                    }
-                    
+                    boxSize[axis] = value;
                     ui.updateBoundingBox(boxSize, boxPosition);
                   });
                 }
               };
-              
-              setupBoxSlider('box-x', 'box-x-value', 'x');
-              setupBoxSlider('box-y', 'box-y-value', 'y');
-              setupBoxSlider('box-z', 'box-z-value', 'z');
-              setupBoxSlider('box-y-pos', 'box-y-pos-value', 'y', true);
-              
-              // Apply Box button
-              const applyBtn = document.getElementById('apply-box-btn');
-              if (applyBtn) {
-                applyBtn.addEventListener('click', async () => {
-                  console.log('[preprocessManual] Applying box filter...');
+
+              // Box position sliders
+              const setupBoxPosSlider = (id, valueId, axis) => {
+                const slider = document.getElementById(id);
+                const valueDisplay = document.getElementById(valueId);
+                
+                if (slider && valueDisplay) {
+                  slider.addEventListener('input', (e) => {
+                    const value = parseFloat(e.target.value);
+                    valueDisplay.textContent = value.toFixed(1);
+                    boxPosition[axis] = value;
+                    ui.updateBoundingBox(boxSize, boxPosition);
+                  });
+                }
+              };
+
+              // PLY offset sliders
+              const setupPlyOffsetSlider = (id, valueId, axis) => {
+                const slider = document.getElementById(id);
+                const valueDisplay = document.getElementById(valueId);
+                
+                if (slider && valueDisplay) {
+                  slider.addEventListener('input', (e) => {
+                    const value = parseFloat(e.target.value);
+                    valueDisplay.textContent = value.toFixed(1);
+                    plyOffset[axis] = value;
+                    gsScene.position[axis] = value;
+                    gsScene.updateMatrixWorld();
+                  });
+                }
+              };
+
+              // Setup all sliders
+              setupBoxSizeSlider('box-x-step0', 'box-x-value-step0', 'x');
+              setupBoxSizeSlider('box-y-step0', 'box-y-value-step0', 'y');
+              setupBoxSizeSlider('box-z-step0', 'box-z-value-step0', 'z');
+
+              setupBoxPosSlider('box-x-pos-step0', 'box-x-pos-value-step0', 'x');
+              setupBoxPosSlider('box-y-pos-step0', 'box-y-pos-value-step0', 'y');
+              setupBoxPosSlider('box-z-pos-step0', 'box-z-pos-value-step0', 'z');
+
+              setupPlyOffsetSlider('ply-x', 'ply-x-value', 'x');
+              setupPlyOffsetSlider('ply-y', 'ply-y-value', 'y');
+              setupPlyOffsetSlider('ply-z', 'ply-z-value', 'z');
+
+              // Reset button
+              const resetAllBtn = document.getElementById('reset-all-btn');
+              if (resetAllBtn) {
+                resetAllBtn.addEventListener('click', () => {
+                  // Reset box
+                  boxSize = { x: 3, y: 3, z: 3 };
+                  boxPosition = { x: 0, y: 1, z: 0 };
+                  document.getElementById('box-x-step0').value = 3;
+                  document.getElementById('box-y-step0').value = 3;
+                  document.getElementById('box-z-step0').value = 3;
+                  document.getElementById('box-x-value-step0').textContent = '3.0';
+                  document.getElementById('box-y-value-step0').textContent = '3.0';
+                  document.getElementById('box-z-value-step0').textContent = '3.0';
+                  
+                  document.getElementById('box-x-pos-step0').value = 0;
+                  document.getElementById('box-y-pos-step0').value = 1;
+                  document.getElementById('box-z-pos-step0').value = 0;
+                  document.getElementById('box-x-pos-value-step0').textContent = '0.0';
+                  document.getElementById('box-y-pos-value-step0').textContent = '1.0';
+                  document.getElementById('box-z-pos-value-step0').textContent = '0.0';
+                  
+                  // Reset PLY offset
+                  plyOffset = { x: 0, y: 0, z: 0 };
+                  document.getElementById('ply-x').value = 0;
+                  document.getElementById('ply-y').value = 0;
+                  document.getElementById('ply-z').value = 0;
+                  document.getElementById('ply-x-value').textContent = '0.0';
+                  document.getElementById('ply-y-value').textContent = '0.0';
+                  document.getElementById('ply-z-value').textContent = '0.0';
+                  
+                  gsScene.position.set(0, 0, 0);
+                  gsScene.updateMatrixWorld();
+                  ui.updateBoundingBox(boxSize, boxPosition);
+                });
+              }
+
+              // Confirm button
+              const confirmBoxBtn = document.getElementById('confirm-box-btn');
+              if (confirmBoxBtn) {
+                confirmBoxBtn.addEventListener('click', async () => {
+                  console.log('[preprocessManual] Box confirmed:', { boxSize, boxPosition, plyOffset });
                   
-                  // ★★★ STOP ANIMATION LOOP BEFORE HEAVY PROCESSING ★★★
                   cleanupAnimation();
                   
-                  ui.setStatus('Filtering splats...');
+                  // Apply PLY offset if any
+                  if (plyOffset.x !== 0 || plyOffset.y !== 0 || plyOffset.z !== 0) {
+                    plyData.vertices.forEach(vertex => {
+                      vertex.x += plyOffset.x;
+                      vertex.y += plyOffset.y;
+                      vertex.z += plyOffset.z;
+                    });
+                    
+                    await gs.viewer.dispose();
+                    
+                    const newHeader = plyData.header;
+                    const newPlyData = parser.createPLYFile(newHeader, plyData.vertices, plyData.vertexSize);
+                    const blob = new Blob([newPlyData], { type: 'application/octet-stream' });
+                    const adjustedPlyUrl = URL.createObjectURL(blob);
+                    
+                    gs = await GVRM.initGS(adjustedPlyUrl, undefined, undefined, scene);
+                    console.log('[preprocessManual] GS reloaded with adjusted position');
+                  }
+                  
+                  ui.hidePositionAdjustment();
+                  ui.setStatus('Filtering splats with bounding box...');
                   
-                  // Filter splats
+                  // Filter splats immediately
                   const filteredVertices = filterSplatsByBox(plyData, boxSize, boxPosition);
                   
                   if (filteredVertices.length === 0) {
-                    alert('No splats found in the box! Please adjust the box size/position.');
-                    // Restart animation
-                    animateBoxAdjustment();
+                    alert('No splats found in the box! Please adjust the box size/position and try again.');
+                    ui.showPositionAdjustment();
                     return;
                   }
                   
-                  // Create new PLY file
+                  console.log(`[preprocessManual] Filtered ${filteredVertices.length}/${plyData.vertices.length} splats`);
+                  
+                  // Create filtered PLY
                   const filteredPlyUrl = createFilteredPLY(
-                    parser, 
-                    plyData.header, 
-                    filteredVertices, 
+                    parser,
+                    plyData.header,
+                    filteredVertices,
                     plyData.vertexSize
                   );
                   
@@ -1046,75 +1108,37 @@ export function preprocessManual(vrmPath, gsPath, scene, camera, renderer, stage
                   // Create GVRM instance
                   const gvrm = new GVRM(character, filteredGs);
                   
-                  ui.showBoneAssignment();
                   ui.setStatus('Step 2: Assign splats to bones');
+                  ui.showBoneAssignment();
                   
                   // ========================================
                   // Step 2: Bone Assignment
                   // ========================================
                   const promise2 = setupBoneAssignment(
-                    ui, scene, camera, renderer, 
+                    ui, scene, camera, renderer,
                     gvrm, character, filteredGs, filteredPlyUrl,
                     vrmPath, useGPU, savePly, fileName,
-                    { vertices: filteredVertices, header: plyData.header, vertexSize: plyData.vertexSize }, // filteredPlyData
-                    plyData  // originalPlyData
+                    { vertices: filteredVertices, header: plyData.header, vertexSize: plyData.vertexSize },
+                    plyData
                   );
                   
-                  // Resolve main promise
                   resolve({
                     gvrm: gvrm,
                     promise2: promise2,
                     error: null,
                     ui: ui
                   });
-                  
                 });
               }
-            });
-          }
-          
-        }).catch(err => {
-          console.error('[preprocessManual] GS init error:', err);
-          ui.setStatus('Error loading GS: ' + err.message);
-          resolve({
-            gvrm: null,
-            promise2: Promise.resolve(),
-            error: 'GS initialization failed: ' + err.message
-          });
-        });
-          
-        }).catch(err => {
-          console.error('[preprocessManual] PLY parse error:', err);
-          loadingSpinner.removeTask(task);
-          resolve({
-            gvrm: null,
-            promise2: Promise.resolve(),
-            error: 'Failed to load PLY: ' + err.message
-          });
-        });
-        
 
 
+              // ========================================
+              // Step 1: Bounding Box Adjustment Deleted 
+              // ========================================
 
-      }).catch(err => {
-        console.error('[preprocessManual] UI init error:', err);
-        resolve({
-          gvrm: null,
-          promise2: Promise.resolve(),
-          error: 'UI initialization failed: ' + err.message
-        });
-      });
-      
-    } catch (err) {
-      console.error('[preprocessManual] Exception:', err);
-      resolve({
-        gvrm: null,
-        promise2: Promise.resolve(),
-        error: 'Exception: ' + err.message
-      });
-    }
-  });
-}
+////////////////////////////12/13 16:20 END
+
+              
 
 // ========================================
 // Bone Assignment Setup Function