Skip to content
This repository has been archived by the owner on Nov 17, 2022. It is now read-only.

서버와 클라의 공통 데이터 수정 #26

Merged
merged 55 commits into from
Nov 25, 2021
Merged

서버와 클라의 공통 데이터 수정 #26

merged 55 commits into from
Nov 25, 2021

Commits on Nov 23, 2021

  1. 충돌 검사용 함수 SeekCollision(), CheckCollision() 추가, 이제 게임 인스턴스는 문자열로 된 고유… 

    …한 식별자를 가진다.
    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    c0ff678 View commit details
    Browse the repository at this point in the history

  2. 충돌 검사 수정 중

    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    d052513 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #22 from iconstudio/2016180042 

    게임 업데이트
    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    e03abc0 View commit details
    Browse the repository at this point in the history

  4. 버그 수정

    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    7e0f5ad View commit details
    Browse the repository at this point in the history

  5. 총알 충돌 확인 용 메시지

    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    c144317 View commit details
    Browse the repository at this point in the history

  6. 한글 인코딩 변경

    @ghk01214
    ghk01214 committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    209fbf3 View commit details
    Browse the repository at this point in the history

  7. 인스턴스의 식별 용 문자열은 이제 inline const 형식

    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    79f6230 View commit details
    Browse the repository at this point in the history

  8. 서버의 내용 통합

    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    7110b9f View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/2016180042' into 2017182004

    @ghk01214
    ghk01214 committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    0c6c669 View commit details
    Browse the repository at this point in the history

  10. 리소스 추가

    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    d9a1be3 View commit details
    Browse the repository at this point in the history

  11. 충돌 검사 추가 

    - 아직 버그 있음.
    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    c8c29d2 View commit details
    Browse the repository at this point in the history

  12. 가상 함수를 사용한 충돌 검사 (버그 있음)

    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    d4da854 View commit details
    Browse the repository at this point in the history

  13. 충돌 검사 버그 수정

    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    4b9618a View commit details
    Browse the repository at this point in the history

  14. 인코딩 방식 변경으로 vcs에서 변경점 안 보이던 문제 수정

    @ghk01214
    ghk01214 committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    4c86422 View commit details
    Browse the repository at this point in the history

  15. Revert "인코딩 방식 변경으로 vcs에서 변경점 안 보이던 문제 수정" 

    This reverts commit 4c86422.
    @ghk01214
    ghk01214 committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    b3c144e View commit details
    Browse the repository at this point in the history

  16. Merge branch '2017182004' of https://github.com/iconstudio/2021-NGP-T… 

    …erm-Project into 2017182004
    @ghk01214
    ghk01214 committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    b7ffcfb View commit details
    Browse the repository at this point in the history

  17. Revert "인코딩 방식 변경으로 vcs에서 변경점 안 보이던 문제 수정" 

    This reverts commit 4c86422.
    @ghk01214
    ghk01214 committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    16f3fac View commit details
    Browse the repository at this point in the history

  18. Merge branch '2017182004' of https://github.com/iconstudio/2021-NGP-T… 

    …erm-Project into 2017182004
    @ghk01214
    ghk01214 committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    3142001 View commit details
    Browse the repository at this point in the history

  19. Merge branch '2017182004' of https://github.com/iconstudio/2021-NGP-T… 

    …erm-Project into 2017182004
    @ghk01214
    ghk01214 committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    5c3a995 View commit details
    Browse the repository at this point in the history

  20. 인코딩 방식 변경(2트)

    @ghk01214
    ghk01214 committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    6015bf5 View commit details
    Browse the repository at this point in the history

  21. 인코딩 문제 수정 UTF-8로 변경

    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    a6ed246 View commit details
    Browse the repository at this point in the history

  22. C++ 버전 업

    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    cfa7230 View commit details
    Browse the repository at this point in the history

  23. 주석 추가

    @iconstudio
    iconstudio committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    54027a8 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2021

  1. 스레드 구조 변경 

    - 수신 이벤트 객체는 이제 자동 리셋을 사용한다. 그래서 수동 리셋 이벤트 객체는 event_send_renders 뿐이 안 남았다.
- 렌더링 정보를 만들 함수 BuildRenderings() 추가
- 플레이어 동작 큐는 한번 수신하고 처리한 후에 초기화
- 플레이어 처리는 접속한 수만큼 반복하고 나서야 렌더링으로 넘어감
- 렌더링 정보는 한 함수에서 만들고, 한번에 보낸다.

# 함수 순서
1. ConnectProcess
1. AwaitClientAcceptEvent
1. CastClientAccept
1. CommunicateProcess

