From c90e42305f5cf5497cc5d5868166345f76b2a6d0 Mon Sep 17 00:00:00 2001
From: Jon Thysell <thysell@gmail.com>
Date: Wed, 20 Oct 2021 09:34:31 -0700
Subject: [PATCH] Added initial playfield rendering

---
 src/GameWindow.c      |  91 ++++++++++++++++++++++++++++++++++++++++--
 src/GameWindow.h      |  15 +++++--
 src/MacLO.c           |  14 +++++--
 src/MacLO.pi.bin      | Bin 11520 -> 11520 bytes
 src/MacLO.pi.rsrc.bin | Bin 3712 -> 3712 bytes
 5 files changed, 109 insertions(+), 11 deletions(-)

diff --git a/src/GameWindow.c b/src/GameWindow.c
index 0355174..7e599f1 100644
--- a/src/GameWindow.c
+++ b/src/GameWindow.c
@@ -3,6 +3,8 @@
 
 #include "GameWindow.h"
 
+void GameWindow_DrawPlayfield(const GameWindow *pGameWindow);
+
 void GameWindow_Init(GameWindow *pGameWindow)
 {
     if (pGameWindow->Window != nil)
@@ -17,18 +19,99 @@ void GameWindow_Init(GameWindow *pGameWindow)
         ShowError("\pGameWindow resource WIND BaseResID missing!", true);
     }
     
+    // Setup rects
+    pGameWindow->PlayfieldRect.left = PlayfieldMargin;
+    pGameWindow->PlayfieldRect.top = PlayfieldMargin;
+    pGameWindow->PlayfieldRect.right = (2 * PlayfieldMargin) + (PuzzleSize * (LightSize + LightMargin)) - LightMargin;
+    pGameWindow->PlayfieldRect.bottom = (2 * PlayfieldMargin) + (PuzzleSize * (LightSize + LightMargin)) - LightMargin;;
+    
+    // Load first level
     GameEngine_LoadLevel(&(pGameWindow->Engine), 0, false);
+    
 }
 
-void GameWindow_Draw(GameWindow *pGameWindow)
+void GameWindow_Draw(const GameWindow *pGameWindow, Boolean fullRefresh)
 {
+    const Rect *pContentRect = &(pGameWindow->Window->portRect);
+    
     SetPort(pGameWindow->Window);
     
-    MoveTo(10, 20);
-    DrawString("\pHello MacLO");
+    if (fullRefresh)
+    {
+        // Fill background
+        ForeColor(blackColor);
+        PaintRect(pContentRect);
+    }
+    
+    GameWindow_DrawPlayfield(pGameWindow);
 }
 
-void GameWindow_Show(GameWindow *pGameWindow)
+void GameWindow_DrawPlayfield(const GameWindow *pGameWindow)
+{
+    int8_t r, c;
+    Rect lightRect;
+    
+    SetPort(pGameWindow->Window);
+    
+    // Draw lights
+    for (r = 0; r < PuzzleSize; r++)
+    {
+        lightRect.top = PlayfieldMargin + (r * (LightMargin + LightSize));
+        lightRect.bottom = lightRect.top + LightSize;
+        
+        for (c = 0; c < PuzzleSize; c++)
+        {
+            lightRect.left = PlayfieldMargin + (c * (LightMargin + LightSize));
+            lightRect.right = lightRect.left + LightSize;
+            
+            if (GameEngine_GetLight(&(pGameWindow->Engine), c, r))
+            {
+                // Draw ON light
+                ForeColor(whiteColor);
+                PaintRoundRect(&lightRect, LightCornerSize, LightCornerSize);
+            }
+            else
+            {
+                // Draw OFF light
+                ForeColor(blackColor);
+                PaintRoundRect(&lightRect, LightCornerSize, LightCornerSize);
+                ForeColor(whiteColor);
+                FrameRoundRect(&lightRect, LightCornerSize, LightCornerSize);
+            }
+        }
+    }
+}
+
+void GameWindow_Show(const GameWindow *pGameWindow)
 {
     ShowWindow(pGameWindow->Window);
 }
