summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/GameState.cpp1178
-rw-r--r--src/GameState.hpp140
-rw-r--r--src/Render.cpp60
-rw-r--r--src/RendererWorld.cpp44
4 files changed, 742 insertions, 680 deletions
diff --git a/src/GameState.cpp b/src/GameState.cpp
index fabfdb8..ace2488 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -7,559 +7,569 @@
#include "Packet.hpp"
void GameState::Update(float deltaTime) {
- if (g_IsGameStarted) {
- std::chrono::steady_clock clock;
- static auto timeOfPreviousSendedPacket(clock.now());
- auto delta = clock.now() - timeOfPreviousSendedPacket;
- using namespace std::chrono_literals;
- if (delta >= 50ms) {
- auto packetToSend = std::make_shared<PacketPlayerPositionAndLookSB>(
- player->pos.x, player->pos.y, player->pos.z,
- player->yaw, player->pitch, player->onGround);
-
- auto packet = std::static_pointer_cast<Packet>(packetToSend);
- PUSH_EVENT("SendPacket", packet);
- timeOfPreviousSendedPacket = clock.now();
- }
-
- bool prevOnGround = player->onGround;
- world.UpdatePhysics(deltaTime);
- if (player->onGround != prevOnGround) {
- auto updatePacket = std::make_shared<PacketPlayerPosition>(
- player->pos.x, player->pos.y,
- player->pos.z, player->onGround);
-
- auto packet = std::static_pointer_cast<Packet>(updatePacket);
- PUSH_EVENT("SendPacket", packet);
- }
-
-
- double playerYaw = Entity::DecodeYaw(player->yaw);
- double playerPitch = Entity::DecodePitch(player->pitch);
-
- glm::vec3 direction;
- direction.x = cos(glm::radians(playerYaw)) * cos(glm::radians(playerPitch));
- direction.y = sin(glm::radians(playerPitch));
- direction.z = sin(glm::radians(playerYaw)) * cos(glm::radians(playerPitch));
-
- RaycastResult raycast = world.Raycast(player->pos + player->EyeOffset, direction);
- if (raycast.isHit != isBlockSelected || ((raycast.isHit == true && isBlockSelected == true) &&
- selectedBlock != raycast.hitBlock)) {
- PUSH_EVENT("SelectedBlockChanged", 0);
- }
-
- if (raycast.isHit) {
- selectedBlock = raycast.hitBlock;
- distanceToSelectedBlock = (player->pos - raycast.hitPos).GetLength();
- } else {
- selectedBlock = Vector(0, 0, 0);
- distanceToSelectedBlock = 0.0f;
- }
-
- isBlockSelected = raycast.isHit;
- raycastHit = raycast.hitPos;
-
- if (doDaylightCycle)
- interpolatedTimeOfDay += 20.0 * deltaTime;
- }
+ if (!gameStatus.isGameStarted)
+ return;
+
+ std::chrono::steady_clock clock;
+ static auto timeOfPreviousSendedPacket(clock.now());
+ auto delta = clock.now() - timeOfPreviousSendedPacket;
+ using namespace std::chrono_literals;
+ if (delta >= 50ms) {
+ auto packetToSend = std::make_shared<PacketPlayerPositionAndLookSB>(
+ player->pos.x, player->pos.y, player->pos.z,
+ player->yaw, player->pitch, player->onGround);
+
+ auto packet = std::static_pointer_cast<Packet>(packetToSend);
+ PUSH_EVENT("SendPacket", packet);
+ timeOfPreviousSendedPacket = clock.now();
+ }
+
+ bool prevOnGround = player->onGround;
+ world.UpdatePhysics(deltaTime);
+ if (player->onGround != prevOnGround) {
+ auto updatePacket = std::make_shared<PacketPlayerPosition>(
+ player->pos.x, player->pos.y,
+ player->pos.z, player->onGround);
+
+ auto packet = std::static_pointer_cast<Packet>(updatePacket);
+ PUSH_EVENT("SendPacket", packet);
+ }
+
+
+ double playerYaw = Entity::DecodeYaw(player->yaw);
+ double playerPitch = Entity::DecodePitch(player->pitch);
+
+ glm::vec3 direction;
+ direction.x = cos(glm::radians(playerYaw)) * cos(glm::radians(playerPitch));
+ direction.y = sin(glm::radians(playerPitch));
+ direction.z = sin(glm::radians(playerYaw)) * cos(glm::radians(playerPitch));
+
+ RaycastResult raycast = world.Raycast(player->pos + player->EyeOffset, direction);
+ if (raycast.isHit != selectionStatus.isBlockSelected || ((raycast.isHit == true && selectionStatus.isBlockSelected == true) &&
+ selectionStatus.selectedBlock != raycast.hitBlock)) {
+ PUSH_EVENT("SelectedBlockChanged", 0);
+ }
+
+ if (raycast.isHit) {
+ selectionStatus.selectedBlock = raycast.hitBlock;
+ selectionStatus.distanceToSelectedBlock = (player->pos - raycast.hitPos).GetLength();
+ }
+ else {
+ selectionStatus.selectedBlock = Vector(0, 0, 0);
+ selectionStatus.distanceToSelectedBlock = 0.0f;
+ }
+
+ selectionStatus.isBlockSelected = raycast.isHit;
+ selectionStatus.raycastHit = raycast.hitPos;
+
+ if (timeStatus.doDaylightCycle)
+ timeStatus.interpolatedTimeOfDay += 20.0 * deltaTime;
}
void GameState::UpdatePacket(std::shared_ptr<Packet> ptr) {
- switch ((PacketNamePlayCB) ptr->GetPacketId()) {
- case SpawnObject: {
- auto packet = std::static_pointer_cast<PacketSpawnObject>(ptr);
- Entity entity = CreateObject(static_cast<ObjectType>(packet->Type));
- entity.entityId = packet->EntityId;
- entity.pos = VectorF(packet->X, packet->Y, packet->Z);
- entity.uuid = packet->ObjectUuid;
- entity.vel = Entity::DecodeVelocity(packet->VelocityX, packet->VelocityY, packet->VelocityZ);
- entity.yaw = packet->Yaw / 256.0;
- entity.pitch = packet->Pitch / 256.0;
- entity.renderColor = glm::vec3(0, 1, 0);
- world.AddEntity(entity);
- PUSH_EVENT("EntityChanged", entity.entityId);
- break;
- }
-
- case SpawnExperienceOrb:
- break;
-
- case SpawnGlobalEntity:
- break;
-
- case SpawnMob: {
- auto packet = std::static_pointer_cast<PacketSpawnMob>(ptr);
- Entity entity;
- entity.entityId = packet->EntityId;
- entity.pos = VectorF(packet->X, packet->Y, packet->Z);
- entity.uuid = packet->EntityUuid;
- entity.vel = Entity::DecodeVelocity(packet->VelocityX, packet->VelocityY, packet->VelocityZ);
- entity.yaw = packet->Yaw / 256.0;
- entity.pitch = packet->Pitch / 256.0;
- entity.renderColor = glm::vec3(0, 0, 1);
- world.AddEntity(entity);
- PUSH_EVENT("EntityChanged", entity.entityId);
- break;
- }
-
- case SpawnPainting:
- break;
-
- case SpawnPlayer: {
- auto packet = std::static_pointer_cast<PacketSpawnPlayer>(ptr);
- Entity entity;
- entity.entityId = packet->EntityId;
- entity.pos = VectorF(packet->X, packet->Y, packet->Z);
- entity.uuid = packet->PlayerUuid;
- entity.yaw = packet->Yaw / 256.0;
- entity.pitch = packet->Pitch / 256.0;
- entity.renderColor = glm::vec3(1, 0, 0);
- entity.height = 1.8;
- entity.width = 0.6;
- world.AddEntity(entity);
- PUSH_EVENT("EntityChanged", entity.entityId);
- break;
- }
- case AnimationCB:
- break;
- case Statistics:
- break;
- case BlockBreakAnimation:
- break;
- case UpdateBlockEntity:
- break;
- case BlockAction:
- break;
-
- case BlockChange: {
- auto packet = std::static_pointer_cast<PacketBlockChange>(ptr);
- world.ParseChunkData(packet);
- break;
- }
-
- case BossBar:
- break;
- case ServerDifficulty:
- break;
- case TabCompleteCB:
- break;
-
- case ChatMessageCB: {
- auto packet = std::static_pointer_cast<PacketChatMessageCB>(ptr);
- LOG(INFO) << "Message (" << int(packet->Position) << "): " << packet->JsonData.text;
- PUSH_EVENT("ChatMessageReceived", std::make_tuple(packet->JsonData, packet->Position));
- break;
- }
-
- case MultiBlockChange: {
- auto packet = std::static_pointer_cast<PacketMultiBlockChange>(ptr);
- world.ParseChunkData(packet);
- break;
- }
-
- case ConfirmTransactionCB: {
- auto packet = std::static_pointer_cast<PacketConfirmTransactionCB>(ptr);
- if (packet->WindowId == 0) {
- try {
- playerInventory.ConfirmTransaction(*packet);
- } catch (std::exception &e) {
- PUSH_EVENT("Disconnected", std::string("Transaction failed"));
- }
- }
- break;
- }
-
- case CloseWindowCB:
- break;
-
- case OpenWindow: {
- auto packet = std::static_pointer_cast<PacketOpenWindow>(ptr);
-
- LOG(INFO) << "Open new window " << packet->WindowTitle << ": " << packet->WindowId;
- break;
- }
-
- case WindowItems: {
- auto packet = std::static_pointer_cast<PacketWindowItems>(ptr);
- if (packet->WindowId == 0) {
- playerInventory.WindowId = 0;
- playerInventory.slots = packet->SlotData;
- }
- break;
- }
-
- case WindowProperty:
- break;
-
- case SetSlot: {
- auto packet = std::static_pointer_cast<PacketSetSlot>(ptr);
- if (packet->WindowId == 0) {
- playerInventory.slots[packet->Slot] = packet->SlotData;
- }
- break;
- }
-
- case SetCooldown:
- break;
- case PluginMessageCB:
- break;
- case NamedSoundEffect:
- break;
-
- case DisconnectPlay: {
- auto packet = std::static_pointer_cast<PacketDisconnectPlay>(ptr);
- LOG(INFO) << "Disconnect reason: " << packet->Reason;
- PUSH_EVENT("Disconnected", packet->Reason);
- break;
- }
-
- case EntityStatus:
- break;
- case Explosion:
- break;
-
- case UnloadChunk: {
- auto packet = std::static_pointer_cast<PacketUnloadChunk>(ptr);
- world.ParseChunkData(packet);
- break;
- }
-
- case ChangeGameState:
- break;
-
- case KeepAliveCB: {
- LOG(WARNING) << "Receive KeepAlive packet in GameState handler";
- break;
- }
-
- case ChunkData: {
- auto packet = std::static_pointer_cast<PacketChunkData>(ptr);
- world.ParseChunkData(packet);
- break;
- }
-
- case Effect:
- break;
- case Particle:
- break;
-
- case JoinGame: {
- auto packet = std::static_pointer_cast<PacketJoinGame>(ptr);
- Entity entity;
- entity.entityId = packet->EntityId;
- entity.width = 0.6;
- entity.height = 1.8;
- world.AddEntity(entity);
- player = world.GetEntityPtr(entity.entityId);
-
- g_PlayerEid = packet->EntityId;
- g_Gamemode = (packet->Gamemode & 0b11111011);
- g_Dimension = packet->Dimension;
- g_Difficulty = packet->Difficulty;
- g_MaxPlayers = packet->MaxPlayers;
- g_LevelType = packet->LevelType;
- g_ReducedDebugInfo = packet->ReducedDebugInfo;
- LOG(INFO) << "Gamemode is " << g_Gamemode << ", Difficulty is " << (int) g_Difficulty
- << ", Level Type is " << g_LevelType;
- PUSH_EVENT("PlayerConnected", 0);
- break;
- }
-
- case Map:
- break;
-
- case EntityRelativeMove: {
- auto packet = std::static_pointer_cast<PacketEntityRelativeMove>(ptr);
- Entity &entity = world.GetEntity(packet->EntityId);
- entity.pos = entity.pos + Entity::DecodeDeltaPos(packet->DeltaX, packet->DeltaY, packet->DeltaZ);
- if (entity.entityId != 0)
- LOG(INFO) << "M: " << packet->EntityId;
- break;
- }
-
- case EntityLookAndRelativeMove: {
- auto packet = std::static_pointer_cast<PacketEntityLookAndRelativeMove>(ptr);
- Entity &entity = world.GetEntity(packet->EntityId);
- entity.pos = entity.pos + Entity::DecodeDeltaPos(packet->DeltaX, packet->DeltaY, packet->DeltaZ);
- entity.pitch = packet->Pitch / 256.0;
- entity.yaw = packet->Yaw / 256.0;
- break;
- }
-
- case EntityLook: {
- auto packet = std::static_pointer_cast<PacketEntityLook>(ptr);
- Entity &entity = world.GetEntity(packet->EntityId);
- entity.pitch = packet->Pitch / 256.0;
- entity.yaw = packet->Yaw / 256.0;
- //LOG(INFO) << "L: " << packet->EntityId;
- break;
- }
-
- case EntityCB:
- break;
- case VehicleMove:
- break;
- case OpenSignEditor:
- break;
- case PlayerAbilitiesCB:
- break;
- case CombatEvent:
- break;
- case PlayerListItem:
- break;
-
- case PlayerPositionAndLookCB: {
- auto packet = std::static_pointer_cast<PacketPlayerPositionAndLookCB>(ptr);
- if ((packet->Flags & 0x10) != 0) {
- player->pitch += packet->Pitch;
- } else {
- player->pitch = packet->Pitch;
- }
-
- if ((packet->Flags & 0x08) != 0) {
- player->yaw += packet->Yaw;
- } else {
- player->yaw = packet->Yaw;
- }
-
- if ((packet->Flags & 0x01) != 0) {
- player->pos.x += packet->X;
- } else {
- player->pos.x = packet->X;
- }
-
- if ((packet->Flags & 0x02) != 0) {
- player->pos.y += packet->Y;
- } else {
- player->pos.y = packet->Y;
- }
-
- if ((packet->Flags & 0x04) != 0) {
- player->pos.z += packet->Z;
- } else {
- player->pos.z = packet->Z;
- }
-
- PUSH_EVENT("PlayerPosChanged", player->pos);
- LOG(INFO) << "PlayerPos is " << player->pos << "\t\tAngle: " << player->yaw << "," << player->pitch;;
-
- if (!g_IsGameStarted) {
- LOG(INFO) << "Game is started";
- PUSH_EVENT("RemoveLoadingScreen", 0);
- }
-
- g_IsGameStarted = true;
-
- auto packetResponse = std::make_shared<PacketTeleportConfirm>(packet->TeleportId);
- auto packetPerformRespawn = std::make_shared<PacketClientStatus>(0);
-
- PUSH_EVENT("SendPacket",std::static_pointer_cast<Packet>(packetResponse));
- PUSH_EVENT("SendPacket",std::static_pointer_cast<Packet>(packetPerformRespawn));
- break;
- }
-
- case UseBed:
- break;
- case UnlockRecipes:
- break;
-
- case DestroyEntities: {
- auto packet = std::static_pointer_cast<PacketDestroyEntities>(ptr);
- for (unsigned int entityId : packet->EntityIds) {
- world.DeleteEntity(entityId);
- }
- break;
- }
-
- case RemoveEntityEffect:
- break;
- case ResourcePackSend:
- break;
- case Respawn:
- break;
- case EntityHeadLook:
- break;
- case SelectAdvancementTab:
- break;
- case WorldBorder:
- break;
- case Camera:
- break;
- case HeldItemChangeCB:
- break;
- case DisplayScoreboard:
- break;
- case EntityMetadata:
- break;
- case AttachEntity:
- break;
-
- case EntityVelocity: {
- auto packet = std::static_pointer_cast<PacketEntityVelocity>(ptr);
- Entity &entity = world.GetEntity(packet->EntityId);
- entity.vel = Entity::DecodeVelocity(packet->VelocityX, packet->VelocityY, packet->VelocityZ);
- break;
- }
-
- case EntityEquipment:
- break;
- case SetExperience:
- break;
-
- case UpdateHealth: {
- auto packet = std::static_pointer_cast<PacketUpdateHealth>(ptr);
- g_PlayerHealth = packet->Health;
- if (g_PlayerHealth <= 0) {
- LOG(INFO) << "Player is dead. Respawning...";
- auto packetPerformRespawn = std::make_shared<PacketClientStatus>(0);
- PUSH_EVENT("SendPacket",std::static_pointer_cast<Packet>(packetPerformRespawn));
- }
- break;
- }
-
- case ScoreboardObjective:
- break;
- case SetPassengers:
- break;
- case Teams:
- break;
- case UpdateScore:
- break;
-
- case SpawnPosition: {
- auto packet = std::static_pointer_cast<PacketSpawnPosition>(ptr);
- g_SpawnPosition = packet->Location;
- LOG(INFO) << "Spawn position is " << g_SpawnPosition.x << " " << g_SpawnPosition.y << " "
- << g_SpawnPosition.z;
- break;
- }
-
- case TimeUpdate: {
- auto packet = std::static_pointer_cast<PacketTimeUpdate>(ptr);
- doDaylightCycle = TimeOfDay != packet->TimeOfDay;
- WorldAge = packet->WorldAge;
- TimeOfDay = packet->TimeOfDay;
- interpolatedTimeOfDay = TimeOfDay;
- break;
- }
-
- case Title:
- break;
- case SoundEffect:
- break;
- case PlayerListHeaderAndFooter:
- break;
- case CollectItem:
- break;
-
- case EntityTeleport: {
- auto packet = std::static_pointer_cast<PacketEntityTeleport>(ptr);
- Entity &entity = world.GetEntity(packet->EntityId);
- entity.pos = VectorF(packet->X, packet->Y, packet->Z);
- entity.pitch = packet->Pitch / 256.0;
- entity.yaw = packet->Yaw / 256.0;
- break;
- }
-
- case Advancements:
- break;
- case EntityProperties:
- break;
- case EntityEffect:
- break;
- }
-
- while (!playerInventory.pendingTransactions.empty()) {
- auto packet = std::make_shared<PacketClickWindow>(playerInventory.pendingTransactions.front());
- playerInventory.pendingTransactions.pop();
- PUSH_EVENT("SendPacket",std::static_pointer_cast<Packet>(packet));
- }
+ switch ((PacketNamePlayCB)ptr->GetPacketId()) {
+ case SpawnObject: {
+ auto packet = std::static_pointer_cast<PacketSpawnObject>(ptr);
+ Entity entity = CreateObject(static_cast<ObjectType>(packet->Type));
+ entity.entityId = packet->EntityId;
+ entity.pos = VectorF(packet->X, packet->Y, packet->Z);
+ entity.uuid = packet->ObjectUuid;
+ entity.vel = Entity::DecodeVelocity(packet->VelocityX, packet->VelocityY, packet->VelocityZ);
+ entity.yaw = packet->Yaw / 256.0;
+ entity.pitch = packet->Pitch / 256.0;
+ entity.renderColor = glm::vec3(0, 1, 0);
+ world.AddEntity(entity);
+ PUSH_EVENT("EntityChanged", entity.entityId);
+ break;
+ }
+
+ case SpawnExperienceOrb:
+ break;
+
+ case SpawnGlobalEntity:
+ break;
+
+ case SpawnMob: {
+ auto packet = std::static_pointer_cast<PacketSpawnMob>(ptr);
+ Entity entity;
+ entity.entityId = packet->EntityId;
+ entity.pos = VectorF(packet->X, packet->Y, packet->Z);
+ entity.uuid = packet->EntityUuid;
+ entity.vel = Entity::DecodeVelocity(packet->VelocityX, packet->VelocityY, packet->VelocityZ);
+ entity.yaw = packet->Yaw / 256.0;
+ entity.pitch = packet->Pitch / 256.0;
+ entity.renderColor = glm::vec3(0, 0, 1);
+ world.AddEntity(entity);
+ PUSH_EVENT("EntityChanged", entity.entityId);
+ break;
+ }
+
+ case SpawnPainting:
+ break;
+
+ case SpawnPlayer: {
+ auto packet = std::static_pointer_cast<PacketSpawnPlayer>(ptr);
+ Entity entity;
+ entity.entityId = packet->EntityId;
+ entity.pos = VectorF(packet->X, packet->Y, packet->Z);
+ entity.uuid = packet->PlayerUuid;
+ entity.yaw = packet->Yaw / 256.0;
+ entity.pitch = packet->Pitch / 256.0;
+ entity.renderColor = glm::vec3(1, 0, 0);
+ entity.height = 1.8;
+ entity.width = 0.6;
+ world.AddEntity(entity);
+ PUSH_EVENT("EntityChanged", entity.entityId);
+ break;
+ }
+ case AnimationCB:
+ break;
+ case Statistics:
+ break;
+ case BlockBreakAnimation:
+ break;
+ case UpdateBlockEntity:
+ break;
+ case BlockAction:
+ break;
+
+ case BlockChange: {
+ auto packet = std::static_pointer_cast<PacketBlockChange>(ptr);
+ world.ParseChunkData(packet);
+ break;
+ }
+
+ case BossBar:
+ break;
+ case ServerDifficulty:
+ break;
+ case TabCompleteCB:
+ break;
+
+ case ChatMessageCB: {
+ auto packet = std::static_pointer_cast<PacketChatMessageCB>(ptr);
+ LOG(INFO) << "Message (" << int(packet->Position) << "): " << packet->JsonData.text;
+ PUSH_EVENT("ChatMessageReceived", std::make_tuple(packet->JsonData, packet->Position));
+ break;
+ }
+
+ case MultiBlockChange: {
+ auto packet = std::static_pointer_cast<PacketMultiBlockChange>(ptr);
+ world.ParseChunkData(packet);
+ break;
+ }
+
+ case ConfirmTransactionCB: {
+ auto packet = std::static_pointer_cast<PacketConfirmTransactionCB>(ptr);
+ if (packet->WindowId == 0) {
+ try {
+ playerInventory.ConfirmTransaction(*packet);
+ }
+ catch (std::exception &e) {
+ PUSH_EVENT("Disconnected", std::string("Transaction failed"));
+ }
+ }
+ break;
+ }
+
+ case CloseWindowCB:
+ break;
+
+ case OpenWindow: {
+ auto packet = std::static_pointer_cast<PacketOpenWindow>(ptr);
+
+ LOG(INFO) << "Open new window " << packet->WindowTitle << ": " << packet->WindowId;
+ break;
+ }
+
+ case WindowItems: {
+ auto packet = std::static_pointer_cast<PacketWindowItems>(ptr);
+ if (packet->WindowId == 0) {
+ playerInventory.WindowId = 0;
+ playerInventory.slots = packet->SlotData;
+ }
+ break;
+ }
+
+ case WindowProperty:
+ break;
+
+ case SetSlot: {
+ auto packet = std::static_pointer_cast<PacketSetSlot>(ptr);
+ if (packet->WindowId == 0) {
+ playerInventory.slots[packet->Slot] = packet->SlotData;
+ }
+ break;
+ }
+
+ case SetCooldown:
+ break;
+ case PluginMessageCB:
+ break;
+ case NamedSoundEffect:
+ break;
+
+ case DisconnectPlay: {
+ auto packet = std::static_pointer_cast<PacketDisconnectPlay>(ptr);
+ LOG(INFO) << "Disconnect reason: " << packet->Reason;
+ PUSH_EVENT("Disconnected", packet->Reason);
+ break;
+ }
+
+ case EntityStatus:
+ break;
+ case Explosion:
+ break;
+
+ case UnloadChunk: {
+ auto packet = std::static_pointer_cast<PacketUnloadChunk>(ptr);
+ world.ParseChunkData(packet);
+ break;
+ }
+
+ case ChangeGameState:
+ break;
+
+ case KeepAliveCB: {
+ LOG(WARNING) << "Receive KeepAlive packet in GameState handler";
+ break;
+ }
+
+ case ChunkData: {
+ auto packet = std::static_pointer_cast<PacketChunkData>(ptr);
+ world.ParseChunkData(packet);
+ break;
+ }
+
+ case Effect:
+ break;
+ case Particle:
+ break;
+
+ case JoinGame: {
+ auto packet = std::static_pointer_cast<PacketJoinGame>(ptr);
+ Entity entity;
+ entity.entityId = packet->EntityId;
+ entity.width = 0.6;
+ entity.height = 1.8;
+ world.AddEntity(entity);
+ player = world.GetEntityPtr(entity.entityId);
+
+ playerStatus.eid = packet->EntityId;
+ gameStatus.gamemode = (packet->Gamemode & 0b11111011);
+ gameStatus.dimension = packet->Dimension;
+ gameStatus.difficulty = packet->Difficulty;
+ gameStatus.maxPlayers = packet->MaxPlayers;
+ gameStatus.levelType = packet->LevelType;
+ gameStatus.reducedDebugInfo = packet->ReducedDebugInfo;
+ LOG(INFO) << "Gamemode is " << gameStatus.gamemode << ", Difficulty is " << (int)gameStatus.difficulty
+ << ", Level Type is " << gameStatus.levelType;
+ PUSH_EVENT("PlayerConnected", 0);
+ break;
+ }
+
+ case Map:
+ break;
+
+ case EntityRelativeMove: {
+ auto packet = std::static_pointer_cast<PacketEntityRelativeMove>(ptr);
+ Entity &entity = world.GetEntity(packet->EntityId);
+ entity.pos = entity.pos + Entity::DecodeDeltaPos(packet->DeltaX, packet->DeltaY, packet->DeltaZ);
+ if (entity.entityId != 0)
+ LOG(INFO) << "M: " << packet->EntityId;
+ break;
+ }
+
+ case EntityLookAndRelativeMove: {
+ auto packet = std::static_pointer_cast<PacketEntityLookAndRelativeMove>(ptr);
+ Entity &entity = world.GetEntity(packet->EntityId);
+ entity.pos = entity.pos + Entity::DecodeDeltaPos(packet->DeltaX, packet->DeltaY, packet->DeltaZ);
+ entity.pitch = packet->Pitch / 256.0;
+ entity.yaw = packet->Yaw / 256.0;
+ break;
+ }
+
+ case EntityLook: {
+ auto packet = std::static_pointer_cast<PacketEntityLook>(ptr);
+ Entity &entity = world.GetEntity(packet->EntityId);
+ entity.pitch = packet->Pitch / 256.0;
+ entity.yaw = packet->Yaw / 256.0;
+ //LOG(INFO) << "L: " << packet->EntityId;
+ break;
+ }
+
+ case EntityCB:
+ break;
+ case VehicleMove:
+ break;
+ case OpenSignEditor:
+ break;
+ case PlayerAbilitiesCB:
+ break;
+ case CombatEvent:
+ break;
+ case PlayerListItem:
+ break;
+
+ case PlayerPositionAndLookCB: {
+ auto packet = std::static_pointer_cast<PacketPlayerPositionAndLookCB>(ptr);
+ if ((packet->Flags & 0x10) != 0) {
+ player->pitch += packet->Pitch;
+ }
+ else {
+ player->pitch = packet->Pitch;
+ }
+
+ if ((packet->Flags & 0x08) != 0) {
+ player->yaw += packet->Yaw;
+ }
+ else {
+ player->yaw = packet->Yaw;
+ }
+
+ if ((packet->Flags & 0x01) != 0) {
+ player->pos.x += packet->X;
+ }
+ else {
+ player->pos.x = packet->X;
+ }
+
+ if ((packet->Flags & 0x02) != 0) {
+ player->pos.y += packet->Y;
+ }
+ else {
+ player->pos.y = packet->Y;
+ }
+
+ if ((packet->Flags & 0x04) != 0) {
+ player->pos.z += packet->Z;
+ }
+ else {
+ player->pos.z = packet->Z;
+ }
+
+ PUSH_EVENT("PlayerPosChanged", player->pos);
+ LOG(INFO) << "PlayerPos is " << player->pos << "\t\tAngle: " << player->yaw << "," << player->pitch;;
+
+ if (!gameStatus.isGameStarted) {
+ LOG(INFO) << "Game is started";
+ PUSH_EVENT("RemoveLoadingScreen", 0);
+ }
+
+ gameStatus.isGameStarted = true;
+
+ auto packetResponse = std::make_shared<PacketTeleportConfirm>(packet->TeleportId);
+ auto packetPerformRespawn = std::make_shared<PacketClientStatus>(0);
+
+ PUSH_EVENT("SendPacket", std::static_pointer_cast<Packet>(packetResponse));
+ PUSH_EVENT("SendPacket", std::static_pointer_cast<Packet>(packetPerformRespawn));
+ break;
+ }
+
+ case UseBed:
+ break;
+ case UnlockRecipes:
+ break;
+
+ case DestroyEntities: {
+ auto packet = std::static_pointer_cast<PacketDestroyEntities>(ptr);
+ for (unsigned int entityId : packet->EntityIds) {
+ world.DeleteEntity(entityId);
+ }
+ break;
+ }
+
+ case RemoveEntityEffect:
+ break;
+ case ResourcePackSend:
+ break;
+ case Respawn:
+ break;
+ case EntityHeadLook:
+ break;
+ case SelectAdvancementTab:
+ break;
+ case WorldBorder:
+ break;
+ case Camera:
+ break;
+ case HeldItemChangeCB:
+ break;
+ case DisplayScoreboard:
+ break;
+ case EntityMetadata:
+ break;
+ case AttachEntity:
+ break;
+
+ case EntityVelocity: {
+ auto packet = std::static_pointer_cast<PacketEntityVelocity>(ptr);
+ Entity &entity = world.GetEntity(packet->EntityId);
+ entity.vel = Entity::DecodeVelocity(packet->VelocityX, packet->VelocityY, packet->VelocityZ);
+ break;
+ }
+
+ case EntityEquipment:
+ break;
+ case SetExperience:
+ break;
+
+ case UpdateHealth: {
+ auto packet = std::static_pointer_cast<PacketUpdateHealth>(ptr);
+ playerStatus.health = packet->Health;
+ if (playerStatus.health <= 0) {
+ LOG(INFO) << "Player is dead. Respawning...";
+ auto packetPerformRespawn = std::make_shared<PacketClientStatus>(0);
+ PUSH_EVENT("SendPacket", std::static_pointer_cast<Packet>(packetPerformRespawn));
+ }
+ break;
+ }
+
+ case ScoreboardObjective:
+ break;
+ case SetPassengers:
+ break;
+ case Teams:
+ break;
+ case UpdateScore:
+ break;
+
+ case SpawnPosition: {
+ auto packet = std::static_pointer_cast<PacketSpawnPosition>(ptr);
+ gameStatus.spawnPosition = packet->Location;
+ LOG(INFO) << "Spawn position is " << gameStatus.spawnPosition;
+ break;
+ }
+
+ case TimeUpdate: {
+ auto packet = std::static_pointer_cast<PacketTimeUpdate>(ptr);
+ timeStatus.doDaylightCycle = timeStatus.timeOfDay != packet->TimeOfDay;
+ timeStatus.worldAge = packet->WorldAge;
+ timeStatus.timeOfDay = packet->TimeOfDay;
+ timeStatus.interpolatedTimeOfDay = timeStatus.timeOfDay;
+ break;
+ }
+
+ case Title:
+ break;
+ case SoundEffect:
+ break;
+ case PlayerListHeaderAndFooter:
+ break;
+ case CollectItem:
+ break;
+
+ case EntityTeleport: {
+ auto packet = std::static_pointer_cast<PacketEntityTeleport>(ptr);
+ Entity &entity = world.GetEntity(packet->EntityId);
+ entity.pos = VectorF(packet->X, packet->Y, packet->Z);
+ entity.pitch = packet->Pitch / 256.0;
+ entity.yaw = packet->Yaw / 256.0;
+ break;
+ }
+
+ case Advancements:
+ break;
+ case EntityProperties:
+ break;
+ case EntityEffect:
+ break;
+ }
+
+ while (!playerInventory.pendingTransactions.empty()) {
+ auto packet = std::make_shared<PacketClickWindow>(playerInventory.pendingTransactions.front());
+ playerInventory.pendingTransactions.pop();
+ PUSH_EVENT("SendPacket", std::static_pointer_cast<Packet>(packet));
+ }
}
-void GameState::HandleMovement(GameState::Direction direction, float deltaTime) {
- if (!g_IsGameStarted)
- return;
- const double playerSpeed = 43;
-
- float velocity = playerSpeed * deltaTime;
-
- double playerYaw = Entity::DecodeYaw(player->yaw);
- double playerPitch = Entity::DecodePitch(player->pitch);
-
- glm::vec3 front, right, worldUp, up;
- worldUp = glm::vec3(0.0f, 1.0f, 0.0f);
- front.x = cos(glm::radians(playerYaw)) * cos(glm::radians(playerPitch));
- front.y = player->isFlying ? sin(glm::radians(playerPitch)): 0;
- front.z = sin(glm::radians(playerYaw)) * cos(glm::radians(playerPitch));
- front = glm::normalize(front);
- right = glm::normalize(glm::cross(front, worldUp));
- up = glm::normalize(glm::cross(right, front));
-
- glm::vec3 vel = player->vel.glm();
- switch (direction) {
- case FORWARD: {
- vel += front * velocity;
- break;
- }
-
- case BACKWARD: {
- vel -= front * velocity;
- break;
- }
-
- case RIGHT: {
- vel += right * velocity;
- break;
- }
-
- case LEFT: {
- vel -= right * velocity;
- break;
- }
-
- case JUMP:
- if (player->onGround && !player->isFlying) {
- vel.y += 10;
- player->onGround = false;
- } else
+void GameState::HandleMovement(GameState::MoveType direction, float deltaTime) {
+ if (!gameStatus.isGameStarted)
+ return;
+
+ const double playerSpeed = 43;
+
+ float velocity = playerSpeed * deltaTime;
+
+ double playerYaw = Entity::DecodeYaw(player->yaw);
+ double playerPitch = Entity::DecodePitch(player->pitch);
+
+ glm::vec3 front, right, worldUp, up;
+ worldUp = glm::vec3(0.0f, 1.0f, 0.0f);
+ front.x = cos(glm::radians(playerYaw)) * cos(glm::radians(playerPitch));
+ front.y = player->isFlying ? sin(glm::radians(playerPitch)) : 0;
+ front.z = sin(glm::radians(playerYaw)) * cos(glm::radians(playerPitch));
+ front = glm::normalize(front);
+ right = glm::normalize(glm::cross(front, worldUp));
+ up = glm::normalize(glm::cross(right, front));
+
+ glm::vec3 vel = player->vel.glm();
+ switch (direction) {
+ case FORWARD: {
+ vel += front * velocity;
+ break;
+ }
+
+ case BACKWARD: {
+ vel -= front * velocity;
+ break;
+ }
+
+ case RIGHT: {
+ vel += right * velocity;
+ break;
+ }
+
+ case LEFT: {
+ vel -= right * velocity;
+ break;
+ }
+
+ case JUMP:
+ if (player->onGround && !player->isFlying) {
+ vel.y += 10;
+ player->onGround = false;
+ }
+ else
if (player->isFlying) {
vel += up * velocity;
}
- break;
- }
- player->vel = VectorF(vel.x, vel.y, vel.z);
+ break;
+ }
+ player->vel = VectorF(vel.x, vel.y, vel.z);
}
void GameState::HandleRotation(double yaw, double pitch) {
- if (!g_IsGameStarted)
- return;
- double playerYaw = Entity::DecodeYaw(player->yaw);
- double playerPitch = Entity::DecodePitch(player->pitch);
- playerYaw += yaw;
- playerPitch += pitch;
- if (playerPitch > 89.0)
- playerPitch = 89.0;
- if (playerPitch < -89.0)
- playerPitch = -89.0;
- player->yaw = Entity::EncodeYaw(playerYaw);
- player->pitch = Entity::EncodePitch(playerPitch);
+ if (!gameStatus.isGameStarted)
+ return;
+
+ double playerYaw = Entity::DecodeYaw(player->yaw);
+ double playerPitch = Entity::DecodePitch(player->pitch);
+ playerYaw += yaw;
+ playerPitch += pitch;
+ if (playerPitch > 89.0)
+ playerPitch = 89.0;
+ if (playerPitch < -89.0)
+ playerPitch = -89.0;
+ player->yaw = Entity::EncodeYaw(playerYaw);
+ player->pitch = Entity::EncodePitch(playerPitch);
}
glm::mat4 GameState::GetViewMatrix() {
- double playerYaw = Entity::DecodeYaw(player->yaw);
- double playerPitch = Entity::DecodePitch(player->pitch);
- glm::vec3 front, right, worldUp, up;
- worldUp = glm::vec3(0.0f, 1.0f, 0.0f);
- front.x = cos(glm::radians(playerYaw)) * cos(glm::radians(playerPitch));
- front.y = sin(glm::radians(playerPitch));
- front.z = sin(glm::radians(playerYaw)) * cos(glm::radians(playerPitch));
- front = glm::normalize(front);
- right = glm::normalize(glm::cross(front, worldUp));
- up = glm::normalize(glm::cross(right, front));
-
- glm::vec3 eyePos = player->pos.glm();
- eyePos += player->EyeOffset.glm();
- return glm::lookAt(eyePos, eyePos + front, up);
+ double playerYaw = Entity::DecodeYaw(player->yaw);
+ double playerPitch = Entity::DecodePitch(player->pitch);
+ glm::vec3 front, right, worldUp, up;
+ worldUp = glm::vec3(0.0f, 1.0f, 0.0f);
+ front.x = cos(glm::radians(playerYaw)) * cos(glm::radians(playerPitch));
+ front.y = sin(glm::radians(playerPitch));
+ front.z = sin(glm::radians(playerYaw)) * cos(glm::radians(playerPitch));
+ front = glm::normalize(front);
+ right = glm::normalize(glm::cross(front, worldUp));
+ up = glm::normalize(glm::cross(right, front));
+
+ glm::vec3 eyePos = player->pos.glm();
+ eyePos += player->EyeOffset.glm();
+ return glm::lookAt(eyePos, eyePos + front, up);
}
// TODO: it should actually be something like this:
@@ -567,20 +577,20 @@ glm::mat4 GameState::GetViewMatrix() {
// send_packet(packet_type=start_digging_packet)
// delay(time=selected_block_dig_time, action=finish_digging)
void GameState::StartDigging() {
- if (!isBlockSelected)
- return;
+ if (!selectionStatus.isBlockSelected)
+ return;
- auto packetStart = std::make_shared<PacketPlayerDigging>(0,selectedBlock,1);
- auto packet = std::static_pointer_cast<Packet>(packetStart);
- PUSH_EVENT("SendPacket",packet);
+ auto packetStart = std::make_shared<PacketPlayerDigging>(0, selectionStatus.selectedBlock, 1);
+ auto packet = std::static_pointer_cast<Packet>(packetStart);
+ PUSH_EVENT("SendPacket", packet);
- FinishDigging();
+ FinishDigging();
}
void GameState::FinishDigging() {
- auto packetFinish = std::make_shared<PacketPlayerDigging>(2,selectedBlock,1);
- auto packet = std::static_pointer_cast<Packet>(packetFinish);
- PUSH_EVENT("SendPacket",packet);
+ auto packetFinish = std::make_shared<PacketPlayerDigging>(2, selectionStatus.selectedBlock, 1);
+ auto packet = std::static_pointer_cast<Packet>(packetFinish);
+ PUSH_EVENT("SendPacket", packet);
}
// TODO: it should actually be something like this:
@@ -589,48 +599,48 @@ void GameState::FinishDigging() {
// send_packet(packet_type=start_digging_packet)
// remove_delayed_action(finish_digging)
void GameState::CancelDigging() {
- auto packetCancel = std::make_shared<PacketPlayerDigging>(1,selectedBlock,1);
- auto packet = std::static_pointer_cast<Packet>(packetCancel);
- PUSH_EVENT("SendPacket", packet);
+ auto packetCancel = std::make_shared<PacketPlayerDigging>(1, selectionStatus.selectedBlock, 1);
+ auto packet = std::static_pointer_cast<Packet>(packetCancel);
+ PUSH_EVENT("SendPacket", packet);
}
BlockFacing detectHitFace(VectorF raycastHit, Vector selectedBlock) {
- auto vec = VectorF(selectedBlock.x + .5, selectedBlock.y + .5, selectedBlock.z +.5) - raycastHit;
-
- // TODO: move these vectors to Vector.hpp
- static const auto vecUp = VectorF(0, 1, 0);
- static const auto vecRight = VectorF(1, 0, 0);
- static const auto vecForward = VectorF(0, 0, -1);
-
- const double up = vec.cosBetween(vecUp);
- const double down = -up;
- const double right = vec.cosBetween(vecRight);
- const double left = -right;
- const double forward = vec.cosBetween(vecForward);
- const double backward = -forward;
-
- const double min_cos = _min(up, down, right, left, forward, backward);
- if (min_cos == down)
- return BlockFacing::Bottom;
- else if (min_cos == up)
- return BlockFacing::Top;
- else if (min_cos == forward)
- return BlockFacing::North;
- else if (min_cos == backward)
- return BlockFacing::South;
- else if (min_cos == left)
- return BlockFacing::West;
- else return BlockFacing::East;
+ auto vec = VectorF(selectedBlock.x + .5, selectedBlock.y + .5, selectedBlock.z + .5) - raycastHit;
+
+ // TODO: move these vectors to Vector.hpp
+ static const auto vecUp = VectorF(0, 1, 0);
+ static const auto vecRight = VectorF(1, 0, 0);
+ static const auto vecForward = VectorF(0, 0, -1);
+
+ const double up = vec.cosBetween(vecUp);
+ const double down = -up;
+ const double right = vec.cosBetween(vecRight);
+ const double left = -right;
+ const double forward = vec.cosBetween(vecForward);
+ const double backward = -forward;
+
+ const double min_cos = _min(up, down, right, left, forward, backward);
+ if (min_cos == down)
+ return BlockFacing::Bottom;
+ else if (min_cos == up)
+ return BlockFacing::Top;
+ else if (min_cos == forward)
+ return BlockFacing::North;
+ else if (min_cos == backward)
+ return BlockFacing::South;
+ else if (min_cos == left)
+ return BlockFacing::West;
+ else return BlockFacing::East;
}
void GameState::PlaceBlock() {
- if (!isBlockSelected)
- return;
+ if (!selectionStatus.isBlockSelected)
+ return;
- BlockFacing face = detectHitFace(raycastHit, selectedBlock);
- auto packetPlace = std::make_shared<PacketPlayerBlockPlacement>(
- selectedBlock, (unsigned char) face, 0, 0, 0, 0);
+ BlockFacing face = detectHitFace(selectionStatus.raycastHit, selectionStatus.selectedBlock);
+ auto packetPlace = std::make_shared<PacketPlayerBlockPlacement>(
+ selectionStatus.selectedBlock, (unsigned char)face, 0, 0, 0, 0);
- auto packet = std::static_pointer_cast<Packet>(packetPlace);
- PUSH_EVENT("SendPacket", packet);
+ auto packet = std::static_pointer_cast<Packet>(packetPlace);
+ PUSH_EVENT("SendPacket", packet);
} \ No newline at end of file
diff --git a/src/GameState.hpp b/src/GameState.hpp
index e96af29..cd39a48 100644
--- a/src/GameState.hpp
+++ b/src/GameState.hpp
@@ -1,73 +1,121 @@
#pragma once
-#include <mutex>
-#include <queue>
#include <memory>
+#include <string>
+#include <vector>
#include <glm/mat4x4.hpp>
+#include "Vector.hpp"
#include "World.hpp"
#include "Window.hpp"
class Packet;
-class NetworkClient;
class Entity;
+struct TimeStatus {
+ double interpolatedTimeOfDay = 0;
+ long long worldAge = 0;
+ long long timeOfDay = 0;
+ bool doDaylightCycle = true;
+};
+
+struct GameStatus {
+ std::string levelType;
+ Vector spawnPosition;
+ int gamemode = 0;
+ int dimension = 0;
+ unsigned char difficulty = 0;
+ unsigned char maxPlayers = 0;
+ bool isGameStarted = false;
+ bool reducedDebugInfo = false;
+};
+
+struct PlayerStatus {
+ std::string uid;
+ std::string name;
+ float flyingSpeed = 0;
+ float fovModifier = 0;
+ float health = 0;
+ int eid = 0;
+ bool invulnerable = false;
+ bool flying = false;
+ bool allowFlying = false;
+ bool creativeMode = false;
+};
+
+struct SelectionStatus {
+ VectorF raycastHit;
+ Vector selectedBlock;
+ float distanceToSelectedBlock;
+ bool isBlockSelected;
+};
+
class GameState {
-public:
+ Entity* player = nullptr;
+
+ World world;
+
+ TimeStatus timeStatus;
- GameState() = default;
+ GameStatus gameStatus;
- ~GameState() = default;
+ PlayerStatus playerStatus;
+
+ SelectionStatus selectionStatus;
+
+ Window playerInventory;
+
+ std::vector<Window> openedWindows;
+public:
void Update(float deltaTime);
void UpdatePacket(std::shared_ptr<Packet> ptr);
- enum Direction {
- FORWARD, BACKWARD, LEFT, RIGHT, JUMP
- };
void StartDigging();
+
void FinishDigging();
+
void CancelDigging();
+
void PlaceBlock();
- void HandleMovement(GameState::Direction direction, float deltaTime);
+
+ enum MoveType {
+ FORWARD, BACKWARD, LEFT, RIGHT, JUMP
+ };
+
+ void HandleMovement(GameState::MoveType direction, float deltaTime);
+
void HandleRotation(double yaw, double pitch);
+
glm::mat4 GetViewMatrix();
- Entity* player;
-
- World world;
-
- std::string g_PlayerUuid = "";
- std::string g_PlayerName = "";
- bool g_IsGameStarted = false;
- int g_PlayerEid = 0;
- int g_Gamemode = 0;
- int g_Dimension = 0;
- unsigned char g_Difficulty = 0;
- unsigned char g_MaxPlayers = 0;
- std::string g_LevelType = "";
- bool g_ReducedDebugInfo = false;
- Vector g_SpawnPosition;
- bool g_PlayerInvulnerable = false;
- bool g_PlayerFlying = false;
- bool g_PlayerAllowFlying = false;
- bool g_PlayerCreativeMode = false;
- float g_PlayerFlyingSpeed = 0;
- float g_PlayerFovModifier = 0;
- float g_PlayerHealth = 0;
-
- long long WorldAge = 0;
- long long TimeOfDay = 0;
-
- Window playerInventory;
- std::vector<Window> openedWindows;
-
- bool isBlockSelected;
- Vector selectedBlock;
- float distanceToSelectedBlock;
- VectorF raycastHit;
-
- double interpolatedTimeOfDay;
- bool doDaylightCycle = true;
+
+ inline Entity *GetPlayer() {
+ return player;
+ }
+
+ inline World &GetWorld() {
+ return world;
+ }
+
+ inline TimeStatus GetTimeStatus() {
+ return timeStatus;
+ }
+
+ inline GameStatus GetGameStatus() {
+ return gameStatus;
+ }
+
+ inline PlayerStatus GetPlayerStatus() {
+ return playerStatus;
+ }
+
+ inline SelectionStatus GetSelectionStatus() {
+ return selectionStatus;
+ }
+
+ inline Window &GetInventory() {
+ return playerInventory;
+ }
};
diff --git a/src/Render.cpp b/src/Render.cpp
index 41f2c7e..b5dea63 100644
--- a/src/Render.cpp
+++ b/src/Render.cpp
@@ -382,6 +382,10 @@ void Render::RenderGui() {
ImGui::Text("FPS: %.1f (%.3fms)", ImGui::GetIO().Framerate, 1000.0f / ImGui::GetIO().Framerate);
float gameTime = DebugInfo::gameThreadTime / 100.0f;
if (world) {
+ Entity *playerPtr = world->GameStatePtr()->GetPlayer();
+ SelectionStatus selectionStatus = world->GameStatePtr()->GetSelectionStatus();
+ World *worldPtr = &world->GameStatePtr()->GetWorld();
+
ImGui::Text("TPS: %.1f (%.2fms)", 1000.0f / gameTime, gameTime);
ImGui::Text("Sections loaded: %d", (int) DebugInfo::totalSections);
ImGui::Text(
@@ -394,50 +398,50 @@ void Render::RenderGui() {
ImGui::Text(
"Player pos: %.1f %.1f %.1f OnGround=%d",
- world->GameStatePtr()->player->pos.x,
- world->GameStatePtr()->player->pos.y,
- world->GameStatePtr()->player->pos.z,
- world->GameStatePtr()->player->onGround);
+ playerPtr->pos.x,
+ playerPtr->pos.y,
+ playerPtr->pos.z,
+ playerPtr->onGround);
ImGui::Text(
"Player block pos: %d %d %d in %d %d %d",
- (int)(world->GameStatePtr()->player->pos.x - std::floor(world->GameStatePtr()->player->pos.x / 16.0) * 16),
- (int)(world->GameStatePtr()->player->pos.y - std::floor(world->GameStatePtr()->player->pos.y / 16.0) * 16),
- (int)(world->GameStatePtr()->player->pos.z - std::floor(world->GameStatePtr()->player->pos.z / 16.0) * 16),
+ (int)(playerPtr->pos.x - std::floor(playerPtr->pos.x / 16.0) * 16),
+ (int)(playerPtr->pos.y - std::floor(playerPtr->pos.y / 16.0) * 16),
+ (int)(playerPtr->pos.z - std::floor(playerPtr->pos.z / 16.0) * 16),
- (int)std::floor(world->GameStatePtr()->player->pos.x / 16.0),
- (int)std::floor(world->GameStatePtr()->player->pos.y / 16.0),
- (int)std::floor(world->GameStatePtr()->player->pos.z / 16.0));
+ (int)std::floor(playerPtr->pos.x / 16.0),
+ (int)std::floor(playerPtr->pos.y / 16.0),
+ (int)std::floor(playerPtr->pos.z / 16.0));
ImGui::Text(
"Player vel: %.1f %.1f %.1f",
- world->GameStatePtr()->player->vel.x,
- world->GameStatePtr()->player->vel.y,
- world->GameStatePtr()->player->vel.z);
+ playerPtr->vel.x,
+ playerPtr->vel.y,
+ playerPtr->vel.z);
ImGui::Text(
"Player health: %.1f/%.1f",
- world->GameStatePtr()->g_PlayerHealth, 20.0f);
+ world->GameStatePtr()->GetPlayerStatus().health, 20.0f);
ImGui::Text(
"Selected block: %d %d %d : %.1f",
- world->GameStatePtr()->selectedBlock.x,
- world->GameStatePtr()->selectedBlock.y,
- world->GameStatePtr()->selectedBlock.z,
- world->GameStatePtr()->distanceToSelectedBlock);
+ selectionStatus.selectedBlock.x,
+ selectionStatus.selectedBlock.y,
+ selectionStatus.selectedBlock.z,
+ selectionStatus.distanceToSelectedBlock);
ImGui::Text("Selected block light: %d (%d)",
- world->GameStatePtr()->world.GetBlockLight(world->GameStatePtr()->selectedBlock),
- world->GameStatePtr()->world.GetBlockSkyLight(world->GameStatePtr()->selectedBlock));
+ worldPtr->GetBlockLight(selectionStatus.selectedBlock),
+ worldPtr->GetBlockSkyLight(selectionStatus.selectedBlock));
ImGui::Text("Selected block id: %d:%d (%s)",
- world->GameStatePtr()->world.GetBlockId(world->GameStatePtr()->selectedBlock).id,
- world->GameStatePtr()->world.GetBlockId(world->GameStatePtr()->selectedBlock).state,
- AssetManager::GetAssetNameByBlockId(BlockId{ world->GameStatePtr()->world.GetBlockId(world->GameStatePtr()->selectedBlock).id,0 }).c_str());
+ worldPtr->GetBlockId(selectionStatus.selectedBlock).id,
+ worldPtr->GetBlockId(selectionStatus.selectedBlock).state,
+ AssetManager::GetAssetNameByBlockId(BlockId{ worldPtr->GetBlockId(selectionStatus.selectedBlock).id,0 }).c_str());
ImGui::Text("Selected block variant: %s:%s",
- TransformBlockIdToBlockStateName(world->GameStatePtr()->world.GetBlockId(world->GameStatePtr()->selectedBlock)).first.c_str(),
- TransformBlockIdToBlockStateName(world->GameStatePtr()->world.GetBlockId(world->GameStatePtr()->selectedBlock)).second.c_str());
+ TransformBlockIdToBlockStateName(worldPtr->GetBlockId(selectionStatus.selectedBlock)).first.c_str(),
+ TransformBlockIdToBlockStateName(worldPtr->GetBlockId(selectionStatus.selectedBlock)).second.c_str());
}
ImGui::End();
@@ -499,7 +503,7 @@ void Render::RenderGui() {
};
ImGui::SetNextWindowPosCenter();
ImGui::Begin("Inventory", 0, windowFlags);
- Window& inventory = world->GameStatePtr()->playerInventory;
+ Window& inventory = world->GameStatePtr()->GetInventory();
//Hand and drop slots
if (renderSlot(inventory.handSlot, -1)) {
@@ -615,7 +619,7 @@ void Render::RenderGui() {
if (fieldSensetivity != sensetivity)
sensetivity = fieldSensetivity;
- world->GameStatePtr()->player->isFlying = fieldFlight;
+ world->GameStatePtr()->GetPlayer()->isFlying = fieldFlight;
isWireframe = fieldWireframe;
timer.SetDelayLength(std::chrono::duration<double, std::milli>(1.0 / fieldTargetFps * 1000.0));
@@ -671,7 +675,7 @@ void Render::InitEvents() {
renderWorld = true;
GlobalState::SetState(State::Playing);
glClearColor(0, 0, 0, 1.0f);
- world->GameStatePtr()->player->isFlying = this->fieldFlight;
+ world->GameStatePtr()->GetPlayer()->isFlying = this->fieldFlight;
PUSH_EVENT("SetMinLightLevel", fieldBrightness);
});
diff --git a/src/RendererWorld.cpp b/src/RendererWorld.cpp
index 75859e9..78519f3 100644
--- a/src/RendererWorld.cpp
+++ b/src/RendererWorld.cpp
@@ -52,13 +52,13 @@ void RendererWorld::ParseQueueUpdate() {
vec.y -= 4500;
}
- parsing[id].data.section = gs->world.GetSection(vec);
- parsing[id].data.north = gs->world.GetSection(vec + Vector(0, 0, 1));
- parsing[id].data.south = gs->world.GetSection(vec + Vector(0, 0, -1));
- parsing[id].data.west = gs->world.GetSection(vec + Vector(1, 0, 0));
- parsing[id].data.east = gs->world.GetSection(vec + Vector(-1, 0, 0));
- parsing[id].data.bottom = gs->world.GetSection(vec + Vector(0, -1, 0));
- parsing[id].data.top = gs->world.GetSection(vec + Vector(0, 1, 0));
+ parsing[id].data.section = gs->GetWorld().GetSection(vec);
+ parsing[id].data.north = gs->GetWorld().GetSection(vec + Vector(0, 0, 1));
+ parsing[id].data.south = gs->GetWorld().GetSection(vec + Vector(0, 0, -1));
+ parsing[id].data.west = gs->GetWorld().GetSection(vec + Vector(1, 0, 0));
+ parsing[id].data.east = gs->GetWorld().GetSection(vec + Vector(-1, 0, 0));
+ parsing[id].data.bottom = gs->GetWorld().GetSection(vec + Vector(0, -1, 0));
+ parsing[id].data.top = gs->GetWorld().GetSection(vec + Vector(0, 1, 0));
parsing[id].parsing = true;
@@ -86,7 +86,7 @@ void RendererWorld::ParseQeueueRemoveUnnecessary() {
if (std::find(elements.begin(), elements.end(), vec) != elements.end())
continue;
- const Section& section = gs->world.GetSection(vec);
+ const Section& section = gs->GetWorld().GetSection(vec);
bool skip = false;
@@ -112,10 +112,10 @@ void RendererWorld::ParseQeueueRemoveUnnecessary() {
}
void RendererWorld::UpdateAllSections(VectorF playerPos) {
- Vector playerChunk(std::floor(gs->player->pos.x / 16), 0, std::floor(gs->player->pos.z / 16));
+ Vector playerChunk(std::floor(gs->GetPlayer()->pos.x / 16), 0, std::floor(gs->GetPlayer()->pos.z / 16));
std::vector<Vector> suitableChunks;
- auto chunks = gs->world.GetSectionsList();
+ auto chunks = gs->GetWorld().GetSectionsList();
for (auto& it : chunks) {
double distance = (Vector(it.x, 0, it.z) - playerChunk).GetLength();
if (distance > MaxRenderingDistance)
@@ -134,7 +134,7 @@ void RendererWorld::UpdateAllSections(VectorF playerPos) {
PUSH_EVENT("DeleteSectionRender", it);
}
- playerChunk.y = std::floor(gs->player->pos.y / 16.0);
+ playerChunk.y = std::floor(gs->GetPlayer()->pos.y / 16.0);
std::sort(suitableChunks.begin(), suitableChunks.end(), [playerChunk](Vector lhs, Vector rhs) {
double leftLengthToPlayer = (playerChunk - lhs).GetLength();
double rightLengthToPlayer = (playerChunk - rhs).GetLength();
@@ -184,9 +184,9 @@ RendererWorld::RendererWorld(GameState* ptr) {
listener->RegisterHandler("EntityChanged", [this](const Event& eventData) {
auto data = eventData.get<unsigned int>();
- for (unsigned int entityId : gs->world.GetEntitiesList()) {
+ for (unsigned int entityId : gs->GetWorld().GetEntitiesList()) {
if (entityId == data) {
- entities.push_back(RendererEntity(&gs->world, entityId));
+ entities.push_back(RendererEntity(&gs->GetWorld(), entityId));
}
}
});
@@ -196,7 +196,7 @@ RendererWorld::RendererWorld(GameState* ptr) {
if (vec == Vector())
return;
- Vector playerChunk(std::floor(gs->player->pos.x / 16), 0, std::floor(gs->player->pos.z / 16));
+ Vector playerChunk(std::floor(gs->GetPlayer()->pos.x / 16), 0, std::floor(gs->GetPlayer()->pos.z / 16));
double distanceToChunk = (Vector(vec.x, 0, vec.z) - playerChunk).GetLength();
if (MaxRenderingDistance != 1000 && distanceToChunk > MaxRenderingDistance) {
@@ -213,7 +213,7 @@ RendererWorld::RendererWorld(GameState* ptr) {
if (vec == Vector())
return;
- Vector playerChunk(std::floor(gs->player->pos.x / 16), 0, std::floor(gs->player->pos.z / 16));
+ Vector playerChunk(std::floor(gs->GetPlayer()->pos.x / 16), 0, std::floor(gs->GetPlayer()->pos.z / 16));
double distanceToChunk = (Vector(vec.x, 0, vec.z) - playerChunk).GetLength();
if (MaxRenderingDistance != 1000 && distanceToChunk > MaxRenderingDistance) {
@@ -228,7 +228,7 @@ RendererWorld::RendererWorld(GameState* ptr) {
});
listener->RegisterHandler("UpdateSectionsRender", [this](const Event&) {
- UpdateAllSections(gs->player->pos);
+ UpdateAllSections(gs->GetPlayer()->pos);
});
listener->RegisterHandler("PlayerPosChanged", [this](const Event& eventData) {
@@ -291,7 +291,7 @@ void RendererWorld::Render(RenderState & renderState) {
}
//Render selected block
- Vector selectedBlock = gs->selectedBlock;
+ Vector selectedBlock = gs->GetSelectionStatus().selectedBlock;
if (selectedBlock != Vector()) {
glLineWidth(2.0f);
{
@@ -309,7 +309,7 @@ void RendererWorld::Render(RenderState & renderState) {
//Render raycast hit
const bool renderHit = false;
if (renderHit) {
- VectorF hit = gs->raycastHit;
+ VectorF hit = gs->GetSelectionStatus().raycastHit;
glLineWidth(2.0f);
{
glm::mat4 model;
@@ -329,16 +329,16 @@ void RendererWorld::Render(RenderState & renderState) {
glCheckError();
//Render sky
- renderState.TimeOfDay = gs->TimeOfDay;
+ renderState.TimeOfDay = gs->GetTimeStatus().timeOfDay;
Shader *skyShader = AssetManager::GetAsset<AssetShader>("/altcraft/shaders/sky")->shader.get();
skyShader->Activate();
skyShader->SetUniform("projection", projection);
skyShader->SetUniform("view", view);
glm::mat4 model = glm::mat4(1.0);
- model = glm::translate(model, gs->player->pos.glm());
+ model = glm::translate(model, gs->GetPlayer()->pos.glm());
const float scale = 1000000.0f;
model = glm::scale(model, glm::vec3(scale, scale, scale));
- float shift = gs->interpolatedTimeOfDay / 24000.0f;
+ float shift = gs->GetTimeStatus().interpolatedTimeOfDay / 24000.0f;
if (shift < 0)
shift *= -1.0f;
model = glm::rotate(model, glm::radians(90.0f), glm::vec3(0, 1.0f, 0.0f));
@@ -355,7 +355,7 @@ void RendererWorld::Render(RenderState & renderState) {
const float moonriseLength = moonriseMax - moonriseMin;
float mixLevel = 0;
- float dayTime = gs->interpolatedTimeOfDay;
+ float dayTime = gs->GetTimeStatus().interpolatedTimeOfDay;
if (dayTime < 0)
dayTime *= -1;
while (dayTime > 24000)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 18:07:32 +0100