1. CastStartGame
1. AwaitStartGameEvent
1. GameInitializeProcess
1. CommunicateProcess
1. QueingPlayerAction
1. AwaitProcessingGameEvent
1. GameProcess
1. InterpretPlayerAction
1. ProceedReceiveIndex
1. ClearPlayerActions
1. 조건이 만족되면 렌더링 전송, 아니면 다시 CommunicateProcess로
1. BuildRenderings
1. AwaitSendRendersEvent
1. 다시 CommunicateProcess로 돌아감
    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    4a9f4fb View commit details
    Browse the repository at this point in the history

  2. 양식 수정

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    85bfd75 View commit details
    Browse the repository at this point in the history

  3. 렌더링을 보낼 SendRenderings() 함수 추가

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    151e5a1 View commit details
    Browse the repository at this point in the history

  4. 플레이어 동작을 큐에 넣기

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    20d0f85 View commit details
    Browse the repository at this point in the history

  5. 플레이어 사격을 큐에 넣기

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    266d773 View commit details
    Browse the repository at this point in the history

  6. 플레이어 캐릭터의 소유자 명시

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    d43a211 View commit details
    Browse the repository at this point in the history

  7. 게임 인스턴스에 기본 렌더링 속성 추가

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    2c9957c View commit details
    Browse the repository at this point in the history

  8. 인스턴스의 렌더링 정보는 파괴될 때 삭제된다.

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    448ed44 View commit details
    Browse the repository at this point in the history

  9. image_index는 이제 double

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    a8e79b4 View commit details
    Browse the repository at this point in the history

  10. 애니메이션 재생을 할 때 사용할 프레임 장수 속성 추가

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    30bef12 View commit details
    Browse the repository at this point in the history

  11. 애니메이션 프레임 재생

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    297be20 View commit details
    Browse the repository at this point in the history

  12. 이제 게임 인스턴스는 스프라이트가 아니라 렌더링 종류를 가진다.

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    204ca57 View commit details
    Browse the repository at this point in the history

  13. 게임 인스턴스는 이제 direction 대신에 image_angle 속성을 가진다. 

    - 플레이어와 총알의 회전 각도 반영
    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    9ef0090 View commit details
    Browse the repository at this point in the history

  14. Merge branch '2017182004' into 2016180042

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    f1dfcfa View commit details
    Browse the repository at this point in the history

  15. 인코딩과 출력 문제 해결

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    3c680d2 View commit details
    Browse the repository at this point in the history

  16. 스레드 처리 함수들의 위치 이동

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    36342b3 View commit details
    Browse the repository at this point in the history

  17. 서버의 시작 메시지 추가

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    18629f2 View commit details
    Browse the repository at this point in the history

  18. 서버 게임의 수신 코드 수정. 고정 길이를 받기 위함. 

    - 플레이어의 입력을 받는다.
    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    98829ba View commit details
    Browse the repository at this point in the history

  19. 서버의 프레임레이트를 20으로

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    6b5822f View commit details
    Browse the repository at this point in the history

  20. 렌더링 신호 보내기

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    4b13b3a View commit details
    Browse the repository at this point in the history

  21. 클라이언트 접속에 제한 두기

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    533d85b View commit details
    Browse the repository at this point in the history

  22. 새로운 방장에게도 메시지 보내기

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    a1ed52c View commit details
    Browse the repository at this point in the history

  23. 플레이어 피격과 무적 시간, 그리고 사망

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    334f894 View commit details
    Browse the repository at this point in the history

  24. 플레이어 무적 시간은 상수

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    213af69 View commit details
    Browse the repository at this point in the history

  25. 클라와 서버의 공통 데이터 수정

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    9c04a98 View commit details
    Browse the repository at this point in the history

  26. 클라와 서버에 공통 데이터로 송수신할 입력의 크기를 추가. 

    - 정수 상수로서 크기는 6.
    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    b320b75 View commit details
    Browse the repository at this point in the history

  27. 서버의 입력 처리

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    d2a7206 View commit details
    Browse the repository at this point in the history

  28. 자기장에 필요한 상수들 선언, 플레이어 체력 상수는 100으로

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    5b43b7e View commit details
    Browse the repository at this point in the history

  29. 플레이어 체력은 이제 double이다.

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    8bc2c88 View commit details
    Browse the repository at this point in the history

  30. 게임 인스턴스에 direction 속성 추가

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    c17509c View commit details
    Browse the repository at this point in the history

  31. 플레이어 갱신 함수의 인자를 간소화

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    147963e View commit details
    Browse the repository at this point in the history

  32. 클라이언트의 키 누름 / 뗌 패킷 종류 추가

    @iconstudio
    iconstudio committed Nov 24, 2021
    Configuration menu
    Copy the full SHA
    c345dc1 View commit details
    Browse the repository at this point in the history