Merge cursors in one image

Crayon2000 · Apr 6, 2024 · 945ef54 · 945ef54
1 parent 8f303e4
commit 945ef54
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 41 deletions.
diff --git a/gfx/hand_o.png b/gfx/hand_o.png
diff --git a/gfx/hand_x.png b/gfx/hand_x.png
diff --git a/gfx/hands.png b/gfx/hands.png
diff --git a/gfx/player1_point.png b/gfx/player1_point.png
diff --git a/gfx/player2_point.png b/gfx/player2_point.png
diff --git a/source/cursor.cpp b/source/cursor.cpp
@@ -1,31 +1,19 @@
 #include "cursor.h"
 
 // Graphics
-#include "hand_x_png.h"
-#include "hand_o_png.h"
-#include "player1_point_png.h"
-#include "player2_point_png.h"
+#include "hands_png.h"
 
 /**
  * Constructor for the Cursor class.
  */
 Cursor::Cursor() : Object()
 {
-    // Load textures
-    CursorImgO = new Texture(hand_o_png, hand_o_png_size);
-    CursorImgX = new Texture(hand_x_png, hand_x_png_size);
-    CursorMenu1 = new Texture(player1_point_png, player1_point_png_size);
-    CursorMenu2 = new Texture(player2_point_png, player2_point_png_size);
+    Width = 96;
+    Height = 96;
 
-    // Set hotspot
-    CursorImgO->SetOffset(48, 45);
-    CursorImgO->SetHandle(CursorImgO->GetOffsetX(), CursorImgO->GetOffsetY());
-    CursorImgX->SetOffset(48, 45);
-    CursorImgX->SetHandle(CursorImgX->GetOffsetX(), CursorImgX->GetOffsetY());
-    CursorMenu1->SetOffset(48, 48);
-    CursorMenu1->SetHandle(CursorMenu1->GetOffsetX(), CursorMenu1->GetOffsetY());
-    CursorMenu2->SetOffset(48, 48);
-    CursorMenu2->SetHandle(CursorMenu2->GetOffsetX(), CursorMenu2->GetOffsetY());
+    // Load textures
+    Cursors = new Texture(hands_png, hands_png_size);
+    GRRLIB_InitTileSet((GRRLIB_texImg *)Cursors, Width, Height, 0);
 
     // Default values
     SetPlayer(cursorType::X);
@@ -36,10 +24,7 @@ Cursor::Cursor() : Object()
  */
 Cursor::~Cursor()
 {
-    delete CursorImgX;
-    delete CursorImgO;
-    delete CursorMenu1;
-    delete CursorMenu2;
+    delete Cursors;
 }
 
 /**
@@ -50,9 +35,9 @@ void Cursor::Paint()
     if(Visible == true)
     {
         // Draw the shadow
-        CurrentCursor->Draw(Left + 3, Top + 3, Angle, 1, 1, 0x00000000 | ((A(Color) == 0xFF) ? 0x44 : 0x11));
+        GRRLIB_DrawTile(Left + 3, Top + 3, (GRRLIB_texImg *)Cursors, Angle, 1, 1, 0x00000000 | ((A(Color) == 0xFF) ? 0x44 : 0x11), Frame);
         // Draw the cursor
-        CurrentCursor->Draw(Left, Top, Angle, 1, 1, Color);
+        GRRLIB_DrawTile(Left, Top, (GRRLIB_texImg *)Cursors, Angle, 1, 1, Color, Frame);
     }
 }
 
@@ -67,20 +52,25 @@ cursorType Cursor::SetPlayer(cursorType NewCType)
     Type = NewCType;
     switch(Type)
     {
-        case cursorType::O:
-            CurrentCursor = CursorImgO;
+        case cursorType::P1:
+            Frame = 0;
+            Cursors->SetOffset(48, 48);
+            break;
+        case cursorType::P2:
+            Frame = 1;
+            Cursors->SetOffset(48, 48);
             break;
         case cursorType::X:
-            CurrentCursor = CursorImgX;
+            Frame = 2;
+            Cursors->SetOffset(48, 45);
             break;
-        case cursorType::P1:
-            CurrentCursor = CursorMenu1;
+        case cursorType::O:
+            Frame = 3;
+            Cursors->SetOffset(48, 45);
             break;
-        case cursorType::P2:
-            CurrentCursor = CursorMenu2;
+        default:
             break;
     }
-    Width = CurrentCursor->GetWidth();
-    Height = CurrentCursor->GetHeight();
+    Cursors->SetHandle(Cursors->GetOffsetX(), Cursors->GetOffsetY());
     return PreviousType;
 }
diff --git a/source/cursor.h b/source/cursor.h
@@ -14,10 +14,10 @@
  * Types of cursor that could be used.
  */
 enum class cursorType : u8 {
-    O,   /**< O cursor. */
-    X,   /**< X cursor. */
     P1,  /**< Player 1 cursor. */
-    P2   /**< Player 2 cursor. */
+    P2,  /**< Player 2 cursor. */
+    X,   /**< X cursor. */
+    O    /**< O cursor. */
 };
 
 /**
@@ -35,11 +35,8 @@ class Cursor : public Object
     cursorType SetPlayer(cursorType NewCType);
 private:
     cursorType Type;
-    Texture *CursorImgX;
-    Texture *CursorImgO;
-    Texture *CursorMenu1;
-    Texture *CursorMenu2;
-    Texture *CurrentCursor;
+    int Frame;
+    Texture *Cursors;
 };
 //---------------------------------------------------------------------------
 #endif