Browse Source

Added Formats. before corresponding files

GLScene 4 years ago
parent
commit
64b585379c
100 changed files with 414 additions and 409 deletions
  1. 4 4
      AdvDemos/Delphi/Christmas/Christmas.dpr
  2. 8 10
      AdvDemos/Delphi/Christmas/FMain.dfm
  3. 108 92
      AdvDemos/Delphi/Christmas/FMain.pas
  4. 2 2
      Demos/Delphi/interface/GameMenu/GameMenu.dpr
  5. 2 2
      Demos/Delphi/interface/GameMenu/GameMenu.dproj
  6. 2 2
      Demos/Delphi/interface/GuiPaint/GuiPaint.dproj
  7. 2 2
      Demos/Delphi/interface/GuiPaint/guipaint.dpr
  8. 2 2
      Demos/Delphi/interface/bmpfont/Bmpfont.dproj
  9. 2 2
      Demos/Delphi/interface/bmpfont/bmpfont.dpr
  10. 2 2
      Demos/Delphi/interface/camera/Camera.dpr
  11. 2 2
      Demos/Delphi/interface/camera/Camera.dproj
  12. 2 2
      Demos/Delphi/interface/fontcolor/Fontcolor.dproj
  13. 2 2
      Demos/Delphi/interface/fontcolor/fontcolor.dpr
  14. 4 4
      Demos/Delphi/interface/winfont/Winfont.dproj
  15. 4 4
      Demos/Delphi/interface/winfont/winfont.dpr
  16. 2 2
      Demos/Delphi/materials/cubemap/cubemap.dpr
  17. 2 2
      Demos/Delphi/materials/cubemap/cubemap.dproj
  18. 2 2
      Demos/Delphi/materials/customquad/customquad.dpr
  19. 2 2
      Demos/Delphi/materials/customquad/customquad.dproj
  20. 2 2
      Demos/Delphi/materials/dynamictexture/dynamictexture.dpr
  21. 2 2
      Demos/Delphi/materials/dynamictexture/dynamictexture.dproj
  22. 2 2
      Demos/Delphi/materials/dyncubemap/dyncubemap.dpr
  23. 2 2
      Demos/Delphi/materials/dyncubemap/dyncubemap.dproj
  24. 29 3
      Demos/Delphi/meshes/skeletal/skeletal.dproj
  25. 13 13
      Demos/Delphi/rendering/SkyBox/Unit1.dfm
  26. 60 65
      Demos/Delphi/rendering/SkyBox/Unit1.pas
  27. 2 2
      Demos/Delphi/utilities/fontgen/fontgen.dpr
  28. 2 2
      Demos/Delphi/utilities/fontgen/fontgen.dproj
  29. 1 1
      Packages/GLScene_Cg_DT.dproj
  30. 19 19
      Packages/GLScene_RT.dpk
  31. 19 19
      Packages/GLScene_RT.dproj
  32. 1 1
      Source/DWS.Classes.pas
  33. 1 1
      Source/DWS.HelperFunc.pas
  34. 1 1
      Source/DWS.Objects.pas
  35. 1 1
      Source/DWS.OpenGL.pas
  36. 1 1
      Source/DWS.Scene.pas
  37. 1 1
      Source/DWS.Script.pas
  38. 1 1
      Source/DWS.VectorGeometry.pas
  39. 1 1
      Source/FCUDAEditor.pas
  40. 1 1
      Source/FGUILayoutEditor.pas
  41. 1 1
      Source/FGuiSkinEditor.pas
  42. 4 27
      Source/FInfo.dfm
  43. 1 1
      Source/FInfo.pas
  44. 1 1
      Source/FLibMaterialPicker.pas
  45. 1 1
      Source/FMaterialEditor.pas
  46. 1 1
      Source/FPlugInManagerEditor.pas
  47. 1 1
      Source/FRColorEditor.pas
  48. 1 1
      Source/FRFaceEditor.pas
  49. 1 1
      Source/FRMaterialPreview.pas
  50. 1 1
      Source/FRTextureEdit.pas
  51. 1 1
      Source/FRTrackBarEdit.pas
  52. 1 1
      Source/FSceneEditor.pas
  53. 1 1
      Source/FShaderMemo.pas
  54. 1 1
      Source/FShaderUniformEditor.pas
  55. 1 1
      Source/FVectorEditor.pas
  56. 1 1
      Source/FXCollectionEditor.pas
  57. 2 2
      Source/Formats.B3D.pas
  58. 4 4
      Source/Formats.DDSImage.pas
  59. 2 2
      Source/Formats.DXTC.pas
  60. 2 2
      Source/Formats.GL2.pas
  61. 3 3
      Source/Formats.HDRImage.pas
  62. 2 2
      Source/Formats.LWO.pas
  63. 2 2
      Source/Formats.MD2.pas
  64. 2 2
      Source/Formats.MD3.pas
  65. 2 2
      Source/Formats.OCT.pas
  66. 2 2
      Source/Formats.Q3BSP.pas
  67. 2 2
      Source/Formats.TGA.pas
  68. 2 2
      Source/Formats.VFW.pas
  69. 1 2
      Source/Formats.VRML.pas
  70. 2 3
      Source/Formats.X.pas
  71. 7 8
      Source/Formats._3DS.pas
  72. 3 3
      Source/Formats._3DSConst.pas
  73. 2 3
      Source/Formats._3DSTypes.pas
  74. 7 8
      Source/Formats._3DSUtils.pas
  75. 2 2
      Source/GLS.AVIRecorder.pas
  76. 1 1
      Source/GLS.AnimatedSprite.pas
  77. 1 1
      Source/GLS.AnimationUtils.pas
  78. 1 1
      Source/GLS.ApplicationFileIO.pas
  79. 1 1
      Source/GLS.ArchiveManager.pas
  80. 1 1
      Source/GLS.AsyncHDS.pas
  81. 1 1
      Source/GLS.AsyncTimer.pas
  82. 1 1
      Source/GLS.Atmosphere.pas
  83. 1 1
      Source/GLS.BaseClasses.pas
  84. 1 1
      Source/GLS.BaseMeshSilhouette.pas
  85. 1 1
      Source/GLS.Behaviours.pas
  86. 1 1
      Source/GLS.BitmapFont.pas
  87. 2 4
      Source/GLS.Blur.pas
  88. 1 1
      Source/GLS.BumpmapHDS.pas
  89. 1 1
      Source/GLS.Cadencer.pas
  90. 1 1
      Source/GLS.CameraController.pas
  91. 1 1
      Source/GLS.Canvas.pas
  92. 1 1
      Source/GLS.Collision.pas
  93. 1 1
      Source/GLS.Color.pas
  94. 1 1
      Source/GLS.CompositeImage.pas
  95. 1 1
      Source/GLS.Console.pas
  96. 1 1
      Source/GLS.Context.pas
  97. 1 1
      Source/GLS.Coordinates.pas
  98. 1 1
      Source/GLS.CrossXML.pas
  99. 1 1
      Source/GLS.CurvesAndSurfaces.pas
  100. 1 1
      Source/GLS.DCE.pas

+ 4 - 4
AdvDemos/Delphi/Christmas/Christmas.dpr

@@ -29,9 +29,9 @@ uses
 
 
 begin
 begin
    // don't complain about missing sound support
    // don't complain about missing sound support
-   vVerboseGLSMErrors:=False;
-   Application.Initialize;
-   Application.Title := 'GLScene Christmas 2016';
-   Application.CreateForm(TMain, Main);
+  vVerboseGLSMErrors:=False;
+  Application.Initialize;
+  Application.Title := 'GLScene Christmas 2016';
+  Application.CreateForm(TMain, Main);
   Application.Run;
   Application.Run;
 end.
 end.

+ 8 - 10
AdvDemos/Delphi/Christmas/FMain.dfm

@@ -31,7 +31,7 @@ object Main: TMain
     Buffer.AmbientColor.Color = {0000803F0000803F0000803F0000803F}
     Buffer.AmbientColor.Color = {0000803F0000803F0000803F0000803F}
     Buffer.ContextOptions = [roDoubleBuffer, roRenderToWindow]
     Buffer.ContextOptions = [roDoubleBuffer, roRenderToWindow]
     Buffer.AntiAliasing = aa2x
     Buffer.AntiAliasing = aa2x
-    FieldOfView = 168.000000000000000000
+    FieldOfView = 160.000000000000000000
     PenAsTouch = False
     PenAsTouch = False
     Align = alClient
     Align = alClient
     PopupMenu = PopupMenu
     PopupMenu = PopupMenu
@@ -68,9 +68,9 @@ object Main: TMain
     Top = 16
     Top = 16
     object Camera: TGLCamera
     object Camera: TGLCamera
       DepthOfView = 100.000000000000000000
       DepthOfView = 100.000000000000000000
-      FocalLength = 29.008768081665040000
-      TargetObject = DCCameraTarget
-      Position.Coordinates = {0000C0400000803F0000E0400000803F}
+      FocalLength = 48.666248321533200000
+      TargetObject = DCFire
+      Position.Coordinates = {0000A04000000000000070410000803F}
     end
     end
     object DCFirTree: TGLDummyCube
     object DCFirTree: TGLDummyCube
       Position.Coordinates = {000000C00000B0C0000000000000803F}
       Position.Coordinates = {000000C00000B0C0000000000000803F}
@@ -338,12 +338,6 @@ object Main: TMain
         end
         end
       end
       end
     end
     end
-    object FFPiano: TGLFreeForm
-      Direction.Coordinates = {79ACAAB400000000000080BF00000000}
-      Position.Coordinates = {00006041000020C0000000000000803F}
-      Scale.Coordinates = {00000040000000400000004000000000}
-      TurnAngle = 180.000000000000000000
-    end
     object DCGifts: TGLDummyCube
     object DCGifts: TGLDummyCube
       Visible = False
       Visible = False
       CubeSize = 1.000000000000000000
       CubeSize = 1.000000000000000000
@@ -5462,4 +5456,8 @@ object Main: TMain
     Left = 24
     Left = 24
     Top = 208
     Top = 208
   end
   end
+  object GLMaterialLibraryCM: TGLMaterialLibrary
+    Left = 552
+    Top = 128
+  end
 end
 end

+ 108 - 92
AdvDemos/Delphi/Christmas/FMain.pas

@@ -104,8 +104,8 @@ type
     PopupMenu: TPopupMenu;
     PopupMenu: TPopupMenu;
     miMerryCristmas: TMenuItem;
     miMerryCristmas: TMenuItem;
     miHappyNewYear: TMenuItem;
     miHappyNewYear: TMenuItem;
