Changeset 451 for GraphicTest

Timestamp:

Nov 23, 2012, 2:09:49 PM (12 years ago)

Author:

chronos

Message:

• Modified: Real FPS is now measured as cumulative.

Location:

GraphicTest

Files:

• Methods/UOpenGLMethod.pas (modified) (3 diffs)
• Methods/UOpenGLPBOMethod.pas (modified) (1 diff)
• UDrawMethod.pas (modified) (2 diffs)
• UMainForm.lfm (modified) (15 diffs)
• UMainForm.pas (modified) (4 diffs)

GraphicTest/Methods/UOpenGLMethod.pas

@@ -9 +9 @@
   {$IFDEF opengl}, GL, GLExt, OpenGLContext{$ENDIF};
 
+{$IFDEF opengl}
 type
-  {$IFDEF opengl}
   { TOpenGLMethod }
 
@@ -23 +23 @@
 implementation
 
+{$IFDEF opengl}
 { TOpenGLMethod }
 
@@ -96 +97 @@
 end;
 
+{$ENDIF}
 
 end.

GraphicTest/Methods/UOpenGLPBOMethod.pas

@@ -9 +9 @@
   {$IFDEF opengl}, GL, GLExt, OpenGLContext{$ENDIF};
 
+{$IFDEF opengl}
 type
-  {$IFDEF opengl}
   { TOpenGLPBOMethod }
 

GraphicTest/UDrawMethod.pas

@@ -30 +30 @@
     FrameCounter: Integer;
     FrameCounterStart: TDateTime;
+    FrameCounterStop: TDateTime;
     function GetFPS: Real;
     property FPS: Real read FFPS write FFPS;
@@ -180 +181 @@
 
 function TDrawMethod.GetFPS: Real;
-begin
-  Result := FrameCounter / ((NowPrecise - FrameCounterStart) / OneSecond);
-  FrameCounter := 0;
-  FrameCounterStart := NowPrecise;
+var
+  StopTime: TDateTime;
+begin
+  if FrameCounterStop <> 0 then StopTime := FrameCounterStop
+    else StopTime := NowPrecise;
+  if FrameCounter > 0 then begin
+    Result := FrameCounter / ((StopTime - FrameCounterStart) / OneSecond);
+    //FrameCounter := 0;
+    //FrameCounterStart := NowPrecise;
+  end else Result := FFPS;
 end;
 

GraphicTest/UMainForm.lfm

@@ -13 +13 @@
   LCLVersion = '1.1'
   object PageControl1: TPageControl
-    Left = 555
+    Left = 459
     Height = 411
     Top = 0
-    Width = 302
+    Width = 398
     ActivePage = TabSheet1
     Align = alRight
@@ -24 +24 @@
       Caption = 'Description'
       ClientHeight = 385
-      ClientWidth = 294
+      ClientWidth = 390
       object Memo1: TMemo
         Left = 0
         Height = 385
         Top = 0
-        Width = 294
+        Width = 390
         Align = alClient
         ReadOnly = True
@@ -526 +526 @@
     Height = 411
     Top = 0
-    Width = 550
+    Width = 454
     Align = alClient
     BevelOuter = bvNone
     ClientHeight = 411
-    ClientWidth = 550
+    ClientWidth = 454
     TabOrder = 1
     object ListViewMethods: TListView
@@ -536 +536 @@
       Height = 335
       Top = 8
-      Width = 539
+      Width = 443
       Anchors = [akTop, akLeft, akRight, akBottom]
       Columns = <      
@@ -545 +545 @@
         item
           Caption = 'FPS'
+          Width = 75
         end      
         item
-          Caption = 'Duration custom draw [ms]'
+          Caption = 'Duration [ms]'
           Width = 80
         end      
@@ -555 +556 @@
         end      
         item
-          Caption = 'Duration step [ms]'
+          Caption = 'Draw duration [ms]'
           Width = 80
         end      
@@ -561 +562 @@
           Caption = 'Step FPS'
           Width = 75
+        end      
+        item
+          Caption = 'Step duration [ms]'
+          Width = 80
         end>
       OwnerData = True
@@ -631 +636 @@
     end
     object SpinEditWidth: TSpinEdit
-      Left = 219
+      Left = 204
       Height = 21
       Top = 382
@@ -642 +647 @@
     end
     object SpinEditHeight: TSpinEdit
-      Left = 288
+      Left = 273
       Height = 21
       Top = 382
@@ -653 +658 @@
     end
     object Label3: TLabel
-      Left = 184
+      Left = 169
       Height = 13
       Top = 387
@@ -662 +667 @@
     end
     object Label4: TLabel
-      Left = 280
+      Left = 265
       Height = 13
       Top = 386
@@ -671 +676 @@
     end
     object CheckBoxDoubleBuffered: TCheckBox
-      Left = 408
+      Left = 336
       Height = 17
       Top = 350
@@ -681 +686 @@
     end
     object CheckBoxEraseBackground: TCheckBox
-      Left = 408
+      Left = 336
       Height = 17
       Top = 367
@@ -691 +696 @@
     end
     object CheckBox1: TCheckBox
-      Left = 408
+      Left = 336
       Height = 17
       Top = 387
@@ -702 +707 @@
   end
   object Splitter1: TSplitter
-    Left = 550
+    Left = 454
     Height = 411
     Top = 0

GraphicTest/UMainForm.pas

@@ -130 +130 @@
     StartTime := NowPrecise;
     FrameCounterStart := NowPrecise;
+    FrameCounterStop := 0;
     FrameCounter := 0;
     repeat
@@ -140 +141 @@
     until TestTerminated or
       ((TestTimeout > 0) and ((NowPrecise - StartTime) > OneSecond * TestTimeout));
-    FPS := GetFPS;
+    FrameCounterStop := NowPrecise;
+    //FPS := GetFPS;
     Done;
   end;
@@ -157 +159 @@
       TestMethod(TDrawMethod(DrawMethods[MethodIndex]));
   finally
-    TimerUpdateList.Enabled := False;
+    //TimerUpdateList.Enabled := False;
     SingleTestActive := False;
     UpdateInterface;
@@ -234 +236 @@
   with TDrawMethod(DrawMethods[Item.Index]) do begin
     Item.Caption := Caption;
+    FPS := GetFPS;
     Item.SubItems.Add(FloatToStr(RoundTo(FPS, -3)));
-    Item.SubItems.Add(FloatToStr(RoundTo(FrameDuration / OneMillisecond, -3)));
+    if FPS > 0 then
+      Item.SubItems.Add(FloatToStr(RoundTo(1 / FPS * 1000, -3)))
+      else Item.SubItems.Add('0');
     if FrameDuration > 0 then
       Item.SubItems.Add(FloatToStr(RoundTo(1 / (FrameDuration / OneSecond), -3)))
       else Item.SubItems.Add('0');
-    Item.SubItems.Add(FloatToStr(RoundTo(StepDuration / OneMillisecond, -3)));
+    Item.SubItems.Add(FloatToStr(RoundTo(FrameDuration / OneMillisecond, -3)));
     if FrameDuration > 0 then
       Item.SubItems.Add(FloatToStr(RoundTo(1 / (StepDuration / OneSecond), -3)))
       else Item.SubItems.Add('0');
+    Item.SubItems.Add(FloatToStr(RoundTo(StepDuration / OneMillisecond, -3)));
   end;
 end;