Renamed file

.gitignore

@@ -1,3 +1,4 @@
 main.o
 easysock.o
 pong
+release/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "subprojects/raylib"]
+	path = subprojects/raylib
+	url = https://github.com/raysan5/raylib.git

README.md

@@ -0,0 +1,32 @@
+## Netpong - A Pong game for the internet era
+
+__Netpong__ is a network-enabled Pong game, written in C++. It enables two players to play against each other, provided an IP address and a port. It also supports a single-player mode.
+
+## How it works
+
+The game has only one runtime dependency: The [raylib](https://www.raylib.com/) graphics system. In order to write idiomatic C++, I chose to use the [raylib-cpp](https://robloach.github.io/raylib-cpp/) wrapper, which provides an object-oriented interface to the Raylib library. However, this wrapper is bundled with the project, and is thus not required to be installed.
+
+## Building
+
+This application uses [Meson](https://mesonbuild.com/) as a build system. To build the application:
+1. Install __meson__ from the link above.
+2. Install __raylib__ from the link above (THIS IS OPTIONAL, SEE STEP 5)
+3. Set up the build directory with the `meson setup build` command.
+4. Compile the application, with the existing raylib installation, using `meson compile -C build`.
+5. If you don't have raylib installed, you can create a statically linked version of the library on Linux by running the following commands:
+
+	 ```
+	 meson configure -Ddefault_library=static build/
+	 meson compile -C build -Ddefault_library=static
+	 ```
+
+## Running
+
+- To run in single-player mode:
+	- Run the application with no arguments: `build/pong`
+	- Left paddle is controlled with `W` and `S` keys, right paddle is controlled with `Up` and `Down` arrow keys.
+	
+- To run in multi-player mode:
+	- One player runs the application in Server mode, specifying their IP address and a port: `build/pong -S <ip_address> <port>`
+	- The other player connects to the first player by running in Client mode, specifying the first player's IP address and port: `build/pong -C <ip_address> <port>`.
+	- The server controls the left paddle by default (WIP to allow the user to modify this), and the client controls the right paddle.

create_release_build.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# This script copies required DLLs, and the application itself into a folder called 'release'. It only runs on MinGW.
+
+BASE_DIR=$(dirname $0)
+REL_DIR="$BASE_DIR/release/dist"
+
+mkdir -p "$REL_DIR"
+
+# Parse the output of the 'ldd' command, and create a file with the required DLL paths.
+ldd build/pong.exe | awk ' NF == 4 {print $3}' > "$BASE_DIR/tmp_file.txt"
+
+# Copy the required DLLs.
+cp $(cat "$BASE_DIR/tmp_file.txt") "$REL_DIR"
+
+# Copy the executable itself
+cp "$BASE_DIR/build/pong" "$REL_DIR"
+
+# Remove the temporary file.
+rm "$BASE_DIR/tmp_file.txt"
+

includes/easysock.hpp

@@ -6,7 +6,7 @@
 	#include <winsock.h>
 	#include <ws2tcpip.h>
 #endif
-#ifdef linux
+#ifdef __unix__
 	#include <sys/types.h>
 	#include <sys/socket.h>
 	#include <netdb.h>

includes/serialization.h

@@ -6,17 +6,19 @@ extern "C" {
 #endif
 
 #include <stdint.h>
+#include <stdbool.h>
 
 /* Struct used to hold the data that will be sent between sockets */
 typedef struct {
-	uint16_t pad_x;
+	uint16_t pad_x; // X-coordinate of sending paddle
-	uint16_t pad_y;
+	uint16_t pad_y; // Y-coordinate of sending paddle
-	uint16_t ball_x;
+	uint16_t ball_x; // X-coordinate of ball (only the server fills this in)
-	uint16_t ball_y;
+	uint16_t ball_y; // Y-coordinate of ball (only the server fills this in)
+	bool should_quit; // Flag to indicate whether game should be quit or not
 } Serial_Data;
 
 /* Create a Serial_Data struct from float values */
-Serial_Data Serial_create_data(float pad_x, float pad_y, float ball_x, float ball_y);
+Serial_Data Serial_create_data(float pad_x, float pad_y, float ball_x, float ball_y, bool should_quit);
 
 /* Serialize a struct into a byte array, that can be sent through a socket */
 uint8_t* Serial_serialize(Serial_Data data);

includes/sock.hpp

@@ -2,7 +2,7 @@
 #define _SOCK_CLASS
 
 #include <string>
-#ifdef linux
+#ifdef __unix__
 	#include <sys/socket.h>
 #endif
 #ifdef _WIN32

main.cpp

@@ -211,7 +211,7 @@ int main(int argc, char** argv) {
 	SetTraceLogLevel(LOG_NONE);
 	raylib::Window window = raylib::Window(WIDTH, HEIGHT, "Pong");
 	window.ClearBackground(BLACK);
-	SetTargetFPS(10);
+	SetTargetFPS(60);
 	SetExitKey(KEY_Q);
 	std::string points_str = std::string("0\t\t0");
 	bool game_started = false;
@@ -264,33 +264,35 @@ int main(int argc, char** argv) {
 		if (game_started) {
 			/* Serialize the data that we need to send, and then send it to the peer paddle */
 			if (type.mode == M_SERVER) {
-				/* Serial_create_data creates a Serial_Data struct from our values, and Serial_serialize serializes it Paddle 2 is controled by the server, Paddle 1, by the client.*/
+				/* Serial_create_data creates a Serial_Data struct from our values.
-				to_send_data = Serial_create_data(pad2.getRect().x, pad2.getRect().y, ball.pos.x, ball.pos.y);
+				 Paddle 2 is controlled by the server, Paddle 1, by the client.*/
+				to_send_data = Serial_create_data(pad2.getRect().x, pad2.getRect().y, ball.pos.x, ball.pos.y, false);
 			}
 			else if (type.mode == M_CLIENT) {
 				/* The _server_ is the authoritative peer for the ball position, so the client sends (0, 0) as the ball position instead of actually sending a position */
-				to_send_data = Serial_create_data(pad1.getRect().x, pad1.getRect().y, 0, 0);
+				to_send_data = Serial_create_data(pad1.getRect().x, pad1.getRect().y, 0, 0, false);
 			}
 			/* Only send and receive data if the game is not in single player mode */
 			if (type.mode != M_SINGLE) {
+				/* Serial_serialize serializes the struct into a byte_array. Since sendAll accepts a string, we have to convert this byte array into a string. */
+				type.netsock->sendAll((char *)Serial_serialize(to_send_data), sizeof(Serial_Data) + 1);
 
-				type.netsock->sendAll((char *)Serial_serialize(to_send_data), 9);	
 				/* Create Serial_data struct from the response of the server. Since recvAll returns a char*, we need to convert it to a byte array */
 				uint8_t* response_array = (uint8_t *)(type.netsock->recvAll());
 				if (response_array != NULL) {
-				/* If the response is NULL, that means it timed-out. In this case, there's no value to print */
 					response_data = Serial_deserialize(response_array);
 					std::cout << response_data.pad_x << "\t" << response_data.pad_y << "\t" << response_data.ball_x << "\t" << response_data.ball_y << std::endl;
 				} else {
+					/* If the response is NULL, that means it timed-out. In this case, there's no value to print */
 					std::cout << "NOTHING RECEIVED" << std::endl;
 				}
-
 			}
 			
-			/* When updating the paddle positions, update the peer paddle's positions based on the vector set earlier */
+			/* Check to see if peer has quit the game */
-
+			if (response_data.should_quit == true) {
-			std::string to_send = "";
+				std::cout << "Peer unexpectedly quit game." << std::endl;
-			/* Update paddle velocity */
+				break; // Break out of main game loop
+			}
 			
 			/* Left paddle (controlled by client) - I use type.mode != M_SERVER, because I also want the single player 
 			mode to be able to control the paddle. Therefore, the only mode that _can't_ control the paddle is the server
@@ -327,7 +329,8 @@ int main(int argc, char** argv) {
 				pad2.velocity.y = 0;
 			}
 
-			/* The client should set the ball position based on the data sent by the server. It doesn't have to do any calculations of its own. */
+			/* Why did I use 'type.mode != M_CLIENT'? - The client should set the ball position solely based
+			 on the data sent by the server. It doesn't have to do any calculations of its own. */
 			if (type.mode != M_CLIENT) {
 				/* Update ball velocity based on collision detection */
 				if (pad1.getRect().CheckCollision(ball.pos, ball.radius)) { /* Collision with paddle 1 */
@@ -366,7 +369,8 @@ int main(int argc, char** argv) {
 				ball.vel.y = ball.vel.y * -1;
 			}
 
-			/* Update positions based on velocities - Client only updates pad1, server updates pad2 and ball */
+			/* Update positions based on velocities - Client only updates pad1 (and receives data for pad2), 
+			server updates pad2 and ball (and receives data for pad1) */
 			if (type.mode != M_CLIENT) {
 				ball.updatePosition();
 				pad2.updatePosition();
@@ -391,8 +395,14 @@ int main(int argc, char** argv) {
 		window.EndDrawing();
 	}
 	
-	window.Close();
+	/* If the game has been quit, ask the peer to quit as well */
+	if (type.mode != M_SINGLE) {
+		to_send_data = Serial_create_data(0, 0, 0, 0, true);
+		type.netsock->sendAll((char *)Serial_serialize(to_send_data), sizeof(Serial_Data) + 1);
 		sock_quit();
+	}
+	
+	window.Close();
 
 	return 0;
 }

meson.build

@@ -1,13 +1,36 @@
-project('Pong', ['cpp', 'c'])
+project('Pong', ['cpp', 'c'], version: '0.1')
-add_global_arguments('-g', '-Wall', '-pedantic', '-Wno-unused-function', '-Werror', language : ['cpp', 'c'])
+add_global_arguments('-g', '-Wall', '-pedantic', '-Wno-unused-function', language : ['cpp', 'c'])
-
-raylib = dependency('raylib', native: true)
-
 compiler = meson.get_compiler('cpp')
-ws2_dep = compiler.find_library('ws2_32', required: false)
+cmake = import('cmake')
+
+if get_option('default_library') == 'shared'
+	raylib = dependency('raylib', required: false) # Try to find dependency with pkg-config
+	if not raylib.found()
+		raylib = compiler.find_library('raylib', has_headers: ['raylib.h', 'raymath.h'], required: true) # Try to manually search for the dependency
+	endif
+#	if not raylib.found()
+#		opt_var = cmake.subproject_options()
+#		opt_var.add_cmake_defines({'BUILD_SHARED_LIBS' : true})
+#		opt_var.add_cmake_defines({'CMAKE_SKIP_RPATH' : true})
+#		raylib_proj = cmake.subproject('raylib', options: opt_var)
+#		raylib = raylib_proj.dependency('raylib')
+#	endif
+endif
+if get_option('default_library') == 'static'
+	raylib_proj = cmake.subproject('raylib')
+	raylib = raylib_proj.dependency('raylib')
+endif
+
+#For Windows only
+	ws2_dep = compiler.find_library('ws2_32', required: false)
+	winmm = compiler.find_library('winmm', required: false)
+if build_machine.system() == 'windows'
+	add_global_arguments('-Wl,--subsystem,windows', '-mwindows', language: ['cpp', 'c']) # Prevent opening console when game is run
+
+endif
 
 executable('pong', 
 	'main.cpp', 'easysock.cpp', 'sock.cpp','paddle.cpp', 'ball.cpp', 'numeric_base.cpp', 'connect_code.cpp', 'server.cpp', 'client.cpp',
 	'serialization.c',
-	dependencies: [raylib, ws2_dep]
+	dependencies: [raylib, ws2_dep, winmm]
 )

serialization.c

@@ -1,7 +1,8 @@
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <string.h>
-#ifdef linux
+#ifdef __unix__
 	#include <arpa/inet.h>
 #endif
 #ifdef _WIN32
@@ -11,29 +12,32 @@
 
 
 /* Takes in float values, casts them to uint16_t and creates a Serial_Data struct */
-Serial_Data Serial_create_data(float pad_x, float pad_y, float ball_x, float ball_y) {
+Serial_Data Serial_create_data(float pad_x, float pad_y, float ball_x, float ball_y, bool should_quit) {
 	Serial_Data data;
 	data.pad_x = (uint16_t)pad_x;
 	data.pad_y = (uint16_t)pad_y;
 	data.ball_x = (uint16_t)ball_x;
 	data.ball_y = (uint16_t)ball_y;
-	
+	data.should_quit = should_quit;
 	return data;
 }
 
 /* Serializes a 'Data' struct into a byte array, converted to network-byte order */
 uint8_t* Serial_serialize(Serial_Data data) {
 	/* Create a pointer that can fit the entire struct */
-	uint8_t* serialized = malloc(4 * sizeof(uint16_t) + 1);
+	uint8_t* serialized = malloc(sizeof(Serial_Data) + 1);
 	uint8_t* pad_x_ptr;
 	uint8_t* pad_y_ptr;
 	uint8_t* ball_x_ptr;
 	uint8_t* ball_y_ptr;
-	memset(serialized, 0, 4 * sizeof(uint16_t) + 1); // Zero out the memory
+	uint8_t* should_quit_ptr;
+	
+	memset(serialized, 0, sizeof(Serial_Data) + 1); // Zero out the memory
 	pad_x_ptr = serialized;
 	pad_y_ptr = pad_x_ptr + sizeof(uint16_t);
 	ball_x_ptr = pad_y_ptr + sizeof(uint16_t);
 	ball_y_ptr = ball_x_ptr + sizeof(uint16_t);
+	should_quit_ptr = ball_y_ptr + sizeof(uint16_t);
 
 	*((uint16_t *)pad_x_ptr) = data.pad_x;
 	*((uint16_t *)pad_x_ptr) = htons(*((uint16_t *)pad_x_ptr));
@@ -46,7 +50,9 @@ uint8_t* Serial_serialize(Serial_Data data) {
 	
 	*((uint16_t *)ball_y_ptr) = data.ball_y;
 	*((uint16_t *)ball_y_ptr) = htons(*((uint16_t *)ball_y_ptr));
-	*(ball_y_ptr + sizeof(uint16_t)) = '\0';
+	
+	*((bool *)should_quit_ptr) = data.should_quit;
+	*(should_quit_ptr + sizeof(bool)) = '\0';
 
 	return serialized;
 }
@@ -59,6 +65,7 @@ Serial_Data Serial_deserialize(uint8_t* serialized) {
 	uint8_t* pad_y_ptr = serialized + sizeof(uint16_t);
 	uint8_t* ball_x_ptr = pad_y_ptr + sizeof(uint16_t);
 	uint8_t* ball_y_ptr = ball_x_ptr + sizeof(uint16_t);
+	uint8_t* should_quit_ptr = ball_y_ptr + sizeof(uint16_t);
 
 	/* Dereference (and cast) the pointers, and store them into the struct */
 	deserialized.pad_x = *((uint16_t *)pad_x_ptr);
@@ -73,6 +80,8 @@ Serial_Data Serial_deserialize(uint8_t* serialized) {
 	deserialized.ball_y = *((uint16_t *)ball_y_ptr);
 	deserialized.ball_y = ntohs(deserialized.ball_y);
 		
+	deserialized.should_quit = *((bool *)should_quit_ptr);
+	
 	return deserialized;
 }
 

server.cpp

@@ -1,4 +1,4 @@
-#ifdef linux
+#ifdef __unix__
 	#include <sys/socket.h>
 #endif
 #ifdef _WIN32