From 2fc701723a70eea861378f026ffec05e1a567976 Mon Sep 17 00:00:00 2001
From: Fries <fries1234@protonmail.com>
Date: Tue, 23 Apr 2024 16:52:55 -0700
Subject: [PATCH] Add a semi-working bird sprite to the flappyBird game.

---
 .vscode/launch.json                           |  29 ++++++++++++++++++
 src/engine/entity.hh                          |   1 +
 src/flappyBird/Assets.hh                      |   7 ++++-
 src/flappyBird/Bird.cc                        |  29 +++++++++++++++---
 src/flappyBird/Bird.hh                        |   2 ++
 src/flappyBird/FlappyBird.cc                  |   4 +++
 src/flappyBird/FlappyBird.hh                  |   1 +
 src/flappyBird/assets/yellowbird-downflap.png | Bin 426 -> 4497 bytes
 src/flappyBird/generateAssets.py              |  20 +++++++-----
 9 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 88266ac..dc9ed8f 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -187,6 +187,35 @@
 			],
 			"avoidWindowsConsoleRedirection": false,
 			"internalConsoleOptions": "openOnSessionStart"
+		},
+		{
+			"name": "(gdb, lxdream-nitro) Launch flappyBird.elf",
+			"type": "cppdbg",
+			"request": "launch",
+			"program": "${workspaceFolder}/build/src/flappyBird.elf",
+			"args": [],
+			"stopAtEntry": false,
+			"cwd": "${workspaceFolder}",
+			"environment": [],
+			"externalConsole": false,
+			"MIMode": "gdb",
+			"miDebuggerPath": "/opt/toolchains/dc/sh-elf/bin/sh-elf-gdb",
+			"miDebuggerServerAddress": "localhost:3263",
+			"debugServerPath": "/home/user/Downloads/lxdream-nitro/builddir/lxdream-nitro",
+			"debugServerArgs": "-d -g 3263 -e ${workspaceFolder}/build/src/flappyBird.elf",
+			"setupCommands": [
+				{
+					"description": "Enable pretty-printing for gdb",
+					"text": "-enable-pretty-printing",
+					"ignoreFailures": true
+				},
+				{
+					"description": "Set SuperH architechture",
+					"text": "set architecture sh4"
+				}
+			],
+			"avoidWindowsConsoleRedirection": false,
+			"internalConsoleOptions": "openOnSessionStart"
 		}
 	]
 }
diff --git a/src/engine/entity.hh b/src/engine/entity.hh
index ea76627..ff69166 100644
--- a/src/engine/entity.hh
+++ b/src/engine/entity.hh
@@ -16,6 +16,7 @@ public:
 	std::vector<Entity*> children = {};
 	virtual void Draw() {};
 	virtual void Update() {};
+	virtual void Start() {};
 	bool b_destroyed = false;
 	Vector3 GetPosition() const;
 	Vector3 GetGlobalPosition() const;
diff --git a/src/flappyBird/Assets.hh b/src/flappyBird/Assets.hh
index 903e2c7..884474a 100644
--- a/src/flappyBird/Assets.hh
+++ b/src/flappyBird/Assets.hh
@@ -2,6 +2,11 @@
 #define ASSETS_HH
 #include <vector>
 namespace assets {
-	std::vector<unsigned char> bird();
+	struct Image {
+		int width;
+		int height;
+		std::vector<unsigned char> data;
+	};
+	extern Image bird;
 }
 #endif
diff --git a/src/flappyBird/Bird.cc b/src/flappyBird/Bird.cc
index f282bb8..f5089ee 100644
--- a/src/flappyBird/Bird.cc
+++ b/src/flappyBird/Bird.cc
@@ -1,22 +1,29 @@
 #include "Bird.hh"
-
+#include "Assets.hh"
+#include <GL/gl.h>
 #include <cstdio>