-    FFPiano: TGLFreeForm;
     GLFireFXManager: TGLFireFXManager;
     GLFireFXManager: TGLFireFXManager;
+    GLMaterialLibraryCM: TGLMaterialLibrary;
     procedure FormCreate(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure CadencerProgress(Sender: TObject; const deltaTime,
     procedure CadencerProgress(Sender: TObject; const deltaTime,
       newTime: Double);
       newTime: Double);
@@ -129,6 +129,7 @@ type
     FireLight : Single;
     FireLight : Single;
     inPreview, inSaver : Boolean;
     inPreview, inSaver : Boolean;
     bStream : Cardinal;
     bStream : Cardinal;
+    function LoadTexture(Matname,Filename : string) : TGLLibMaterial;
   end;
   end;
 
 
 var
 var
@@ -138,6 +139,14 @@ implementation
 
 
 {$R *.dfm}
 {$R *.dfm}
 
 
+
+function TMain.LoadTexture(Matname, Filename: string): TGLLibMaterial;
+begin
+  Result := GLMaterialLibraryCM.AddTextureMaterial(Matname, Filename);
+  Result.Material.Texture.Disabled := False;
+  Result.Material.Texture.TextureMode := tmDecal;
+end;
+
 procedure TMain.FormCreate(Sender: TObject);
 procedure TMain.FormCreate(Sender: TObject);
 var
 var
   DataPath : String;
   DataPath : String;
@@ -145,9 +154,12 @@ begin
   Randomize;
   Randomize;
   DataPath := ExtractFilePath(ParamStr(0)) + 'data';
   DataPath := ExtractFilePath(ParamStr(0)) + 'data';
   SetCurrentDir(DataPath);
   SetCurrentDir(DataPath);
+
+  // Skybox textures
+
   FFFirTree.LoadFromFile('firtree.3ds');
   FFFirTree.LoadFromFile('firtree.3ds');
   FFFirePlace.LoadFromFile('fireplace.3ds');
   FFFirePlace.LoadFromFile('fireplace.3ds');
-  FFPiano.LoadFromFile('Piano.obj');
+
   FireLight := 0.5;
   FireLight := 0.5;
   FTYear.Text := '';
   FTYear.Text := '';
 end;
 end;
@@ -177,8 +189,8 @@ end;
 
 
 procedure TMain.FormKeyPress(Sender: TObject; var Key: Char);
 procedure TMain.FormKeyPress(Sender: TObject; var Key: Char);
 begin
 begin
-   Key:=#0;
-   Application.Terminate;
+  Key := #0;
+  Application.Terminate;
 end;
 end;
 
 
 procedure TMain.FormMouseWheel(Sender: TObject; Shift: TShiftState;
 procedure TMain.FormMouseWheel(Sender: TObject; Shift: TShiftState;
@@ -189,130 +201,134 @@ end;
 
 
 procedure TMain.ViewerDblClick(Sender: TObject);
 procedure TMain.ViewerDblClick(Sender: TObject);
 begin
 begin
-   if (not inPreview) and (not inSaver) and (not Application.Terminated) and (BorderStyle<>bsNone) then
-   begin
-      BorderStyle:=bsNone;
-      FormStyle:=fsStayOnTop;
-      Align:=alClient;
-   end;
+  if (not inPreview) and (not inSaver) and (not Application.Terminated) and
+    (BorderStyle <> bsNone) then
+  begin
+    BorderStyle := bsNone;
+    FormStyle := fsStayOnTop;
+    Align := alClient;
+  end;
 end;
 end;
 
 
 procedure TMain.ViewerMouseDown(Sender: TObject; Button: TMouseButton;
 procedure TMain.ViewerMouseDown(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: Integer);
   Shift: TShiftState; X, Y: Integer);
 begin
 begin
-  mx:=x; my:=y;
+  mx := X;
+  my := Y;
 end;
 end;
 
 
 procedure TMain.ViewerMouseMove(Sender: TObject; Shift: TShiftState; X,
 procedure TMain.ViewerMouseMove(Sender: TObject; Shift: TShiftState; X,
   Y: Integer);
   Y: Integer);
 begin
 begin
-   if Shift=[ssLeft] then begin
-      Camera.MoveAroundTarget(my-y, mx-x);
-      mx:=x; my:=y;
-   end;
+  if Shift = [ssLeft] then
+  begin
+    Camera.MoveAroundTarget(my - Y, mx - X);
+    mx := X;
+    my := Y;
+  end;
 end;
 end;
 
 
 
 
 procedure TMain.CadencerProgress(Sender: TObject; const deltaTime,
 procedure TMain.CadencerProgress(Sender: TObject; const deltaTime,
   newTime: Double);
   newTime: Double);
 begin
 begin
-   FireLight:=ClampValue(fireLight+Random*0.4-0.2, 0, 1);
-   LSFire.Diffuse.Color:=VectorLerp(clrYellow, VectorMake(0.5, 0, 0, 1),
-                                    fireLight);
-   LSFire.Position.Y:=FireLight*0.1;
-
-   if inPreview then
-      HUDSprite.Visible:=False;
-
-   if HUDSprite.Visible then
-   begin
-     HUDSprite.Material.FrontProperties.Diffuse.Alpha:=
-         HUDSprite.Material.FrontProperties.Diffuse.Alpha-deltaTime*0.03  ;
-     if HUDSprite.Material.FrontProperties.Diffuse.Alpha<0.01 then
-         HUDSprite.Visible:=False;
-   end;
-   DCFirTree.Turn(deltaTime);
-   Viewer.Invalidate();
+  FireLight := ClampValue(FireLight + Random * 0.4 - 0.2, 0, 1);
+  LSFire.Diffuse.Color := VectorLerp(clrYellow, VectorMake(0.5, 0, 0, 1),
+    FireLight);
+  LSFire.Position.Y := FireLight * 0.1;
+
+  if inPreview then
+    HUDSprite.Visible := False;
+
+  if HUDSprite.Visible then
+  begin
+    HUDSprite.Material.FrontProperties.Diffuse.Alpha :=
+      HUDSprite.Material.FrontProperties.Diffuse.Alpha - deltaTime * 0.03;
+    if HUDSprite.Material.FrontProperties.Diffuse.Alpha < 0.01 then
+      HUDSprite.Visible := False;
+  end;
+  DCFirTree.Turn(deltaTime);
+  Viewer.Invalidate();
 end;
 end;
 
 
 procedure TMain.TimerTimer(Sender: TObject);
 procedure TMain.TimerTimer(Sender: TObject);
 var
 var
-   i : Integer;
-   t : TDateTime;
-   buf : String;
-   y, m, d : Word;
-   TheChristmas, isArrived : Boolean;
+  i: Integer;
+  t: TDateTime;
+  buf: String;
+  Y, m, d: Word;
+  TheChristmas, isArrived: Boolean;
 
 
 begin
 begin
-   Caption:=Format('%.1f FPS', [Viewer.FramesPerSecond]);
-   Viewer.ResetPerformanceMonitor;
-   if SMBASS.Active and (bStream=0) then
-   begin
-     bStream:=BASS_StreamCreateFile(False, PAnsiChar('Jingle_Bells_64.mp3'), 0, 0, BASS_STREAM_AUTOFREE);
-     BASS_ChannelPlay(bStream, True);
-   end;
-   DecodeDate(Now(), y, m, d);
-//   if miMerryCristmas.Checked then
-   begin
-     t:=EncodeDate(y, 12, 25)-Now();
-     FTCongratulations.Text := 'Merry Christmas!';
-   end;
-(*
-   else
-   begin
-     t:=EncodeDate(y+1, 01, 01)-Now();
-     FTCongratulations.Text := 'Happy New Year!';
-     FTYear.Text:= IntToStr(y+1);
-   end;
-*)
-   if (t<1) and (t>-1) then
-      DCGifts.Visible:=True;
-   if t>=2 then
-   begin
-      buf:=IntToStr(Trunc(t))+' days, ';
-      i:=Round(Frac(t)*24);
-      if i>1 then
-         buf:=buf+IntToStr(i)+' hours...'
-      else
-        buf:=buf+IntToStr(i)+' hour...';
-      FTCountDown.Text:=buf;
-   end
-   else
-   begin
-      t:=t*24;
-      if t>1 then
-      begin
-        buf:=IntToStr(Trunc(t))+' hours, ';
-        i:=Round(Frac(t)*60);
-        if i>1 then
-          buf:=buf+IntToStr(i)+' minutes...'
-        else buf:=buf+IntToStr(i)+' minute...';
-        FTCountDown.Text:=buf;
-      end
+  Caption := Format('%.1f FPS', [Viewer.FramesPerSecond]);
+  Viewer.ResetPerformanceMonitor;
+  if SMBASS.Active and (bStream = 0) then
+  begin
+    bStream := BASS_StreamCreateFile(False, PAnsiChar('Jingle_Bells_64.mp3'), 0,
+      0, BASS_STREAM_AUTOFREE);
+    BASS_ChannelPlay(bStream, True);
+  end;
+  DecodeDate(Now(), Y, m, d);
+  if miMerryCristmas.Checked then
+  begin
+    t := EncodeDate(Y, 12, 25) - Now();
+    FTCongratulations.Text := 'Merry Christmas!';
+  end
+  else
+    begin
+    t:=EncodeDate(y+1, 01, 01)-Now();
+    FTCongratulations.Text := 'Happy New Year!';
+    FTYear.Text:= IntToStr(y+1);
+    end;
+   if (t < 1) and (t > -1) then
+    DCGifts.Visible := True;
+  if t >= 2 then
+  begin
+    buf := IntToStr(Trunc(t)) + ' days, ';
+    i := Round(Frac(t) * 24);
+    if i > 1 then
+      buf := buf + IntToStr(i) + ' hours...'
+    else
+      buf := buf + IntToStr(i) + ' hour...';
+    FTCountDown.Text := buf;
+  end
+  else
+  begin
+    t := t * 24;
+    if t > 1 then
+    begin
+      buf := IntToStr(Trunc(t)) + ' hours, ';
+      i := Round(Frac(t) * 60);
+      if i > 1 then
+        buf := buf + IntToStr(i) + ' minutes...'
       else
       else
-      begin
-         t:=t*60;
-         FTCountDown.Text:= IntToStr(Trunc(t))+' minutes, '
-                           +IntToStr(Round(Frac(t)*60))+' seconds...';
-      end;
-   end;
+        buf := buf + IntToStr(i) + ' minute...';
+      FTCountDown.Text := buf;
+    end
+    else
+    begin
+      t := t * 60;
+      FTCountDown.Text := IntToStr(Trunc(t)) + ' minutes, ' +
+        IntToStr(Round(Frac(t) * 60)) + ' seconds...';
+    end;
+  end;
 end;
 end;
 
 
 procedure TMain.ScreenSaverCloseQuery(Sender: TObject;
 procedure TMain.ScreenSaverCloseQuery(Sender: TObject;
   var CanClose: Boolean);
   var CanClose: Boolean);
 begin
 begin
-   Application.Terminate;
-   CanClose:=False;
+  Application.Terminate;
+  CanClose := False;
 end;
 end;
 
 
 procedure TMain.ScreenSaverExecute(Sender: TObject);
 procedure TMain.ScreenSaverExecute(Sender: TObject);
 begin
 begin
-   inSaver:=True;
+  inSaver := True;
 end;
 end;
 
 
 procedure TMain.ScreenSaverPreview(Sender: TObject; previewHwnd: HWND);
 procedure TMain.ScreenSaverPreview(Sender: TObject; previewHwnd: HWND);
 begin
 begin
-  inPreview:=True;
+  inPreview := True;
 end;
 end;
 
 
 end.
 end.

+ 2 - 2
Demos/Delphi/interface/GameMenu/GameMenu.dpr

@@ -9,12 +9,12 @@ program GameMenu;
 
 
 uses
 uses
   Forms,
   Forms,
-  UnitM in 'UnitM.pas' {Form1};
+  fGameMenu in 'fGameMenu.pas' {FormGameMenu};
 
 
 {$R *.res}
 {$R *.res}
 
 
 begin
 begin
   Application.Initialize;
   Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TFormGameMenu, FormGameMenu);
   Application.Run;
   Application.Run;
 end.
 end.

+ 2 - 2
Demos/Delphi/interface/GameMenu/GameMenu.dproj

@@ -123,8 +123,8 @@
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         </DelphiCompile>
-        <DCCReference Include="UnitM.pas">
-            <Form>Form1</Form>
+        <DCCReference Include="fGameMenu.pas">
+            <Form>FormGameMenu</Form>
         </DCCReference>
         </DCCReference>
         <BuildConfiguration Include="Debug">
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <Key>Cfg_2</Key>

+ 2 - 2
Demos/Delphi/interface/GuiPaint/GuiPaint.dproj

@@ -122,8 +122,8 @@
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         </DelphiCompile>
-        <DCCReference Include="Unit1.pas">
-            <Form>Form1</Form>
+        <DCCReference Include="fGuiPaint.pas">
+            <Form>FormGuiPaint</Form>
         </DCCReference>
         </DCCReference>
         <BuildConfiguration Include="Debug">
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <Key>Cfg_2</Key>

+ 2 - 2
Demos/Delphi/interface/GuiPaint/guipaint.dpr

@@ -44,12 +44,12 @@ program GuiPaint;
 
 
 uses
 uses
   Forms,
   Forms,
-  Unit1 in 'Unit1.pas' {Form1};
+  fGuiPaint in 'fGuiPaint.pas' {FormGuiPaint};
 
 
 {$R *.RES}
 {$R *.RES}
 
 
 begin
 begin
   Application.Initialize;
   Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TFormGuiPaint, FormGuiPaint);
   Application.Run;
   Application.Run;
 end.
 end.

+ 2 - 2
Demos/Delphi/interface/bmpfont/Bmpfont.dproj

@@ -123,8 +123,8 @@
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         </DelphiCompile>
-        <DCCReference Include="Unit1.pas">
-            <Form>Form1</Form>
+        <DCCReference Include="fBmpFont.pas">
+            <Form>FormBmpFont</Form>
         </DCCReference>
         </DCCReference>
         <BuildConfiguration Include="Debug">
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <Key>Cfg_2</Key>

+ 2 - 2
Demos/Delphi/interface/bmpfont/bmpfont.dpr

@@ -18,12 +18,12 @@ program Bmpfont;
 
 
 uses
 uses
   Forms,
   Forms,
-  Unit1 in 'Unit1.pas' {Form1};
+  fBmpFont in 'fBmpFont.pas' {FormBmpFont};
 
 
 {$R *.RES}
 {$R *.RES}
 
 
 begin
 begin
   Application.Initialize;
   Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TFormBmpFont, FormBmpFont);
   Application.Run;
   Application.Run;
 end.
 end.

