Merge complete

sample/PGEX_SMX_Example.cpp

@@ -6,6 +6,9 @@ using namespace olc;
 class SMX_PGE : public olc::PixelGameEngine
 {
     PGEX_SMX smx;
+    bool paused = false;
+    int mode = 0;
+    vf2d playerPos = { 0,0 };
 public:
     SMX_PGE()
     {
@@ -21,11 +24,44 @@ public:
 
     bool OnUserUpdate(float fElapsedTime) override
     {
-        smx.GetPanel(RIGHT,0).bHeld;
+        smx.GetPanel(RIGHT, 0).bHeld;
-        // called once per frame
+        if (GetKey(RIGHT).bPressed) {
-        for (int x = 0; x < ScreenWidth(); x++)
+            mode = (mode + 1) % 3;
-            for (int y = 0; y < ScreenHeight(); y++)
+        }
-                Draw(x, y, olc::Pixel(rand() % 255, rand() % 255, rand()% 255));	
+        switch (mode) {
+            case 0: {
+                if (GetKey(SPACE).bPressed) {
+                    paused = !paused;
+                }
+                // called once per frame
+                if (!paused) {
+                    for (int x = 0; x < ScreenWidth(); x++)
+                        for (int y = 0; y < ScreenHeight(); y++)
+                            Draw(x, y, olc::Pixel(rand() % 255, rand() % 255, rand() % 255));
+                }
+            }break;
+            case 1: {
+                Clear(DARK_CYAN);
+                DrawRect({ 1,1 }, { 9,18 }, RED);
+            }break;
+            case 2: {
+                Clear(VERY_DARK_BLUE);
+                FillCircle(playerPos, 3,VERY_DARK_GREY);
+                DrawCircle(playerPos, 3);
+                if (GetKey(W).bHeld) {
+                    playerPos.y -= 5*fElapsedTime;
+                }
+                if (GetKey(A).bHeld) {
+                    playerPos.x -= 5 * fElapsedTime;
+                }
+                if (GetKey(S).bHeld) {
+                    playerPos.y += 5 * fElapsedTime;
+                }
+                if (GetKey(D).bHeld) {
+                    playerPos.x += 5 * fElapsedTime;
+                }
+            }break;
+        }
         return true;
     }
 };