Lots of Refactoring

Added ResizeTo and Undo menu options under Edit.

This refactoring is to shape things up for supporting multiple icons/sprites in future versions

flood.pas

@@ -39,7 +39,7 @@ implementation
 
 Procedure CheckRight;
 begin
-if xx<255 then
+if xx< (RMCoreBase.GetWidth-1) then
 begin
 if RMCoreBase.getpixel(xx+1,yy) = ColTofill  then
 //IconImage[xx+1,yy] = ColTofill then
@@ -105,7 +105,7 @@ implementation
 
 Procedure CheckDown;
 begin
-if yy<255 then
+if yy<(RMCoreBase.GetHeight-1) then
 begin
 //If IconImage[xx,yy+1]=ColTofill then
    If RMCoreBase.GetPixel(xx,yy+1)=ColTofill then

rmabout.lfm

@@ -1,7 +1,7 @@
 object AboutDialog: TAboutDialog
-  Left = 233
+  Left = 1054
   Height = 313
-  Top = 229
+  Top = 278
   Width = 600
   BorderStyle = bsDialog
   Caption = 'About'

rmabout.pas

@@ -8,7 +8,7 @@ interface
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls,lclintf;
 
 Const
-  ProgramName ='Raster Master v1.0 Beta R11';
+  ProgramName ='Raster Master v1.0 Beta R12';
   ProgramLicense = 'Released under MIT License';
 
 type

rmcolor.lfm

@@ -1,7 +1,7 @@
 object RMEGAColorDialog: TRMEGAColorDialog
-  Left = 250
+  Left = 806
   Height = 256
-  Top = 218
+  Top = 640
   Width = 415
   BorderStyle = bsDialog
   Caption = 'EGA Palette'

rmcolorvga.lfm

@@ -5,8 +5,8 @@ object RMVgaColorDialog: TRMVgaColorDialog
   Width = 512
   BorderStyle = bsDialog
   Caption = 'VGA Color'
-  ClientHeight = 348
-  ClientWidth = 512
+  ClientHeight = 0
+  ClientWidth = 0
   DesignTimePPI = 120
   LCLVersion = '2.0.10.0'
   object ColorPalette: TColorPalette

rmcore.pas

@@ -7,6 +7,10 @@ interface
   Classes, Graphics, SysUtils,GraphUtil,Math;
 
 
+//const
+//  MaxImagePixelWidth = 256;
+//  MaxImagePixelHeight = 256;
+
 Type
   TRMColorRec = Record
                    r : integer;
@@ -31,7 +35,8 @@   TRMPalette = class(TObject)
                function GetRed(index : integer) : integer;
                function GetGreen(index : integer) : integer;
                function GetBlue(index : integer) : integer;
-               function FindColorMatch(r,g,b : integer) : integer;
+               function FindNearColorMatch(r,g,b : integer) : integer;
+               function FindExactColorMatch(r,g,b : integer) : integer;
 
                procedure DownToVGA;
                procedure DownToEGA;
@@ -63,6 +68,8 @@   TRMCoreBase = class(TObject)
                   TempImageBuf  : TRMImageBuf;
                   UndoImageBuf  : TRMImageBuf;
                   CurColor      : integer; // current color
+                  ImgBufWidth         : integer;
+                  ImgBufHeight        : integer;
 
                  public
 
@@ -75,6 +82,11 @@   TRMCoreBase = class(TObject)
                  procedure ClearBuf(Color : integer);
                  procedure CopyToUndoBuf;
                  procedure UnDo;
+                 procedure SetWidth(width : integer);
+                 procedure SetHeight(height : integer);
+
+                 function GetWidth : integer;
+                 function GetHeight : integer;
 
   end;
 
@@ -488,8 +500,8 @@   TRMCoreBase = class(TObject)
 
 
 
-  var
-    RMCoreBase : TRMCoreBase;
+var
+  RMCoreBase : TRMCoreBase;
 
 procedure GetRGBEGA64(index : integer;var cr : TRMColorREc);
 procedure GetRGBVGA(index : integer;var cr : TRMColorREc);
@@ -638,13 +650,34 @@ procedure TRMPalette.GetColor(index : integer;var cr : TRMColorRec);
     end;
 end;
 
+function TRMPalette.FindExactColorMatch(r,g,b : integer) : integer;
+var
+  i: integer;
+begin
+  FindExactColorMatch:=-1;
+  for i:=0 to GetColorCount-1 do
+  begin
+     if (r=GetRed(i)) AND (g=GetGreen(i)) AND (b=GetBlue(i)) then
+     begin
+        FindExactColorMatch:=i;
+        exit;
+     end;
+  end;
+end;
 
-function TRMPalette.FindColorMatch(r,g,b : integer) : integer;
+function TRMPalette.FindNearColorMatch(r,g,b : integer) : integer;
 var
   c1,c2 : TColor;
   gap,tgap : double;
-  i,fcm : integer;
+  i,fcm,ec : integer;
 begin