+#include <vector>
 
 void Bird::Draw() {
 	engine::Vector3 one = {-1.0, -1.0, 0.0};
 	engine::Vector3 two = {0.0, 1.0, 0.0};
 	engine::Vector3 three = {1.0, -1.0, 0.0f};
 
+	glEnable(GL_TEXTURE_2D);
 	glBegin(GL_TRIANGLES);
-	glColor3f(1.0f, 0.0f, 0.0f);
+	// glColor3f(1.0f, 0.0f, 0.0f);
+	glTexCoord2f(0.0f, 0.0f);
 	glVertex3fv((float*)&(one));
 
-	glColor3f(0.0f, 1.0f, 0.0f);
+	// glColor3f(0.0f, 1.0f, 0.0f);
+	glTexCoord2f(1.0f, 0.0f);
 	glVertex3fv((float*)&two);
 
-	glColor3f(0.0f, 0.0f, 1.0f);
+	// glColor3f(0.0f, 0.0f, 1.0f);
+	glTexCoord2f(0.5f, 1.0f);
 	glVertex3fv((float*)&three);
 	glEnd();
+	glDisable(GL_TEXTURE_2D);
 }
 
 void Bird::Update() {
@@ -63,3 +70,17 @@ Bird::Bird(engine::Engine* engie, engine::Entity* parent, PipesContainer* pipes)
 	: Entity(engie, parent) {
 	this->pipes = pipes;
 }
+
+void Bird::Start() {
+	auto bird = assets::bird;
+
+	glGenTextures(1, &ui_birdTexture);
+	glBindTexture(GL_TEXTURE_2D, ui_birdTexture);
+
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, bird.width, bird.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, bird.data.data());
+}
diff --git a/src/flappyBird/Bird.hh b/src/flappyBird/Bird.hh
index a776310..a6a0157 100644
--- a/src/flappyBird/Bird.hh
+++ b/src/flappyBird/Bird.hh
@@ -7,6 +7,7 @@ class Bird : public engine::Entity {
    public:
 	void Draw() override;
 	void Update() override;
+	void Start() override;
 	Bird(engine::Engine* engie, engine::Entity* parent, PipesContainer* pipes);
 	bool b_isHit = false;
 
@@ -15,5 +16,6 @@ class Bird : public engine::Entity {
 	static constexpr float JUMP_CONST = 0.5;
 	float f_verticalSpeed = JUMP_CONST;
 	PipesContainer *pipes = nullptr;
+	unsigned int ui_birdTexture = 0;
 };
 #endif
diff --git a/src/flappyBird/FlappyBird.cc b/src/flappyBird/FlappyBird.cc
index cafc2af..491ac6c 100644
--- a/src/flappyBird/FlappyBird.cc
+++ b/src/flappyBird/FlappyBird.cc
@@ -105,3 +105,7 @@ FlappyBird::~FlappyBird()
 		p_thread->detach();
 	delete p_thread;
 }
+
+void FlappyBird::Start() {
+	p_bird->Start();
+}
diff --git a/src/flappyBird/FlappyBird.hh b/src/flappyBird/FlappyBird.hh
index f04fc79..0185b58 100644
--- a/src/flappyBird/FlappyBird.hh
+++ b/src/flappyBird/FlappyBird.hh
@@ -11,6 +11,7 @@
 
 class FlappyBird : public engine::Engine {
 	void GameLoop() override;
+	void Start() override;
 	void SpawnPipes();
 	void MainGameLoop();
 	void MainMenuLoop();
diff --git a/src/flappyBird/assets/yellowbird-downflap.png b/src/flappyBird/assets/yellowbird-downflap.png
index e9e1c77b9deb38738f6f4d184243143bca2da46b..943fe360a2225a7492102f5c24ee3bc4d77f5818 100644
GIT binary patch
literal 4497
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
AcK`qY

literal 426
zcmeAS@N?(olHy`uVBq!ia0vp^N<b{Z!VDyHJB+M=6id3JuOkD)#(wTUiL5}rLb6AY
zF9SoBDg#49GXulV|3LaB14F3+1H-EX1_rAc3=HD=lj4uM0o6(e_=LCu>0k@DU)Otn
z{rdG|yYcmBXZ~0)JZRAQ|NsAjlBe20X~vQuzhDN3XE)M7oFs2|7ml`jQ>%a+&H|6f
zVg?3oVGw3ym^DWND9B#o>Fdh=n3;!xN%;9M)g3^gEKe855Q)pZ7Xx_@DDbdch_c|`
z+Rz#`qc!rtzdq>=sjVsBUE?z}5|%k^4ByAJ!`ka$T!g!ToEOuzDa{u&IhFo(WoYXz
zDx9oRkXI(;$Etnt%hpG8VzmpM7VpkfwA$Ns>~Px5;^<#p`}Q%EMVg;vcHSliv{kjl
zHKHUXu_V<hxhNG#F&G&bTIw1Y>lzw{7+P2v7+D!wY8#kY85lg&vOJ8UAvZrIGp!Q0
Uh6&}3^*{{_p00i_>zopr0M`A6wg3PC

diff --git a/src/flappyBird/generateAssets.py b/src/flappyBird/generateAssets.py
index a67cb8a..60c22bf 100644
--- a/src/flappyBird/generateAssets.py
+++ b/src/flappyBird/generateAssets.py
@@ -3,13 +3,13 @@ from pathlib import Path
 from PIL import Image
 
 parser = argparse.ArgumentParser()
-parser.add_argument("function")
+parser.add_argument("variable")
 parser.add_argument("input")
 parser.add_argument("output")
 
 args = parser.parse_args()
 
-function = args.function
+variable = args.variable
 input = Path(args.input)
 output = Path(args.output)
 
@@ -18,10 +18,14 @@ if not input.exists():
 	raise SystemExit(1)
 
 hexList = list()
+imageWidth = 0
+imageHeight = 0
 
 with Image.open(input) as image:
-	imageBytes = bytes(image.getdata())
-	byteList = list(imageBytes)
+	imageWidth = image.width
+	imageHeight = image.height
+	# flatten a tuple of RGBA bytes into a list of bytes
+	byteList = [item for tup in [*image.getdata()] for item in tup]
 
 	for byte in byteList:
 		hexList.append(f'0x{byte:02x}')
@@ -31,9 +35,11 @@ code = f"""#include <Assets.hh>
 #include <vector>
 
 namespace assets {{
-std::vector<unsigned char> {function}() {{
-	return {{ {','.join(hexList)} }};
-}}
+Image {variable} = {{
+	.width = {imageWidth},
+	.height = {imageHeight},
+	.data = {{ {','.join(hexList)} }}
+}};
 }}
 """