From c34b7c2c046461d0f0d09b4ff65c82a2cc357895 Mon Sep 17 00:00:00 2001
From: Barry Kane <barra@ocathain.ie>
Date: Tue, 21 Mar 2023 13:36:35 +0000
Subject: [PATCH] Added a title screen, and improved input selection.

Pressing enter on startup will choose keyboard only, and pressing button zero on the controller will choose that controller.
---
 Images/Title.png | Bin 0 -> 3688 bytes
 Spacewar.c       |  52 ++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 Images/Title.png

diff --git a/Images/Title.png b/Images/Title.png
new file mode 100644
index 0000000000000000000000000000000000000000..62965719436893b4be4e6b960681f889b1f05e27
GIT binary patch
literal 3688
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
GLSTYR_h&o+

literal 0
HcmV?d00001

diff --git a/Spacewar.c b/Spacewar.c
index 4e98f0b..23c6ddd 100644
--- a/Spacewar.c
+++ b/Spacewar.c
@@ -79,12 +79,19 @@ int main(int argc, char ** argv)
 	
 	// Initialize image loading:
 	IMG_Init(IMG_INIT_PNG);
+
 	SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "2");
 	SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");
 	
 	playerController playerOne = createShipPlayerController(&shipA);
 	playerController playerTwo = createShipPlayerController(&shipB);
 
+	// Create an SDL window and rendering context in that window:
+	SDL_Window * window = SDL_CreateWindow("SDL_TEST", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 700, 700, 0);
+	SDL_Renderer * renderer = SDL_CreateRenderer(window, -1, rendererFlags);
+	SDL_SetWindowResizable(window, SDL_TRUE);
+	SDL_SetWindowTitle(window, "Spacewar!");
+
 	// Check for joysticks:
 	if (SDL_NumJoysticks() < 1 )
 	{
@@ -103,17 +110,50 @@ int main(int argc, char ** argv)
 		}
 
 		// Choose a player joystick:
-		printf("Please press button zero on the controller you wish to use. \n");
+		printf("Please press button zero on the controller you wish to use, or enter to play keyboard only.\n");
 
+		// Load the title screen:
+		SDL_Texture * titleTexture = IMG_LoadTexture(renderer, "./Images/Title.png");
+		SDL_Rect titleRect;
+		titleRect.w = 317;
+		titleRect.h = 51;
+		
 		int joystickIndex = 0;
-		while(SDL_JoystickGetButton(joysticksList[joystickIndex], 0) == 0)
+		int keyCount = 0; 
+		const uint8_t * keyboardState = SDL_GetKeyboardState(&keyCount);
+		bool inputSelected = false;
+		while(!inputSelected)
 		{
+			// Draw the title screen:
+			SDL_GetWindowSize(window, &width, &height);
+			titleRect.x = (width/2) - (317/2);
+			titleRect.y = (height/2) - 51;
+			
+			// Set the colour to black:
+			SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
+			
+			// Clear the screen, filling it with black:
+			SDL_RenderClear(renderer);
+
+			SDL_RenderCopy(renderer, titleTexture,  NULL,  &titleRect);
+			SDL_RenderPresent(renderer);
+			
 			SDL_PumpEvents();
+			SDL_GetKeyboardState(&keyCount);
+			if(keyboardState[SDL_SCANCODE_RETURN] == 1)
+			{
+				joysticksList[joystickIndex] = NULL;
+				inputSelected = true;
+			}
 			joystickIndex++;
 			if(joystickIndex >= joystickListLength)
 			{
 				joystickIndex = 0;
 			}
+			if(SDL_JoystickGetButton(joysticksList[joystickIndex], 0) == 1)
+			{
+				inputSelected = true;				
+			}
 		}
 		
 		// Load joystick
@@ -126,11 +166,6 @@ int main(int argc, char ** argv)
 		SDL_HapticRumbleInit(playerOne.haptic);
 	}
 
-		// Create an SDL window and rendering context in that window:
-	SDL_Window * window = SDL_CreateWindow("SDL_TEST", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 700, 700, 0);
-	SDL_Renderer * renderer = SDL_CreateRenderer(window, -1, rendererFlags);
-	SDL_SetWindowTitle(window, "Spacewar!");
-	
 	// Load in all of our textures:
 	SDL_Texture * idleTexture, * acceleratingTexture, * clockwiseTexture, * anticlockwiseTexture, * currentTexture,
 	    * acceleratingTexture2;
@@ -142,9 +177,6 @@ int main(int argc, char ** argv)
 	acceleratingTexture2 = IMG_LoadTexture(renderer, "./Images/Ship-Accelerating-Frame-2.png");
 	currentTexture = acceleratingTexture;
 
-	// Enable resizing the window:
-	SDL_SetWindowResizable(window, SDL_TRUE);
-
 	lastFrameTime = SDL_GetPerformanceCounter();
 	thisFrameTime = SDL_GetPerformanceCounter();