+ 2 - 2
Demos/Delphi/interface/camera/Camera.dpr

@@ -17,12 +17,12 @@ program Camera;
 
 
 uses
 uses
   Forms,
   Forms,
-  Unit1 in 'Unit1.pas' {Form1};
+  fCamera in 'fCamera.pas' {FormCamera};
 
 
 {$R *.RES}
 {$R *.RES}
 
 
 begin
 begin
   Application.Initialize;
   Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TFormCamera, FormCamera);
   Application.Run;
   Application.Run;
 end.
 end.

+ 2 - 2
Demos/Delphi/interface/camera/Camera.dproj

@@ -123,8 +123,8 @@
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         </DelphiCompile>
-        <DCCReference Include="Unit1.pas">
-            <Form>Form1</Form>
+        <DCCReference Include="fCamera.pas">
+            <Form>FormCamera</Form>
         </DCCReference>
         </DCCReference>
         <BuildConfiguration Include="Debug">
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <Key>Cfg_2</Key>

+ 2 - 2
Demos/Delphi/interface/fontcolor/Fontcolor.dproj

@@ -123,8 +123,8 @@
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         </DelphiCompile>
-        <DCCReference Include="Unit1.pas">
-            <Form>Form1</Form>
+        <DCCReference Include="fFontColor.pas">
+            <Form>FormFontColor</Form>
         </DCCReference>
         </DCCReference>
         <BuildConfiguration Include="Debug">
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <Key>Cfg_2</Key>

+ 2 - 2
Demos/Delphi/interface/fontcolor/fontcolor.dpr

@@ -11,12 +11,12 @@ program Fontcolor;
 
 
 uses
 uses
   Forms,
   Forms,
-  Unit1 in 'Unit1.pas' {Form1};
+  fFontColor in 'fFontColor.pas' {FormFontColor};
 
 
 {$R *.res}
 {$R *.res}
 
 
 begin
 begin
   Application.Initialize;
   Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TFormFontColor, FormFontColor);
   Application.Run;
   Application.Run;
 end.
 end.

+ 4 - 4
Demos/Delphi/interface/winfont/Winfont.dproj

@@ -123,11 +123,11 @@
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         </DelphiCompile>
-        <DCCReference Include="Unit1.pas">
-            <Form>Form1</Form>
+        <DCCReference Include="fWinFont.pas">
+            <Form>FormWinFont</Form>
         </DCCReference>
         </DCCReference>
-        <DCCReference Include="Unit2.pas">
-            <Form>Form2</Form>
+        <DCCReference Include="fFontTexture.pas">
+            <Form>FormFontTexture</Form>
         </DCCReference>
         </DCCReference>
         <BuildConfiguration Include="Debug">
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <Key>Cfg_2</Key>

+ 4 - 4
Demos/Delphi/interface/winfont/winfont.dpr

@@ -16,14 +16,14 @@ program Winfont;
 
 
 uses
 uses
   Forms,
   Forms,
-  Unit1 in 'Unit1.pas' {Form1},
-  Unit2 in 'Unit2.pas' {Form2};
+  fWinFont in 'fWinFont.pas' {FormWinFont},
+  fFontTexture in 'fFontTexture.pas' {FormFontTexture};
 
 
 {$R *.RES}
 {$R *.RES}
 
 
 begin
 begin
   Application.Initialize;
   Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
-  Application.CreateForm(TForm2, Form2);
+  Application.CreateForm(TFormWinFont, FormWinFont);
+  Application.CreateForm(TFormFontTexture, FormFontTexture);
   Application.Run;
   Application.Run;
 end.
 end.

+ 2 - 2
Demos/Delphi/materials/cubemap/cubemap.dpr

@@ -15,12 +15,12 @@ program cubemap;
 
 
 uses
 uses
   Forms,
   Forms,
-  Unit1 in 'Unit1.pas' {Form1};
+  fCubeMap in 'fCubeMap.pas' {FormCubeMap};
 
 
 {$R *.res}
 {$R *.res}
 
 
 begin
 begin
   Application.Initialize;
   Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TFormCubeMap, FormCubeMap);
   Application.Run;
   Application.Run;
 end.
 end.

+ 2 - 2
Demos/Delphi/materials/cubemap/cubemap.dproj

@@ -115,8 +115,8 @@
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         </DelphiCompile>
-        <DCCReference Include="Unit1.pas">
-            <Form>Form1</Form>
+        <DCCReference Include="fCubeMap.pas">
+            <Form>FormCubeMap</Form>
         </DCCReference>
         </DCCReference>
         <BuildConfiguration Include="Debug">
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <Key>Cfg_2</Key>

+ 2 - 2
Demos/Delphi/materials/customquad/customquad.dpr

@@ -15,12 +15,12 @@ program customquad;
 
 
 uses
 uses
   Forms,
   Forms,
-  Unit1 in 'Unit1.pas' {Form1};
+  fCustomQuad in 'fCustomQuad.pas' {FormCustomQuad};
 
 
 {$R *.RES}
 {$R *.RES}
 
 
 begin
 begin
   Application.Initialize;
   Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TFormCustomQuad, FormCustomQuad);
   Application.Run;
   Application.Run;
 end.
 end.

+ 2 - 2
Demos/Delphi/materials/customquad/customquad.dproj

@@ -116,8 +116,8 @@
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         </DelphiCompile>
-        <DCCReference Include="Unit1.pas">
-            <Form>Form1</Form>
+        <DCCReference Include="fCustomQuad.pas">
+            <Form>FormCustomQuad</Form>
         </DCCReference>
         </DCCReference>
         <BuildConfiguration Include="Debug">
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <Key>Cfg_2</Key>

+ 2 - 2
Demos/Delphi/materials/dynamictexture/dynamictexture.dpr

@@ -13,12 +13,12 @@ program dynamictexture;
 
 
 uses
 uses
   Forms,
   Forms,
-  Unit1 in 'Unit1.pas' {Form1};
+  fDynamicTexture in 'fDynamicTexture.pas' {FormDynamicTexture};
 
 
 {$R *.res}
 {$R *.res}
 
 
 begin
 begin
   Application.Initialize;
   Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TFormDynamicTexture, FormDynamicTexture);
   Application.Run;
   Application.Run;
 end.
 end.

