Rotating bugs

.gitignore

@@ -4,3 +4,4 @@ debuggers
 *.o
 *.pgp
 *.pgs
+*.res

include/bug.h

@@ -15,6 +15,8 @@ public:
 
 private:
     int kind = 0;
+    float rotation = 0;
+    int8_t rotationSpeed;
 };
 }
 

pge/src/olcPGEX_Graphics2D.cpp

@@ -8,8 +8,8 @@ namespace olc
 			return;
 
 		// Work out bounding rectangle of sprite
-		float ex, ey;
-		float sx, sy;		
+		float ex=-1, ey=-1;
+		float sx, sy;
 		float px, py;
 
 		float x0 = 0;
@@ -63,8 +63,8 @@ namespace olc
 			return;
 
 		// Work out bounding rectangle of sprite
-		float ex, ey;
-		float sx, sy;		
+		float ex=-1, ey=-1;
+		float sx, sy;
 		float px, py;
 
 		float xOff = 0;
@@ -108,7 +108,10 @@ namespace olc
 			{
 				float ox, oy;
 				transform.Backward(i, j, ox, oy);
-				pge->Draw((int32_t)i, (int32_t)j, sprite->GetPixel((int32_t)(xOff+x0+ox+0.5f), (int32_t)(yOff+y0+oy+0.5f)));
+				int32_t xx = (int32_t)(xOff+x0+ox+0.5f);
+				int32_t yy = (int32_t)(yOff+y0+oy+0.5f);
+				if (xx >= x0 && xx < x0 + w && yy >= y0 && yy < y0 + h) 
+					pge->Draw((int32_t)i, (int32_t)j, sprite->GetPixel(xx, yy));
 			}
 		}
 	}

src/bug.cpp

@@ -4,8 +4,8 @@
 #include <random>
 
 namespace pabloader {
-Bug::Bug(Debuggers* game_)
-    : Entity(game_)
+Bug::Bug(Debuggers* game)
+    : Entity(game)
 {
     w = game->enemiesSprite.width / 4;
     h = game->enemiesSprite.height / 4;
@@ -15,6 +15,12 @@ void Bug::Update(float dt)
 {
     y += yv * dt;
     yv += 30 * dt;
+
+    rotation += 3.14 / 8 * rotationSpeed * dt;
+
+    transform.Reset();
+    transform.Rotate(rotation);
+    transform.Translate(x, y);
 }
 
 void Bug::Draw()
@@ -22,7 +28,7 @@ void Bug::Draw()
 #ifdef _DEBUG
     game->DrawRect(x - w / 2, y - h / 2, w, h, olc::RED);
 #endif
-    game->DrawPartialSprite(x, y, &game->enemiesSprite, 0, kind * h, w, h, 1, true);
+    olc::GFX2D::DrawPartialSprite(&game->enemiesSprite, 0, kind * h, w, h, transform, true);
 }
 
 bool Bug::IsActive()
@@ -32,10 +38,11 @@ bool Bug::IsActive()
 
 void Bug::ResetPosition()
 {
-    y = -20 - std::rand() % 100;
+    y = -20 - std::rand() % game->ScreenHeight();
     x = w + std::rand() % (game->ScreenWidth() - w * 2);
     yv = 0;
     kind = std::rand() % 4;
+    rotationSpeed = -8 + rand()%17;
 }
 
 void Bug::Kill()

src/debuggers.cpp

@@ -1,8 +1,8 @@
 #include "debuggers.h"
 #include <cmath>
+#include <ctime>
 #include <iostream>
 #include <random>
-#include <ctime>
 
 namespace pabloader {
 std::string& rtrim(std::string& str, const std::string& chars = "\t\n\v\f\r ")
@@ -140,15 +140,16 @@ bool Debuggers::OnUserUpdate(float fElapsedTime)
         programmer->Draw();
     }
 
-    Player* player = dynamic_cast<Player*>(programmers.at(0));
+    Programmer* player = programmers.at(0);
 
     if (bugsSize == 0 && player->IsOnGround()) {
         SpawnBug();
     }
 
-    if (bugsCatched >= bugsSize * (15 * programmers.size()) && player->GetSkin() < bugsSize) {
+    if (bugsCatched >= 15 * bugsSize * programmers.size() && player->GetSkin() < bugsSize) {
         player->UpgradeLevel();
         SpawnBug();
+        SpawnBug();
         SpawnProgrammer();
     }
 

src/programmer.cpp

@@ -10,7 +10,7 @@ Programmer::Programmer(Debuggers* game)
     w = game->playerSprite.width / 4;
     h = game->playerSprite.height / 4;
     x = (game->ScreenWidth() - w) / 2;
-    y = game->GameScreenHeight() / 2;
+    y = h / 2;
 }
 
 void Programmer::Think()
@@ -49,7 +49,7 @@ void Programmer::Update(float dt)
         yv += (70 + skin * 30) * dt;
         yv *= 1 - 0.05 * dt;
     } else {
-        xv *= 1 - 0.5 * dt;
+        xv *= 1 - dt;
     }
 
     transform.Reset();
@@ -127,9 +127,9 @@ void Programmer::Draw()
 {
     int xOff = xv < 0 ? -1 : 0;
     if (std::abs(xv) < 1) {
-        olc::GFX2D::DrawPartialSprite(&game->playerSprite, skin * w + xOff, h + tile * h, w, h, transform, true);
+        olc::GFX2D::DrawPartialSprite(&game->playerSprite, skin * w + xOff, h + tile * h, w - xOff, h, transform, true);
     } else {
-        olc::GFX2D::DrawPartialSprite(&game->playerSprite, skin * w + xOff, 0 + tile * h, w, h, transform, true);
+        olc::GFX2D::DrawPartialSprite(&game->playerSprite, skin * w + xOff, 0 + tile * h, w - xOff, h, transform, true);
     }
 #ifdef _DEBUG
     game->DrawRect(x - w / 2, y - h / 2, w, h, olc::GREEN);