Update index.html

index.html

@@ -152,8 +152,6 @@
 
     let scene, camera, renderer, playerCube, garage;
     let playerPos = { x: 0, y: 1, z: 0 };
-    let cameraDistance = 8;
-    let cameraHeight = 3;
     let moveDirection = { x: 0, z: 0 };
     let moveSpeed = 0.1;
     let cameraRotation = { x: 0, y: 0 };
@@ -315,40 +313,42 @@
       document.getElementById('coordZ').textContent = playerPos.z.toFixed(2);
     }
 
-    function checkCameraWallCollision(camPos, playerPos) {
-      const wallDistance = 1.5; // How close to wall before camera pulls back
-      const minCamDistance = 2; // Minimum distance from player
-      
-      // Define garage walls
-      const walls = [
-        { side: 'left', x: -2.2, minZ: -4, maxZ: 3.5 },
-        { side: 'right', x: 4, minZ: -4, maxZ: 3.5 },
-        { side: 'front', z: -4, minX: -2.2, maxX: 4 },
-        { side: 'back', z: 3.5, minX: -2.2, maxX: 4 }
-      ];
-      
-      let newCamPos = { ...camPos };
-      
-      // Check distance to each wall
-      walls.forEach(wall => {
-        if (wall.side === 'left' || wall.side === 'right') {
-          const wallX = wall.x;
-          const distToWall = Math.abs(camPos.x - wallX);
-          if (distToWall < wallDistance && camPos.z >= wall.minZ && camPos.z <= wall.maxZ) {
-            // Push camera closer to player
-            newCamPos.x = playerPos.x + (wall.side === 'left' ? minCamDistance : -minCamDistance);
+    function checkCollisions(newPos) {
+      if (!garage) return newPos;
+
+      const raycaster = new THREE.Raycaster();
+      const sphere = new THREE.Sphere(new THREE.Vector3(newPos.x, newPos.y, newPos.z), 0.6);
+
+      let hasCollision = false;
+      garage.traverse((child) => {
+        if (child.geometry && child.userData.isCollider) {
+          const box = new THREE.Box3().setFromObject(child);
+          if (box.containsPoint(sphere.center) || box.distanceToPoint(sphere.center) < sphere.radius) {
+            hasCollision = true;
           }
-        } else {
-          const wallZ = wall.z;
-          const distToWall = Math.abs(camPos.z - wallZ);
-          if (distToWall < wallDistance && camPos.x >= wall.minX && camPos.x <= wall.maxX) {
-            // Push camera closer to player
-            newCamPos.z = playerPos.z + (wall.side === 'front' ? minCamDistance : -minCamDistance);
+        }
+      });
+
+      return hasCollision ? playerPos : newPos;
+    }
+
+    function checkCollisions(newPos) {
+      if (!garage) return newPos;
+
+      const raycaster = new THREE.Raycaster();
+      const sphere = new THREE.Sphere(new THREE.Vector3(newPos.x, newPos.y, newPos.z), 0.6);
+
+      let hasCollision = false;
+      garage.traverse((child) => {
+        if (child.geometry && child.userData.isCollider) {
+          const box = new THREE.Box3().setFromObject(child);
+          if (box.containsPoint(sphere.center) || box.distanceToPoint(sphere.center) < sphere.radius) {
+            hasCollision = true;
           }
         }
       });
-      
-      return newCamPos;
+
+      return hasCollision ? playerPos : newPos;
     }
 
     function animate() {
@@ -364,19 +364,13 @@
       playerPos = checkCollisions(newPos);
       playerCube.position.set(playerPos.x, playerPos.y, playerPos.z);
 
-      // Update camera (third person) - Fixed: camera stays behind, doesn't move with movement
-      const cameraX = playerPos.x + Math.sin(cameraRotation.y) * cameraDistance * Math.cos(cameraRotation.x);
-      const cameraY = playerPos.y + cameraHeight + Math.sin(cameraRotation.x) * cameraDistance;
-      const cameraZ = playerPos.z + Math.cos(cameraRotation.y) * cameraDistance * Math.cos(cameraRotation.x);
-      
-      // Clamp camera inside garage bounds based on actual garage dimensions
-      let clampedX = Math.max(-2.2, Math.min(4, cameraX));
-      let clampedZ = Math.max(-4, Math.min(3.5, cameraZ));
-      let clampedY = Math.max(0.3, Math.min(15, cameraY));
-      
-      camera.position.set(clampedX, clampedY, clampedZ);
+      // First person camera - directly at player eye level
+      camera.position.set(playerPos.x, playerPos.y + 1.6, playerPos.z);
       
-      camera.lookAt(playerPos.x, playerPos.y + 0.5, playerPos.z);
+      // Apply camera rotation for looking around
+      camera.rotation.order = 'YXZ';
+      camera.rotation.y = cameraRotation.y;
+      camera.rotation.x = cameraRotation.x;
 
       updateCoordinates();
       renderer.render(scene, camera);