[GameTime] 'getCurrentTime' now uses the new tick system.

[DebugOverlay] Added client TPS info.
[Network] Packet 'ServerTick' added. Sent at the beginning of every tick.

Author: Unarelith

docs/network-protocol.md

@@ -47,6 +47,12 @@ _This packet has no field._
 
 ### Clientbound
 
+#### ServerTick
+
+Packet sent at the beginning of every server tick.
+
+_This packet has no field._
+
 #### ServerClosed
 
 | Field name    | Field type  | Notes                                                |

source/client/graphics/Skybox.cpp

@@ -49,9 +49,8 @@ Skybox::Skybox(gk::Camera &camera, ClientWorld &world) : m_camera(camera), m_wor
 		auto &star = m_stars.emplace_back();
 		star.setColor(gk::Color{0, 0, 0, 0});
 		star.setSize(5, 5);
-		star.setPosition(700 * ((rand() % 2) * 2 - 1), (rand() % 500) * 2 - 500, (rand() % 500) * 2 - 500);
-		star.setRotationOffset(rand() % 360);
-		star.setRotationSpeed(0.4f);
+		star.setPosition(600 * ((rand() % 2) * 2 - 1), (rand() % 500) * 2 - 500, (rand() % 500) * 2 - 500);
+		star.setRotationOffset(rand() % GameTime::dayLength);
 		star.setRotationAxis({rand() % 100 / 100.f, rand() % 100 / 100.f, rand() % 100 / 100.f});
 	}
 }

source/client/hud/DebugOverlay.cpp

@@ -33,6 +33,7 @@
 #include "ClientWorld.hpp"
 #include "Config.hpp"
 #include "DebugOverlay.hpp"
+#include "GameTime.hpp"
 
 DebugOverlay::DebugOverlay(const ClientPlayer &player, const ClientWorld &world)
 	: m_player(player), m_world(world)
@@ -84,6 +85,8 @@ void DebugOverlay::update() {
 	stream << "Alive entities: " << m_world.scene().registry().alive();
 	stream << '\n';
 	stream << "Chunk updates: " << ClientChunk::chunkUpdatesPerSec;
+	stream << '\n';
+	stream << "TPS: " << GameTime::getTicksPerSecond();
 
 	m_positionText.setString(stream.str());
 }

source/client/network/ClientCommandHandler.cpp

@@ -37,6 +37,7 @@
 #include "ConnectionErrorState.hpp"
 #include "DrawableComponent.hpp"
 #include "DrawableDef.hpp"
+#include "GameTime.hpp"
 #include "LuaGUIState.hpp"
 #include "NetworkComponent.hpp"
 #include "PositionComponent.hpp"
@@ -167,6 +168,11 @@ void ClientCommandHandler::setupCallbacks() {
 		}
 	});
 
