Merge pull request #194 from ucsd-cse125-sp24/fix/tick-rate

Fix/tick rate

config.json

@@ -2,7 +2,7 @@
   "game": {
     "maze": {
       "directory": "maps",
-      "procedural": false,
+      "procedural": true,
       "maze_file": "test/itemRoom.maze"
     }
   },

dependencies/freetype/CMakeLists.txt

@@ -2,7 +2,7 @@
 
 FetchContent_Declare(
   freetype
-  GIT_REPOSITORY https://gitlab.freedesktop.org/freetype/freetype.git
+  GIT_REPOSITORY https://github.com/freetype/freetype.git
   GIT_TAG        VER-2-13-2
 )
 

include/shared/network/constants.hpp

@@ -8,4 +8,4 @@
 // How many objects we send in one LoadGameState packet
 // If there are more objects that need to be sent, then
 // they are split up into multiple LoadGameState packets
-#define OBJECTS_PER_UPDATE 80 
+#define OBJECTS_PER_UPDATE 250

src/client/client.cpp

@@ -75,6 +75,7 @@ Client::Client(boost::asio::io_context& io_context, GameConfig config):
     lobby_finder(io_context, config),
     cam(new Camera()) {    
 
+
     //  Initialize Client's GUIState::Lobby related state
     //  Initial lobby player state is set to connected (this assumes that whenever
     //  GUIState is set to GUIState::Lobby, the client is connected to a lobby)

src/server/game/servergamestate.cpp

@@ -107,7 +107,6 @@ ServerGameState::~ServerGameState() {}
 /*	SharedGameState generation	*/
 std::vector<SharedGameState> ServerGameState::generateSharedGameState(bool send_all) {
 	std::vector<SharedGameState> partial_updates;
-	auto all_objects = this->objects.toShared();
 
 	auto getUpdateTemplate = [this]() {
 		SharedGameState curr_update;
@@ -122,6 +121,8 @@ std::vector<SharedGameState> ServerGameState::generateSharedGameState(bool send_
 	};
 
 	if (send_all) {
+		auto all_objects = this->objects.toShared();
+
 		for (int i = 0; i < all_objects.size(); i += OBJECTS_PER_UPDATE) {
 			SharedGameState curr_update = getUpdateTemplate();
 
@@ -137,7 +138,14 @@ std::vector<SharedGameState> ServerGameState::generateSharedGameState(bool send_
 
 		int num_in_curr_update = 0;
 		for (EntityID id : this->updated_entities) {
-			curr_update.objects.insert({id, all_objects.at(id)});
+
+			Object* obj = this->objects.getObject(id);
+			if (obj == nullptr) {
+				curr_update.objects.insert({ id, boost::none });
+			} else {
+				curr_update.objects.insert({ id, obj->toShared() });
+			}
+
 			num_in_curr_update++;
 
 			if (num_in_curr_update >= OBJECTS_PER_UPDATE) {

src/server/server.cpp

@@ -413,6 +413,7 @@ void Server::_doAccept() {
     this->acceptor.async_accept(this->socket,
         [this](boost::system::error_code ec) {
             if (!ec) {
+                this->socket.set_option(boost::asio::ip::tcp::no_delay(true));
                 auto addr = this->socket.remote_endpoint().address();
                 auto new_session = this->_handleNewSession(addr);