+  ec:=FindExactColorMatch(r,g,b);
+  if ec > -1 then
+  begin
+    FindNearColorMatch:=ec;
+    exit;
+  end;
+
   c1:=RGBToColor(r,g,b);
   gap:=10000;
   fcm:=0;
@@ -658,7 +691,7 @@ function TRMPalette.FindColorMatch(r,g,b : integer) : integer;
         fcm:=i;
      end;
   end;
-  FindColorMatch:=fcm;
+  FindNearColorMatch:=fcm;
 end;
 
 procedure TRMPalette.SetColor(index : integer;cr : TRMColorRec);
@@ -744,11 +777,33 @@ procedure TRMPalette.UpToCGA;
 Constructor TRMCoreBase.create;
 begin
     Palette:=TRMPalette.Create;
+    SetWidth(256);
+    SetHeight(256);
     SetCurColor(1);
     ClearBuf(0);
     CopyToUndoBuf;
  end;
 
+procedure TRMCoreBase.SetWidth(width : integer);
+begin
+  ImgBufWidth:=width;
+end;
+
+procedure TRMCoreBase.SetHeight(height : integer);
+begin
+  ImgBufHeight:=height;
+end;
+
+function TRMCoreBase.GetWidth : integer;
+begin
+  GetWidth:=ImgBufWidth;
+end;
+
+function TRMCoreBase.GetHeight : integer;
+begin
+  GetHeight:=ImgBufHeight;
+end;
+
 procedure TRMCoreBase.SetCurColor(Color : integer);
 begin
     CurColor:=Color;
@@ -774,23 +829,22 @@ procedure TRMCoreBase.ClearBuf(Color : Integer);
 
 procedure TRMCoreBase.PutPixel(x,y,Color : Integer);
 begin
-    if (x > 255) or (y > 255)  then exit;
-    ImageBuf.Pixel[x,y]:=Color;
+  if (x<0) or (x > (ImgBufWidth-1)) or (y<0) or (y > (ImgBufHeight-1))  then exit;
+  ImageBuf.Pixel[x,y]:=Color;
 end;
 
 procedure TRMCoreBase.PutPixel(x,y : Integer);
 begin
-    if (x<0) or (x > 255) or (y<0) or (y > 255)  then exit;
-    ImageBuf.Pixel[x,y]:=CurColor;
+  if (x<0) or (x > (ImgBufWidth-1)) or (y<0) or (y > (ImgBufHeight-1))  then exit;
+  ImageBuf.Pixel[x,y]:=CurColor;
 end;
 
 
 function TRMCoreBase.GetPixel(x,y : Integer) : Integer;
 begin
-    GetPixel:=ImageBuf.Pixel[x,y];
+  GetPixel:=ImageBuf.Pixel[x,y];
 end;
 
-
 procedure TRMCoreBase.CopyToUndoBuf;
 begin
   UndoImageBuf:=ImageBuf;

rmmain.lfm

@@ -13,12 +13,6 @@ object RMMainForm: TRMMainForm
   Position = poDefault
   LCLVersion = '2.0.10.0'
   Scaled = False
-  object ActualBox: TImage
-    Left = 16
-    Height = 256
-    Top = 16
-    Width = 256
-  end
   object HorizScroll: TScrollBar
     Left = 368
     Height = 32
@@ -316,6 +310,21 @@ object RMMainForm: TRMMainForm
       Transparent = True
     end
   end
+  object Panel2: TPanel
+    Left = 32
+    Height = 281
+    Top = 40
+    Width = 288
+    ClientHeight = 281
+    ClientWidth = 288
+    TabOrder = 5
+    object ActualBox: TImage
+      Left = 16
+      Height = 256
+      Top = 8
+      Width = 256
+    end
+  end
   object MainMenu1: TMainMenu
     Left = 1584
     Top = 216
@@ -389,6 +398,37 @@ object RMMainForm: TRMMainForm
     end
     object MenuItem1: TMenuItem
       Caption = 'Edit'
+      object EditResizeTo: TMenuItem
+        Caption = 'Resize To'
+        object EditResizeTo8: TMenuItem
+          Caption = '8 X 8'
+          OnClick = EditResizeToNewSize
+        end
+        object EditResizeTo16: TMenuItem
+          Caption = '16 X 16'
+          OnClick = EditResizeToNewSize
+        end
+        object EditResizeTo32: TMenuItem
+          Caption = '32 X 32'
+          OnClick = EditResizeToNewSize
+        end
+        object EditResizeTo64: TMenuItem
+          Caption = '64 X 64'
+          OnClick = EditResizeToNewSize
+        end
+        object EditResizeTo128: TMenuItem
+          Caption = '128 X 128'
+          OnClick = EditResizeToNewSize
+        end
+        object EditResizeTo256: TMenuItem
+          Caption = '256 X 256'
+          OnClick = EditResizeToNewSize
+        end
+      end
+      object EditUndo: TMenuItem
+        Caption = 'Undo'
+        OnClick = ToolUndoIconClick
+      end
       object EditCopy: TMenuItem
         Caption = 'Copy'
         OnClick = EditCopyClick