Update game.js

game.js

@@ -614,62 +614,152 @@ class Enemy {
     const distanceToPlayer = this.mesh.position.distanceTo(playerPosition);
     const minDistance = 50;
     
-    this.mesh.lookAt(playerPosition);
+    // 이전 위치 저장
+    const previousPosition = this.mesh.position.clone();
     
     if (distanceToPlayer > minDistance) {
         const moveVector = direction.multiplyScalar(this.moveSpeed);
         const newPosition = this.mesh.position.clone().add(moveVector);
         
-        // 새로운 위치의 지형 높이 가져오기
-        const heightAtNewPos = window.gameInstance.getHeightAtPosition(newPosition.x, newPosition.z);
+        // 지형 높이 가져오기
+        const heightAtNewPos = window.gameInstance.getHeightAtPosition(
+            newPosition.x,
+            newPosition.z
+        );
         newPosition.y = heightAtNewPos + TANK_HEIGHT;
         
-        // 경사 체크
-        const heightDifference = Math.abs(newPosition.y - this.mesh.position.y);
-        const maxClimbAngle = 0.5;
+        // 임시로 위치 이동하여 충돌 체크
+        const originalPosition = this.mesh.position.clone();
+        this.mesh.position.copy(newPosition);
         
-        if (heightDifference / this.moveSpeed < maxClimbAngle) {
-            this.mesh.position.copy(newPosition);
-            
-            // 적 탱크 기울기 조정
-            const forwardVector = new THREE.Vector3(0, 0, 1).applyQuaternion(this.mesh.quaternion);
-            const rightVector = new THREE.Vector3(1, 0, 0).applyQuaternion(this.mesh.quaternion);
-            
-            const frontHeight = window.gameInstance.getHeightAtPosition(
-                newPosition.x + forwardVector.x,
-                newPosition.z + forwardVector.z
-            );
-            const backHeight = window.gameInstance.getHeightAtPosition(
-                newPosition.x - forwardVector.x,
-                newPosition.z - forwardVector.z
-            );
-            const rightHeight = window.gameInstance.getHeightAtPosition(
-                newPosition.x + rightVector.x,
-                newPosition.z + rightVector.z
-            );
-            const leftHeight = window.gameInstance.getHeightAtPosition(
-                newPosition.x - rightVector.x,
-                newPosition.z - rightVector.z
-            );
+        // 장애물과 충돌 체크
+        const enemyBox = new THREE.Box3().setFromObject(this.mesh);
+        let hasCollision = false;
+        
+        // 모든 장애물에 대해 충돌 검사
+        for (const obstacle of window.gameInstance.obstacles) {
+            const obstacleBox = new THREE.Box3().setFromObject(obstacle);
+            if (enemyBox.intersectsBox(obstacleBox)) {
+                hasCollision = true;
+                break;
+            }
+        }
+        
+        // 다른 적 탱크와의 충돌 검사
+        if (!hasCollision) {
+            for (const otherEnemy of window.gameInstance.enemies) {
+                if (otherEnemy !== this && otherEnemy.mesh) {
+                    const otherEnemyBox = new THREE.Box3().setFromObject(otherEnemy.mesh);
+                    if (enemyBox.intersectsBox(otherEnemyBox)) {
+                        hasCollision = true;
+                        break;
+                    }
+                }
+            }
+        }
+        
+        // 맵 경계 체크
+        const mapBoundary = MAP_SIZE / 2;
+        if (Math.abs(newPosition.x) > mapBoundary || 
+            Math.abs(newPosition.z) > mapBoundary) {
+            hasCollision = true;
+        }
+        
+        // 충돌이 있으면 이전 위치로 복귀, 없으면 새 위치 유지
+        if (hasCollision) {
+            this.mesh.position.copy(previousPosition);
             
-            const pitch = Math.atan2(frontHeight - backHeight, 2);
-            const roll = Math.atan2(rightHeight - leftHeight, 2);
+            // 충돌 시 우회 경로 시도
+            const alternateDirections = [
+                new THREE.Vector3(-direction.z, 0, direction.x), // 왼쪽으로 90도
+                new THREE.Vector3(direction.z, 0, -direction.x), // 오른쪽으로 90도
+                new THREE.Vector3(-direction.x, 0, -direction.z)  // 180도 회전
+            ];
             
-            this.mesh.rotation.x = pitch;
-            this.mesh.rotation.z = roll;
+            for (const altDirection of alternateDirections) {
+                const altMoveVector = altDirection.multiplyScalar(this.moveSpeed);
+                const altNewPosition = previousPosition.clone().add(altMoveVector);
+                
+                this.mesh.position.copy(altNewPosition);
+                const altEnemyBox = new THREE.Box3().setFromObject(this.mesh);
+                
+                let altHasCollision = false;
+                
+                // 새로운 방향에 대한 충돌 검사
+                for (const obstacle of window.gameInstance.obstacles) {
+                    const obstacleBox = new THREE.Box3().setFromObject(obstacle);
+                    if (altEnemyBox.intersectsBox(obstacleBox)) {
+                        altHasCollision = true;
+                        break;
+                    }
+                }
+                
+                if (!altHasCollision) {
+                    // 우회 경로가 가능하면 그 방향으로 이동
+                    break;
+                } else {
+                    // 우회도 불가능하면 이전 위치로 복귀
+                    this.mesh.position.copy(previousPosition);
+                }
+            }
         }
+        
+        // 지형에 따른 기울기 조정
+        const forwardVector = new THREE.Vector3(0, 0, 1).applyQuaternion(this.mesh.quaternion);
+        const rightVector = new THREE.Vector3(1, 0, 0).applyQuaternion(this.mesh.quaternion);
+        
+        const frontHeight = window.gameInstance.getHeightAtPosition(
+            this.mesh.position.x + forwardVector.x,
+            this.mesh.position.z + forwardVector.z
+        );
+        const backHeight = window.gameInstance.getHeightAtPosition(
+            this.mesh.position.x - forwardVector.x,
+            this.mesh.position.z - forwardVector.z
+        );
+        const rightHeight = window.gameInstance.getHeightAtPosition(
+            this.mesh.position.x + rightVector.x,
+            this.mesh.position.z + rightVector.z
+        );
+        const leftHeight = window.gameInstance.getHeightAtPosition(
+            this.mesh.position.x - rightVector.x,
+            this.mesh.position.z - rightVector.z
+        );
+        
+        const pitch = Math.atan2(frontHeight - backHeight, 2);
+        const roll = Math.atan2(rightHeight - leftHeight, 2);
+        
+        // 현재 회전 유지하면서 기울기만 적용
+        const currentRotation = this.mesh.rotation.y;
+        this.mesh.rotation.set(pitch, currentRotation, roll);
     }
-
-
-    // 총알 업데이트 부분
-    for (let i = this.bullets.length - 1; i >= 0; i--) {
-        const bullet = this.bullets[i];
-        bullet.position.add(bullet.velocity);
-
-        if (Math.abs(bullet.position.x) > MAP_SIZE || 
-            Math.abs(bullet.position.z) > MAP_SIZE) {
-            this.scene.remove(bullet);
-            this.bullets.splice(i, 1);
+    
+    // 플레이어를 향해 포탑 회전
+    this.mesh.lookAt(playerPosition);
+    
+    // 총알 업데이트
+    if (this.bullets) {
+        for (let i = this.bullets.length - 1; i >= 0; i--) {
+            const bullet = this.bullets[i];
+            bullet.position.add(bullet.velocity);
+            
+            // 총알이 맵 밖으로 나가거나 장애물과 충돌하면 제거
+            if (Math.abs(bullet.position.x) > MAP_SIZE / 2 || 
+                Math.abs(bullet.position.z) > MAP_SIZE / 2) {
+                this.scene.remove(bullet);
+                this.bullets.splice(i, 1);
+                continue;
+            }
+            
+            // 총알과 장애물 충돌 체크
+            const bulletBox = new THREE.Box3().setFromObject(bullet);
+            for (const obstacle of window.gameInstance.obstacles) {
+                const obstacleBox = new THREE.Box3().setFromObject(obstacle);
+                if (bulletBox.intersectsBox(obstacleBox)) {
+                    this.scene.remove(bullet);
+                    this.bullets.splice(i, 1);
+                    break;
+                }
+            }
         }
     }
 }
@@ -1482,14 +1572,33 @@ class Game {
     const tankPosition = this.tank.getPosition();
     const tankBoundingBox = new THREE.Box3().setFromObject(this.tank.body);
 
-    // 탱크와 장애물 충돌 체크
+    // 탱크와 장애물 충돌 체크 (개선)
     this.obstacles.forEach(obstacle => {
         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;
+        
+        const enemyBoundingBox = new THREE.Box3().setFromObject(enemy.mesh);
+        const enemyPreviousPosition = enemy.mesh.position.clone();
+        
+        this.obstacles.forEach(obstacle => {
+            const obstacleBoundingBox = new THREE.Box3().setFromObject(obstacle);
+            if (enemyBoundingBox.intersectsBox(obstacleBoundingBox)) {
+                enemy.mesh.position.copy(enemyPreviousPosition);
+            }
+        });
+    });
 
     // 적 총알과 플레이어 탱크 충돌 체크
     this.enemies.forEach(enemy => {
@@ -1516,6 +1625,50 @@ 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 (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);
+                this.tank.bullets.splice(i, 1);
+                break;
+            }
+        }
+    }
+
+    // 적 포탄
+    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;
+                }
+            }
+        }
+    });
+
+
     // 플레이어 총알과 적 충돌 체크
     for (let i = this.tank.bullets.length - 1; i >= 0; i--) {
         const bullet = this.tank.bullets[i];