+ 2 - 2
Demos/Delphi/materials/dynamictexture/dynamictexture.dproj

@@ -115,8 +115,8 @@
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         </DelphiCompile>
-        <DCCReference Include="Unit1.pas">
-            <Form>Form1</Form>
+        <DCCReference Include="fDynamicTexture.pas">
+            <Form>FormDynamicTexture</Form>
         </DCCReference>
         </DCCReference>
         <BuildConfiguration Include="Debug">
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <Key>Cfg_2</Key>

+ 2 - 2
Demos/Delphi/materials/dyncubemap/dyncubemap.dpr

@@ -22,12 +22,12 @@ program dyncubemap;
 
 
 uses
 uses
   Forms,
   Forms,
-  Unit1 in 'Unit1.pas' {Form1};
+  fDynCubeMap in 'fDynCubeMap.pas' {FormDynCubeMap};
 
 
 {$R *.res}
 {$R *.res}
 
 
 begin
 begin
   Application.Initialize;
   Application.Initialize;
-  Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TFormDynCubeMap, FormDynCubeMap);
   Application.Run;
   Application.Run;
 end.
 end.

+ 2 - 2
Demos/Delphi/materials/dyncubemap/dyncubemap.dproj

@@ -122,8 +122,8 @@
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         </DelphiCompile>
-        <DCCReference Include="Unit1.pas">
-            <Form>Form1</Form>
+        <DCCReference Include="fDynCubeMap.pas">
+            <Form>FormDynCubeMap</Form>
         </DCCReference>
         </DCCReference>
         <BuildConfiguration Include="Debug">
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <Key>Cfg_2</Key>

+ 29 - 3
Demos/Delphi/meshes/skeletal/skeletal.dproj

@@ -4,11 +4,11 @@
         <MainSource>skeletal.dpr</MainSource>
         <MainSource>skeletal.dpr</MainSource>
         <Base>True</Base>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>1</TargetedPlatforms>
+        <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>19.0</ProjectVersion>
         <ProjectVersion>19.0</ProjectVersion>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
     </PropertyGroup>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
         <Base>true</Base>
@@ -28,6 +28,12 @@
         <CfgParent>Base</CfgParent>
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
         <Base>true</Base>
     </PropertyGroup>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
+        <Cfg_1_Win64>true</Cfg_1_Win64>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
     <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
         <Cfg_2>true</Cfg_2>
         <Cfg_2>true</Cfg_2>
         <CfgParent>Base</CfgParent>
         <CfgParent>Base</CfgParent>
@@ -39,6 +45,12 @@
         <Cfg_2>true</Cfg_2>
         <Cfg_2>true</Cfg_2>
         <Base>true</Base>
         <Base>true</Base>
     </PropertyGroup>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
+        <Cfg_2_Win64>true</Cfg_2_Win64>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
     <PropertyGroup Condition="'$(Base)'!=''">
         <DCC_F>false</DCC_F>
         <DCC_F>false</DCC_F>
         <DCC_S>false</DCC_S>
         <DCC_S>false</DCC_S>
@@ -64,6 +76,12 @@
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
         <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
+        <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
+        <BT_BuildType>Debug</BT_BuildType>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
     </PropertyGroup>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -71,6 +89,10 @@
         <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
         <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
         <DCC_DebugInformation>0</DCC_DebugInformation>
         <DCC_DebugInformation>0</DCC_DebugInformation>
     </PropertyGroup>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
         <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
         <DCC_Optimize>false</DCC_Optimize>
         <DCC_Optimize>false</DCC_Optimize>
@@ -84,6 +106,10 @@
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
     </PropertyGroup>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+    </PropertyGroup>
     <ItemGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
             <MainSource>MainSource</MainSource>
@@ -121,7 +147,7 @@
             </Delphi.Personality>
             </Delphi.Personality>
             <Platforms>
             <Platforms>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win32">True</Platform>
-                <Platform value="Win64">False</Platform>
+                <Platform value="Win64">True</Platform>
             </Platforms>
             </Platforms>
         </BorlandProject>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>
         <ProjectFileVersion>12</ProjectFileVersion>

+ 13 - 13
Demos/Delphi/rendering/SkyBox/Unit1.dfm

@@ -36,7 +36,7 @@ object Form1: TForm1
     object GLSkyBox1: TGLSkyBox
     object GLSkyBox1: TGLSkyBox
       Direction.Coordinates = {9598A23144F7DFB20000803F00000000}
       Direction.Coordinates = {9598A23144F7DFB20000803F00000000}
       Up.Coordinates = {1DB356B30000803FB3FA87B300000000}
       Up.Coordinates = {1DB356B30000803FB3FA87B300000000}
-      MaterialLibrary = GLMaterialLibrary1
+      MaterialLibrary = GLMaterialLibraryCM
       MatNameTop = 'Top'
       MatNameTop = 'Top'
       MatNameBottom = 'Bottom'
       MatNameBottom = 'Bottom'
       MatNameLeft = 'Left'
       MatNameLeft = 'Left'
@@ -47,7 +47,7 @@ object Form1: TForm1
       CloudsPlaneOffset = 0.119999997317791000
       CloudsPlaneOffset = 0.119999997317791000
       CloudsPlaneSize = 2.000000000000000000
       CloudsPlaneSize = 2.000000000000000000
       object GLSphere1: TGLSphere
       object GLSphere1: TGLSphere
-        Material.MaterialLibrary = GLMaterialLibrary1
+        Material.MaterialLibrary = GLMaterialLibraryCM
         Direction.Coordinates = {18EBC2BE6823FE3E49BA47BF00000000}
         Direction.Coordinates = {18EBC2BE6823FE3E49BA47BF00000000}
         PitchAngle = 86.500000000000000000
         PitchAngle = 86.500000000000000000
         Position.Coordinates = {000000C000008040000080BF0000803F}
         Position.Coordinates = {000000C000008040000080BF0000803F}
@@ -55,7 +55,7 @@ object Form1: TForm1
         Up.Coordinates = {CE00D4BE9A8D58BF0519ACBE00000000}
         Up.Coordinates = {CE00D4BE9A8D58BF0519ACBE00000000}
         Radius = 1.000000000000000000
         Radius = 1.000000000000000000
         object GLSphere2: TGLSphere
         object GLSphere2: TGLSphere
-          Material.MaterialLibrary = GLMaterialLibrary1
+          Material.MaterialLibrary = GLMaterialLibraryCM
           Direction.Coordinates = {000000000000803F0000000000000000}
           Direction.Coordinates = {000000000000803F0000000000000000}
           PitchAngle = -8.000000000000000000
           PitchAngle = -8.000000000000000000
           Position.Coordinates = {0000000000000000000000400000803F}
           Position.Coordinates = {0000000000000000000000400000803F}
@@ -66,7 +66,7 @@ object Form1: TForm1
       end
       end
     end
     end
     object GLSkyBox2: TGLSkyBox
     object GLSkyBox2: TGLSkyBox
-      MaterialLibrary = GLMaterialLibrary1
+      MaterialLibrary = GLMaterialLibraryCM
       MatNameClouds = 'Clouds'
       MatNameClouds = 'Clouds'
       CloudsPlaneOffset = 0.100000001490116100
       CloudsPlaneOffset = 0.100000001490116100
       CloudsPlaneSize = 4.000000000000000000
       CloudsPlaneSize = 4.000000000000000000
@@ -74,47 +74,47 @@ object Form1: TForm1
     object Castle: TGLDummyCube
     object Castle: TGLDummyCube
       CubeSize = 1.000000000000000000
       CubeSize = 1.000000000000000000
       object GLCube1: TGLCube
       object GLCube1: TGLCube
-        Material.MaterialLibrary = GLMaterialLibrary1
+        Material.MaterialLibrary = GLMaterialLibraryCM
         Position.Coordinates = {0BD43940FFFF7FC018230B400000803F}
         Position.Coordinates = {0BD43940FFFF7FC018230B400000803F}
         CubeSize = {0000803F000000420000803F}
         CubeSize = {0000803F000000420000803F}
         object GLCube2: TGLCube
         object GLCube2: TGLCube
-          Material.MaterialLibrary = GLMaterialLibrary1
+          Material.MaterialLibrary = GLMaterialLibraryCM
           Position.Coordinates = {000040C0000000BFCDCCCC3D0000803F}
           Position.Coordinates = {000040C0000000BFCDCCCC3D0000803F}
           CubeSize = {0000C0400000803F0000803F}
           CubeSize = {0000C0400000803F0000803F}
         end
         end
       end
       end
       object GLCube11: TGLCube
       object GLCube11: TGLCube
-        Material.MaterialLibrary = GLMaterialLibrary1
+        Material.MaterialLibrary = GLMaterialLibraryCM
         Direction.Coordinates = {000080BF000000001AE1F7B300000000}
         Direction.Coordinates = {000080BF000000001AE1F7B300000000}
         Position.Coordinates = {F42B46C0FFFF7FC018230B400000803F}
         Position.Coordinates = {F42B46C0FFFF7FC018230B400000803F}
         TurnAngle = -90.000000000000000000
         TurnAngle = -90.000000000000000000
         CubeSize = {0000803F000000420000803F}
         CubeSize = {0000803F000000420000803F}
         object GLCube21: TGLCube
         object GLCube21: TGLCube
-          Material.MaterialLibrary = GLMaterialLibrary1
+          Material.MaterialLibrary = GLMaterialLibraryCM
           Position.Coordinates = {000040C0000000BFCDCCCC3D0000803F}
           Position.Coordinates = {000040C0000000BFCDCCCC3D0000803F}
           CubeSize = {0000C0400000803F0000803F}
           CubeSize = {0000C0400000803F0000803F}
         end
         end
       end
       end
       object GLCube111: TGLCube
       object GLCube111: TGLCube
-        Material.MaterialLibrary = GLMaterialLibrary1
+        Material.MaterialLibrary = GLMaterialLibraryCM
         Direction.Coordinates = {0000803F00000000B28FF03200000000}
         Direction.Coordinates = {0000803F00000000B28FF03200000000}
         Position.Coordinates = {0CD43940FFFF7FC0E8DC74C00000803F}
         Position.Coordinates = {0CD43940FFFF7FC0E8DC74C00000803F}
         TurnAngle = 90.000000000000000000
         TurnAngle = 90.000000000000000000
         CubeSize = {0000803F000000420000803F}
         CubeSize = {0000803F000000420000803F}
         object GLCube211: TGLCube
         object GLCube211: TGLCube
