From 093b3b901a5a2baf6da3a5c0a20a3f13fc10d698 Mon Sep 17 00:00:00 2001
From: Barry Kane <barra@ocathain.ie>
Date: Sat, 25 Mar 2023 16:25:49 +0000
Subject: [PATCH] Added a textured black hole indicator.

---
 Images/Black-Hole-Pointer.png | Bin 0 -> 1124 bytes
 Spacewar.c                    |  29 +++++++++++++----------------
 spacewarGraphics.c            |   1 -
 3 files changed, 13 insertions(+), 17 deletions(-)
 create mode 100644 Images/Black-Hole-Pointer.png

diff --git a/Images/Black-Hole-Pointer.png b/Images/Black-Hole-Pointer.png
new file mode 100644
index 0000000000000000000000000000000000000000..e35adc4eeb5859e3c16e505cc7548ab3ff6576d8
GIT binary patch
literal 1124
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU~I{Bb`J1#c2+1T%1_J8No8Qr
zm{>c}*5j~)%+dH@*NI;2))9p#0_MJ1q|~>S%XNi7R%@87kKW%VHD1rI?!^zH3O*!n
zeD&bbn$^v#6*%e|cI>jy+~v{v-<wM}$;RT{@!i$^yUQCctT8(K%9CMM-t3tnL1&(Z
zAKe$uBIqhn=#rWySv+Y<+xs88+#A-H7tVWH|L(lu3Nalv7MDjX#y+zvnk&*Sn_0XU
zc8`b*>pb77?z2nbqw;mp{`(fwW5g=bj+{w*)~S3XX=V3Ry|mO|<#}p-D`)xrbUK$j
z^|M&|+Nkum)t|)MxPF~7x}Mpm)at6^*u=qF8WPazTN}Dya+0F+Z%_IE9j~XKSUO=f
zlUpC_l?9Gve;?F;*d4vv!t|wT>m-Nw-H&T}7;ASstbS;5|9IbJE5@et2d3WpczxD^
zH|j5Y`^2o74&6R*wA4NLTf=GDgdZm-_}-k_WYU@>SYf|7{}i+H_5%lIU5~DoU(W9^
zZI{=52KM#?6`h-|*WSB(|L*Pm>9_v=W!O5k=-`@toi~Be!j|Oi?gFHN;HUHMdLYGF
z;1OBOz@VoL!i*J5?aP3I>?NMQuI$g5B?UzIDnxeG0)-??Tq8=H^K)}k^GX<;i&7Iy
zQd1PlGfOfQ+&z5*!W;R-85o#sJY5_^DsH{Kz1we!qX@$T;|)q4$yYcY>CTuDk@0YL
zL|{bZOXe5M85s+MxN8}>guT7Fxw56aO+IcDVind4oN#*Mjn-7=s2dwU*PcxK|EGTI
z|2dY%&waMJEZt`>bN=kJk2fM;_aD3A*5h|}y3~E=_+I;}mmgctXb7q*EpkceJo?gG
z^2@%d)6<Jzo;=Fjyw{>ub9%a45ZekzIiqutPq_l(8B$!PSfp(5=4z0da-ySAHv8ed
z-zzTkrzh{+YalWEY~zi{T$kh=WvS<8kIww<cV$~~U}g1LzeD-r%%*&HSJqa3kE+{O
zyZ6<v{p(+GO!)Gew;{j(*!Q%5hniPwGGyg&l*Ds1WSu(j{Q2go|Gix_1tm9{lv=Vn
z=z7<0lXjZ8c3VNG$J_%}YxY^qjWjAMXOFP5KKOKIV7p`Kn*U2b?|q-3p?!xxM3mum
ze!KDaRr_rU7($dDJ)b>Ulc8$IJN>s;>;Ip<)YsnAG54#T<O1<rUAfmOKQ7g(%!##B
zc=Y{G09QlY>_5%7V{IF3OsrE%=Qe6FC8U~dy8Qj@w`cX`<`=r!u3g=?W<#iZ?2Q%K
z{1>Di@UP!ra{vF8UoksPcjYTCP}jL{IZ=D_#M{|_EzJcj%|CwU+5fxd@!f!DVJFv5
z?w!KeS9MZe@cn!@mz?8g#sAN{v-|w>N8xTRJ$DQms}z`d{(slW^ZWLDJutP93S=zn
Y8JIS%_<vk@=@*b*Pgg&ebxsLQ0716wW&i*H

literal 0
HcmV?d00001

diff --git a/Spacewar.c b/Spacewar.c
index 6969b88..3b0b778 100644
--- a/Spacewar.c
+++ b/Spacewar.c
@@ -101,12 +101,6 @@ int main(int argc, char ** argv)
 	int keyCount = 0; 
 	const uint8_t * keyboardState = SDL_GetKeyboardState(&keyCount);
 
-	// Load the title screen:   
-	SDL_Texture * titleTexture = IMG_LoadTexture(renderer, "./Images/Title.png");
-	SDL_Rect titleRect;
-	SDL_QueryTexture(titleTexture, NULL, NULL, NULL, &titleRect.h);
-	SDL_QueryTexture(titleTexture, NULL, NULL, &titleRect.w, NULL);
-	
 	SDL_Texture * starfieldTexture = IMG_LoadTexture(renderer, "./Images/Starfield.png");
 	SDL_Rect starfieldRect;
 	SDL_QueryTexture(starfieldTexture, NULL, NULL, NULL, &starfieldRect.h);
@@ -205,14 +199,15 @@ int main(int argc, char ** argv)
 
 	// Load in all of our textures:
 	SDL_Texture * blackHoleTexture, * idleTexture, * acceleratingTexture, * clockwiseTexture, * anticlockwiseTexture,
-		* currentTexture, * acceleratingTexture2;
+		* currentTexture, * acceleratingTexture2, *blackHolePointerTexture;
 
 	idleTexture = IMG_LoadTexture(renderer, "./Images/Ship-Idle.png");
 	blackHoleTexture = IMG_LoadTexture(renderer, "./Images/Black-Hole.png");
 	clockwiseTexture = IMG_LoadTexture(renderer, "./Images/Ship-Clockwise.png");
 	acceleratingTexture = IMG_LoadTexture(renderer, "./Images/Ship-Accelerating.png");
 	anticlockwiseTexture = IMG_LoadTexture(renderer, "./Images/Ship-Anticlockwise.png");
-	acceleratingTexture2 = IMG_LoadTexture(renderer, "./Images/Ship-Accelerating-Frame-2.png"); 
+	blackHolePointerTexture = IMG_LoadTexture(renderer, "./Images/Black-Hole-Pointer.png");
+	acceleratingTexture2 = IMG_LoadTexture(renderer, "./Images/Ship-Accelerating-Frame-2.png");
 	currentTexture = acceleratingTexture;
 
 	SDL_Rect blackHoleRectangle;
@@ -221,6 +216,11 @@ int main(int argc, char ** argv)
 	SDL_QueryTexture(blackHoleTexture, NULL, NULL, NULL, &blackHoleRectangle.h);
 	SDL_QueryTexture(blackHoleTexture, NULL, NULL, &blackHoleRectangle.w, NULL);
 
+	SDL_Rect blackHolePointerRectangle;
+	blackHolePointerRectangle.x = 0;
+	blackHolePointerRectangle.y = 0;
+	blackHolePointerRectangle.w = 128;
+	blackHolePointerRectangle.h = 128;
 	lastFrameTime = SDL_GetPerformanceCounter();
 	thisFrameTime = SDL_GetPerformanceCounter();
 	
@@ -347,14 +347,11 @@ int main(int argc, char ** argv)
 		SDL_SetRenderDrawColor(renderer, 0, 0, 255, 255);
 
 		// Draw a line representing the direction of the star:
-		normalizeXYVector(&shipA.gravity);
-		multiplyXYVector(&shipA.gravity, 100);
-		SDL_RenderDrawLine(renderer,
-						   width/2  - (shipA.velocity.xComponent * 15),
-						   height/2  - (shipA.velocity.yComponent * 15),
-						   (width/2  - (shipA.velocity.xComponent * 15)) + shipA.gravity.xComponent,
-						   ((height/2) - (shipA.velocity.yComponent * 15)) + shipA.gravity.yComponent);
-
+		blackHolePointerRectangle.x = width/2  - (shipA.velocity.xComponent * 15) - (blackHolePointerRectangle.w / 2);
+		blackHolePointerRectangle.y = height/2  - (shipA.velocity.yComponent * 15) -  (blackHolePointerRectangle.h / 2);
+		SDL_RenderCopyEx(renderer, blackHolePointerTexture, NULL, &blackHolePointerRectangle,
+						 angleBetweenVectors(&shipA.gravity, &upVector) + 90, NULL, 0);
+		
 		// Present the rendered graphics:
 		SDL_RenderPresent(renderer);
 	}
diff --git a/spacewarGraphics.c b/spacewarGraphics.c
index 31367d0..f49279d 100644
--- a/spacewarGraphics.c
+++ b/spacewarGraphics.c
@@ -51,7 +51,6 @@ void drawTitleScreen(SpacewarTitlescreen * titlescreen)
 {
 	// Get the current size of the window:
 	int width = 0, height = 0;
-	printf("%p\n", titlescreen->window);
 	SDL_GetWindowSize(titlescreen->window, &width, &height);
 
 	// Position the elements on-screen: