Update game.js

game.js

@@ -1135,67 +1135,94 @@ class Game {
         }
 
         // 바위 생성
-        const rockGeometries = [
-            new THREE.DodecahedronGeometry(3),
-            new THREE.DodecahedronGeometry(2),
-            new THREE.DodecahedronGeometry(4)
-        ];
+        // 바위 생성
+    const rockGeometries = [
+        new THREE.DodecahedronGeometry(3),
+        new THREE.DodecahedronGeometry(2),
+        new THREE.DodecahedronGeometry(4)
+    ];
 
-        const rockMaterial = new THREE.MeshStandardMaterial({
-            color: 0x8B4513,
-            roughness: 0.9,
-            metalness: 0.1
-        });
+    const rockMaterial = new THREE.MeshStandardMaterial({
+        color: 0x8B4513,
+        roughness: 0.9,
+        metalness: 0.1
+    });
 
-        for (let i = 0; i < 100; i++) {
-            const rockGeometry = rockGeometries[Math.floor(Math.random() * rockGeometries.length)];
-            const rock = new THREE.Mesh(rockGeometry, rockMaterial);
-            rock.position.set(
-                (Math.random() - 0.5) * MAP_SIZE * 0.9,
-                Math.random() * 2,
-                (Math.random() - 0.5) * MAP_SIZE * 0.9
-            );
-            
-            rock.rotation.set(
-                Math.random() * Math.PI,
-                Math.random() * Math.PI,
-                Math.random() * Math.PI
-            );
-            
-            rock.scale.set(
-                1 + Math.random() * 0.5,
-                1 + Math.random() * 0.5,
-                1 + Math.random() * 0.5
-            );
-            
-            rock.castShadow = true;
-            rock.receiveShadow = true;
-            rock.userData.type = 'rock'; // 장애물 타입 지정
-            this.obstacles.push(rock);
-            this.scene.add(rock);
-        }
+    // 바위용 충돌 박스를 시각화하는 재질 (디버깅용)
+    const collisionBoxMaterial = new THREE.MeshBasicMaterial({
+        color: 0xff0000,
+        wireframe: true,
+        visible: false // 필요시 true로 변경하여 충돌 박스 확인
+    });
 
-        // 선인장 추가
-        const cactusGeometry = new THREE.CylinderGeometry(0.5, 0.7, 4, 8);
-        const cactusMaterial = new THREE.MeshStandardMaterial({
-            color: 0x2F4F2F,
-            roughness: 0.8
-        });
+    for (let i = 0; i < 100; i++) {
+        const rockGeometry = rockGeometries[Math.floor(Math.random() * rockGeometries.length)];
+        const rock = new THREE.Mesh(rockGeometry, rockMaterial);
+        
+        // 바위 위치 설정
+        rock.position.set(
+            (Math.random() - 0.5) * MAP_SIZE * 0.9,
+            Math.random() * 2,
+            (Math.random() - 0.5) * MAP_SIZE * 0.9
+        );
+        
+        rock.rotation.set(
+            Math.random() * Math.PI,
+            Math.random() * Math.PI,
+            Math.random() * Math.PI
+        );
+        
+        rock.scale.set(
+            1 + Math.random() * 0.5,
+            1 + Math.random() * 0.5,
+            1 + Math.random() * 0.5
+        );
+        
+        // 충돌 박스 생성 및 설정
+        const boundingBox = new THREE.Box3().setFromObject(rock);
+        const boxSize = boundingBox.getSize(new THREE.Vector3());
+        const collisionGeometry = new THREE.BoxGeometry(boxSize.x, boxSize.y, boxSize.z);
+        const collisionMesh = new THREE.Mesh(collisionGeometry, collisionBoxMaterial);
+        
+        collisionMesh.position.copy(rock.position);
+        collisionMesh.rotation.copy(rock.rotation);
+        
+        // 바위에 충돌 속성 추가
+        rock.userData.isCollidable = true;
+        rock.userData.type = 'rock';
+        rock.userData.collisionMesh = collisionMesh;
+        
+        rock.castShadow = true;
+        rock.receiveShadow = true;
+        
+        this.obstacles.push(rock);
+        this.scene.add(rock);
+        this.scene.add(collisionMesh); // 디버깅용 충돌 박스
+    }
 