-          Material.MaterialLibrary = GLMaterialLibrary1
+          Material.MaterialLibrary = GLMaterialLibraryCM
           Position.Coordinates = {000040C0000000BFCDCCCC3D0000803F}
           Position.Coordinates = {000040C0000000BFCDCCCC3D0000803F}
           CubeSize = {0000C0400000803F0000803F}
           CubeSize = {0000C0400000803F0000803F}
         end
         end
       end
       end
       object GLCube112: TGLCube
       object GLCube112: TGLCube
-        Material.MaterialLibrary = GLMaterialLibrary1
+        Material.MaterialLibrary = GLMaterialLibraryCM
         Direction.Coordinates = {647F2B3300000000000080BF00000000}
         Direction.Coordinates = {647F2B3300000000000080BF00000000}
         Position.Coordinates = {F42B46C0FFFF7FC0E8DC74C00000803F}
         Position.Coordinates = {F42B46C0FFFF7FC0E8DC74C00000803F}
         TurnAngle = -180.000000000000000000
         TurnAngle = -180.000000000000000000
         CubeSize = {0000803F000000420000803F}
         CubeSize = {0000803F000000420000803F}
         object GLCube212: TGLCube
         object GLCube212: TGLCube
-          Material.MaterialLibrary = GLMaterialLibrary1
+          Material.MaterialLibrary = GLMaterialLibraryCM
           Position.Coordinates = {000040C0000000BFCDCCCC3D0000803F}
           Position.Coordinates = {000040C0000000BFCDCCCC3D0000803F}
           CubeSize = {0000C0400000803F0000803F}
           CubeSize = {0000C0400000803F0000803F}
         end
         end
@@ -141,7 +141,7 @@ object Form1: TForm1
       Up.Coordinates = {A633CE3EC0C1593F8711ADBE00000000}
       Up.Coordinates = {A633CE3EC0C1593F8711ADBE00000000}
     end
     end
   end
   end
-  object GLMaterialLibrary1: TGLMaterialLibrary
+  object GLMaterialLibraryCM: TGLMaterialLibrary
     Left = 112
     Left = 112
     Top = 24
     Top = 24
   end
   end

+ 60 - 65
Demos/Delphi/rendering/SkyBox/Unit1.pas

@@ -13,12 +13,12 @@ uses
   Vcl.Dialogs,
   Vcl.Dialogs,
   Vcl.ExtCtrls,
   Vcl.ExtCtrls,
   Vcl.Imaging.Jpeg,
   Vcl.Imaging.Jpeg,
-  
+
   GLS.Scene,
   GLS.Scene,
   GLS.VectorTypes,
   GLS.VectorTypes,
   GLS.Texture,
   GLS.Texture,
   GLS.SkyDome,
   GLS.SkyDome,
- 
+
   GLS.Cadencer,
   GLS.Cadencer,
   GLS.Navigator,
   GLS.Navigator,
   GLS.SceneViewer,
   GLS.SceneViewer,
@@ -35,7 +35,7 @@ type
   TForm1 = class(TForm)
   TForm1 = class(TForm)
     GLScene1: TGLScene;
     GLScene1: TGLScene;
     GLCamera1: TGLCamera;
     GLCamera1: TGLCamera;
-    GLMaterialLibrary1: TGLMaterialLibrary;
+    GLMaterialLibraryCM: TGLMaterialLibrary;
     GLLightSource1: TGLLightSource;
     GLLightSource1: TGLLightSource;
     Castle: TGLDummyCube;
     Castle: TGLDummyCube;
     GLCube1: TGLCube;
     GLCube1: TGLCube;
@@ -72,83 +72,78 @@ implementation
 
 
 {$R *.dfm}
 {$R *.dfm}
 
 
-
 function TForm1.LoadTexture(Matname,Filename : string) : TGLLibMaterial;
 function TForm1.LoadTexture(Matname,Filename : string) : TGLLibMaterial;
 begin
 begin
-  SetGLSceneMediaDir();
-  Result := GLMaterialLibrary1.AddTextureMaterial(Matname, Filename);
-  Result.Material.Texture.Disabled := false;
+  Result := GLMaterialLibraryCM.AddTextureMaterial(Matname, Filename);
+  Result.Material.Texture.Disabled := False;
   Result.Material.Texture.TextureMode := tmDecal;
   Result.Material.Texture.TextureMode := tmDecal;
 end;
 end;
 
 
 procedure TForm1.FormCreate(Sender: TObject);
 procedure TForm1.FormCreate(Sender: TObject);
 begin
 begin
-     // --------------
-     // Load graphics
-     // --------------
-
-     // Skybox textures
-     LoadTexture('Left','icecraterlf.jpg');
-     LoadTexture('Right','icecraterrt.jpg');
-     LoadTexture('Top','icecraterup.jpg');
-     LoadTexture('Bottom','icecraterdn.jpg');
-     LoadTexture('Front','icecraterft.jpg');
-     LoadTexture('Back','icecraterbk.jpg');
-     with LoadTexture('Clouds','Clouds.jpg') do
-     begin
-      // Add transparency to clouds
-      Material.BlendingMode := bmTransparency;
-      Material.FrontProperties.Diffuse.Alpha := 0.2;
-
-      // scale the clouds texture
-      TextureScale.X := 8;
-      TextureScale.y := 8;
-     end;
-
-     // bricks
-     with LoadTexture('Bricks','rawwall.jpg') do
-     begin
-        TextureScale.X := 1;
-        TextureScale.y := 32;
-        Material.Texture.TextureMode := tmModulate;
-     end;
-     with LoadTexture('Bricks2','marbletiles.jpg') do
-     begin
-        TextureScale.X := 6;
-        TextureScale.y := 1;
-        Material.Texture.TextureMode := tmModulate;
-     end;
-
-
-     //Moon
-     LoadTexture('Moon','unwrapped moon.jpg').Material.Texture.TextureMode := tmModulate;
-
-
-     //-----------------------------------------
-     // Assign materials to objects
-     //-----------------------------------------
-     GLCube1.Material.LibMaterialName := 'Bricks';
-     GLCube11.Material.LibMaterialName := 'Bricks';
-     GLCube111.Material.LibMaterialName := 'Bricks';
-     GLCube112.Material.LibMaterialName := 'Bricks';
-     GLCube2.Material.LibMaterialName := 'Bricks2';
-     GLCube21.Material.LibMaterialName := 'Bricks2';
-     GLCube21.Material.LibMaterialName := 'Bricks2';
-     GLCube211.Material.LibMaterialName := 'Bricks2';
-     GLCube212.Material.LibMaterialName := 'Bricks2';
-     GLSphere1.Material.LibMaterialName := 'Moon';
-     GLSphere2.Material.LibMaterialName := 'Moon';
-
-     GLUserInterface1.MouseLookActive:=true;
+  SetGLSceneMediaDir();
+  // --------------
+  // Load graphics
+  // --------------
+  // Skybox textures
+  LoadTexture('Left', 'icecraterlf.jpg');
+  LoadTexture('Right', 'icecraterrt.jpg');
+  LoadTexture('Top', 'icecraterup.jpg');
+  LoadTexture('Bottom', 'icecraterdn.jpg');
+  LoadTexture('Front', 'icecraterft.jpg');
+  LoadTexture('Back', 'icecraterbk.jpg');
+  with LoadTexture('Clouds', 'Clouds.jpg') do
+  begin
+    // Add transparency to clouds
+    Material.BlendingMode := bmTransparency;
+    Material.FrontProperties.Diffuse.Alpha := 0.2;
+
+    // scale the clouds texture
+    TextureScale.X := 8;
+    TextureScale.y := 8;
+  end;
 
 
+  // bricks
+  with LoadTexture('Bricks', 'rawwall.jpg') do
+  begin
+    TextureScale.X := 1;
+    TextureScale.y := 32;
+    Material.Texture.TextureMode := tmModulate;
+  end;
+  with LoadTexture('Bricks2', 'marbletiles.jpg') do
+  begin
+    TextureScale.X := 6;
+    TextureScale.y := 1;
+    Material.Texture.TextureMode := tmModulate;
+  end;
 
 
+  // Moon
+  LoadTexture('Moon', 'unwrapped moon.jpg').Material.Texture.TextureMode :=
+    tmModulate;
+
+  // -----------------------------------------
+  // Assign materials to objects
+  // -----------------------------------------
+  GLCube1.Material.LibMaterialName := 'Bricks';
+  GLCube11.Material.LibMaterialName := 'Bricks';
+  GLCube111.Material.LibMaterialName := 'Bricks';
+  GLCube112.Material.LibMaterialName := 'Bricks';
+  GLCube2.Material.LibMaterialName := 'Bricks2';
+  GLCube21.Material.LibMaterialName := 'Bricks2';
+  GLCube21.Material.LibMaterialName := 'Bricks2';
+  GLCube211.Material.LibMaterialName := 'Bricks2';
+  GLCube212.Material.LibMaterialName := 'Bricks2';
+  GLSphere1.Material.LibMaterialName := 'Moon';
+  GLSphere2.Material.LibMaterialName := 'Moon';
+
+  GLUserInterface1.MouseLookActive := true;
 end;
 end;
 
 
 procedure TForm1.GLCadencer1Progress(Sender: TObject; const deltaTime,
 procedure TForm1.GLCadencer1Progress(Sender: TObject; const deltaTime,
   newTime: Double);
   newTime: Double);
 begin
 begin
    // Make clouds Texture slide
    // Make clouds Texture slide
-   with GLMaterialLibrary1.Materials.GetLibMaterialByName('Clouds') do
+   with GLMaterialLibraryCM.Materials.GetLibMaterialByName('Clouds') do
    begin
    begin
         TextureOffset.X := TextureOffset.X + deltaTime * 0.02;
         TextureOffset.X := TextureOffset.X + deltaTime * 0.02;
         TextureOffset.Y := TextureOffset.Y + deltaTime * 0.03;
         TextureOffset.Y := TextureOffset.Y + deltaTime * 0.03;

+ 2 - 2
Demos/Delphi/utilities/fontgen/fontgen.dpr

@@ -2,12 +2,12 @@ program fontgen;
 
 
 uses
 uses
   Forms,
   Forms,
-  main in 'main.pas' {frmMain};
+  fFontGen in 'fFontGen.pas' {FormFontGen};
 
 
 {$R *.res}
 {$R *.res}
 
 
 begin
 begin
   Application.Initialize;
   Application.Initialize;
