Render beam directly instead of using a texture

Author: sharkwouter

assets/images/beam.bmp

@@ -14,6 +14,7 @@ class Draw {
     void BlitWater(SDL_Texture * texture, int rotation, int dx, int dy);
     void BlitOther(SDL_Texture * texture, int x, int y, int dx, int dy, int w, int h);
     void BlackSquare(int x, int y);
+    void BlitBeam(int rotation, int x, int y);
 
     void BlitText(char * text, int x, int y);
     void Flip();

include/Draw.h

@@ -14,7 +14,6 @@ class Textures {
     bool load();
 
     SDL_Texture * getBarSprites() { return barSprites; };
-    SDL_Texture * getBeamSprites() { return beamSprites; };
     SDL_Texture * getGroundSprites() { return groundSprites; };
     SDL_Texture * getMirrorSprites() { return mirrorSprites; };
     SDL_Texture * getNukeSprites() { return nukeSprites; };
@@ -35,7 +34,6 @@ class Textures {
     SDL_Renderer * renderer;
 
     SDL_Texture * barSprites;
-    SDL_Texture * beamSprites;
     SDL_Texture * groundSprites;
     SDL_Texture * mirrorSprites;
     SDL_Texture * nukeSprites;

include/Textures.h

@@ -192,13 +192,13 @@ class Tile
 
 	void DisplayBeam() {
 		if (HadFiredLeft||WasHitLeft)
-			draw->BlitSquare(textures->getBeamSprites(), 0 ,1, x_pos, y_pos);
+			draw->BlitBeam(0, x_pos, y_pos);
 		if (HadFiredUp||WasHitTop)
-			draw->BlitSquare(textures->getBeamSprites(), 1 ,1, x_pos, y_pos);
+			draw->BlitBeam(1, x_pos, y_pos);
 		if (HadFiredRight||WasHitRight)
-			draw->BlitSquare(textures->getBeamSprites(), 2 ,1, x_pos, y_pos);
+			draw->BlitBeam(2, x_pos, y_pos);
 		if (HadFiredDown||WasHitBottom)
-			draw->BlitSquare(textures->getBeamSprites(), 3 ,1, x_pos, y_pos);
+			draw->BlitBeam(3, x_pos, y_pos);
 	}
 
 	virtual bool MoveUp();

include/Tile.h

@@ -69,6 +69,42 @@ void Draw::BlackSquare(int x, int y) {
     SDL_RenderFillRect(renderer, &r);
 }
 
+void Draw::BlitBeam(int rotation, int x, int y) {
+    x *= BLOCK_SIZE;
+    y *= BLOCK_SIZE;
+    SDL_Rect r={0, 0, 0, 0};
+    switch(rotation) {
+        case 0:
+            r.x = x;
+            r.y = y + (BLOCK_SIZE / 2) - 1;
+            r.w = BLOCK_SIZE / 2 ;
+            r.h = 2;
+            break;
+        case 1:
+            r.x = x + (BLOCK_SIZE / 2) - 1;
+            r.y = y;
+            r.w = 2;
+            r.h = BLOCK_SIZE / 2;
+            break;
+        case 2:
+            r.x = x + BLOCK_SIZE / 2;
+            r.y = y + (BLOCK_SIZE / 2) - 1;
+            r.w = BLOCK_SIZE / 2;
+            r.h = 2;
+            break;
+        case 3:
+            r.x = x + (BLOCK_SIZE / 2) - 1;
+            r.y = y + (BLOCK_SIZE / 2);
+            r.w = 2;
+            r.h = BLOCK_SIZE;
+            break;
+        default:
+            return;
+    }
+    SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255);
+    SDL_RenderFillRect(renderer, &r);
+}
+
 void Draw::BlitText(char * text, int x, int y) {
     SDL_Surface * surface = TTF_RenderText_Solid(font, text, {0, 255, 0, 255});
     if (surface == NULL) {

src/Draw.cpp

@@ -10,7 +10,6 @@ Textures::Textures(SDL_Renderer * renderer) : renderer(renderer) {
 
 Textures::~Textures() {
     SDL_DestroyTexture(barSprites);
-    SDL_DestroyTexture(beamSprites);
     SDL_DestroyTexture(groundSprites);
     SDL_DestroyTexture(mirrorSprites);
     SDL_DestroyTexture(nukeSprites);
@@ -28,7 +27,6 @@ Textures::~Textures() {
 
 bool Textures::load() {
         barSprites = loadImage("bar.bmp");
-        beamSprites = loadImage("beam.bmp");
         groundSprites = loadImage("ground.bmp");
         mirrorSprites = loadImage("mirror.bmp");
         nukeSprites= loadImage("nuke.bmp");
@@ -46,7 +44,6 @@ bool Textures::load() {
 
         return
             barSprites != nullptr &&
-            beamSprites != nullptr &&
             groundSprites != nullptr &&
             mirrorSprites != nullptr &&
             nukeSprites != nullptr &&