Update game.js

game.js

@@ -553,330 +553,97 @@ class Enemy {
         this.isLoaded = false;
         this.moveSpeed = type === 'tank' ? ENEMY_MOVE_SPEED : ENEMY_MOVE_SPEED * 0.7;
     }
-    createCollisionBox() {
-        const dimensions = new THREE.Vector3(4, 2, 7);
-        const geometry = new THREE.BoxGeometry(dimensions.x, dimensions.y, dimensions.z);
-        const material = new THREE.MeshBasicMaterial({
-            color: 0xff0000,
-            wireframe: true,
-            visible: false
-        });
-        
-        this.collisionBox = new THREE.Mesh(geometry, material);
-        this.mesh.add(this.collisionBox);
-        this.collisionBox.position.set(0, dimensions.y / 2, 0);
-    }
 
     async initialize(loader) {
-        await super.initialize(loader);
-        this.createCollisionBox();
-    }
-}
-    createMuzzleFlash() {
-    if (!this.mesh) return;
-    
-    const flashGroup = new THREE.Group();
-    
-    // 화염 크기 증가 및 색상 변경
-    const flameGeometry = new THREE.SphereGeometry(1.0, 8, 8);
-    const flameMaterial = new THREE.MeshBasicMaterial({
-        color: 0xffa500, // 노란색으로 변경
-        transparent: true,
-        opacity: 0.8
-    });
-    const flame = new THREE.Mesh(flameGeometry, flameMaterial);
-    flame.scale.set(2, 2, 3);
-    flashGroup.add(flame);
-
-    // 연기 효과 크기 증가
-    const smokeGeometry = new THREE.SphereGeometry(0.8, 8, 8);
-    const smokeMaterial = new THREE.MeshBasicMaterial({
-        color: 0x555555,
-        transparent: true,
-        opacity: 0.5
-    });
-    
-    for (let i = 0; i < 5; i++) {
-        const smoke = new THREE.Mesh(smokeGeometry, smokeMaterial);
-        smoke.position.set(
-            Math.random() * 1 - 0.5,
-            Math.random() * 1 - 0.5,
-            -1 - Math.random()
-        );
-        smoke.scale.set(1.5, 1.5, 1.5);
-        flashGroup.add(smoke);
+        try {
+            const result = await loader.loadAsync('/models/t90.glb');
+            this.mesh = result.scene;
+            this.mesh.position.copy(this.position);
+            this.mesh.scale.set(ENEMY_SCALE, ENEMY_SCALE, ENEMY_SCALE);
+            this.setupMesh();
+            this.isLoaded = true;
+        } catch (error) {
+            console.error('Error loading enemy model:', error);
+            this.isLoaded = false;
+        }
     }
 
-    // 포구 위치 계산
-    const muzzleOffset = new THREE.Vector3(0, 0.5, 4);
-    const muzzlePosition = new THREE.Vector3();
-    const meshWorldQuaternion = new THREE.Quaternion();
-    
-    this.mesh.getWorldPosition(muzzlePosition);
-    this.mesh.getWorldQuaternion(meshWorldQuaternion);
-    
-    muzzleOffset.applyQuaternion(meshWorldQuaternion);
-    muzzlePosition.add(muzzleOffset);
-
-    flashGroup.position.copy(muzzlePosition);
-    flashGroup.quaternion.copy(meshWorldQuaternion);
-
-    this.scene.add(flashGroup);
-
-    // 이펙트 지속 시간 증가
-    setTimeout(() => {
-        this.scene.remove(flashGroup);
-    }, 500);
-}
-
-    async initialize(loader) {
-    try {
-        const modelPath = this.type === 'tank' ? '/models/t90.glb' : '/models/t90.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);
-        
-        this.mesh.traverse((child) => {
+    setupMesh() {
+        this.mesh.traverse(child => {
             if (child.isMesh) {
                 child.castShadow = true;
                 child.receiveShadow = true;
             }
         });
-        
         this.createCollisionBox();
         this.scene.add(this.mesh);
-        this.isLoaded = true;
-    } catch (error) {
-        console.error('Error loading enemy model:', error);
-        this.isLoaded = false;
     }
-}
+
+    createCollisionBox() {
+        const geometry = new THREE.BoxGeometry(4, 2, 7);
+        const material = new THREE.MeshBasicMaterial({
+            color: 0xff0000,
+            wireframe: true,
+            visible: false
+        });
+        this.collisionBox = new THREE.Mesh(geometry, material);
+        this.mesh.add(this.collisionBox);
+        this.collisionBox.position.set(0, 1, 0);
+    }
 
     update(playerPosition) {
-    if (!this.mesh || !this.isLoaded) return;
+        if (!this.isLoaded) return;
+        this.moveTowardsPlayer(playerPosition);
+        this.updateBullets();
+    }
 
-    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
-        );
-        newPosition.y = heightAtNewPos + TANK_HEIGHT;
+    moveTowardsPlayer(playerPosition) {
+        const direction = new THREE.Vector3()
+            .subVectors(playerPosition, this.mesh.position)
+            .normalize();
         
-        // 임시로 위치 이동하여 충돌 체크
-        const originalPosition = this.mesh.position.clone();
-        this.mesh.position.copy(newPosition);
-        
-        // 장애물과 충돌 체크
-        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 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 distanceToPlayer = this.mesh.position.distanceTo(playerPosition);
+        if (distanceToPlayer > 50) {
+            this.tryMove(direction);
         }
-        
-        // 지형에 따른 기울기 조정
-        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);
     }
-    
-    // 플레��어를 향해 포탑 회전
-    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;
-                }
-            }
-        }
-    }
-}
-
 
     shoot(playerPosition) {
-    const currentTime = Date.now();
-    const attackInterval = this.type === 'tank' ? 
-        ENEMY_CONFIG.ATTACK_INTERVAL : 
-        ENEMY_CONFIG.ATTACK_INTERVAL * 1.5;
+        if (Date.now() - this.lastAttackTime < ENEMY_CONFIG.ATTACK_INTERVAL) return;
 
-    if (currentTime - this.lastAttackTime < attackInterval) return;
+        const bullet = this.createBullet(playerPosition);
+        this.scene.add(bullet);
+        this.bullets.push(bullet);
+        this.lastAttackTime = Date.now();
 
-    // 발사 이펙트 생성
-    this.createMuzzleFlash();
+        new Audio('sounds/mbtfire5.ogg').play();
+    }
 