-  Application.CreateForm(TfrmMain, frmMain);
+  Application.CreateForm(TFormFontGen, FormFontGen);
   Application.Run;
   Application.Run;
 end.
 end.

+ 2 - 2
Demos/Delphi/utilities/fontgen/fontgen.dproj

@@ -109,8 +109,8 @@
         <DelphiCompile Include="$(MainSource)">
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         </DelphiCompile>
-        <DCCReference Include="main.pas">
-            <Form>frmMain</Form>
+        <DCCReference Include="fFontGen.pas">
+            <Form>FormFontGen</Form>
         </DCCReference>
         </DCCReference>
         <BuildConfiguration Include="Debug">
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <Key>Cfg_2</Key>

+ 1 - 1
Packages/GLScene_Cg_DT.dproj

@@ -189,7 +189,7 @@
                         <Overwrite>true</Overwrite>
                         <Overwrite>true</Overwrite>
                     </Platform>
                     </Platform>
                 </DeployFile>
                 </DeployFile>
-                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\GLScene_Cg_DT.bpl" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\20.0\Bpl\GLScene_Cg_DT.bpl" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
                     <Platform Name="Win32">
                         <RemoteName>GLScene_Cg_DT.bpl</RemoteName>
                         <RemoteName>GLScene_Cg_DT.bpl</RemoteName>
                         <Overwrite>true</Overwrite>
                         <Overwrite>true</Overwrite>

+ 19 - 19
Packages/GLScene_RT.dpk

@@ -36,24 +36,24 @@ requires
   xmlrtl;
   xmlrtl;
 
 
 contains
 contains
-  Format3DSConst in '..\Source\Format3DSConst.pas',
-  Format3DSTypes in '..\Source\Format3DSTypes.pas',
-  Format3DSUtils in '..\Source\Format3DSUtils.pas',
-  FormatDDSImage in '..\Source\FormatDDSImage.pas',
-  FormatDXTC in '..\Source\FormatDXTC.pas',
-  Format3DS in '..\Source\Format3DS.pas',
-  FormatHDRImage in '..\Source\FormatHDRImage.pas',
-  FormatQ3BSP in '..\Source\FormatQ3BSP.pas',
-  FormatB3D in '..\Source\FormatB3D.pas',
-  FormatGL2 in '..\Source\FormatGL2.pas',
-  FormatLWO in '..\Source\FormatLWO.pas',
-  FormatMD2 in '..\Source\FormatMD2.pas',
-  FormatMD3 in '..\Source\FormatMD3.pas',
-  FormatOCT in '..\Source\FormatOCT.pas',
-  FormatTGA in '..\Source\FormatTGA.pas',
-  FormatX in '..\Source\FormatX.pas',
-  FormatVFW in '..\Source\FormatVFW.pas',
-  FormatVRML in '..\Source\FormatVRML.pas',
+  Formats._3DSConst in '..\Source\Formats._3DSConst.pas',
+  Formats._3DSTypes in '..\Source\Formats._3DSTypes.pas',
+  Formats._3DSUtils in '..\Source\Formats._3DSUtils.pas',
+  Formats.DDSImage in '..\Source\Formats.DDSImage.pas',
+  Formats.DXTC in '..\Source\Formats.DXTC.pas',
+  Formats._3DS in '..\Source\Formats._3DS.pas',
+  Formats.HDRImage in '..\Source\Formats.HDRImage.pas',
+  Formats.Q3BSP in '..\Source\Formats.Q3BSP.pas',
+  Formats.B3D in '..\Source\Formats.B3D.pas',
+  Formats.GL2 in '..\Source\Formats.GL2.pas',
+  Formats.LWO in '..\Source\Formats.LWO.pas',
+  Formats.MD2 in '..\Source\Formats.MD2.pas',
+  Formats.MD3 in '..\Source\Formats.MD3.pas',
+  Formats.OCT in '..\Source\Formats.OCT.pas',
+  Formats.TGA in '..\Source\Formats.TGA.pas',
+  Formats.X in '..\Source\Formats.X.pas',
+  Formats.VFW in '..\Source\Formats.VFW.pas',
+  Formats.VRML in '..\Source\Formats.VRML.pas',
   GLS.AVIRecorder in '..\Source\GLS.AVIRecorder.pas',
   GLS.AVIRecorder in '..\Source\GLS.AVIRecorder.pas',
   GLS.AnimatedSprite in '..\Source\GLS.AnimatedSprite.pas',
   GLS.AnimatedSprite in '..\Source\GLS.AnimatedSprite.pas',
   GLS.AnimationUtils in '..\Source\GLS.AnimationUtils.pas',
   GLS.AnimationUtils in '..\Source\GLS.AnimationUtils.pas',
@@ -255,7 +255,7 @@ contains
   GLS.CrossXML in '..\Source\GLS.CrossXML.pas',
   GLS.CrossXML in '..\Source\GLS.CrossXML.pas',
   GLS.Silhouette in '..\Source\GLS.Silhouette.pas',
   GLS.Silhouette in '..\Source\GLS.Silhouette.pas',
   GLS.PlugInManager in '..\Source\GLS.PlugInManager.pas',
   GLS.PlugInManager in '..\Source\GLS.PlugInManager.pas',
-  GLS.VectorRecTypes in '..\Source\GLS.VectorRecTypes.pas',
+  GLS.VectorTypesExt in '..\Source\GLS.VectorTypesExt.pas',
   GLS.VectorGeometry in '..\Source\GLS.VectorGeometry.pas',
   GLS.VectorGeometry in '..\Source\GLS.VectorGeometry.pas',
   GLS.Logger in '..\Source\GLS.Logger.pas',
   GLS.Logger in '..\Source\GLS.Logger.pas',
   GLS.RGBE in '..\Source\GLS.RGBE.pas',
   GLS.RGBE in '..\Source\GLS.RGBE.pas',

+ 19 - 19
Packages/GLScene_RT.dproj

@@ -140,24 +140,24 @@
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="vclimg.dcp"/>
         <DCCReference Include="vclimg.dcp"/>
         <DCCReference Include="xmlrtl.dcp"/>
         <DCCReference Include="xmlrtl.dcp"/>
-        <DCCReference Include="..\Source\Format3DSConst.pas"/>
-        <DCCReference Include="..\Source\Format3DSTypes.pas"/>
-        <DCCReference Include="..\Source\Format3DSUtils.pas"/>
-        <DCCReference Include="..\Source\FormatDDSImage.pas"/>
-        <DCCReference Include="..\Source\FormatDXTC.pas"/>
-        <DCCReference Include="..\Source\Format3DS.pas"/>
-        <DCCReference Include="..\Source\FormatHDRImage.pas"/>
-        <DCCReference Include="..\Source\FormatQ3BSP.pas"/>
-        <DCCReference Include="..\Source\FormatB3D.pas"/>
-        <DCCReference Include="..\Source\FormatGL2.pas"/>
-        <DCCReference Include="..\Source\FormatLWO.pas"/>
-        <DCCReference Include="..\Source\FormatMD2.pas"/>
-        <DCCReference Include="..\Source\FormatMD3.pas"/>
-        <DCCReference Include="..\Source\FormatOCT.pas"/>
-        <DCCReference Include="..\Source\FormatTGA.pas"/>
-        <DCCReference Include="..\Source\FormatX.pas"/>
-        <DCCReference Include="..\Source\FormatVFW.pas"/>
-        <DCCReference Include="..\Source\FormatVRML.pas"/>
+        <DCCReference Include="..\Source\Formats._3DSConst.pas"/>
+        <DCCReference Include="..\Source\Formats._3DSTypes.pas"/>
+        <DCCReference Include="..\Source\Formats._3DSUtils.pas"/>
+        <DCCReference Include="..\Source\Formats.DDSImage.pas"/>
+        <DCCReference Include="..\Source\Formats.DXTC.pas"/>
+        <DCCReference Include="..\Source\Formats._3DS.pas"/>
+        <DCCReference Include="..\Source\Formats.HDRImage.pas"/>
+        <DCCReference Include="..\Source\Formats.Q3BSP.pas"/>
+        <DCCReference Include="..\Source\Formats.B3D.pas"/>
+        <DCCReference Include="..\Source\Formats.GL2.pas"/>
+        <DCCReference Include="..\Source\Formats.LWO.pas"/>
+        <DCCReference Include="..\Source\Formats.MD2.pas"/>
+        <DCCReference Include="..\Source\Formats.MD3.pas"/>
+        <DCCReference Include="..\Source\Formats.OCT.pas"/>
+        <DCCReference Include="..\Source\Formats.TGA.pas"/>
+        <DCCReference Include="..\Source\Formats.X.pas"/>
+        <DCCReference Include="..\Source\Formats.VFW.pas"/>
+        <DCCReference Include="..\Source\Formats.VRML.pas"/>
         <DCCReference Include="..\Source\GLS.AVIRecorder.pas"/>
         <DCCReference Include="..\Source\GLS.AVIRecorder.pas"/>
         <DCCReference Include="..\Source\GLS.AnimatedSprite.pas"/>
         <DCCReference Include="..\Source\GLS.AnimatedSprite.pas"/>
         <DCCReference Include="..\Source\GLS.AnimationUtils.pas"/>
         <DCCReference Include="..\Source\GLS.AnimationUtils.pas"/>
@@ -359,7 +359,7 @@
         <DCCReference Include="..\Source\GLS.CrossXML.pas"/>
         <DCCReference Include="..\Source\GLS.CrossXML.pas"/>
         <DCCReference Include="..\Source\GLS.Silhouette.pas"/>
         <DCCReference Include="..\Source\GLS.Silhouette.pas"/>
         <DCCReference Include="..\Source\GLS.PlugInManager.pas"/>
         <DCCReference Include="..\Source\GLS.PlugInManager.pas"/>
-        <DCCReference Include="..\Source\GLS.VectorRecTypes.pas"/>
+        <DCCReference Include="..\Source\GLS.VectorTypesExt.pas"/>
         <DCCReference Include="..\Source\GLS.VectorGeometry.pas"/>
         <DCCReference Include="..\Source\GLS.VectorGeometry.pas"/>
         <DCCReference Include="..\Source\GLS.Logger.pas"/>
         <DCCReference Include="..\Source\GLS.Logger.pas"/>
         <DCCReference Include="..\Source\GLS.RGBE.pas"/>
         <DCCReference Include="..\Source\GLS.RGBE.pas"/>

+ 1 - 1
Source/DWS.Classes.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit DWS.Classes;
 unit DWS.Classes;

