From 13b3e08d63e82d8dd98555477339557dedbb0a81 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Sat, 29 Apr 2023 20:46:50 -0500
Subject: [PATCH] Temporary map sprite/decal re-rendering.

---
 Faceball2030/assets/enemies/IShoot.png | Bin 7590 -> 7755 bytes
 Faceball2030/main.cpp                  |  18 +++++++++++++++++-
 Faceball2030/main.h                    |   3 +++
 TODO.txt                               |   5 +++++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 TODO.txt

diff --git a/Faceball2030/assets/enemies/IShoot.png b/Faceball2030/assets/enemies/IShoot.png
index 7faa4e02cb37af81fceebdce024ad153885e7a4f..b06088d8811cc5ffc8c3e9c285fa5dfa4e6efc89 100644
GIT binary patch
delta 2750
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

delta 2506
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
XPe;atuP+%vNZ{<?zPHN$c;bHm7H~FG

diff --git a/Faceball2030/main.cpp b/Faceball2030/main.cpp
index 3b7b033..6bd2249 100644
--- a/Faceball2030/main.cpp
+++ b/Faceball2030/main.cpp
@@ -1694,6 +1694,9 @@ bool FaceBall::OnUserCreate()
 	mapWalls.texture = wall_tex;
 	mapFloor.texture = floor_tex;
 
+	mapSpr=new Sprite(128,128);
+	mapDecal=new Decal(mapSpr);
+
 	InitializeEnemyData();
 	InitializePowerupColors();
 
@@ -1982,6 +1985,16 @@ void FaceBall::RenderHud(float fElapsedTime) {
 		if (camoDuration > 0) {
 			DrawPartialDecal({ hudOffset + float(ScreenWidth() / 10 - 16), float(ScreenHeight() / 4 + ScreenHeight() / 4 * 2 - 16 * 4) }, vf2d{ 32,32 }*4, powerups_tex, { 5 * 32,0 }, { 32,32 },camoDuration>7?WHITE:camoDuration>2?std::abs(std::sin(10*camoDuration))>0.65?WHITE:BLACK: std::abs(std::sin(30 * camoDuration)) > 0.75 ? WHITE : BLACK);
 		}
+		vf2d mapCenter = {float(ScreenWidth()-364),float(164)};
+		mapSpr= new Sprite{128,128};
+		vf2d mapSprSize = {float(mapSpr->width),float(mapSpr->height)};
+		SetDrawTarget(mapSpr);
+		Clear(BLACK);
+		vf2d center = mapSprSize/2;
+		FillCircle(center,5,GREEN);
+		SetDrawTarget(nullptr);
+		mapDecal=new Decal(mapSpr);
+		DrawRotatedDecal(mapCenter-mapSprSize,mapDecal,-fYaw,mapSprSize/2);
 		SetDecalMode(DecalMode::NORMAL);
 	}
 	GradientFillRectDecal({ 0,0 }, vf2d{ (float)ScreenWidth()/2,(float)ScreenHeight()/2 }, { (uint8_t)screenCol.r,(uint8_t)screenCol.g,(uint8_t)screenCol.b,(uint8_t)(hudShakeTime>0.2f?120:hudShakeTime>0?64:0) }, { (uint8_t)screenCol.r,(uint8_t)screenCol.g,(uint8_t)screenCol.b,(uint8_t)(hudShakeTime>0.2f?120:hudShakeTime>0?64:0) }, { (uint8_t)screenCol.r,(uint8_t)screenCol.g,(uint8_t)screenCol.b,(uint8_t)(hudShakeTime > 0.2f ? 64 : 0) }, { (uint8_t)screenCol.r,(uint8_t)screenCol.g,(uint8_t)screenCol.b,(uint8_t)(hudShakeTime>0.2f?120:hudShakeTime>0?64:0) });
@@ -2106,7 +2119,8 @@ void FaceBall::RunEnemyAI(Enemy& e,float fElapsedTime,int myIndex) {
 				}break;
 				}
 			}break;
-			case ISHOOT: {
+			case ISHOOT:
+			case ISHOOT_MAP: {
 				e.rot += dat.rotSpd * fElapsedTime;
 				if (e.CanShoot()) {
 					e.ShootBullet(myIndex);
@@ -2154,6 +2168,8 @@ void FaceBall::RunEnemyAI(Enemy& e,float fElapsedTime,int myIndex) {
 
 bool FaceBall::OnUserUpdate(float fElapsedTime)
 {
+	delete mapSpr;
+	delete mapDecal;
 	fElapsedTime = std::min(0.01667f, fElapsedTime);
 	gameTimer += fElapsedTime;
 	switch (mode) {
diff --git a/Faceball2030/main.h b/Faceball2030/main.h
index 6df59fb..a9b09b7 100644
--- a/Faceball2030/main.h
+++ b/Faceball2030/main.h
@@ -263,6 +263,9 @@ class FaceBall : public PixelGameEngine
 		enemy_Sonar, mapExit,enemy_ShootMe2,powerup,powerup2,
 		enemy_IShoot;
 
+	Sprite*mapSpr;
+	Decal*mapDecal;
+
 	Decal* dot, * enemy_ShootMe_tex,*bullet_tex,*wall_tex,*floor_tex,
 		*enemy_Sonar_tex,*hud,*exit_wall_tex,*enemy_ShootMe2_tex,*enemy_IShoot_tex,
 		*life4,*life3,*life2,*life1,*crosshair,*hudmeter,*powerup_tex,*powerup2_tex,
diff --git a/TODO.txt b/TODO.txt
new file mode 100644
index 0000000..07736e2
--- /dev/null
+++ b/TODO.txt
@@ -0,0 +1,5 @@
+- Minimap
+- Skybox
+- Levels have distinguishing elements (skybox, walls, floor, fog color)
+- Main Menu
+- Sounds & Music
\ No newline at end of file