Upload preprocess_manual.js

preprocess_manual.js

@@ -2414,7 +2414,312 @@ function setupBoneAssignment(ui, scene, camera, renderer, gvrm, character, filte
           }
         });
       }
+      ////helper関数挿入
+
+// ========================================
+// 完全なペイント・選択機能
+// "// ========================================
+// // Selection Radius
+// // ========================================"
+// の直後に追加してください
+// ========================================
+
+// ========================================
+// Raycaster と マウスイベント
+// ========================================
+const raycaster = new THREE.Raycaster();
+const mouse = new THREE.Vector2();
+
+/**
+ * 2D画面座標から最も近い3D Splatを検索
+ */
+function findNearestSplat(mouseX, mouseY, camera, filteredGs, maxScreenDistance = 100) {
+  console.log('[findNearestSplat] Searching for splat near mouse:', { mouseX, mouseY });
+  
+  const canvas = renderer.domElement;
+  const mousePixelX = (mouseX + 1) * canvas.width / 2;
+  const mousePixelY = (-mouseY + 1) * canvas.height / 2;
+  
+  let nearestSplatIndex = -1;
+  let nearestScreenDist = Infinity;
+  let nearestWorldDist = Infinity;
+  
+  const cameraPos = camera.position;
+  const worldPos = new THREE.Vector3();
+  const screenPos = new THREE.Vector3();
+  
+  for (let i = 0; i < filteredGs.splatCount; i++) {
+    worldPos.x = filteredGs.centers0[i * 3 + 0];
+    worldPos.y = filteredGs.centers0[i * 3 + 1];
+    worldPos.z = filteredGs.centers0[i * 3 + 2];
+    
+    screenPos.copy(worldPos);
+    screenPos.project(camera);
+    
+    if (screenPos.z > 1) continue;
+    
+    const screenPixelX = (screenPos.x + 1) * canvas.width / 2;
+    const screenPixelY = (-screenPos.y + 1) * canvas.height / 2;
+    
+    const dx = screenPixelX - mousePixelX;
+    const dy = screenPixelY - mousePixelY;
+    const screenDist = Math.sqrt(dx * dx + dy * dy);
+    
+    if (screenDist < maxScreenDistance && screenDist < nearestScreenDist) {
+      nearestScreenDist = screenDist;
+      nearestSplatIndex = i;
+      
+      const worldDx = worldPos.x - cameraPos.x;
+      const worldDy = worldPos.y - cameraPos.y;
+      const worldDz = worldPos.z - cameraPos.z;
+      nearestWorldDist = Math.sqrt(worldDx * worldDx + worldDy * worldDy + worldDz * worldDz);
+    }
+  }
+  
+  if (nearestSplatIndex >= 0) {
+    console.log('[findNearestSplat] ✓ Found nearest splat:', {
+      index: nearestSplatIndex,
+      screenDistance: nearestScreenDist.toFixed(1) + 'px',
+      worldDistance: nearestWorldDist.toFixed(3) + 'm'
+    });
+    
+    return {
+      index: nearestSplatIndex,
+      screenDistance: nearestScreenDist,
+      worldDistance: nearestWorldDist
+    };
+  }
+  
+  console.log('[findNearestSplat] ✗ No splat found within', maxScreenDistance, 'px');
+  return null;
+}
+
+/**
+ * 球体範囲内の全Splatを検索
+ */
+function findSplatsInSphere(center, radius, filteredGs) {
+  const indicesInSphere = [];
+  const radiusSquared = radius * radius;
+  
+  for (let i = 0; i < filteredGs.splatCount; i++) {
+    const x = filteredGs.centers0[i * 3 + 0];
+    const y = filteredGs.centers0[i * 3 + 1];
+    const z = filteredGs.centers0[i * 3 + 2];
+    
+    const dx = x - center.x;
+    const dy = y - center.y;
+    const dz = z - center.z;
+    const distSquared = dx * dx + dy * dy + dz * dz;
+    
+    if (distSquared <= radiusSquared) {
+      indicesInSphere.push(i);
+    }
+  }
+  
+  console.log('[findSplatsInSphere] Found', indicesInSphere.length, 'splats within radius', radius.toFixed(2), 'm');
+  return indicesInSphere;
+}
+
+/**
+ * ペイントモード用: マウスパスに沿ってSplatを塗る
+ */
+function findSplatsAlongMousePath(mouseX, mouseY, lastMouseX, lastMouseY, camera, filteredGs, brushRadius = 30) {
+  const affectedSplats = new Set();
+  
+  const steps = 5;
+  for (let step = 0; step <= steps; step++) {
+    const t = step / steps;
+    const interpX = lastMouseX + (mouseX - lastMouseX) * t;
+    const interpY = lastMouseY + (mouseY - lastMouseY) * t;
+    
+    const result = findNearestSplatWithRadius(interpX, interpY, camera, filteredGs, brushRadius);
+    if (result && result.indices) {
+      result.indices.forEach(idx => affectedSplats.add(idx));
+    }
+  }
+  
+  return Array.from(affectedSplats);
+}
+
+/**
+ * ブラシ半径内の全Splatを返す
+ */
+function findNearestSplatWithRadius(mouseX, mouseY, camera, filteredGs, brushRadius) {
+  const canvas = renderer.domElement;
+  const mousePixelX = (mouseX + 1) * canvas.width / 2;
+  const mousePixelY = (-mouseY + 1) * canvas.height / 2;
+  
+  const affectedIndices = [];
+  const worldPos = new THREE.Vector3();
+  const screenPos = new THREE.Vector3();
+  
+  for (let i = 0; i < filteredGs.splatCount; i++) {
+    worldPos.x = filteredGs.centers0[i * 3 + 0];
+    worldPos.y = filteredGs.centers0[i * 3 + 1];
+    worldPos.z = filteredGs.centers0[i * 3 + 2];
+    
+    screenPos.copy(worldPos);
+    screenPos.project(camera);
+    
+    if (screenPos.z > 1) continue;
+    
+    const screenPixelX = (screenPos.x + 1) * canvas.width / 2;
+    const screenPixelY = (-screenPos.y + 1) * canvas.height / 2;
+    
+    const dx = screenPixelX - mousePixelX;
+    const dy = screenPixelY - mousePixelY;
+    const screenDist = Math.sqrt(dx * dx + dy * dy);
+    
+    if (screenDist < brushRadius) {
+      affectedIndices.push(i);
+    }
+  }
+  
+  return affectedIndices.length > 0 ? { indices: affectedIndices } : null;
+}
+
+// ========================================
+// マウスイベント処理
+// ========================================
+
+let lastPaintMouseX = null;
+let lastPaintMouseY = null;
+
+renderer.domElement.addEventListener('mousedown', (event) => {
+  if (!isPaintMode || !selectedTarget) return;
+  
+  isPainting = true;
+  paintModeEraser = event.shiftKey;
+  
+  const rect = renderer.domElement.getBoundingClientRect();
+  mouse.x = ((event.clientX - rect.left) / rect.width) * 2 - 1;
+  mouse.y = -((event.clientY - rect.top) / rect.height) * 2 + 1;
+  
+  lastPaintMouseX = mouse.x;
+  lastPaintMouseY = mouse.y;
+  
+  // 最初のクリック位置でペイント
+  handlePaintAtPosition(mouse.x, mouse.y);
+});
+
+renderer.domElement.addEventListener('mousemove', (event) => {
+  if (!isPainting || !isPaintMode) return;
+  
+  const rect = renderer.domElement.getBoundingClientRect();
+  mouse.x = ((event.clientX - rect.left) / rect.width) * 2 - 1;
+  mouse.y = -((event.clientY - rect.top) / rect.height) * 2 + 1;
+  
+  // パスに沿ってペイント
+  const affectedIndices = findSplatsAlongMousePath(
+    mouse.x, mouse.y,
+    lastPaintMouseX, lastPaintMouseY,
+    camera, filteredGs,
+    30 // ブラシ半径30px
+  );
+  
+  if (affectedIndices.length > 0) {
+    applyAssignmentToIndices(affectedIndices, selectedTarget, paintModeEraser);
+  }
+  
+  lastPaintMouseX = mouse.x;
+  lastPaintMouseY = mouse.y;
+});
+
+renderer.domElement.addEventListener('mouseup', () => {
+  isPainting = false;
+  lastPaintMouseX = null;
+  lastPaintMouseY = null;
+});
+
+/**
+ * ペイント処理を実行
+ */
+function handlePaintAtPosition(mouseX, mouseY) {
+  const result = findNearestSplatWithRadius(mouseX, mouseY, camera, filteredGs, 30);
+  
+  if (result && result.indices.length > 0) {
+    applyAssignmentToIndices(result.indices, selectedTarget, paintModeEraser);
+  } else {
+    console.log('[Paint] No splats found under cursor');
+  }
+}
+
+// ========================================
+// 球体選択ボタン
+// ========================================
+
+const selectSphereBtn = document.getElementById('select-sphere-btn');
+
+if (selectSphereBtn) {
+  selectSphereBtn.addEventListener('click', () => {
+    if (!selectedTarget) {
+      alert('Please select a target bone or group first!');
+      return;
+    }
+    
+    selectionMode = 'sphere';
+    console.log('[Sphere Selection] Mode activated, radius:', selectionRadius, 'm');
+    console.log('[Sphere Selection] Click on a splat to select all nearby splats');
+    
+    const onSphereClick = (event) => {
+      const rect = renderer.domElement.getBoundingClientRect();
+      mouse.x = ((event.clientX - rect.left) / rect.width) * 2 - 1;
+      mouse.y = -((event.clientY - rect.top) / rect.height) * 2 + 1;
+      
+      // ⭐ 改善: 最も近いsplatを見つける
+      const nearestResult = findNearestSplat(mouse.x, mouse.y, camera, filteredGs, 100);
+      
+      if (!nearestResult) {
+        alert('No splat found near click. Please click closer to the object.');
+        renderer.domElement.removeEventListener('click', onSphereClick);
+        selectionMode = null;
+        return;
+      }
+      
+      const centerIdx = nearestResult.index;
+      
+      const centerX = filteredGs.centers0[centerIdx * 3 + 0];
+      const centerY = filteredGs.centers0[centerIdx * 3 + 1];
+      const centerZ = filteredGs.centers0[centerIdx * 3 + 2];
+      const center = new THREE.Vector3(centerX, centerY, centerZ);
+      
+      console.log('[Sphere Selection] Center splat:', centerIdx, 'at', center);
+      
+      const indicesInSphere = findSplatsInSphere(center, selectionRadius, filteredGs);
+      
+      if (indicesInSphere.length === 0) {
+        alert('No splats found in sphere. Try increasing the radius.');
+        renderer.domElement.removeEventListener('click', onSphereClick);
+        selectionMode = null;
+        return;
+      }
+      
+      applyAssignmentToIndices(indicesInSphere, selectedTarget, false);
       
+      assignmentData.history.push({
+        action: 'sphere_select',
+        indices: [...indicesInSphere],
+        target: selectedTarget
+      });
+      
+      console.log('[Sphere Selection] Completed:', indicesInSphere.length, 'splats assigned');
+      
+      renderer.domElement.removeEventListener('click', onSphereClick);
+      selectionMode = null;
+    };
+    
+    renderer.domElement.addEventListener('click', onSphereClick);
+  });
+}
+
+console.log('[setupBoneAssignment] ✓ Improved splat selection system initialized');
+console.log('[setupBoneAssignment] Features:');
+console.log('  - Finds nearest splat within 100px');
+console.log('  - Paint mode with drag support');
+console.log('  - Smooth brush strokes with interpolation');
+console.log('  - Sphere selection with improved center detection');
+
+      ////helper関数挿入
       // ========================================
       // Statistics Update
       // ========================================
@@ -2471,9 +2776,7 @@ function setupBoneAssignment(ui, scene, camera, renderer, gvrm, character, filte
         // ========================================
         // Raycaster Setup
         // ========================================
-        ////ここから
-        const raycaster = new THREE.Raycaster();
-        const mouse = new THREE.Vector2();
+
 
 //////挿入箇所start
 
@@ -2672,9 +2975,6 @@ function findNearestSplatWithRadius(mouseX, mouseY, camera, filteredGs, brushRad
 // マウスクリック/ドラッグイベント処理の改善例
 // ========================================
 
-// グローバル変数
-let lastPaintMouseX = null;
-let lastPaintMouseY = null;
 
 // マウスダウンイベント
 renderer.domElement.addEventListener('mousedown', (event) => {
@@ -2801,8 +3101,7 @@ function applyAssignmentToIndices(indices, target, isEraser) {
 // 球体選択モード（元のコード互換）
 // ========================================
 
-// Sphere Selection Button
-const selectSphereBtn = document.getElementById('select-sphere-btn');
+
 
 if (selectSphereBtn) {
   selectSphereBtn.addEventListener('click', () => {