diff options
author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-04-21 15:31:43 +0200 |
---|---|---|
committer | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-04-21 15:31:43 +0200 |
commit | 71760514fc044f273914c17b1510fa3cf10419b3 (patch) | |
tree | 72f822efde300d8e1e9de1cc578d431ff72e0e03 /Game.cpp | |
parent | 2017-04-15 (diff) | |
download | AltCraft-71760514fc044f273914c17b1510fa3cf10419b3.tar AltCraft-71760514fc044f273914c17b1510fa3cf10419b3.tar.gz AltCraft-71760514fc044f273914c17b1510fa3cf10419b3.tar.bz2 AltCraft-71760514fc044f273914c17b1510fa3cf10419b3.tar.lz AltCraft-71760514fc044f273914c17b1510fa3cf10419b3.tar.xz AltCraft-71760514fc044f273914c17b1510fa3cf10419b3.tar.zst AltCraft-71760514fc044f273914c17b1510fa3cf10419b3.zip |
Diffstat (limited to '')
-rw-r--r-- | Game.cpp | 44 |
1 files changed, 27 insertions, 17 deletions
@@ -1,43 +1,51 @@ #include "Game.hpp" #include "PacketParser.hpp" #include "PacketBuilder.hpp" -#include "json.h" -#include <chrono> - +#include "json.hpp" Game::Game() { - m_display = new Display(); - m_display->SetWorld(&m_world); + m_display = new Display(1280, 720, "AltCraft", &m_world, gameStartWaiter); m_nc = new NetworkClient("127.0.0.1", 25565, "HelloOne"); - m_nc->Update(); - Packet response = m_nc->GetPacket(); + Packet &response = *m_nc->GetPacket(); + if (response.GetId()!=0x02){ + std::cout<< response.GetId()<<std::endl; + throw 127; + } PacketParser::Parse(response, Login); g_PlayerUuid = response.GetField(0).GetString(); g_PlayerName = response.GetField(1).GetString(); + delete &response; m_networkState = ConnectionState::Play; std::cout << g_PlayerName << "'s UUID is " << g_PlayerUuid << std::endl; } Game::~Game() { + std::cout<<"Stopping game thread..."<<std::endl; + m_gameThread.join(); + std::cout<<"Stopping graphics..."<<std::endl; delete m_display; + std::cout<<"Stopping network..."<<std::endl; delete m_nc; } void Game::MainLoop() { + //std::thread(std::this_thread::get_id()).swap(m_display->GetThreadHandler()); while (!m_exit) { ParsePackets(); - if (g_IsGameStarted) - m_display->Update(); if (m_display->IsClosed()) - throw 140; + m_exit = true; } } void Game::ParsePackets() { - m_nc->Update(); - Packet packet = m_nc->GetPacket(); - if (packet.GetId() == -1) + Packet *packetPtr =m_nc->GetPacket(); + if (!packetPtr) { + using namespace std::chrono_literals; + std::this_thread::sleep_for(16ms); return; + } + Packet packet = *packetPtr; + delete packetPtr; PacketParser::Parse(packet); nlohmann::json json; @@ -109,6 +117,7 @@ void Game::ParsePackets() { std::cout << "PlayerPos is " << g_PlayerX << "," << g_PlayerY << "," << g_PlayerZ << "\t" << g_PlayerYaw << "," << g_PlayerPitch << std::endl; m_display->SetPlayerPos(g_PlayerX, g_PlayerY); + gameStartWaiter.notify_all(); break; case 0x1A: json = nlohmann::json::parse(packet.GetField(0).GetString()); @@ -116,11 +125,7 @@ void Game::ParsePackets() { throw 119; break; case 0x20: - std::cout.setstate(std::ios_base::failbit); m_world.ParseChunkData(packet); - std::cout.clear(); - //sf::sleep(sf::seconds(0.1)); - //throw 122; break; case 0x07: std::cout << "Statistics:" << std::endl; @@ -147,3 +152,8 @@ void Game::ParsePackets() { } } } + +void Game::Exec() { + m_gameThread = std::thread(&Game::MainLoop,this); + m_display->MainLoop(); +} |