Merge pull request #30 from Crazy-Cow/feature/CD-76

fix: Game Interval 1번만 켜지도록 수정 [CD-76]
Crazy-Cow · Nov 15, 2024 · 6027d61 · 6027d61
2 parents 1b6664e + 683a43e
commit 6027d61
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/src/game/maps/common.ts b/src/game/maps/common.ts
@@ -13,11 +13,12 @@ const GROUND_POS = {
 }
 
 export class CommonMap {
-    updateInterval: number
+    private updateInterval: number
     world: CANNON.World
     characters: Character[] = []
     characterMaterial: CANNON.Material
     groundMaterial: CANNON.Material
+    private intervalId?: NodeJS.Timeout
 
     constructor() {
         this.updateInterval = 1 / 60 // 60 FPS
@@ -135,4 +136,19 @@ export class CommonMap {
             this.checkAndUpdatePosition(character)
         })
     }
+
+    startGameLoop(emitter: (data: unknown) => void) {
+        this.intervalId = setInterval(() => {
+            this.updateGameState()
+            const gameState = this.convertGameState()
+            emitter(gameState) // 특정 방이나 전체에 상태를 브로드캐스트
+        }, 1000 * this.updateInterval)
+    }
+
+    stopGameLoop() {
+        if (this.intervalId) {
+            clearInterval(this.intervalId)
+            this.intervalId = undefined
+        }
+    }
 }
diff --git a/src/game/server/index.ts b/src/game/server/index.ts
@@ -14,7 +14,6 @@ class SocketImplement {
         this.socket = socket
         this.register()
         this.handleConnect()
-        this.updateGameState() // TODO: 게임방별로 돌아야함
     }
 
     private register = () => {
@@ -55,14 +54,6 @@ class SocketImplement {
         this.socket.emit('characters', gameWorld.convertGameState())
     }
 
-    updateGameState = () => {
-        setInterval(() => {
-            gameWorld.updateGameState()
-            // Q. 업데이트 주기에만 쏘면되지 않나??
-            this.socket.emit('characters', gameWorld.convertGameState()) // TODO: broadcast only room
-        }, 1000 * gameWorld.updateInterval)
-    }
-
     public logger = (msg: string, args?: SocketOnEvtData) => {
         console.log(
             `[${this.socket.id}] ${msg} ${args ? JSON.stringify(args) : ''}`
@@ -73,6 +64,13 @@ class SocketImplement {
 export function initInGmaeSocket(io: Server): void {
     const root = io.of('/')
 
+    // 게임 서버 interval ON
+    gameWorld.startGameLoop((gameState) => {
+        root.emit('characters', gameState) // TODO: broadcast only room
+    })
+
+    // TODO: OFF
+
     root.on(SOCKET_ON_EVT_TYPE.CONNECT, (socket: Socket) => {
         const instance = new SocketImplement(socket)
         instance.logger('complete connection')