Update game.js

game.js

@@ -12,7 +12,7 @@ const MAX_HEALTH = 1000;
 const ENEMY_MOVE_SPEED = 0.1;
 const ENEMY_COUNT_MAX = 5;
 const PARTICLE_COUNT = 15;
-const BUILDING_COUNT = 30;  // 건물 수 추가
+const BUILDING_COUNT = 30;
 const ENEMY_CONFIG = {
     ATTACK_RANGE: 100,
     ATTACK_INTERVAL: 2000,
@@ -75,62 +75,56 @@ class TankPlayer {
     }
 
     shoot(scene) {
-    const currentTime = Date.now();
-    if (currentTime - this.lastShootTime < this.shootInterval || this.ammo <= 0) return null;
-
-    // 총알 생성
-    const bulletGeometry = new THREE.SphereGeometry(0.2);
-    const bulletMaterial = new THREE.MeshBasicMaterial({ color: 0x00ff00 });
-    const bullet = new THREE.Mesh(bulletGeometry, bulletMaterial);
-
-    // 총알 시작 위치 (포탑 끝)
-    const bulletOffset = new THREE.Vector3(0, 0.5, 2);
-    // 포탑의 회전을 적용
-    bulletOffset.applyQuaternion(this.turretGroup.quaternion);
-    bulletOffset.applyQuaternion(this.body.quaternion);
-    bullet.position.copy(this.body.position).add(bulletOffset);
-
-    // 총알 속도 (포탑 방향)
-    const direction = new THREE.Vector3(0, 0, 1);
-    direction.applyQuaternion(this.turretGroup.quaternion);
-    direction.applyQuaternion(this.body.quaternion);
-    bullet.velocity = direction.multiplyScalar(2);
-
-    scene.add(bullet);
-    this.bullets.push(bullet);
-    this.ammo--;
-    this.lastShootTime = currentTime;
-
-    document.getElementById('ammo').textContent = `Ammo: ${this.ammo}/10`;
-    
-    return bullet;
-}
+        const currentTime = Date.now();
+        if (currentTime - this.lastShootTime < this.shootInterval || this.ammo <= 0) return null;
+
+        const bulletGeometry = new THREE.SphereGeometry(0.2);
+        const bulletMaterial = new THREE.MeshBasicMaterial({ color: 0x00ff00 });
+        const bullet = new THREE.Mesh(bulletGeometry, bulletMaterial);
+
+        const bulletOffset = new THREE.Vector3(0, 0.5, 2);
+        bulletOffset.applyQuaternion(this.turretGroup.quaternion);
+        bulletOffset.applyQuaternion(this.body.quaternion);
+        bullet.position.copy(this.body.position).add(bulletOffset);
+
+        const direction = new THREE.Vector3(0, 0, 1);
+        direction.applyQuaternion(this.turretGroup.quaternion);
+        direction.applyQuaternion(this.body.quaternion);
+        bullet.velocity = direction.multiplyScalar(2);
+
+        scene.add(bullet);
+        this.bullets.push(bullet);
+        this.ammo--;
+        this.lastShootTime = currentTime;
+
+        document.getElementById('ammo').textContent = `Ammo: ${this.ammo}/10`;
+        
+        return bullet;
+    }
 
     update(mouseX, mouseY) {
-   if (!this.body || !this.turretGroup) return;
-   
-   // 총알 업데이트만 수행하고 포탑 회전은 Game 클래스의 handleMovement에서 처리
-   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) {
-           scene.remove(bullet);
-           this.bullets.splice(i, 1);
-       }
-   }
-}
+        if (!this.body || !this.turretGroup) return;
+        
+        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) {
+                scene.remove(bullet);
+                this.bullets.splice(i, 1);
+            }
+        }
+    }
 
     move(direction) {
-    if (!this.body) return;
-    
-    const moveVector = new THREE.Vector3();
-    moveVector.x = direction.x * this.moveSpeed;
-    moveVector.z = direction.z * this.moveSpeed;
-    
-    this.body.position.add(moveVector);
+        if (!this.body) return;
+        
+        const moveVector = new THREE.Vector3();
+        moveVector.x = direction.x * this.moveSpeed;
+        moveVector.z = direction.z * this.moveSpeed;
+        
+        this.body.position.add(moveVector);
     }
 
     rotate(angle) {
@@ -147,23 +141,22 @@ class TankPlayer {
         return this.health <= 0;
     }
 }