-    // 발사 사운드 재생
-    const enemyFireSound = new Audio('sounds/mbtfire5.ogg');
-    enemyFireSound.volume = 0.3;
-    enemyFireSound.play();
+    createBullet(targetPosition) {
+        const bullet = new THREE.Mesh(
+            new THREE.CylinderGeometry(0.2, 0.2, 2, 8),
+            new THREE.MeshBasicMaterial({ color: 0xff0000 })
+        );
 
-    // 포탄 생성 (플레이어와 유사하게 수정)
-    const bulletGeometry = new THREE.CylinderGeometry(0.2, 0.2, 2, 8);
-    const bulletMaterial = new THREE.MeshBasicMaterial({ 
-        color: 0xff0000,  // 빨간색 포탄
-        emissive: 0xff0000,
-        emissiveIntensity: 0.5
-    });
-    const bullet = new THREE.Mesh(bulletGeometry, bulletMaterial);
+        const muzzlePosition = this.getMuzzlePosition();
+        bullet.position.copy(muzzlePosition);
+        
+        const direction = new THREE.Vector3()
+            .subVectors(targetPosition, muzzlePosition)
+            .normalize();
+        
+        bullet.velocity = direction.multiplyScalar(ENEMY_CONFIG.BULLET_SPEED);
+        return bullet;
+    }
 
-    // 포구 위치에서 발사
-    const muzzleOffset = new THREE.Vector3(0, 0.5, 4);
-    const muzzlePosition = new THREE.Vector3();
-    this.mesh.getWorldPosition(muzzlePosition);
-    muzzleOffset.applyQuaternion(this.mesh.quaternion);
-    muzzlePosition.add(muzzleOffset);
-    
-    bullet.position.copy(muzzlePosition);
-    
-    // 포탄 회전 설정
-    bullet.quaternion.copy(this.mesh.quaternion);
-    
-    const direction = new THREE.Vector3()
-        .subVectors(playerPosition, muzzlePosition)
-        .normalize();
-    
-    const bulletSpeed = this.type === 'tank' ? 
-        ENEMY_CONFIG.BULLET_SPEED : 
-        ENEMY_CONFIG.BULLET_SPEED * 0.8;
-    
-    bullet.velocity = direction.multiplyScalar(bulletSpeed);
-    
-    // 포탄 트레일 효과 추가
-    const trailGeometry = new THREE.CylinderGeometry(0.1, 0.1, 1, 8);
-    const trailMaterial = new THREE.MeshBasicMaterial({
-        color: 0xff4444,
-        transparent: true,
-        opacity: 0.5
-    });
-    
-    const trail = new THREE.Mesh(trailGeometry, trailMaterial);
-    trail.position.z = -1;
-    bullet.add(trail);
-    
-    this.scene.add(bullet);
-    this.bullets.push(bullet);
-    this.lastAttackTime = currentTime;
-}
+    getMuzzlePosition() {
+        const muzzleOffset = new THREE.Vector3(0, 0.5, 4);
+        const position = new THREE.Vector3();
+        this.mesh.getWorldPosition(position);
+        muzzleOffset.applyQuaternion(this.mesh.quaternion);
+        return position.add(muzzleOffset);
+    }
 
     takeDamage(damage) {
         this.health -= damage;