-        for (let i = 0; i < 50; i++) {
-            const cactus = new THREE.Mesh(cactusGeometry, cactusMaterial);
-            cactus.position.set(
-                (Math.random() - 0.5) * MAP_SIZE * 0.8,
-                2,
-                (Math.random() - 0.5) * MAP_SIZE * 0.8
-            );
-            cactus.castShadow = true;
-            cactus.receiveShadow = true;
-            cactus.userData.type = 'cactus'; // 장애물 타입 지정
-            this.obstacles.push(cactus);
-            this.scene.add(cactus);
-        }
+    // 선인장 추가
+    const cactusGeometry = new THREE.CylinderGeometry(0.5, 0.7, 4, 8);
+    const cactusMaterial = new THREE.MeshStandardMaterial({
+        color: 0x2F4F2F,
+        roughness: 0.8
+    });
+
+    for (let i = 0; i < 50; i++) {
+        const cactus = new THREE.Mesh(cactusGeometry, cactusMaterial);
+        cactus.position.set(
+            (Math.random() - 0.5) * MAP_SIZE * 0.8,
+            2,
+            (Math.random() - 0.5) * MAP_SIZE * 0.8
+        );
+        cactus.castShadow = true;
+        cactus.receiveShadow = true;
+        cactus.userData.isCollidable = false; // 선인장은 충돌하지 않음
+        cactus.userData.type = 'cactus';
+        
+        this.scene.add(cactus);
+        // 선인장은 obstacles 배열에 추가하지 않음
     }
+}
 
 
    getHeightAtPosition(x, z) {
@@ -1587,17 +1614,13 @@ class Game {
 
     // 탱크와 장애물 충돌 체크 (개선)
     this.obstacles.forEach(obstacle => {
+    if (obstacle.userData.isCollidable) { // 충돌 가능한 객체만 검사
         const obstacleBoundingBox = new THREE.Box3().setFromObject(obstacle);
         if (tankBoundingBox.intersectsBox(obstacleBoundingBox)) {
-            // 충돌 시 이전 위치로 되돌리기
             this.tank.body.position.copy(this.previousTankPosition);
-            
-            // 충돌 사운드 재생
-            //const collisionSound = new Audio('sounds/collision.ogg');
-            //collisionSound.volume = 0.3;
-            //collisionSound.play();
         }
-    });
+    }
+});
         // 적 탱크와 장애물 충돌 체크 (추가)
     this.enemies.forEach(enemy => {
         if (!enemy.mesh || !enemy.isLoaded) return;
@@ -1638,13 +1661,14 @@ class Game {
         });
     });
 
-               // 포탄과 장애물 충돌 체크 (추가)
     // 플레이어 포탄
-    for (let i = this.tank.bullets.length - 1; i >= 0; i--) {
-        const bullet = this.tank.bullets[i];
-        const bulletBox = new THREE.Box3().setFromObject(bullet);
+    // 포탄과 장애물 충돌 체크
+for (let i = this.tank.bullets.length - 1; i >= 0; i--) {
+    const bullet = this.tank.bullets[i];
+    const bulletBox = new THREE.Box3().setFromObject(bullet);
 
-        for (const obstacle of this.obstacles) {
+    for (const obstacle of this.obstacles) {
+        if (obstacle.userData.isCollidable) { // 충돌 가능한 객체만 검사
             const obstacleBox = new THREE.Box3().setFromObject(obstacle);
             if (bulletBox.intersectsBox(obstacleBox)) {
                 // 폭발 이펙트 생성
@@ -1657,29 +1681,24 @@ class Game {
             }
         }
     }
+}
 
-    // 적 포탄
-    this.enemies.forEach(enemy => {
-        if (!enemy.bullets) return;
-        
-        for (let i = enemy.bullets.length - 1; i >= 0; i--) {
-            const bullet = enemy.bullets[i];
-            const bulletBox = new THREE.Box3().setFromObject(bullet);
-
-            for (const obstacle of this.obstacles) {
-                const obstacleBox = new THREE.Box3().setFromObject(obstacle);
-                if (bulletBox.intersectsBox(obstacleBox)) {
-                    // 폭발 이펙트 생성
-                    this.tank.createExplosionEffect(this.scene, bullet.position);
-                    
-                    // 포탄 제거
-                    this.scene.remove(bullet);
-                    enemy.bullets.splice(i, 1);
-                    break;
-                }
+    // 적 탱크와 장애물 충돌 체크
+this.enemies.forEach(enemy => {
+    if (!enemy.mesh || !enemy.isLoaded) return;
+    
+    const enemyBoundingBox = new THREE.Box3().setFromObject(enemy.mesh);
+    const enemyPreviousPosition = enemy.mesh.position.clone();
+    
+    this.obstacles.forEach(obstacle => {
+        if (obstacle.userData.isCollidable) { // 충돌 가능한 객체만 검사
+            const obstacleBoundingBox = new THREE.Box3().setFromObject(obstacle);
+            if (enemyBoundingBox.intersectsBox(obstacleBoundingBox)) {
+                enemy.mesh.position.copy(enemyPreviousPosition);
             }
         }
     });
+});
 
 
     // 플레이어 총알과 적 충돌 체크