Changeset 2 for trunk/UCore.pas

Timestamp:

Mar 5, 2011, 10:16:19 PM (14 years ago)

Author:

george

Message:

• Modified: Used TemplateGenerics package for world surface pixel array.

Location:

trunk

Files:

• . (modified) (1 prop)
• UCore.pas (modified) (7 diffs)

trunk/UCore.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Contnrs, Graphics;
+  Dialogs, Classes, SysUtils, Contnrs, Graphics, SpecializedMatrix;
 
 type
   TEngine = class;
+
+  TSurfaceMatter = (smNothing, smDirt1, smDirt2, smRock1, smRock2, smHouse1, smHouse2);
 
   TPlayerKeys = record
@@ -36 +38 @@
   TWorld = class
   private
-    function GetSize: TPoint;
-    procedure SetSize(const AValue: TPoint);
+    function GetSize: TMatrixByteIndex;
+    procedure SetSize(const AValue: TMatrixByteIndex);
   public
     Engine: TEngine;
-    Surface: TBitmap;
+    Surface: TMatrixByte;
     procedure Generate;
     constructor Create;
     destructor Destroy; override;
-    property Size: TPoint read GetSize write SetSize;
+    property Size: TMatrixByteIndex read GetSize write SetSize;
   end;
 
@@ -67 +69 @@
   end;
 
+const
+  SurfaceMatterColors: array[TSurfaceMatter] of TColor = (clBlack, $0756b0, $2170c3, clGray, clGray + $808080, clGreen, clBlue);
+
 var
   Engine: TEngine;
@@ -74 +79 @@
 { TWorld }
 
-function TWorld.GetSize: TPoint;
-begin
-  Result := Point(Surface.Width, Surface.Height);
-end;
-
-procedure TWorld.SetSize(const AValue: TPoint);
-begin
-  Surface.SetSize(AValue.X, AValue.Y);
+function TWorld.GetSize: TMatrixByteIndex;
+begin
+  Result := Surface.Count;
+end;
+
+procedure TWorld.SetSize(const AValue: TMatrixByteIndex);
+begin
+  Surface.Count := AValue;
   Generate;
 end;
@@ -89 +94 @@
   X, Y: Integer;
 begin
-  for Y := 0 to Surface.Height - 1 do
-    for X := 0 to Surface.Width - 1 do begin
+  for Y := 0 to Surface.Count.Y - 1 do
+    for X := 0 to Surface.Count.X - 1 do begin
       if Random < 0.5 then
-        Surface.Canvas.Pixels[X, Y] := TColor($0756b0) else
-        Surface.Canvas.Pixels[X, Y] := TColor($2170c3);
+        Surface[Y, X] := Byte(smDirt1) else
+        Surface[Y, X] := Byte(smDirt2);
     end;
 end;
 
 constructor TWorld.Create;
-begin
-  Surface := TBitmap.Create;
-  Surface.PixelFormat := pf4bit;
-  Size := Point(500, 100);
+var
+  NewSize: TMatrixByteIndex;
+begin
+  Surface := TMatrixByte.Create;
+  NewSize.X := 5000;
+  NewSize.Y := 500;
+  Size := NewSize;
 end;
 
@@ -121 +129 @@
 
 procedure TPlayer.Paint;
+var
+  X, Y: Integer;
+  XX, YY: Integer;
 begin
   with Engine.Bitmap.Canvas do begin
     Rectangle(ScreenFrame);
-    CopyRect(ScreenFrame, Engine.World.Surface.Canvas, Rect(
+    //FillRect(ScreenFrame);
+
+    with Engine.World do
+    for Y := ScreenFrame.Top to ScreenFrame.Bottom - 1 do
+      for X := ScreenFrame.Left to ScreenFrame.Right - 1 do begin
+        XX := X - ScreenFrame.Left - ((ScreenFrame.Right - ScreenFrame.Left) div 2) + Position.X;
+        YY := Y - ScreenFrame.Top - ((ScreenFrame.Bottom - ScreenFrame.Top) div 2) + Position.Y;
+        if (YY >= 0) and (YY < Surface.Count.Y) and (XX >= 0) and (XX < Surface.Count.X) then
+          Pixels[X, Y] := SurfaceMatterColors[TSurfaceMatter(Surface[YY, XX])];
+      end;
+    (*CopyRect(ScreenFrame, Engine.World.Surface.Canvas,
+    Rect(
       Position.X - (ScreenFrame.Right - ScreenFrame.Left) div 2,
       Position.Y - (ScreenFrame.Bottom - ScreenFrame.Top) div 2,
       Position.X + (ScreenFrame.Right - ScreenFrame.Left) div 2,
-      Position.Y + (ScreenFrame.Bottom - ScreenFrame.Top) div 2));
+      Position.Y + (ScreenFrame.Bottom - ScreenFrame.Top) div 2));*)
     TextOut(ScreenFrame.Left, ScreenFrame.Top, Name);
+    //ShowMessage(IntToStr(ScreenFrame.Right - ScreenFrame.Left) + ' ' +
+    //IntToStr(ScreenFrame.Bottom - ScreenFrame.Top));
   end;
 end;
@@ -189 +213 @@
 begin
   Players := TObjectList.Create;
-  PlayerCount := 2;
-  with TPlayer(Players[0]) do begin
-    Position := Point(100, 100);
-    Color := TColor($00f805);
-    Keys.Left := 65;
-    Keys.Up := 87;
-    Keys.Right := 68;
-    Keys.Down := 83;
-    Keys.Shoot := 69;
-  end;
-  with TPlayer(Players[1]) do begin
-    Position := Point(300, 200);
-    Color := TColor($00f805);
-    Keys.Left := 37;
-    Keys.Up := 38;
-    Keys.Right := 39;
-    Keys.Down := 40;
-    Keys.Shoot := 17;
-  end;
   World := TWorld.Create;
   World.Engine := Self;