+ 1 - 1
Source/DWS.HelperFunc.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit DWS.HelperFunc;
 unit DWS.HelperFunc;

+ 1 - 1
Source/DWS.Objects.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit DWS.Objects;
 unit DWS.Objects;

+ 1 - 1
Source/DWS.OpenGL.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit DWS.OpenGL;
 unit DWS.OpenGL;

+ 1 - 1
Source/DWS.Scene.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit DWS.Scene;
 unit DWS.Scene;

+ 1 - 1
Source/DWS.Script.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit DWS.Script;
 unit DWS.Script;

+ 1 - 1
Source/DWS.VectorGeometry.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit DWS.VectorGeometry;
 unit DWS.VectorGeometry;

+ 1 - 1
Source/FCUDAEditor.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FCUDAEditor;
 unit FCUDAEditor;

+ 1 - 1
Source/FGUILayoutEditor.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 unit FGuiLayoutEditor;
 unit FGuiLayoutEditor;
 
 

+ 1 - 1
Source/FGuiSkinEditor.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FGuiSkinEditor;
 unit FGuiSkinEditor;

+ 4 - 27
Source/FInfo.dfm

@@ -36,10 +36,6 @@ object GLInfoForm: TGLInfoForm
     object TabSheetGLScene: TTabSheet
     object TabSheetGLScene: TTabSheet
       Caption = 'GLScene'
       Caption = 'GLScene'
       ImageIndex = 4
       ImageIndex = 4
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object Image: TImage
       object Image: TImage
         Left = 1
         Left = 1
         Top = 2
         Top = 2
@@ -2730,10 +2726,6 @@ object GLInfoForm: TGLInfoForm
     end
     end
     object TabSheetInformation: TTabSheet
     object TabSheetInformation: TTabSheet
       Caption = 'Information'
       Caption = 'Information'
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object ScrollBoxInfo: TScrollBox
       object ScrollBoxInfo: TScrollBox
         Left = 0
         Left = 0
         Top = 0
         Top = 0
@@ -3457,10 +3449,6 @@ object GLInfoForm: TGLInfoForm
     object TabSheetExtensions: TTabSheet
     object TabSheetExtensions: TTabSheet
       Caption = 'Supported extensions'
       Caption = 'Supported extensions'
       ImageIndex = 3
       ImageIndex = 3
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object ListBoxExtensions: TListBox
       object ListBoxExtensions: TListBox
         Left = 0
         Left = 0
         Top = 0
         Top = 0
@@ -3487,10 +3475,6 @@ object GLInfoForm: TGLInfoForm
     end
     end
     object TabSheetContributors: TTabSheet
     object TabSheetContributors: TTabSheet
       Caption = 'Contributors'
       Caption = 'Contributors'
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object MemoContributors: TMemo
       object MemoContributors: TMemo
         Left = 0
         Left = 0
         Top = 0
         Top = 0
@@ -3507,10 +3491,8 @@ object GLInfoForm: TGLInfoForm
           'Alejandro Leon Escalera'
           'Alejandro Leon Escalera'
           'Alexandre Hirzel'
           'Alexandre Hirzel'
           'Arvydas Juskevicius'
           'Arvydas Juskevicius'
-          'Ast'
           'Brian Johns'
           'Brian Johns'
           'Burkhard Carstens'
           'Burkhard Carstens'
-          'C4'
           'Da Stranger'
           'Da Stranger'
           'Daniel Bartlett'
           'Daniel Bartlett'
           'Dave Kerr'
           'Dave Kerr'
@@ -3520,8 +3502,7 @@ object GLInfoForm: TGLInfoForm
           'Eric Hardinge'
           'Eric Hardinge'
           'Eric Pascual'
           'Eric Pascual'
           'Erick Schuitema'
           'Erick Schuitema'
-          'fig'
-          'filippo'
+          'Filippo'
           'Gabriel Corneanu'
           'Gabriel Corneanu'
           'Ivan Lee Herring'
           'Ivan Lee Herring'
           'Jerome Delauney'
           'Jerome Delauney'
@@ -3532,11 +3513,10 @@ object GLInfoForm: TGLInfoForm
           'Lionel Reynaud'
           'Lionel Reynaud'
           'Lord Crc'
           'Lord Crc'
           'Lukasz Sokol'
           'Lukasz Sokol'
-          'mal'
           'Marcus Oblak'
           'Marcus Oblak'
           'Matheus Degiovani'
           'Matheus Degiovani'
           'Mattias Fagerlund'
           'Mattias Fagerlund'
-          'mif'
+          'Mif'
           'Mike Lischke'
           'Mike Lischke'
           'Nelson Chu'
           'Nelson Chu'
           'overkrik'
           'overkrik'
@@ -3551,7 +3531,7 @@ object GLInfoForm: TGLInfoForm
           'Roshal Sasha'
           'Roshal Sasha'
           'Rustam Asmandiarov'
           'Rustam Asmandiarov'
           'Sandor Domokos'
           'Sandor Domokos'
-          'Sergio'
+          'Sergio Feitoza'
           'Solerman Kaplon'
           'Solerman Kaplon'
           'Sternas Stefanos'
           'Sternas Stefanos'
           'Stuart Gooding'
           'Stuart Gooding'
@@ -3561,14 +3541,11 @@ object GLInfoForm: TGLInfoForm
         ReadOnly = True
         ReadOnly = True
         ScrollBars = ssVertical
         ScrollBars = ssVertical
         TabOrder = 0
         TabOrder = 0
+        ExplicitTop = 72
       end
       end
     end
     end
     object TabSheetAbout: TTabSheet
     object TabSheetAbout: TTabSheet
       Caption = 'About'
       Caption = 'About'
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object WebsiteLbl: TLabel
       object WebsiteLbl: TLabel
         Left = 57
         Left = 57
         Top = 274
         Top = 274

+ 1 - 1
Source/FInfo.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FInfo;
 unit FInfo;

+ 1 - 1
Source/FLibMaterialPicker.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FLibMaterialPicker;
 unit FLibMaterialPicker;

+ 1 - 1
Source/FMaterialEditor.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FMaterialEditor;
 unit FMaterialEditor;

+ 1 - 1
Source/FPlugInManagerEditor.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FPlugInManagerEditor;
 unit FPlugInManagerEditor;

+ 1 - 1
Source/FRColorEditor.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FRColorEditor;
 unit FRColorEditor;

+ 1 - 1
Source/FRFaceEditor.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FRFaceEditor;
 unit FRFaceEditor;

+ 1 - 1
Source/FRMaterialPreview.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FRMaterialPreview;
 unit FRMaterialPreview;

+ 1 - 1
Source/FRTextureEdit.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FRTextureEdit;
 unit FRTextureEdit;

+ 1 - 1
Source/FRTrackBarEdit.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FRTrackBarEdit;
 unit FRTrackBarEdit;

+ 1 - 1
Source/FSceneEditor.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FSceneEditor;
 unit FSceneEditor;

+ 1 - 1
Source/FShaderMemo.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FShaderMemo;
 unit FShaderMemo;

+ 1 - 1
Source/FShaderUniformEditor.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FShaderUniformEditor;
 unit FShaderUniformEditor;

+ 1 - 1
Source/FVectorEditor.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FVectorEditor;
 unit FVectorEditor;

+ 1 - 1
Source/FXCollectionEditor.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit FXCollectionEditor;
 unit FXCollectionEditor;

+ 2 - 2
Source/FormatB3D.pas → Source/Formats.B3D.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit FormatB3D;
+unit Formats.B3D;
 
 
 (* File streaming class for the B3D loader *)
 (* File streaming class for the B3D loader *)
 
 

