Upload preprocess_manual.js

preprocess_manual.js

@@ -1464,8 +1464,9 @@ if (confirmBoxBtn) {
 
 ///// Line 1113-1419 を以下に置き換え ///// Line 1113-1419 を以下に置き換え
 
-        /////////////////////////////////////////15:01
-        // GSの初期表示
+
+        /////////////////////////////ここから
+
         GVRM.initGS(gsPath, undefined, undefined, scene).then((gs) => {
           console.log('[preprocessManual] GS initialized');
           
@@ -1490,10 +1491,14 @@ if (confirmBoxBtn) {
           }
 
           // ========================================
-          // ⭐ 1. まずカメラコントロールを初期化
+          // ⭐ 1. カメラコントロールを初期化（グローバルに保存）
           // ========================================
-          const cameraControls = setupCameraControls(camera, renderer);
-          console.log('[preprocessManual] Camera controls initialized');
+          if (!window.globalCameraControls) {
+            window.globalCameraControls = setupCameraControls(camera, renderer);
+            console.log('[preprocessManual] ✓ Camera controls created and saved globally');
+          } else {
+            console.log('[preprocessManual] Using existing global camera controls');
+          }
           
           // ========================================
           // ⭐ 2. キーボードコントロールを初期化
@@ -1503,9 +1508,9 @@ if (confirmBoxBtn) {
 
           // ========================================
           // ⭐ 3. アニメーションループを開始
-          // ======================================== 12/18 02:00
-
-          // ⭐ グローバルなカメラロック状態
+          // ========================================
+          
+          // グローバルなカメラロック状態
           if (!window.cameraLockState) {
             window.cameraLockState = { 
               locked: false,
@@ -1521,18 +1526,18 @@ if (confirmBoxBtn) {
             
             // キーボードコントロールの更新（カメラロック時は無効化）
             if (!window.cameraLockState.locked) {
-              updateCameraFromKeys(camera, cameraControls);
+              updateCameraFromKeys(camera, window.globalCameraControls);
             }
             
             // ⭐⭐⭐ 重要：カメラがロックされている場合はOrbitControlsを強制的に無効化し続ける
             if (window.cameraLockState.locked) {
-              if (cameraControls && cameraControls.controls) {
-                cameraControls.controls.enabled = false;
+              if (window.globalCameraControls && window.globalCameraControls.controls) {
+                window.globalCameraControls.controls.enabled = false;
               }
             } else {
               // カメラがアンロックされている場合のみ更新
-              if (cameraControls && cameraControls.controls) {
-                cameraControls.controls.update();
+              if (window.globalCameraControls && window.globalCameraControls.controls) {
+                window.globalCameraControls.controls.update();
               }
             }
             
@@ -1540,7 +1545,7 @@ if (confirmBoxBtn) {
             if (window.cameraLockState.frameCount % 600 === 0) {
               console.log('[animateControls] Status check:', {
                 locked: window.cameraLockState.locked,
-                controlsEnabled: cameraControls?.controls?.enabled,
+                controlsEnabled: window.globalCameraControls?.controls?.enabled,
                 frame: window.cameraLockState.frameCount
               });
             }
@@ -1551,6 +1556,7 @@ if (confirmBoxBtn) {
           animateControls();
           console.log('[preprocessManual] ✓ Animation loop started with camera lock support');
 
+          ////ここまで
 
           // Cleanup function to stop animation
           const cleanupAnimation = () => {
@@ -1597,15 +1603,17 @@ if (confirmBoxBtn) {
           camera.position.set(0, maxDim * 0.3, distance);
           camera.lookAt(0, 0, 0);
           camera.updateProjectionMatrix();
-
-          cameraControls.controls.target.set(0, 0, 0);
-          cameraControls.controls.update();
+////
+          window.globalCameraControls.controls.target.set(0, 0, 0);
+          window.globalCameraControls.controls.update();
 
           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] Initial box setup - size:', boxSize);
 
 
@@ -2476,92 +2484,91 @@ function setupBoneAssignment(ui, scene, camera, renderer, gvrm, character, filte
         // ========================================
         // Camera Lock Setup (完全版)
         // ========================================
-        console.log('[setupBoneAssignment] Setting up camera lock...');
+   /////ここから
 
-        // ボタンを取得
-        const cameraLockBtn = document.getElementById('camera-lock-btn');
 
-        if (!cameraLockBtn) {
-          console.error('[setupBoneAssignment] ❌ Camera lock button NOT FOUND!');
-        } else {
-          console.log('[setupBoneAssignment] ✓ Camera lock button found');
-          
-          // カメラロック切り替え関数
-          function toggleCameraLock() {
-            // グローバル状態を反転
-            window.cameraLockState.locked = !window.cameraLockState.locked;
-            const isLocked = window.cameraLockState.locked;
-            
-            console.log('');
-            console.log('═══════════════════════════════════════════════');
-            console.log('   CAMERA LOCK TOGGLE');
-            console.log('═══════════════════════════════════════════════');
-            console.log('New state:', isLocked ? '🔒 LOCKED' : '🔓 UNLOCKED');
+      // ========================================
+      // Camera Lock Setup の修正版
+      // Line 2479-2562 付近を以下に置き換えてください
+      // ========================================
+
+      console.log('[setupBoneAssignment] Setting up camera lock...');
+
+      const cameraLockBtn = document.getElementById('camera-lock-btn');
+
+      if (!cameraLockBtn) {
+        console.error('[setupBoneAssignment] ❌ Camera lock button NOT FOUND!');
+      } else {
+        console.log('[setupBoneAssignment] ✓ Camera lock button found');
+        
+        // カメラロック切り替え関数
+        function toggleCameraLock() {
+          // グローバル状態を反転
+          window.cameraLockState.locked = !window.cameraLockState.locked;
+          const isLocked = window.cameraLockState.locked;
+          
+          console.log('');
+          console.log('═══════════════════════════════════════════════');
+          console.log('   CAMERA LOCK TOGGLE');
+          console.log('═══════════════════════════════════════════════');
+          console.log('New state:', isLocked ? '🔒 LOCKED' : '🔓 UNLOCKED');
+          
+          if (isLocked) {
+            console.log('Locking camera...');
             
-            if (isLocked) {
-              // === カメラをロック ===
-              console.log('Locking camera...');
-              
-              // OrbitControlsを無効化
-              if (cameraControls && cameraControls.controls) {
-                cameraControls.controls.enabled = false;
-                console.log('  ✓ OrbitControls.enabled = false');
-              } else {
-                console.warn('  ⚠️ cameraControls not available!');
-              }
-              
-              // UIを更新
-              cameraLockBtn.textContent = '🔒 Camera Locked (Fixed View)';
-              cameraLockBtn.style.background = '#E91E63';
-              cameraLockBtn.style.fontWeight = 'bold';
-              
-              console.log('✅ Camera locked');
-              console.log('ℹ️  Try to rotate the camera with mouse - it should NOT move');
-              console.log('ℹ️  You can still click to paint');
-              
-            } else {
-              // === カメラのロックを解除 ===
-              console.log('Unlocking camera...');
-              
-              // OrbitControlsを有効化
-              if (cameraControls && cameraControls.controls) {
-                cameraControls.controls.enabled = true;
-                console.log('  ✓ OrbitControls.enabled = true');
-              } else {
-                console.warn('  ⚠️ cameraControls not available!');
-              }
-              
-              // UIを更新
-              cameraLockBtn.textContent = '🔓 Camera Unlocked (Can Rotate)';
-              cameraLockBtn.style.background = '#9C27B0';
-              cameraLockBtn.style.fontWeight = 'bold';
-              
-              console.log('✅ Camera unlocked');
-              console.log('ℹ️  Camera can now be rotated with mouse');
+            // OrbitControlsを無効化
+            if (cameraControls && cameraControls.controls) {
+              cameraControls.controls.enabled = false;
+              console.log('  ✓ OrbitControls.enabled = false');
             }
             
-            // 現在の状態を詳細表示
-            console.log('─────────────────────────────────────────────');
-            console.log('Current state:');
-            console.log('  window.cameraLockState.locked:', window.cameraLockState.locked);
-            console.log('  cameraControls exists:', !!(cameraControls && cameraControls.controls));
+            // ⭐⭐⭐ ボタンのテキストとスタイルを��新 ⭐⭐⭐
+            cameraLockBtn.textContent = '🔒 Camera Locked (Click to Unlock)';
+            cameraLockBtn.style.background = '#4CAF50'; // 緑色に変更
+            
+            console.log('✅ Camera locked');
+            console.log('ℹ️  Try to rotate the camera with mouse - it should NOT move');
+            console.log('ℹ️  You can still click to paint');
+            
+          } else {
+            console.log('Unlocking camera...');
+            
+            // OrbitControlsを有効化
             if (cameraControls && cameraControls.controls) {
-              console.log('  cameraControls.controls.enabled:', cameraControls.controls.enabled);
+              cameraControls.controls.enabled = true;
+              console.log('  ✓ OrbitControls.enabled = true');
             }
-            console.log('═══════════════════════════════════════════════');
-            console.log('');
+            
+            // ⭐⭐⭐ ボタンのテキストとスタイルを更新 ⭐⭐⭐
+            cameraLockBtn.textContent = '🔓 Camera Unlocked (Can Rotate)';
+            cameraLockBtn.style.background = '#9C27B0'; // 元の紫色に戻す
+            
+            console.log('✅ Camera unlocked');
+            console.log('ℹ️  Camera can now be rotated with mouse');
           }
           
-          // ボタンにイベントリスナーを設定
-          cameraLockBtn.onclick = function(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            toggleCameraLock();
-          };
-          
-          console.log('[setupBoneAssignment] ✓ Camera lock button configured');
-          console.log('[setupBoneAssignment] Initial state: UNLOCKED');
+          // デバッグ情報を出力
+          console.log('─────────────────────────────────────────────');
+          console.log('Current state:');
+          console.log('  window.cameraLockState.locked:', window.cameraLockState.locked);
+          console.log('  cameraControls exists:', !!cameraControls);
+          if (cameraControls && cameraControls.controls) {
+            console.log('  cameraControls.controls.enabled:', cameraControls.controls.enabled);
+          }
+          console.log('  Button text:', cameraLockBtn.textContent);
+          console.log('═══════════════════════════════════════════════');
+          console.log('');
         }
+        
+        // ✅ ボタンのクリックイベントを設定
+        cameraLockBtn.addEventListener('click', toggleCameraLock);
+        
+        console.log('[setupBoneAssignment] ✓ Camera lock button configured');
+        console.log('[setupBoneAssignment] Initial state: UNLOCKED');
+      }
+
+        ////ここまで       
+
 
 
 // Call this after OrbitControls is created