-// Enemy 클래스 수정
+
 class Enemy {
     constructor(scene, position, type = 'tank') {
         this.scene = scene;
         this.position = position;
         this.mesh = null;
-        this.type = type; // 'tank' 또는 'heavy'
-        this.health = type === 'tank' ? 100 : 200; // heavy는 체력이 더 높음
+        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; // heavy는 더 느림
+        this.moveSpeed = type === 'tank' ? ENEMY_MOVE_SPEED : ENEMY_MOVE_SPEED * 0.7;
     }
 
     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;
@@ -188,22 +181,17 @@ class Enemy {
     update(playerPosition) {
         if (!this.mesh || !this.isLoaded) return;
 
-        // 플레이어 방향으로 회전
         const direction = new THREE.Vector3()
             .subVectors(playerPosition, this.mesh.position)
             .normalize();
         
         this.mesh.lookAt(playerPosition);
-
-        // 플레이어 방향으로 이동 (타입에 따라 다른 속도)
         this.mesh.position.add(direction.multiplyScalar(this.moveSpeed));
 
-        // 총알 업데이트
         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);
@@ -216,7 +204,7 @@ class Enemy {
         const currentTime = Date.now();
         const attackInterval = this.type === 'tank' ? 
             ENEMY_CONFIG.ATTACK_INTERVAL : 
-            ENEMY_CONFIG.ATTACK_INTERVAL * 1.5; // heavy는 발사 간격이 더 김
+            ENEMY_CONFIG.ATTACK_INTERVAL * 1.5;
 
         if (currentTime - this.lastAttackTime < attackInterval) return;
 
@@ -258,7 +246,6 @@ class Enemy {
     }
 }
 
-// Particle 클래스는 그대로 유지
 class Particle {
     constructor(scene, position) {
         const geometry = new THREE.SphereGeometry(0.1);
@@ -290,10 +277,9 @@ class Particle {
         scene.remove(this.mesh);
     }
 }
-// Game 클래스
+
 class Game {
     constructor() {
-        // 기본 Three.js 설정
         this.scene = new THREE.Scene();
         this.camera = new THREE.PerspectiveCamera(75, window.innerWidth / window.innerHeight, 0.1, 1000);
         this.renderer = new THREE.WebGLRenderer({ antialias: true });
@@ -301,7 +287,6 @@ class Game {
         this.renderer.shadowMap.enabled = true;
         document.getElementById('gameContainer').appendChild(this.renderer.domElement);
 
-        // 게임 요소 초기화
         this.tank = new TankPlayer();
         this.enemies = [];
         this.particles = [];
@@ -315,7 +300,6 @@ class Game {
         this.previousTankPosition = new THREE.Vector3();
         this.lastTime = performance.now();
 
-        // 마우스/키보드 상태
         this.mouse = { x: 0, y: 0 };
         this.keys = {
             forward: false,
@@ -324,408 +308,90 @@ class Game {
             right: false
         };
 
-        // 이벤트 리스너 설정
         this.setupEventListeners();
         this.initialize();
-        this.disposedObjects = new Set(); // 제거된 객체 추적
+        this.disposedObjects = new Set();
     }
 
-    // 리소스 정리를 위한 메서드
-    dispose(object) {
-        if (this.disposedObjects.has(object)) return;
-        
-        if (object.geometry) object.geometry.dispose();
-        if (object.material) {
-            if (Array.isArray(object.material)) {
-                object.material.forEach(material => material.dispose());
-            } else {
-                object.material.dispose();
-            }
-        }
-        if (object.parent) object.parent.remove(object);
-        this.disposedObjects.add(object);
-    }
+    // 여기에 Game 클래스의 나머지 메서드들이 들어갑니다...
+    // (initialize, setupEventListeners, handleMovement, animate, checkCollisions, updateUI, endGame 등)
 
-    // 총알 정리
-    cleanupBullets() {
-        // 플레이어 총알 정리
-        for (let i = this.tank.bullets.length - 1; i >= 0; i--) {
-            const bullet = this.tank.bullets[i];
-            if (Math.abs(bullet.position.x) > MAP_SIZE/2 || 
-                Math.abs(bullet.position.z) > MAP_SIZE/2) {
-                this.dispose(bullet);
-                this.tank.bullets.splice(i, 1);
-            }
+    createExplosion(position) {
+        for (let i = 0; i < PARTICLE_COUNT; i++) {
+            this.particles.push(new Particle(this.scene, position));
         }
-
-        // 적 총알 정리
-        this.enemies.forEach(enemy => {
-            for (let i = enemy.bullets.length - 1; i >= 0; i--) {
-                const bullet = enemy.bullets[i];
-                if (Math.abs(bullet.position.x) > MAP_SIZE/2 || 
-                    Math.abs(bullet.position.z) > MAP_SIZE/2) {
-                    this.dispose(bullet);
-                    enemy.bullets.splice(i, 1);
-                }
-            }
-        });
     }
 
-    async initialize() {
-        try {
-            // 조명 설정
-            const ambientLight = new THREE.AmbientLight(0xffffff, 0.5);
-            this.scene.add(ambientLight);
-
-            const directionalLight = new THREE.DirectionalLight(0xffffff, 0.8);
-            directionalLight.position.set(50, 50, 50);
-            directionalLight.castShadow = true;
-            directionalLight.shadow.mapSize.width = 2048;
-            directionalLight.shadow.mapSize.height = 2048;
-            this.scene.add(directionalLight);
-
-            // 지형 생성
-            const ground = new THREE.Mesh(
-                new THREE.PlaneGeometry(MAP_SIZE, MAP_SIZE),
-                new THREE.MeshStandardMaterial({ 
-                    color: 0x333333,
-                    roughness: 0.9,
-                    metalness: 0.1
-                })
-            );
-            ground.rotation.x = -Math.PI / 2;
-            ground.receiveShadow = true;
-            this.scene.add(ground);
-
-            // 건물 생성
-            await this.createBuildings();
-
-            // 탱크 초기화
-            await this.tank.initialize(this.scene, this.loader);
-            if (!this.tank.isLoaded) {
-                throw new Error('Tank loading failed');
+    updateParticles() {
+        for (let i = this.particles.length - 1; i >= 0; i--) {
+            const particle = this.particles[i];
+            if (!particle.update()) {
+                particle.destroy(this.scene);
+                this.particles.splice(i, 1);
             }
-
-            // 카메라 초기 설정
-            const tankPosition = this.tank.getPosition();
-            this.camera.position.set(
-                tankPosition.x,
-                tankPosition.y + 15,
-                tankPosition.z - 30
-            );
-            this.camera.lookAt(new THREE.Vector3(
-                tankPosition.x,
-                tankPosition.y + 2,
-                tankPosition.z
-            ));
-
-            // 로딩 완료
-            this.isLoading = false;
-            document.getElementById('loading').style.display = 'none';
-
-            // 게임 시작
-            this.animate();
-            this.spawnEnemies();
-            this.startGameTimer();
-
-        } catch (error) {
-            console.error('Game initialization error:', error);
-            this.handleLoadingError();
         }
     }
 
-    setupEventListeners() {
-        document.addEventListener('keydown', (event) => {
-            if (this.isLoading) return;
-            switch(event.code) {
-                case 'KeyW': this.keys.forward = true; break;
-                case 'KeyS': this.keys.backward = true; break;
-                case 'KeyA': this.keys.left = true; break;
-                case 'KeyD': this.keys.right = true; break;
-            }
-        });
-
-        document.addEventListener('keyup', (event) => {
-            if (this.isLoading) return;
-            switch(event.code) {
-                case 'KeyW': this.keys.forward = false; break;
-                case 'KeyS': this.keys.backward = false; break;
-                case 'KeyA': this.keys.left = false; break;
-                case 'KeyD': this.keys.right = false; break;
-            }
-        });
-
-        document.addEventListener('mousemove', (event) => {
-            if (this.isLoading || !document.pointerLockElement) return;
-            this.mouse.x += event.movementX * 0.002;
-            this.mouse.y += event.movementY * 0.002;
-        });
-
-        document.addEventListener('click', () => {
-            if (!document.pointerLockElement) {
-                document.body.requestPointerLock();
-            } else {
-                const bullet = this.tank.shoot(this.scene);
-                if (bullet) {
-                    // 발사 효과 추가 가능
-                }
-            }
-        });
-
-        document.addEventListener('pointerlockchange', () => {
-            if (!document.pointerLockElement) {
-                this.mouse.x = 0;
-                this.mouse.y = 0;
-            }
-        });
-
-        window.addEventListener('resize', () => {
-            this.camera.aspect = window.innerWidth / window.innerHeight;
-            this.camera.updateProjectionMatrix();
-            this.renderer.setSize(window.innerWidth, window.innerHeight);
-        });
-    }
-
-    handleMovement() {
-        if (!this.tank.isLoaded) return;
-        
-        const direction = new THREE.Vector3();
-        
-        if (this.keys.forward) direction.z += 1;
-        if (this.keys.backward) direction.z -= 1;
-        if (this.keys.left) direction.x -= 1;
-        if (this.keys.right) direction.x += 1;
-        
-        if (direction.length() > 0) {
-            direction.normalize();
+    async createBuildings() {
+        for (let i = 0; i < BUILDING_COUNT; i++) {
+            const x = (Math.random() - 0.5) * MAP_SIZE;
+            const z = (Math.random() - 0.5) * MAP_SIZE;
             
-            if (this.keys.left) this.tank.rotate(-1);
-            if (this.keys.right) this.tank.rotate(1);
+            const geometry = new THREE.BoxGeometry(10, 20, 10);
+            const material = new THREE.MeshStandardMaterial({ color: 0x808080 });
+            const building = new THREE.Mesh(geometry, material);
             
-            direction.applyEuler(this.tank.body.rotation);
-            this.tank.move(direction);
-        }
-
-        const mouseVector = new THREE.Vector2(this.mouse.x, -this.mouse.y);
-        const rotationAngle = Math.atan2(mouseVector.x, mouseVector.y);
-        
-        if (this.tank.turretGroup) {
-            this.tank.turretGroup.rotation.y = rotationAngle;
+            building.position.set(x, 10, z);
+            building.castShadow = true;
+            building.receiveShadow = true;
+            
+            this.scene.add(building);
+            this.buildings.push(building);
         }
-
-        const tankPos = this.tank.getPosition();
-        const cameraDistance = 30;
-        const cameraHeight = 15;
-        const lookAtHeight = 5;
-        
-        const tankRotation = this.tank.body.rotation.y;
-        
-        this.camera.position.set(
-            tankPos.x - Math.sin(tankRotation) * cameraDistance,
-            tankPos.y + cameraHeight,
-            tankPos.z - Math.cos(tankRotation) * cameraDistance
-        );
-
-        const lookAtPoint = new THREE.Vector3(
-            tankPos.x + Math.sin(tankRotation) * 10,
-            tankPos.y + lookAtHeight,
-            tankPos.z + Math.cos(tankRotation) * 10
-        );
-        
-        this.camera.lookAt(lookAtPoint);
     }
 
-    animate() {
-        if (this.isGameOver) return;
-
-        requestAnimationFrame(() => this.animate());
-
-        const currentTime = performance.now();
-        const deltaTime = (currentTime - this.lastTime) / 1000;
-        this.lastTime = currentTime;
-
-        if (this.isLoading) {
-            this.renderer.render(this.scene, this.camera);
-            return;
-        }
+    spawnEnemies() {
+        const spawnInterval = setInterval(() => {
+            if (this.isGameOver || this.enemies.length >= ENEMY_COUNT_MAX) return;
 
-        if (deltaTime < 1/60) return;
+            const angle = Math.random() * Math.PI * 2;
+            const distance = 100 + Math.random() * 50;
+            const x = Math.cos(angle) * distance;
+            const z = Math.sin(angle) * distance;
 
-        this.handleMovement();
-        this.tank.update(this.mouse.x, this.mouse.y);
-        
-        const tankPosition = this.tank.getPosition();
-        
-        this.enemies.forEach(enemy => {
-            if (!enemy.mesh || !enemy.isLoaded) return;
-            
-            const distance = enemy.mesh.position.distanceTo(tankPosition);
-            if (distance > 200) return;
-            
-            enemy.update(tankPosition);
-            if (distance < ENEMY_CONFIG.ATTACK_RANGE) {
-                enemy.shoot(tankPosition);
-            }
-        });
-
-        this.updateParticles();
-        this.checkCollisions();
-        this.cleanupBullets();
-        this.updateUI();
-        this.renderer.render(this.scene, this.camera);
+            const enemyType = Math.random() > 0.7 ? 'heavy' : 'tank';
+            const enemy = new Enemy(this.scene, new THREE.Vector3(x, ENEMY_GROUND_HEIGHT, z), enemyType);
+            enemy.initialize(this.loader);
+            this.enemies.push(enemy);
+        }, 3000);
     }
 
-    checkCollisions() {
-        if (this.isLoading || !this.tank.isLoaded) return;
-
-        const tankPosition = this.tank.getPosition();
-        const tankBoundingBox = new THREE.Box3().setFromObject(this.tank.body);
-
-        for (const enemy of this.enemies) {
-            if (!enemy.mesh || !enemy.isLoaded) continue;
-
-            for (let i = enemy.bullets.length - 1; i >= 0; i--) {
-                const bullet = enemy.bullets[i];
-                const distance = bullet.position.distanceTo(tankPosition);
-                
-                if (distance > 50) continue;
-                
-                if (distance < 1) {
-                    if (this.tank.takeDamage(10)) {
-                        this.endGame();
-                        return;
-                    }
-                    this.dispose(bullet);
-                    enemy.bullets.splice(i, 1);
-                    this.createExplosion(bullet.position);
-                    document.getElementById('health').style.width = 
-                        `${(this.tank.health / MAX_HEALTH) * 100}%`;
-                }
+    startGameTimer() {
+        const timerInterval = setInterval(() => {
+            if (this.isGameOver) {
+                clearInterval(timerInterval);
+                return;
             }
-        }
 
-        for (const building of this.buildings) {
-            const buildingBox = new THREE.Box3().setFromObject(building);
-            if (tankBoundingBox.intersectsBox(buildingBox)) {
-                this.tank.body.position.copy(this.previousTankPosition);
-                break;
+            this.gameTime--;
+            if (this.gameTime <= 0) {
+                this.endGame();
+                clearInterval(timerInterval);
             }
-        }
-        
-        this.previousTankPosition = this.tank.body.position.clone();
-    }
-
-    updateUI() {
-        const healthBar = document.getElementById('health');
-        if (healthBar) {
-            healthBar.style.width = `${(this.tank.health / MAX_HEALTH) * 100}%`;
-        }
-
-        const timeElement = document.getElementById('time');
-        if (timeElement) {
-            timeElement.textContent = `Time: ${this.gameTime}s`;
-        }
-
-        const scoreElement = document.getElementById('score');
-        if (scoreElement) {
-            scoreElement.textContent = `Score: ${this.score}`;
-        }
+        }, 1000);
     }
 
-    endGame() {
-        this.isGameOver = true;
-        const gameOverDiv = document.createElement('div');
-        gameOverDiv.style.position = 'absolute';
-        gameOverDiv.style.top = '50%';
-        gameOverDiv.style.left = '50%';
-        gameOverDiv.style.transform = 'translate(-50%, -50%)';
-        gameOverDiv.style.color = 'white';
-        gameOverDiv.style.fontSize = '48px';
-        gameOverDiv.style.backgroundColor = 'rgba(0, 0, 0, 0.7)';
-        gameOverDiv.style.padding = '20px';
-        gameOverDiv.style.borderRadius = '10px';
-        gameOverDiv.innerHTML = `
-            Game Over<br>
-            Score: ${this.score}<br>
-            Time Survived: ${GAME_DURATION - this.gameTime}s<br>
-            <button onclick="location.reload()" 
-                    style="font-size: 24px; padding: 10px; margin-top: 20px; 
-                           cursor: pointer; background: #4CAF50; border: none; 
-                           color: white; border-radius: 5px;">
-                Play Again
-            </button>
-        `;
-        document.body.appendChild(gameOverDiv);
-    }
-
-
-    animate() {
-    if (this.isGameOver) return;
-
-    requestAnimationFrame(() => this.animate());
-
-    const currentTime = performance.now();
-    const deltaTime = (currentTime - this.lastTime) / 1000;
-    this.lastTime = currentTime;
-
-    if (this.isLoading) {
-        this.renderer.render(this.scene, this.camera);
-        return;
-    }
-
-    // 프레임 제한 (60fps)
-    if (deltaTime < 1/60) return;
-
-    this.handleMovement();
-    this.tank.update(this.mouse.x, this.mouse.y);
-    
-    const tankPosition = this.tank.getPosition();
-    
-    // 화면에 보이는 적만 업데이트
-    this.enemies.forEach(enemy => {
-        if (!enemy.mesh || !enemy.isLoaded) return;
-        
-        const distance = enemy.mesh.position.distanceTo(tankPosition);
-        if (distance > 200) return; // 먼 적은 업데이트 스킵
-        
-        enemy.update(tankPosition);
-        if (distance < ENEMY_CONFIG.ATTACK_RANGE) {
-            enemy.shoot(tankPosition);
-        }
-    });
-
-    this.updateParticles();
-    this.checkCollisions();
-    this.cleanupBullets();
-    this.updateUI();
-    this.renderer.render(this.scene, this.camera);
-}
-
-    updateUI() {
-        const healthBar = document.getElementById('health');
-        if (healthBar) {
-            healthBar.style.width = `${(this.tank.health / MAX_HEALTH) * 100}%`;
-        }
-
-        const timeElement = document.getElementById('time');
-        if (timeElement) {
-            timeElement.textContent = `Time: ${this.gameTime}s`;
-        }
-
-        const scoreElement = document.getElementById('score');
-        if (scoreElement) {
-            scoreElement.textContent = `Score: ${this.score}`;
-        }
+    handleLoadingError() {
+        this.isLoading = false;
+        document.getElementById('loading').style.display = 'none';
+        document.getElementById('error').style.display = 'block';
     }
 }
 
-
-
-// HTML의 startGame 함수와 연결
+// 게임 시작
 window.startGame = function() {
     document.getElementById('startScreen').style.display = 'none';
     document.body.requestPointerLock();
 };
 
-// 게임 인스턴스 생성
 const game = new Game();