+ 4 - 4
Source/FormatDDSImage.pas → Source/Formats.DDSImage.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit FormatDDSImage;
+unit Formats.DDSImage;
 
 
 (*
 (*
     Alternative for DDS unit with more supported formats of flat image:
     Alternative for DDS unit with more supported formats of flat image:
@@ -25,7 +25,7 @@ uses
   System.SysUtils,
   System.SysUtils,
   Vcl.Graphics,
   Vcl.Graphics,
 
 
-  GLS.OpenGLTokens,
+  GLS.VectorTypes,
   GLS.VectorGeometry,
   GLS.VectorGeometry,
   GLS.Graphics,
   GLS.Graphics,
   GLS.Context;
   GLS.Context;
@@ -45,7 +45,7 @@ implementation
 //-------------------------------------------------  
 //-------------------------------------------------  
 
 
 uses
 uses
-  FormatDXTC,
+  Formats.DXTC,
   GLS.FileDDS,
   GLS.FileDDS,
   GLS.TextureFormat;
   GLS.TextureFormat;
 
 

+ 2 - 2
Source/FormatDXTC.pas → Source/Formats.DXTC.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit FormatDXTC;
+unit Formats.DXTC;
 
 
 (*
 (*
    DXTC (also S3TC) decoding.
    DXTC (also S3TC) decoding.

+ 2 - 2
Source/FormatGL2.pas → Source/Formats.GL2.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit FormatGL2;
+unit Formats.GL2;
 
 
 (*
 (*
   Ghoul2 (GLM/GLA) file format loading structures
   Ghoul2 (GLM/GLA) file format loading structures

+ 3 - 3
Source/FormatHDRImage.pas → Source/Formats.HDRImage.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit FormatHDRImage;
+unit Formats.HDRImage;
 
 
 (*
 (*
     Good for preview picture in OpenDialog,
     Good for preview picture in OpenDialog,
@@ -20,7 +20,7 @@ uses
   System.SysUtils,
   System.SysUtils,
   Vcl.Graphics,
   Vcl.Graphics,
 
 
-  GLS.OpenGLTokens,
+  GLS.VectorTypes,
   GLS.VectorGeometry,
   GLS.VectorGeometry,
   GLS.Graphics;
   GLS.Graphics;
 
 

+ 2 - 2
Source/FormatLWO.pas → Source/Formats.LWO.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit FormatLWO;
+unit Formats.LWO;
 
 
 (* =============================================================
 (* =============================================================
 
 

+ 2 - 2
Source/FormatMD2.pas → Source/Formats.MD2.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit FormatMD2;
+unit Formats.MD2;
 
 
 (* Loading methods for MD2 file format *)
 (* Loading methods for MD2 file format *)
 
 

+ 2 - 2
Source/FormatMD3.pas → Source/Formats.MD3.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit FormatMD3;
+unit Formats.MD3;
 
 
 (* File loading methods for the MD3 file format *)
 (* File loading methods for the MD3 file format *)
 
 

+ 2 - 2
Source/FormatOCT.pas → Source/Formats.OCT.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit FormatOCT;
+unit Formats.OCT;
 
 
 (* Loader for FSRad OCT files *)
 (* Loader for FSRad OCT files *)
 
 

+ 2 - 2
Source/FormatQ3BSP.pas → Source/Formats.Q3BSP.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit FormatQ3BSP;
+unit Formats.Q3BSP;
 
 
 (* Simple Quake III BSP file loader. *)
 (* Simple Quake III BSP file loader. *)
 
 

+ 2 - 2
Source/FormatTGA.pas → Source/Formats.TGA.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit FormatTGA;
+unit Formats.TGA;
 
 
 (* Graphic engine friendly loading of TGA image. *)
 (* Graphic engine friendly loading of TGA image. *)
 
 

+ 2 - 2
Source/FormatVFW.pas → Source/Formats.VFW.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit FormatVFW;
+unit Formats.VFW;
 
 
 (*  Video for windows *)
 (*  Video for windows *)
 
 

+ 1 - 2
Source/FormatVRML.pas → Source/Formats.VRML.pas

@@ -1,8 +1,7 @@
 //
 //
 // The unit is part of the GLScene Engine, http://glscene.org
 // The unit is part of the GLScene Engine, http://glscene.org
 //
 //
-
-unit FormatVRML;
+unit Formats.VRML;
 
 
 (*  VRML file format parser. *)
 (*  VRML file format parser. *)
 
 

+ 2 - 3
Source/FormatX.pas → Source/Formats.X.pas

@@ -1,8 +1,7 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
-
-unit FormatX;
+unit Formats.X;
 
 
 (* Simple X format support (Microsoft's favorite format) *)
 (* Simple X format support (Microsoft's favorite format) *)
 
 

+ 7 - 8
Source/Format3DS.pas → Source/Formats._3DS.pas

@@ -1,8 +1,7 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
-
-unit Format3DS;
+unit Formats._3DS;
 
 
 (*
 (*
   Implementation of an universal 3DS file reader (and writer). This is the main file of the
   Implementation of an universal 3DS file reader (and writer). This is the main file of the
@@ -27,7 +26,7 @@ uses
   System.Classes, 
   System.Classes, 
   System.SysUtils,
   System.SysUtils,
 
 
-  Format3DSTypes;
+  Formats._3DSTypes;
 
 
 type
 type
   TFile3DS = class;
   TFile3DS = class;
@@ -241,8 +240,8 @@ implementation
 // ---------------------------------------------------------------------------------------------------------------------
 // ---------------------------------------------------------------------------------------------------------------------
 
 
 uses 
 uses 
-  Format3DSConst,
-  Format3DSUtils;
+  Formats._3DSConst,
+  Formats._3DSUtils;
 
 
 function StrPasFree(P: PChar3DS): String;
 function StrPasFree(P: PChar3DS): String;
 begin
 begin
@@ -2955,7 +2954,7 @@ end;
 function TFile3DS.GetDatabaseRelease: TReleaseLevel;
 function TFile3DS.GetDatabaseRelease: TReleaseLevel;
 
 
 begin
 begin
-  Result := Format3DSUtils.GetDatabaseRelease(Self, FDatabase);
+  Result := Formats._3DSUtils.GetDatabaseRelease(Self, FDatabase);
 end;
 end;
 
 
 //---------------------------------------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------------------------------------
@@ -2963,7 +2962,7 @@ end;
 function TFile3DS.GetMeshRelease: TReleaseLevel;
 function TFile3DS.GetMeshRelease: TReleaseLevel;
 
 
 begin
 begin
-  Result := Format3DSUtils.GetMeshRelease(Self, FDatabase);
+  Result := Formats._3DSUtils.GetMeshRelease(Self, FDatabase);
 end;
 end;
 
 
 //---------------------------------------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------------------------------------

+ 3 - 3
Source/Format3DSConst.pas → Source/Formats._3DSConst.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit Format3DSConst;
+unit Formats._3DSConst;
 
 
 (*
 (*
  All 3DS constant definitions used by the various routines (mainly in Utils3DS.pas). About one thousand
  All 3DS constant definitions used by the various routines (mainly in Utils3DS.pas). About one thousand
@@ -14,7 +14,7 @@ unit Format3DSConst;
 interface
 interface
 
 
 uses
 uses
-  Format3DSTypes;
+  Formats._3DSTypes;
 
 
 // ---------------- Constants for commonly used structures --------------------
 // ---------------- Constants for commonly used structures --------------------
 
 

+ 2 - 3
Source/Format3DSTypes.pas → Source/Formats._3DSTypes.pas

@@ -1,8 +1,7 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
-
-unit Format3DSTypes;
+unit Formats._3DSTypes;
 
 
 (* Implements the standard Teapot, build from evaluators. *)
 (* Implements the standard Teapot, build from evaluators. *)
 
 

+ 7 - 8
Source/Format3DSUtils.pas → Source/Formats._3DSUtils.pas

@@ -1,8 +1,8 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
-unit Format3DSUtils;
+unit Formats._3DSUtils;
 
 
 (*
 (*
    Utility functions for the universal 3DS file reader and writer (TFile3DS).
    Utility functions for the universal 3DS file reader and writer (TFile3DS).
@@ -15,11 +15,13 @@ interface
 {$I GLScene.inc}
 {$I GLScene.inc}
 {$R-}
 {$R-}
 
 
-uses 
+uses
   System.Classes,
   System.Classes,
   System.SysUtils,
   System.SysUtils,
-  Format3DS,
-  Format3DSTypes,
+  Formats._3DS,
+  Formats._3DSTypes,
+  Formats._3DSConst,
+
   GLS.Strings;
   GLS.Strings;
 
 
 // functions to retrieve global settings of a specific 3DS database
 // functions to retrieve global settings of a specific 3DS database
@@ -130,9 +132,6 @@ procedure ShowErrorFormatted(const ErrorMessage: string; const Args: array of co
 implementation
 implementation
 //-------------------------------------------------
 //-------------------------------------------------
 
 
-uses 
-  Format3DSConst;
-
 type
 type
   E3DSError = class(Exception);
   E3DSError = class(Exception);
 
 

+ 2 - 2
Source/GLS.AVIRecorder.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.AVIRecorder;
 unit GLS.AVIRecorder;
@@ -21,7 +21,7 @@ uses
   VCL.Graphics, 
   VCL.Graphics, 
   VCL.Dialogs,
   VCL.Dialogs,
    
    
-  FormatVFW,
+  Formats.VFW,
 
 
   GLS.Graphics,
   GLS.Graphics,
   GLS.Scene,
   GLS.Scene,

+ 1 - 1
Source/GLS.AnimatedSprite.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.AnimatedSprite;
 unit GLS.AnimatedSprite;

+ 1 - 1
Source/GLS.AnimationUtils.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.AnimationUtils;
 unit GLS.AnimationUtils;

+ 1 - 1
Source/GLS.ApplicationFileIO.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.ApplicationFileIO;
 unit GLS.ApplicationFileIO;

+ 1 - 1
Source/GLS.ArchiveManager.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.ArchiveManager;
 unit GLS.ArchiveManager;

+ 1 - 1
Source/GLS.AsyncHDS.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.AsyncHDS;
 unit GLS.AsyncHDS;

+ 1 - 1
Source/GLS.AsyncTimer.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.AsyncTimer;
 unit GLS.AsyncTimer;

+ 1 - 1
Source/GLS.Atmosphere.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.Atmosphere;
 unit GLS.Atmosphere;

+ 1 - 1
Source/GLS.BaseClasses.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.BaseClasses;
 unit GLS.BaseClasses;

+ 1 - 1
Source/GLS.BaseMeshSilhouette.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.BaseMeshSilhouette;
 unit GLS.BaseMeshSilhouette;

+ 1 - 1
Source/GLS.Behaviours.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.Behaviours;
 unit GLS.Behaviours;

+ 1 - 1
Source/GLS.BitmapFont.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.BitmapFont;
 unit GLS.BitmapFont;

+ 2 - 4
Source/GLS.Blur.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.Blur;
 unit GLS.Blur;
@@ -17,8 +17,7 @@ uses
   System.SysUtils,
   System.SysUtils,
   VCL.Graphics,
   VCL.Graphics,
 
 
-  
-  GLS.OpenGLTokens,
+  GLS.VectorTypes,
   GLS.VectorGeometry,
   GLS.VectorGeometry,
   GLS.BaseClasses,
   GLS.BaseClasses,
   GLS.Scene,
   GLS.Scene,
@@ -169,7 +168,6 @@ uses
   GLS.Coordinates,
   GLS.Coordinates,
   GLS.PersistentClasses,
   GLS.PersistentClasses,
   GLS.Strings,
   GLS.Strings,
-  GLS.VectorTypes,
   GLS.OpenGLAdapter;
   GLS.OpenGLAdapter;
 
 
 const
 const

+ 1 - 1
Source/GLS.BumpmapHDS.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.BumpmapHDS;
 unit GLS.BumpmapHDS;

+ 1 - 1
Source/GLS.Cadencer.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.Cadencer;
 unit GLS.Cadencer;

+ 1 - 1
Source/GLS.CameraController.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.CameraController;
 unit GLS.CameraController;

+ 1 - 1
Source/GLS.Canvas.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.Canvas;
 unit GLS.Canvas;

+ 1 - 1
Source/GLS.Collision.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.Collision;
 unit GLS.Collision;

+ 1 - 1
Source/GLS.Color.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.Color;
 unit GLS.Color;

+ 1 - 1
Source/GLS.CompositeImage.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.CompositeImage;
 unit GLS.CompositeImage;

+ 1 - 1
Source/GLS.Console.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.Console;
 unit GLS.Console;

+ 1 - 1
Source/GLS.Context.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.Context;
 unit GLS.Context;

+ 1 - 1
Source/GLS.Coordinates.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.Coordinates;
 unit GLS.Coordinates;

+ 1 - 1
Source/GLS.CrossXML.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.CrossXML;
 unit GLS.CrossXML;

+ 1 - 1
Source/GLS.CurvesAndSurfaces.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.CurvesAndSurfaces;
 unit GLS.CurvesAndSurfaces;

+ 1 - 1
Source/GLS.DCE.pas

@@ -1,5 +1,5 @@
 //
 //
-// This unit is part of the GLScene Engine, http://glscene.org
+// The graphics rendering engine GLScene http://glscene.org
 //
 //
 
 
 unit GLS.DCE;
 unit GLS.DCE;

Some files were not shown because too many files changed in this diff