+	m_client.setCommandCallback(Network::Command::ServerTick, [this](Network::Packet &) {
+		if (!m_isSingleplayer) // FIXME
+			GameTime::incrementTicks();
+	});
+
 	m_client.setCommandCallback(Network::Command::ServerClosed, [this](Network::Packet &packet) {
 		std::string message;
 		packet >> message;

source/common/core/GameTime.cpp

@@ -35,7 +35,7 @@ u64 GameTime::s_ticks = 0;
 u16 GameTime::s_ticksPerSecond = 0;
 
 float GameTime::getCurrentTime(float offset, float speed) {
-	return std::fmod(gk::GameClock::getInstance().getTicks() * daySpeed * speed / 1000.f + offset, 360.f) / 360.f;
+	return std::fmod(s_ticks * daySpeed * speed + offset, dayLength) / dayLength;
 }
 
 float GameTime::getSunlightIntensityFromTime(float time) {

source/common/core/GameTime.hpp

@@ -34,6 +34,7 @@ class Sky;
 class GameTime {
 	public:
 		static constexpr float daySpeed = 1.f;
+		static constexpr u32 dayLength = 24000;
 
 		// Note: These functions are only needed in the client
 		static float getCurrentTime(float offset = 0.f, float speed = 1.f);

source/common/network/Network.cpp

@@ -37,6 +37,7 @@ std::string Network::commandToString(Network::Command command) {
 		{Network::Command::ClientOk,              "ClientOk"},
 		{Network::Command::ClientRefused,         "ClientRefused"},
 
+		{Network::Command::ServerTick,            "ServerTick"},
 		{Network::Command::ServerClosed,          "ServerClosed"},
 
 		{Network::Command::ChunkData,             "ChunkData"},

source/common/network/Network.hpp

@@ -40,40 +40,41 @@ namespace Network {
 		ClientOk              = 0x02,
 		ClientRefused         = 0x03,
 
-		ServerClosed          = 0x04,
+		ServerTick            = 0x04,
+		ServerClosed          = 0x05,
 
-		ChunkData             = 0x05,
-		ChunkRequest          = 0x06,
+		ChunkData             = 0x06,
+		ChunkRequest          = 0x07,
 
-		PlayerPlaceBlock      = 0x07,
-		PlayerDigBlock        = 0x08,
-		PlayerInvUpdate       = 0x09,
-		PlayerPosUpdate       = 0x0a,
-		PlayerRotUpdate       = 0x0b,
-		PlayerSpawn           = 0x0c,
-		PlayerChangeDimension = 0x0d,
-		PlayerHeldItemChanged = 0x0e,
+		PlayerPlaceBlock      = 0x08,
+		PlayerDigBlock        = 0x09,
+		PlayerInvUpdate       = 0x0a,
+		PlayerPosUpdate       = 0x0b,
+		PlayerRotUpdate       = 0x0c,
+		PlayerSpawn           = 0x0d,
+		PlayerChangeDimension = 0x0e,
+		PlayerHeldItemChanged = 0x0f,
 
-		BlockUpdate           = 0x0f,
-		BlockActivated        = 0x10,
-		BlockGUIData          = 0x11,
-		BlockInvUpdate        = 0x12,
-		BlockDataUpdate       = 0x13,
+		BlockUpdate           = 0x10,
+		BlockActivated        = 0x11,
+		BlockGUIData          = 0x12,
+		BlockInvUpdate        = 0x13,
+		BlockDataUpdate       = 0x14,
 
-		ItemActivated         = 0x14,
+		ItemActivated         = 0x15,
 
-		RegistryData          = 0x15,
+		RegistryData          = 0x16,
 
-		ChatMessage           = 0x16,
+		ChatMessage           = 0x17,
 
-		EntitySpawn           = 0x17,
-		EntityDespawn         = 0x18,
-		EntityPosition        = 0x19,
-		EntityRotation        = 0x1a,
-		EntityAnimation       = 0x1b,
-		EntityDrawableDef     = 0x1c,
+		EntitySpawn           = 0x18,
+		EntityDespawn         = 0x19,
+		EntityPosition        = 0x1a,
+		EntityRotation        = 0x1b,
+		EntityAnimation       = 0x1c,
+		EntityDrawableDef     = 0x1d,
 
-		KeyPressed            = 0x1d,
+		KeyPressed            = 0x1e,
 	};
 
 	std::string commandToString(Command command);

source/server/core/ServerApplication.cpp

@@ -201,6 +201,8 @@ void ServerApplication::update() {
 		doTick = true;
 
 		GameTime::incrementTicks();
+
+		m_serverCommandHandler.sendServerTick();
 	}
 
 	m_worldController.update(doTick);

source/server/network/ServerCommandHandler.cpp

@@ -37,6 +37,16 @@
 #include "ServerItem.hpp"
 #include "WorldController.hpp"
 
+void ServerCommandHandler::sendServerTick(const ClientInfo *client) const {
+	Network::Packet packet;
+	packet << Network::Command::ServerTick;
+
+	if (!client)
+		m_server.sendToAllClients(packet);
+	else
+		client->tcpSocket->send(packet);
+}
+
 void ServerCommandHandler::sendServerClosed(const std::string &message, const ClientInfo *client) const {
 	Network::Packet packet;
 	packet << Network::Command::ServerClosed << message;

source/server/network/ServerCommandHandler.hpp

@@ -61,6 +61,7 @@ class ServerCommandHandler {
 		ServerCommandHandler(ScriptEngine &scriptEngine, Server &server, WorldController &worldController, PlayerList &players, Registry &registry)
 			: m_scriptEngine(scriptEngine), m_server(server), m_worldController(worldController), m_players(players), m_registry(registry) {}
 
+		void sendServerTick(const ClientInfo *client = nullptr) const;
 		void sendServerClosed(const std::string &message, const ClientInfo *client = nullptr) const;
 		void sendBlockDataUpdate(s32 x, s32 y, s32 z, const BlockData *blockData, const ClientInfo *client = nullptr) const;
 		void sendBlockInvUpdate(s32 x, s32 y, s32 z, const Inventory &inventory, const ClientInfo *client = nullptr) const;