Code formatting (#275)

* code formatting * Code Formatting * Code Formatting * Code Formatting * Code formatting * Code Formatting * Code Formatting * Code Formatting * Code Formatting * Code Formatting * Code Formatting * Code Formatting * Code Formatting and add 11.3 support
MagicFoundation · Mar 18, 2023 · efef700 · efef700
1 parent 29ac7ce
commit efef700
Show file tree

Hide file tree

Showing 445 changed files with 18,312 additions and 14,463 deletions.
diff --git a/CompileAll.bat b/CompileAll.bat
@@ -114,8 +114,20 @@ REM -------------------
 REM Normalize all units
 REM -------------------
 
-call "%ALBaseDir%\Tools\UnitNormalizer\UnitNormalizer.exe" -Dir="%ALBaseDir%\Source\" -CreateBackup="false"
+echo -------------------
+echo Normalize all units
+echo -------------------
+echo.
+
+call "%ALBaseDir%\Tools\UnitNormalizer\UnitNormalizer.exe" -Dir="%ALBaseDir%\Demos\" -CreateBackup="false" -FilesToIgnore="superxmlparser.pas;supertimezone.pas;superobject.pas;superdate.pas;dwsXPlatform.pas;dwsUtils.pas;dwsJSON.pas" -NoInteraction=true
+IF ERRORLEVEL 1 goto ERROR
+call "%ALBaseDir%\Tools\UnitNormalizer\UnitNormalizer.exe" -Dir="%ALBaseDir%\Source\" -FilesToIgnore="ZLibExGZ.pas;ZLibExApi.pas;ZLibEx.pas;Grijjy.SymbolTranslator.pas;Grijjy.ErrorReporting.pas;Alcinoe.FBX.Lib.pas;Alcinoe.FBX.Base.pas" -CreateBackup="false" -NoInteraction=true
+IF ERRORLEVEL 1 goto ERROR
+call "%ALBaseDir%\Tools\UnitNormalizer\UnitNormalizer.exe" -Dir="%ALBaseDir%\Tests\" -CreateBackup="false" -NoInteraction=true
 IF ERRORLEVEL 1 goto ERROR
+call "%ALBaseDir%\Tools\UnitNormalizer\UnitNormalizer.exe" -Dir="%ALBaseDir%\Tools\" -CreateBackup="false" -NoInteraction=true
+IF ERRORLEVEL 1 goto ERROR
+echo.
 
 
 REM -----------------
@@ -391,9 +403,6 @@ IF EXIST "%FileName%" rmdir /s /q "%FileName%"
 if exist "%FileName%" goto ERROR
 mkdir "%FileName%"
 
-call "%ALBaseDir%\Tools\UnitNormalizer\UnitNormalizer.exe" -Dir="%~1\%~2" -CreateBackup="false"
-IF ERRORLEVEL 1 goto ERROR
-
 call "%ALBaseDir%\Tools\DProjNormalizer\DProjNormalizer.exe" -DProj="%~1\%~2\%~3" -CreateBackup="false"
 IF ERRORLEVEL 1 goto ERROR
 

diff --git a/Demos/ALCipher/_Source/Unit1.pas b/Demos/ALCipher/_Source/Unit1.pas
@@ -175,7 +175,7 @@ procedure TForm1.ALButton10Click(Sender: TObject);
   end;
 end;
 
-{***********************************************}
+{************************************************}
 procedure TForm1.ALButton11Click(Sender: TObject);
 Var aData: AnsiString;
     aTmpData: ansiString;
@@ -415,12 +415,13 @@ procedure TForm1.ALButton9Click(Sender: TObject);
   ALMemoDeCryptedData.Lines.Text := string(outString);
 end;
 
+{*******************************************************}
 procedure TForm1.ALMemoCollisionsChange(Sender: TObject);
 begin
 
 end;
 
-{*********************************************}
+{**********************************************}
 procedure TForm1.Button10Click(Sender: TObject);
 Var aData: AnsiString;
     aBase64Data: AnsiString;
@@ -469,6 +470,7 @@ procedure TForm1.Button10Click(Sender: TObject);
   end;
 end;
 
+{**********************************************}
 procedure TForm1.Button11Click(Sender: TObject);
 Var aData: AnsiString;
     aHash: ansiString;
@@ -517,6 +519,7 @@ procedure TForm1.Button11Click(Sender: TObject);
   end;
 end;
 
+{**********************************************}
 procedure TForm1.Button12Click(Sender: TObject);
 Var aData: ansiString;
     aTmpData: ansiString;
@@ -578,6 +581,7 @@ procedure TForm1.Button12Click(Sender: TObject);
   end;
 end;
 
+{**********************************************}
 procedure TForm1.Button13Click(Sender: TObject);
 Var aData: String;
     aTmpData: String;
@@ -639,6 +643,7 @@ procedure TForm1.Button13Click(Sender: TObject);
   end;
 end;
 
+{**********************************************}
 procedure TForm1.Button14Click(Sender: TObject);
 Var aData: String;
     aTmpData: String;
@@ -700,6 +705,7 @@ procedure TForm1.Button14Click(Sender: TObject);
   end;
 end;
 
+{**********************************************}
 procedure TForm1.Button15Click(Sender: TObject);
 Var aData: String;
     aBase64Data: String;
@@ -748,6 +754,7 @@ procedure TForm1.Button15Click(Sender: TObject);
   end;
 end;
 
+{**********************************************}
 procedure TForm1.Button16Click(Sender: TObject);
 Var aData: ansiString;
     aTmpData: ansiString;
@@ -809,6 +816,7 @@ procedure TForm1.Button16Click(Sender: TObject);
   end;
 end;
 
+{**********************************************}
 procedure TForm1.Button17Click(Sender: TObject);
 Var aData: String;
     aTmpData: String;
@@ -870,6 +878,7 @@ procedure TForm1.Button17Click(Sender: TObject);
   end;
 end;
 
+{**********************************************}
 procedure TForm1.Button18Click(Sender: TObject);
 Var aData: Tbytes;
     aData2: Tbytes;
@@ -921,6 +930,7 @@ procedure TForm1.Button18Click(Sender: TObject);
   end;
 end;
 
+{*********************************************}
 procedure TForm1.Button1Click(Sender: TObject);
 Var aData: AnsiString;
     aTmpData: ansiString;
@@ -1044,6 +1054,7 @@ procedure TForm1.Button2Click(Sender: TObject);
   end;
 end;
 
+{*********************************************}
 procedure TForm1.Button9Click(Sender: TObject);
 Var aData: AnsiString;
     aTmpData: ansiString;
@@ -1436,6 +1447,7 @@ procedure TForm1.Button7Click(Sender: TObject);
   end;
 end;
 
+{*********************************************}
 procedure TForm1.Button8Click(Sender: TObject);
 Var aData: AnsiString;
     aTmpData: ansiString;

diff --git a/Demos/ALConfetti/_Source/ALConfettiDemo.dproj b/Demos/ALConfetti/_Source/ALConfettiDemo.dproj
@@ -327,7 +327,12 @@
       <Form>TMainForm</Form>
       <FormType>fmx</FormType>
     </DCCReference>
-    <JavaReference Include="Android\Merged\libs\r.jar"/>
+    <JavaReference Include="Android\Merged\libs\32bit\r.jar">
+      <ContainerId>ClassesdexFile</ContainerId>
+    </JavaReference>
+    <JavaReference Include="Android\Merged\libs\64bit\r.jar">
+      <ContainerId>ClassesdexFile64</ContainerId>
+    </JavaReference>
     <BuildConfiguration Include="Base">
       <Key>Base</Key>
     </BuildConfiguration>

diff --git a/...onfetti/_Source/Android/Merged/libs/r.jar → ...i/_Source/Android/Merged/libs/32bit/r.jar b/...onfetti/_Source/Android/Merged/libs/r.jar → ...i/_Source/Android/Merged/libs/32bit/r.jar
diff --git a/...Effects/_Source/android/Merged/libs/r.jar → ...i/_Source/Android/Merged/libs/64bit/r.jar b/...Effects/_Source/android/Merged/libs/r.jar → ...i/_Source/Android/Merged/libs/64bit/r.jar
diff --git a/Demos/ALConfetti/_Source/Main.pas b/Demos/ALConfetti/_Source/Main.pas
@@ -58,11 +58,13 @@ implementation
 
 {$R *.fmx}
 
+{************************************************}
 function _randomInRange(min, max: single): Single;
 begin
   result := random * (max - min) + min;
 end;
 
+{**********************************************************}
 procedure TTMainForm.BtnFireFireworksClick(Sender: TObject);
 begin
   if FireworksTimer.Enabled then exit;
@@ -71,6 +73,7 @@ procedure TTMainForm.BtnFireFireworksClick(Sender: TObject);
   FireworksTimer.Enabled := True;
 end;
 
+{********************************************************}
 procedure TTMainForm.FireworksTimerTimer(Sender: TObject);
 begin
   FireworksTimer.tag := FireworksTimer.tag + NativeInt(FireworksTimer.Interval);
@@ -113,11 +116,13 @@ procedure TTMainForm.FireworksTimerTimer(Sender: TObject);
 
 end;
 
+{************************************************************************************}
 procedure TTMainForm.FormPaint(Sender: TObject; Canvas: TCanvas; const ARect: TRectF);
 begin
   UpdateStatusBar;
 end;
 
+{**************************************************************}
 procedure TTMainForm.BtnFireRealisticLookClick(Sender: TObject);
 begin
   Confetti.Fire(
@@ -197,6 +202,7 @@ procedure TTMainForm.BtnFireRealisticLookClick(Sender: TObject);
 
 end;
 
+{************************************************************}
 procedure TTMainForm.BtnFireSchoolPrideClick(Sender: TObject);
 begin
   if SchoolPrideTimer.Enabled then exit;
@@ -205,6 +211,7 @@ procedure TTMainForm.BtnFireSchoolPrideClick(Sender: TObject);
   SchoolPrideTimer.Enabled := True;
 end;
 
+{**********************************************************}
 procedure TTMainForm.SchoolPrideTimerTimer(Sender: TObject);
 begin
 
@@ -247,6 +254,7 @@ procedure TTMainForm.SchoolPrideTimerTimer(Sender: TObject);
 
 end;
 
+{*****************************************************}
 procedure TTMainForm.BtnFireSnowClick(Sender: TObject);
 begin
   if SnowTimer.Enabled then exit;
@@ -257,6 +265,7 @@ procedure TTMainForm.BtnFireSnowClick(Sender: TObject);
   SnowTimer.Enabled := True;
 end;
 
+{************************************************************}
 procedure TTMainForm.BtnRandomDirectionClick(Sender: TObject);
 begin
   Confetti.Fire(
@@ -275,16 +284,18 @@ procedure TTMainForm.BtnRandomDirectionClick(Sender: TObject);
     1); // const AScalar: Single = 1)
 end;
 
+{***************************************************}
 procedure TTMainForm.ConfettiFinish(Sender: TObject);
 begin
   UpdateStatusBar;
   TThread.ForceQueue(nil,
-  procedure
-  begin
-    invalidate;
-  end);
+    procedure
+    begin
+      invalidate;
+    end);
 end;
 
+{***************************************************}
 procedure TTMainForm.SnowTimerTimer(Sender: TObject);
 begin
 
@@ -316,6 +327,7 @@ procedure TTMainForm.SnowTimerTimer(Sender: TObject);
 
 end;
 
+{***********************************}
 procedure TTMainForm.UpdateStatusBar;
 begin
   var LAverageFPS: Double := 0;
@@ -348,13 +360,16 @@ procedure TTMainForm.UpdateStatusBar;
   end;
 end;
 
+{*************************************************************}
 procedure TTMainForm.BtnFireCustomConfigClick(Sender: TObject);
 
+  {~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~}
   Function _StrToColors(const AStr: String): TArray<TalphaColor>;
   begin
     result := []; // Im lazzy
   end;
 
+  {~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~}
   Function _StrToShapes(const AStr: String): TArray<TALConfetti.TParticule.TShape>;
   begin
     result := []; // Im lazzy