+
+void GameWindow_Click(GameWindow *pGameWindow, const Point *pPosition)
+{
+    int8_t r, c;
+    Rect lightRect;
+    
+    if (PtInRect(*pPosition, &(pGameWindow->PlayfieldRect)))
+    {
+        for (r = 0; r < PuzzleSize; r++)
+        {
+            lightRect.top = PlayfieldMargin + (r * (LightMargin + LightSize));
+            lightRect.bottom = lightRect.top + LightSize;
+        
+            for (c = 0; c < PuzzleSize; c++)
+            {
+                lightRect.left = PlayfieldMargin + (c * (LightMargin + LightSize));
+                lightRect.right = lightRect.left + LightSize;
+                
+                if (PtInRect(*pPosition, &lightRect))
+                {
+                    GameEngine_ToggleLights(&(pGameWindow->Engine), c, r);
+                    GameWindow_DrawPlayfield(pGameWindow);
+                    break;
+                }
+            }
+        }
+       
+    }
+}
diff --git a/src/GameWindow.h b/src/GameWindow.h
index 1c13da6..7679f64 100644
--- a/src/GameWindow.h
+++ b/src/GameWindow.h
@@ -7,14 +7,23 @@
 #include "MacCommon.h"
 #include "GameEngine.h"
 
+#define PlayfieldMargin 5
+#define LightMargin     10
+#define LightSize       50
+#define LightCornerSize 10
+
 typedef struct GameWindow
 {
-    WindowPtr Window;
+    WindowPtr  Window;
     GameEngine Engine;
+    Rect       PlayfieldRect;
 } GameWindow;
 
 void GameWindow_Init(GameWindow *pGameWindow);
-void GameWindow_Draw(GameWindow *pGameWindow);
-void GameWindow_Show(GameWindow *pGameWindow);
+
+void GameWindow_Draw(const GameWindow *pGameWindow, Boolean fullRefresh);
+void GameWindow_Show(const GameWindow *pGameWindow);
+
+void GameWindow_Click(GameWindow *pGameWindow, const Point *pPosition);
 
 #endif
diff --git a/src/MacLO.c b/src/MacLO.c
index 583c44c..4b5cf62 100644
--- a/src/MacLO.c
+++ b/src/MacLO.c
@@ -58,7 +58,7 @@ void MacLO_AppInit()
     
     // Setup the game window
     GameWindow_Init(&gGameWindow);
-    GameWindow_Draw(&gGameWindow);
+    GameWindow_Draw(&gGameWindow, true);
     GameWindow_Show(&gGameWindow);
 }
 
@@ -103,7 +103,7 @@ void MacLO_HandleUpdate(const EventRecord *pEvent)
     
     if (window == gGameWindow.Window)
     {
-        GameWindow_Draw(&gGameWindow);
+        GameWindow_Draw(&gGameWindow, true);
     }
     
     EndUpdate(window);
@@ -114,19 +114,25 @@ void MacLO_HandleMouseDown(const EventRecord *pEvent)
     WindowPtr window;
     long windowPart;
     long menuChoice;
+    Point mousePosition;
     
     windowPart = FindWindow(pEvent->where, &window);
+    mousePosition = pEvent->where;
     
     switch (windowPart)
     {
         case inMenuBar:
-            menuChoice = MenuSelect(pEvent->where);
+            menuChoice = MenuSelect(mousePosition);
             MacLO_HandleMenuChoice(menuChoice);
         case inSysWindow:
             SystemClick(pEvent, window);
             break;
         case inDrag:
-            DragWindow(window, pEvent->where, &((*GetGrayRgn())->rgnBBox));
+            DragWindow(window, mousePosition, &((*GetGrayRgn())->rgnBBox));
+            break;
+        case inContent:
+            GlobalToLocal(&mousePosition);
+            GameWindow_Click(&gGameWindow, &mousePosition);
             break;
     }
 }
diff --git a/src/MacLO.pi.bin b/src/MacLO.pi.bin
index 48b9363ca43ec38cbdbf1cb386dfb36244b1ca6c..743a81f17f08cd8b32079b663e1822f4c0ab491a 100644
GIT binary patch
delta 3414
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

delta 3400
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

diff --git a/src/MacLO.pi.rsrc.bin b/src/MacLO.pi.rsrc.bin
index 114a30e8ef9fee2853952b0cc673852d90e54820..7f5ddfbc55178070fddfb4bd029362b6ced273e3 100644
GIT binary patch
delta 64
zcmZpWZIGR?mr-QmK2z?g6XhAefcN2KM#iSi4U7+Y<fRxG85m?Fd>x&g8Mu8Dlb!Q(
RbMy1`G8h<`?)D3K0{}Df5d8oE

delta 64
rcmZpWZIGR?m+|hzeWu(K7G7Wg1Kx*|85x^4H!wcrk>7SZ7asxub^agS