From 926b43878e06fff4c3a4e90d3ce64c75ff0ae0b1 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Sun, 9 Apr 2023 01:16:56 -0500
Subject: [PATCH] Added ability to configure which enemy ID is selected, what
 facing directions are set and adding/removing entities.

---
 Faceball2030/Editor.cpp        |  15 +++++++++++++++
 Faceball2030/Editor.h          |   1 +
 Faceball2030/assets/arrow.png  | Bin 0 -> 5264 bytes
 Faceball2030/main.cpp          |   3 +++
 Faceball2030/main.h            |   2 +-
 Faceball2030/pixelGameEngine.h |   1 +
 6 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 Faceball2030/assets/arrow.png

diff --git a/Faceball2030/Editor.cpp b/Faceball2030/Editor.cpp
index 83892d6..f0ccc65 100644
--- a/Faceball2030/Editor.cpp
+++ b/Faceball2030/Editor.cpp
@@ -65,6 +65,18 @@ void Editor::Update(float fElapsedTime){
 				if (game->GetMouse(1).bPressed) {
 					t.enemyId = EnemyID::NONE;
 				}
+				if (game->GetKey(DOWN).bHeld) {
+					t.facingDir = FacingDirection::SOUTH;
+				}
+				if (game->GetKey(RIGHT).bHeld) {
+					t.facingDir = FacingDirection::EAST;
+				}
+				if (game->GetKey(UP).bHeld) {
+					t.facingDir = FacingDirection::NORTH;
+				}
+				if (game->GetKey(LEFT).bHeld) {
+					t.facingDir = FacingDirection::WEST;
+				}
 				game->FillRectDecal(squarePos, GRID_SIZE, { 0,0,255,64 });
 			}
 			//game->DrawRectDecal(squarePos,GRID_SIZE,{64,64,64});
@@ -79,6 +91,9 @@ void Editor::Update(float fElapsedTime){
 				}
 				else {
 					game->DrawDecal(squarePos, game->circle, { 1,1 }, game->GetData(t.enemyId).col);
+					if (t.enemyId >= START) {
+						game->DrawRotatedDecal(squarePos + vf2d{16, 16}, game->arrow, PI / 2 * (int)t.facingDir, { 16,16 }, { 1,1 }, WHITE);
+					}
 				}
 			}
 			game->DrawLineDecal(squarePos,{squarePos.x+ (float)GRID_SIZE.x,squarePos.y},t.wallN?WHITE:Pixel{64,64,64});
diff --git a/Faceball2030/Editor.h b/Faceball2030/Editor.h
index 92e0c59..59a4394 100644
--- a/Faceball2030/Editor.h
+++ b/Faceball2030/Editor.h
@@ -9,6 +9,7 @@ enum class FacingDirection {
 enum EnemyID {
 	NONE,
 	EXIT,
+	START,
 	SHOOTME,
 	COIN = 56,
 	POWERUP_ARMOR = 57,
diff --git a/Faceball2030/assets/arrow.png b/Faceball2030/assets/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f6c57190346d3e44c478d6adc4b310e1e1febb5
GIT binary patch
literal 5264
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

literal 0
HcmV?d00001

diff --git a/Faceball2030/main.cpp b/Faceball2030/main.cpp
index fe1d4a6..6f0968f 100644
--- a/Faceball2030/main.cpp
+++ b/Faceball2030/main.cpp
@@ -9,7 +9,9 @@ using namespace olc;
 FaceBall* game;
 
 void FaceBall::InitializeEnemyData() {
+	enemyData[EnemyID::NONE] = { "VOID",BLACK };
 	enemyData[EXIT] = { "EXIT",GREEN };
+	enemyData[START] = { "SPAWN POSITION",{128,64,0} };
 	enemyData[SHOOTME] = { "SHOOTME",YELLOW,1,1,PI / 8,2,1,3 };
 	enemyData[COIN] = { "Coin",BLUE };
 	enemyData[POWERUP_ARMOR] = { "Armor",{96,0,96} };
@@ -606,6 +608,7 @@ bool FaceBall::OnUserCreate()
 	matProj = Matrix_MakeProjection(90.0f, (float)ScreenHeight() / (float)ScreenWidth(), 0.1f, 1000.0f);
 	dot = new Decal(new Sprite("assets/dot.png"));
 	circle = new Decal(new Sprite("assets/circle.png"));
+	arrow = new Decal(new Sprite("assets/arrow.png"));
 	enemy_ShootMe_tex = new Decal(new Sprite("assets/enemies/ShootMe.png"));
 
 	InitializeEnemyData();
diff --git a/Faceball2030/main.h b/Faceball2030/main.h
index 64c6df1..4e080e8 100644
--- a/Faceball2030/main.h
+++ b/Faceball2030/main.h
@@ -149,7 +149,7 @@ class FaceBall : public PixelGameEngine
 	}
 
 	EnemyData GetData(EnemyID id);
-	Decal* circle;
+	Decal* circle,*arrow;
 	private:
 	Mesh mapMesh;
 
diff --git a/Faceball2030/pixelGameEngine.h b/Faceball2030/pixelGameEngine.h
index 647c3f8..a15639a 100644
--- a/Faceball2030/pixelGameEngine.h
+++ b/Faceball2030/pixelGameEngine.h
@@ -2891,6 +2891,7 @@ namespace olc
 		di.pos.resize(4);
 		di.uv = { { 0.0f, 0.0f}, {0.0f, 1.0f}, {1.0f, 1.0f}, {1.0f, 0.0f} };
 		di.w = { 1, 1, 1, 1 };
+		di.z = { 0,0,0,0 };
 		di.tint = { tint, tint, tint, tint };
 		di.points = 4;
 		di.pos[0] = (olc::vf2d(0.0f, 0.0f) - center) * scale;