Fix Three.js bundling: Remove external aliases, ensure proper dependency bundling

Author: Parsa Azari

dist/index.html

@@ -5,6 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>3D Portfolio</title>
   <link rel="icon" type="image/x-icon" href="/3D-Portfolio/favicon.ico">
+  <!-- Fixed deployment - v3 -->
   <style>
     body {
       margin: 0;
@@ -126,7 +127,7 @@
       transition: opacity 0.3s ease;
     }
   </style>
-  <script type="module" crossorigin src="/3D-Portfolio/assets/index-QhzON4yl.js"></script>
+  <script type="module" crossorigin src="/3D-Portfolio/assets/index-DCxxmV1z.js"></script>
   <link rel="stylesheet" crossorigin href="/3D-Portfolio/assets/index-BnuVihSM.css">
 </head>
 

src/core/rendering/environments/SeveranceEnvironment.js

@@ -3968,13 +3968,19 @@ export class SeveranceEnvironment extends BaseEnvironment {
     if (bulbMeshes.length === 0) {
       // Try fallback: find mesh with high white/emissive material
       lampMesh.traverse((child) => {
-        if (child.isMesh && child.material && child.material.emissive && child.material.emissive.getHex() === 0xffffff) {
-          bulbMeshes.push(child);
+        if (child.isMesh && child.material) {
+          // Look for bulb meshes by name or emissive property
+          const isLightBulb = child.name.toLowerCase().includes('bulb') || 
+                             child.name.toLowerCase().includes('light') ||
+                             (child.material.emissive && child.material.emissive.getHex() === 0xffffff);
+          if (isLightBulb) {
+            bulbMeshes.push(child);
+          }
         }
       });
     }
     if (bulbMeshes.length === 0) {
-      console.warn('[Lamp Shader] No bulb mesh found in lamp.glb. No shader applied.');
+      console.log('[Lamp Shader] No bulb mesh found in lamp.glb. Using standard material.');
     } else {
       const lampShaderMat = createLampLightShaderMaterial();
       bulbMeshes.forEach(bulb => {
@@ -4679,7 +4685,9 @@ export class SeveranceEnvironment extends BaseEnvironment {
             const textureLoader = new THREE.TextureLoader();
 
             // Create the appropriate path based on posterTitle
-            const basePath = getAssetPath(`Images/performance/solo performances/${posterTitle.toLowerCase()}/`);
+            // Normalize title: convert to lowercase and replace spaces with hyphens
+            const normalizedTitle = posterTitle.toLowerCase().replace(/ /g, '-');
+            const basePath = getAssetPath(`Images/performance/solo-performances/${normalizedTitle}/`);
             console.log(`Looking for images at path: ${basePath}`);
 
             for (let i = 0; i < count; i++) {
@@ -4716,25 +4724,28 @@ export class SeveranceEnvironment extends BaseEnvironment {
                 // Get appropriate image filename based on gallery type
                 let imageName = null;
 
-                if (posterTitle === 'Circle of Confusion') {
-                    // Files are named: photo_2025-05-01_17-25-22.jpg, photo_2025-05-01_17-25-22 (2).jpg, etc.
-                    // Note: No (1) file, starts with no suffix then goes to (2)
-                    if (i === 0) {
-                        imageName = 'photo_2025-05-01_17-25-22.jpg';
-                    } else if (i < 6) {
-                        // Use (2) through (6) for indexes 1-5
-                        imageName = `photo_2025-05-01_17-25-22 (${i+1}).jpg`;
-                    }
-                } else if (posterTitle === 'Dissolve') {
-                    // Files are named: سی پرفورمنس ،سی هنرمند، سی روز 3.jpg, سی پرفورمنس ،سی هنرمند، سی روز 3 (1).jpg, etc.
-                    if (i === 0) {
-                        imageName = 'سی پرفورمنس ،سی هنرمند، سی روز 3.jpg';
-                    } else if (i < 18) { // We have up to (18)
-                        imageName = `سی پرفورمنس ،سی هنرمند، سی روز 3 (${i}).jpg`;
-                    }
-                } else if (posterTitle === 'Friends') {
-                    // Files have various names, map them explicitly
-                    const friendsImages = [
+                // Define simple image arrays for each gallery
+                const imageArrays = {
+                    'Circle of Confusion': [
+                        'photo_2025-05-01_17-25-22.jpg',
+                        'photo_2025-05-01_17-25-22_(2).jpg',
+                        'photo_2025-05-01_17-25-22_(3).jpg',
+                        'photo_2025-05-01_17-25-22_(4).jpg',
+                        'photo_2025-05-01_17-25-22_(5).jpg',
+                        'photo_2025-05-01_17-25-22_(6).jpg'
+                    ],
+                    'Dissolve': [
+                        'dissolve-base.jpg',
+                        'dissolve-1.jpg',
+                        'dissolve-2.jpg',
+                        'dissolve-3.jpg',
+                        'dissolve-4.jpg',
+                        'dissolve-5.jpg',
+                        'dissolve-6.jpg',
+                        'dissolve-7.jpg',
+                        'dissolve-8.jpg'
+                    ],
+                    'Friends': [
                         'photo_2025-05-01_17-29-01.jpg',
                         'M2RjNjJmMjZk.jpg',
                         'NzIwYjJkZmQ1.jpg',
@@ -4743,15 +4754,13 @@ export class SeveranceEnvironment extends BaseEnvironment {
                         'MGE1ZjJiODcw.jpg',
                         'YmQ4YmZlY2U4.jpg',
                         'N2MyYTc3OWFj.jpg',
-                        'NDc1MWY3OGM2.jpg',
-                        'M2MwYmIyMzY4.jpg',
-                        'NDc2M2NhOTc3.jpg',
-                        'MzkyNmRjZDFm.jpg',
-                        'ZDY5ZmU5Njg2.jpg'
-                    ];
-                    if (i < friendsImages.length) {
-                        imageName = friendsImages[i];
-                    }
+                        'NDc1MWY3OGM2.jpg'
+                    ]
+                };
+                
+                const availableImages = imageArrays[posterTitle] || [];
+                if (i < availableImages.length) {
+                    imageName = availableImages[i];
                 }
 
                 let imageMaterial;
@@ -6334,7 +6343,8 @@ function createKrugerTextTexture(text, { width = 1024, height = 256, bgColor = '
 // Helper function to get image paths for a given poster title
 const getArtPosterImagePaths = (title) => {
   // Path that matches the known directory structure
-  const correctBasePath = getAssetPath(`assets/Images/performance/solo performances/${title.toLowerCase()}/`); 
+      const normalizedTitle = title.toLowerCase().replace(/ /g, '-');
+    const correctBasePath = getAssetPath(`assets/Images/performance/solo-performances/${normalizedTitle}/`); 
   const urls = [];
   let count = 0;
 
@@ -6347,22 +6357,30 @@ const getArtPosterImagePaths = (title) => {
   }
 
   if (title === 'Circle of Confusion') {
-    count = 6; 
-    const baseFileName = 'photo_2025-05-01_17-25-22';
-    for (let i = 0; i < count; i++) {
-      if (i === 0) {
-        pushUrl(`${correctBasePath}${baseFileName}.jpg`);
-      } else {
-        pushUrl(`${correctBasePath}${baseFileName} (${i + 1}).jpg`);
-      }
-    }
+    // Use the actual file names that exist in the directory
+    const circleImages = [
+      'photo_2025-05-01_17-25-22.jpg',
+      'photo_2025-05-01_17-25-22_(2).jpg',
+      'photo_2025-05-01_17-25-22_(3).jpg', 
+      'photo_2025-05-01_17-25-22_(4).jpg',
+      'photo_2025-05-01_17-25-22_(5).jpg',
+      'photo_2025-05-01_17-25-22_(6).jpg'
+    ];
+    circleImages.forEach(imgName => {
+      pushUrl(`${correctBasePath}${imgName}`);
+    });
   } else if (title === 'Dissolve') {
-    count = 14; // Reduce to 14 images based on error messages
-    const baseFileName = 'سی پرفورمنس ،سی هنرمند، سی روز 3'; // Changed to use spaces instead of plus signs
-    pushUrl(`${correctBasePath}${baseFileName}.jpg`); 
-    for (let i = 1; i < count; i++) { 
-      pushUrl(`${correctBasePath}${baseFileName} (${i}).jpg`);
-    }
+    // Use the actual file names that exist in the directory
+    const dissolveImages = [
+      'dissolve-base.jpg', 'dissolve-1.jpg', 'dissolve-2.jpg', 'dissolve-3.jpg',
+      'dissolve-4.jpg', 'dissolve-5.jpg', 'dissolve-6.jpg', 'dissolve-7.jpg',
+      'dissolve-8.jpg', 'dissolve-9.jpg', 'dissolve-10.jpg', 'dissolve-11.jpg',
+      'dissolve-12.jpg', 'dissolve-13.jpg', 'dissolve-14.jpg', 'dissolve-15.jpg',
+      'dissolve-16.jpg', 'dissolve-17.jpg', 'dissolve-18.jpg'
+    ];
+    dissolveImages.forEach(imgName => {
+      pushUrl(`${correctBasePath}${imgName}`);
+    });
   } else if (title === 'Friends') {
     const friendsImages = [
       'photo_2025-05-01_17-29-01.jpg', 'M2RjNjJmMjZk.jpg', 'NzIwYjJkZmQ1.jpg',

src/core/rendering/materials/SeveranceMaterials.js

@@ -195,9 +195,11 @@ export class SeveranceMaterials {
             return (x & (x - 1)) === 0;
           }
           if (!isPowerOfTwo(texture.image.width) || !isPowerOfTwo(texture.image.height)) {
-            console.warn(`Texture ${name} (${path}) is not power-of-two. This may impact performance.`);
+            // Silently handle non-power-of-two textures for better performance
             texture.generateMipmaps = false;
             texture.minFilter = THREE.LinearFilter;
+            texture.wrapS = THREE.ClampToEdgeWrap;
+            texture.wrapT = THREE.ClampToEdgeWrap;
           } else {
             texture.generateMipmaps = true;
             texture.minFilter = THREE.LinearMipmapLinearFilter;

src/main.js

@@ -348,21 +348,36 @@ class SeveranceApp {
         }
       }
 
-      // Always try to resume audio context on key press
-      if (this.audioManager) {
-        this.audioManager.resumeAudioContext().catch(err => {
-          // Silent catch - no need to log every time
-        });
-      }
+      // Setup one-time audio context initialization with user gesture
+      this.tryResumeAudio();
     });
 
-    // Also resume audio context on any click
-    document.addEventListener("click", () => {
-      if (this.audioManager) {
-        this.audioManager.resumeAudioContext().catch(err => {
-          // Silent catch - no need to log every time
-        });
+    // Setup comprehensive audio context initialization
+    this.setupAudioContextInitialization();
+  }
+
+  setupAudioContextInitialization() {
+    let audioContextInitialized = false;
+    
+    this.tryResumeAudio = () => {
+      if (!audioContextInitialized && this.audioManager) {
+        this.audioManager.resumeAudioContext()
+          .then(success => {
+            if (success) {
+              audioContextInitialized = true;
+              console.log("AudioContext successfully initialized after user gesture");
+            }
+          })
+          .catch(err => {
+            // Silent catch - AudioContext failures are expected until user gesture
+          });
       }
+    };
+
+    // Try to initialize audio on various user interactions
+    const events = ['click', 'keydown', 'touchstart', 'pointerdown'];
+    events.forEach(eventType => {
+      document.addEventListener(eventType, this.tryResumeAudio, { once: false });
     });
   }
 
@@ -2602,14 +2617,17 @@ document.addEventListener("DOMContentLoaded", () => {
   let isDragging = false;
   let offsetX, offsetY;
 
-  document.getElementById('dev-terminal-header').addEventListener('mousedown', function(e) {
-    // Don't drag if clicking controls
-    if (e.target.classList.contains('terminal-btn')) return;
-    
-    isDragging = true;
-    offsetX = e.clientX - overlay.getBoundingClientRect().left;
-    offsetY = e.clientY - overlay.getBoundingClientRect().top;
-  });
+  const terminalHeader = document.getElementById('dev-terminal-header');
+  if (terminalHeader) {
+    terminalHeader.addEventListener('mousedown', function(e) {
+      // Don't drag if clicking controls
+      if (e.target.classList.contains('terminal-btn')) return;
+      
+      isDragging = true;
+      offsetX = e.clientX - overlay.getBoundingClientRect().left;
+      offsetY = e.clientY - overlay.getBoundingClientRect().top;
+    });
+  }
 
   document.addEventListener('mousemove', function(e) {
     if (!isDragging) return;

src/systems/movement/UnifiedMovementController.js

@@ -601,14 +601,14 @@ export class UnifiedMovementController {
    * @private - Renamed to indicate internal use
    */
   _checkCollision(moveDelta, recursionDepth = 0) {
-    if (recursionDepth >= this.collisionCheckSteps) {
+    if (recursionDepth >= Math.min(this.collisionCheckSteps, 3)) {
       console.warn("[Collision] Max recursion depth reached, stopping movement.");
       return new THREE.Vector3(0, 0, 0); // Stop movement if too many bounces
     }
 
     const moveLength = moveDelta.length();
-    if (moveLength < 0.001) {
-      return moveDelta; // Not moving significantly
+    if (moveLength < 0.005 || recursionDepth > 0 && moveLength < 0.01) {
+      return moveDelta; // Not moving significantly or small slide movement
     }
 
     if (!this.environment || typeof this.environment.getCollidableWalls !== 'function') {

src/utils/assetPaths.js

@@ -16,7 +16,7 @@ export function getAssetPath(path) {
     return `/3D-Portfolio/${cleanPath}`;
   }
 
-  // In development, use paths relative to the root
+  // In development, serve directly from root (no base path)
   return `/${cleanPath}`;
 }
 
@@ -35,7 +35,8 @@ export function getTexturePath(filename) {
  * @returns {string} - The complete shader path
  */
 export function getShaderPath(filename) {
-  return getAssetPath(`src/shaders/${filename}`);
+  // Shaders are in public/shaders, not src/shaders
+  return getAssetPath(`shaders/${filename}`);
 }
 
 /**

vite.config.js

@@ -1,8 +1,8 @@
 import { defineConfig } from "vite";
 import { resolve } from "path";
 
-export default defineConfig({
-  base: "/3D-Portfolio/", // GitHub Pages repository name
+export default defineConfig(({ command }) => ({
+  base: command === 'build' ? "/3D-Portfolio/" : "/", // Only use base path in production
   build: {
     outDir: "dist",
     assetsDir: "assets",
@@ -21,4 +21,4 @@ export default defineConfig({
   },
   assetsInclude: ["**/*.glsl"],
   publicDir: "public",
-});
+}));