Update game.js

game.js

@@ -572,31 +572,67 @@ class Enemy {
     constructor(scene, position, type = 'tank') {
         this.scene = scene;
         this.position = position;
-        this.mesh = null;
+        this.body = null;
+        this.turret = null;
+        this.turretGroup = new THREE.Group();
         this.type = type;
         this.health = type === 'tank' ? 100 : 200;
         this.lastAttackTime = 0;
         this.bullets = [];
         this.isLoaded = false;
         this.moveSpeed = type === 'tank' ? ENEMY_MOVE_SPEED : ENEMY_MOVE_SPEED * 0.7;
+        this.turnSpeed = 0.03;
+        this.targetRotation = 0;
+        this.turretRotation = 0;
+        this.canShoot = false;  // 포탑이 정렬되었는지 확인하는 플래그
     }
 
     async initialize(loader) {
         try {
-            const modelPath = this.type === 'tank' ? '/models/enemy1.glb' : '/models/enemy4.glb';
-            const result = await loader.loadAsync(modelPath);
-            this.mesh = result.scene;
-            this.mesh.position.copy(this.position);
-            this.mesh.scale.set(ENEMY_SCALE, ENEMY_SCALE, ENEMY_SCALE);
+            // 몸체 로드
+            const bodyResult = await loader.loadAsync('/models/t90Body.glb');
+            this.body = bodyResult.scene;
+            
+            // 포탑 로드
+            const turretResult = await loader.loadAsync('/models/t90Turret.glb');
+            this.turret = turretResult.scene;
+            
+            // 포탑 그룹 설정
+            this.turretGroup.position.y = 0.2;  // 포탑 높이 조정
+            this.turretGroup.add(this.turret);
+            this.body.add(this.turretGroup);
+            
+            // 위치와 스케일 설정
+            this.body.position.copy(this.position);
+            this.body.scale.set(ENEMY_SCALE, ENEMY_SCALE, ENEMY_SCALE);
             
-            this.mesh.traverse((child) => {
+            // 그림자 설정
+            this.body.traverse((child) => {
                 if (child.isMesh) {
                     child.castShadow = true;
                     child.receiveShadow = true;
                 }
             });
             
-            this.scene.add(this.mesh);
+            this.turret.traverse((child) => {
+                if (child.isMesh) {
+                    child.castShadow = true;
+                    child.receiveShadow = true;
+                }
+            });
+            
+            // 그림자 평면 추가
+            const shadowPlaneGeometry = new THREE.PlaneGeometry(8, 8);
+            const shadowPlaneMaterial = new THREE.ShadowMaterial({
+                opacity: 0.3
+            });
+            this.shadowPlane = new THREE.Mesh(shadowPlaneGeometry, shadowPlaneMaterial);
+            this.shadowPlane.receiveShadow = true;
+            this.shadowPlane.rotation.x = -Math.PI / 2;
+            this.shadowPlane.position.y = 0.1;
+            this.body.add(this.shadowPlane);
+            
+            this.scene.add(this.body);
             this.isLoaded = true;
         } catch (error) {
             console.error('Error loading enemy model:', error);
@@ -605,38 +641,76 @@ class Enemy {
     }
 
     update(playerPosition) {
-    if (!this.mesh || !this.isLoaded) return;
+        if (!this.body || !this.isLoaded) return;
 
-    const direction = new THREE.Vector3()
-        .subVectors(playerPosition, this.mesh.position)
-        .normalize();
-    
-    const distanceToPlayer = this.mesh.position.distanceTo(playerPosition);
-    const minDistance = 50;
-    
-    // 이전 위치 저장
-    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 direction = new THREE.Vector3()
+            .subVectors(playerPosition, this.body.position)
+            .normalize();
+        
+        const distanceToPlayer = this.body.position.distanceTo(playerPosition);
+        const minDistance = 50;
+        
+        // 이전 위치 저장
+        const previousPosition = this.body.position.clone();
+        
+        if (distanceToPlayer > minDistance) {
+            // 목표 회전 각도 계산
+            this.targetRotation = Math.atan2(direction.x, direction.z);
+            
+            // 부드러운 회전
+            let rotationDiff = this.targetRotation - this.body.rotation.y;
+            while (rotationDiff > Math.PI) rotationDiff -= Math.PI * 2;
+            while (rotationDiff < -Math.PI) rotationDiff += Math.PI * 2;
+            
+            this.body.rotation.y += Math.sign(rotationDiff) * Math.min(Math.abs(rotationDiff), this.turnSpeed);
+            
+            // 전진 방향으로 이동
+            const moveVector = new THREE.Vector3(0, 0, this.moveSpeed);
+            moveVector.applyEuler(this.body.rotation);
+            const newPosition = this.body.position.clone().add(moveVector);
+            
+            // 지형 높이 가져오기
+            const heightAtNewPos = window.gameInstance.getHeightAtPosition(
+                newPosition.x,
+                newPosition.z
+            );
+            newPosition.y = heightAtNewPos + TANK_HEIGHT;
+            
+            // 충돌 검사 및 이동 처리
+            this.handleCollisions(newPosition, previousPosition);
+        }
+        
+        // 포탑 회전 - 플레이어를 향해
+        const turretTargetRotation = Math.atan2(
+            playerPosition.x - this.body.position.x,
+            playerPosition.z - this.body.position.z
         );
-        newPosition.y = heightAtNewPos + TANK_HEIGHT;
         
+        // 월드 좌표에서의 포탑 회전을 로컬 회전으로 변환
+        const localTurretRotation = turretTargetRotation - this.body.rotation.y;
+        
+        // 포탑 회전 보간
+        let turretRotationDiff = localTurretRotation - this.turretGroup.rotation.y;
+        while (turretRotationDiff > Math.PI) turretRotationDiff -= Math.PI * 2;
+        while (turretRotationDiff < -Math.PI) turretRotationDiff += Math.PI * 2;
+        
+        this.turretGroup.rotation.y += Math.sign(turretRotationDiff) * Math.min(Math.abs(turretRotationDiff), this.turnSpeed);
+        
+        // 포탑이 플레이어를 향하고 있는지 확인
+        this.canShoot = Math.abs(turretRotationDiff) < 0.1;
+
+        // 총알 업데이트 로직
+        this.updateBullets();
+    }
+
+    handleCollisions(newPosition, previousPosition) {
         // 임시로 위치 이동하여 충돌 체크
-        const originalPosition = this.mesh.position.clone();
-        this.mesh.position.copy(newPosition);
+        this.body.position.copy(newPosition);
         
-        // 장애물과 충돌 체크
-        const enemyBox = new THREE.Box3().setFromObject(this.mesh);
+        const enemyBox = new THREE.Box3().setFromObject(this.body);
         let hasCollision = false;
         
-        // 모든 장애물에 대해 충돌 검사
+        // 장애물 충돌 검사
         for (const obstacle of window.gameInstance.obstacles) {
             const obstacleBox = new THREE.Box3().setFromObject(obstacle);
             if (enemyBox.intersectsBox(obstacleBox)) {
@@ -645,127 +719,34 @@ class Enemy {
             }
         }
         
-        // 다른 적 탱크와의 충돌 검사
-        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;
-                    }
+        // 다른 적과의 충돌 검사
+        for (const otherEnemy of window.gameInstance.enemies) {
+            if (otherEnemy !== this && otherEnemy.body) {
+                const otherEnemyBox = new THREE.Box3().setFromObject(otherEnemy.body);
+                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 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도 회전
-            ];
-            
-            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);
-    }
-    
-    // 플레이어를 향해 포탑 회전
-    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;
-                }
-            }
+            this.body.position.copy(previousPosition);
         }
     }
-}
-
 
     shoot(playerPosition) {
+        // 포탑이 정렬되지 않았으면 발사하지 않음
+        if (!this.canShoot) return;
+
         const currentTime = Date.now();
         const attackInterval = this.type === 'tank' ? 
             ENEMY_CONFIG.ATTACK_INTERVAL : 
@@ -773,16 +754,28 @@ class Enemy {
 
         if (currentTime - this.lastAttackTime < attackInterval) return;
 
+        // 포탄 생성
         const bulletGeometry = new THREE.SphereGeometry(this.type === 'tank' ? 0.2 : 0.3);
         const bulletMaterial = new THREE.MeshBasicMaterial({ 
             color: this.type === 'tank' ? 0xff0000 : 0xff6600 
         });
         const bullet = new THREE.Mesh(bulletGeometry, bulletMaterial);
 
-        bullet.position.copy(this.mesh.position);
+        // 포탑 끝에서 포탄이 발사되도록 위치 조정
+        const muzzleOffset = new THREE.Vector3(0, 0.5, 4);
+        const muzzlePosition = new THREE.Vector3();
+        const turretWorldQuaternion = new THREE.Quaternion();
+        
+        this.turret.getWorldPosition(muzzlePosition);
+        this.turret.getWorldQuaternion(turretWorldQuaternion);
+        
+        muzzleOffset.applyQuaternion(turretWorldQuaternion);
+        muzzlePosition.add(muzzleOffset);
+        
+        bullet.position.copy(muzzlePosition);
         
         const direction = new THREE.Vector3()
-            .subVectors(playerPosition, this.mesh.position)
+            .subVectors(playerPosition, muzzlePosition)
             .normalize();
         
         const bulletSpeed = this.type === 'tank' ? 
@@ -796,14 +789,40 @@ class Enemy {
         this.lastAttackTime = currentTime;
     }
 
+    updateBullets() {
+        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;
+                }
+            }
+        }
+    }
+
     takeDamage(damage) {
         this.health -= damage;
         return this.health <= 0;
     }
 
     destroy() {
-        if (this.mesh) {
-            this.scene.remove(this.mesh);
+        if (this.body) {
+            this.scene.remove(this.body);
             this.bullets.forEach(bullet => this.scene.remove(bullet));
             this.bullets = [];
             this.isLoaded = false;