Changeset 33 for trunk

Timestamp:

Apr 19, 2015, 12:42:58 AM (9 years ago)

Author:

chronos

Message:

• Added: Attempt to reduce scene redraw be introducing Redraw method and RedrawPending flag. But clock need to be redrawn as fast as possible so different approach need to be taken.

Location:

trunk

Files:

• UEngine.pas (modified) (14 diffs)
• UFormMain.pas (modified) (4 diffs)

trunk/UEngine.pas

@@ -304 +304 @@
     ServedPassengerCount: Integer;
     State: TGameState;
-    procedure Tick;
+    RedrawPending: Boolean;
     procedure MouseMove(Position: TPoint);
     procedure MouseUp(Button: TMouseButton; Position: TPoint);
     procedure MouseDown(Button: TMouseButton; Position: TPoint);
     procedure Reset;
+    procedure Redraw;
     constructor Create;
     destructor Destroy; override;
+    procedure Tick;
     procedure Paint(TargetCanvas: TCanvas);
     property Time: TDateTime read FTime;
@@ -341 +343 @@
   //TimePerSecond = (60 * OneMinute);
   TimePerSecond = (60 * OneMinute);
-  NewStationPeriod = 0.01;
+  NewStationPeriod = 1;
   NewShapePeriod = 10;
   NewTrainPeriod = 7; // Each week
@@ -1607 +1609 @@
         RelPos := RelPos + PosChange;
         LastTrainMoveTime := Time;
+        Redraw;
         if Assigned(BaseTrackPoint) then
         while (Direction = -1) and (RelPos < 0) do begin
@@ -1651 +1654 @@
           InStation := True;
           StationStopTime := Time;
+          Redraw;
         end;
         LastPosDelta := PosDelta;
@@ -1791 +1795 @@
   if State = gsRunning then begin
     FTime := FTime + (Now - LastTickTime) / OneSecond * TimePerSecond;
+    Redraw; // Redraw on every because engine time is changed so clock should be redrawn
 
   // Add new trains
@@ -1797 +1802 @@
     Trains.AddNew;
     // TODO: Show notification screen with confirmation
+    Redraw;
   end;
 
@@ -1803 +1809 @@
     LastNewShapeTime := Time;
     if ShapeCount <= Integer(High(TStationShape)) then Inc(ShapeCount);
+    Redraw;
   end;
 
@@ -1810 +1817 @@
     Stations.AddNew;
     ResizeView;
+    Redraw;
   end;
 
@@ -1825 +1833 @@
       while (Passenger.Shape = Passenger.Station.Shape) or not (Passenger.Shape in GetExistStationShapes) do
         Passenger.Shape := TStationShape((Integer(Passenger.Shape) + 1) mod Integer(ShapeCount));
-    end;
-  end;
-
+      Redraw;
+    end;
+  end;
+
+  // Check station passenger overload state
   for I := 0 to Stations.Count - 1 do
   with TMapStation(Stations[I]) do begin
@@ -1834 +1844 @@
       if OverloadDuration > MaxPassengersOveloadTime then
         OverloadDuration := MaxPassengersOveloadTime;
+      if OverloadDuration < MaxPassengersOveloadTime then Redraw;
     end;
     if Passengers.Count <= MaxWaitingPassengers then begin
+      if OverloadDuration > 0 then Redraw;
       OverloadDuration := OverloadDuration - (FTime - FLastTime);
       if OverloadDuration < 0 then begin
@@ -1848 +1860 @@
   for I := 0 to Stations.Count - 1 do
   with TMapStation(Stations[I]) do begin
-    if OverloadDuration >= MaxPassengersOveloadTime then State := gsGameOver;
+    if OverloadDuration >= MaxPassengersOveloadTime then begin
+      State := gsGameOver;
+      Redraw;
+    end;
   end;
 
@@ -1868 +1883 @@
       FocusedStation := GetStationOnPos(View.PointDestToSrc(Position));
       Line := nil;
-      if Assigned(TrackStationDown) then Line := TrackStationDown.Track.Line;
-      if Assigned(TrackStationUp) then Line := TrackStationUp.Track.Line;
+      if Assigned(TrackStationDown) then begin
+        Line := TrackStationDown.Track.Line;
+        Redraw;
+      end;
+      if Assigned(TrackStationUp) then begin
+        Line := TrackStationUp.Track.Line;
+        Redraw;
+      end;
       if Assigned(Line) and not Assigned(LastFocusedStation) and Assigned(FocusedStation) then begin
         if Assigned(TrackStationDown) and (TrackStationDown.LineStation.MapStation = FocusedStation) then begin
@@ -2064 +2085 @@
   LastTickTime := Now;
   State := gsRunning;
+  Redraw;
+end;
+
+procedure TEngine.Redraw;
+begin
+  RedrawPending := True;
 end;
 
@@ -2315 +2342 @@
     TargetCanvas.TextOut((TargetCanvas.Width - TargetCanvas.TextWidth(Text)) div 2, 180, Text);
   end;
+  RedrawPending := False;
 end;
 

trunk/UFormMain.pas

@@ -37 +37 @@
   public
     Engine: TEngine;
-    procedure Repaint;
   end;
 
@@ -114 +113 @@
 procedure TFormMain.PaintBox1Resize(Sender: TObject);
 begin
+  Engine.Redraw;
 end;
 
@@ -119 +119 @@
 begin
   Engine.Tick;
-  PaintBox1.Repaint;
+  if Engine.RedrawPending then
+    PaintBox1.Repaint;
 end;
 
@@ -127 +128 @@
 end;
 
-procedure TFormMain.Repaint;
-begin
-
-end;
-
 end.