Updated cpp interface demos

AdvDemos/PakEdit/FolderDialog.pas

@@ -2,8 +2,16 @@ unit FolderDialog;
 
 interface
 
-uses Windows, System.SysUtils, System.Classes, Vcl.Graphics, Vcl.Forms, Vcl.Controls, Vcl.StdCtrls, 
-  Buttons, Vcl.ExtCtrls;
+uses
+  Windows,
+  System.SysUtils,
+  System.Classes,
+  Vcl.Graphics,
+  Vcl.Forms,
+  Vcl.Controls,
+  Vcl.StdCtrls,
+  Vcl.Buttons,
+  Vcl.ExtCtrls;
 
 type
   TFDialog = class(TForm)

AdvDemos/PakEdit/FolderSelect.pas

@@ -2,8 +2,16 @@ unit FolderSelect;
 
 interface
 
-uses Windows, System.SysUtils, System.Classes, Vcl.Graphics, Vcl.Forms, Vcl.Controls, Vcl.StdCtrls, 
-  Buttons, Vcl.ExtCtrls, Vcl.ComCtrls, ShellCtrls;
+uses
+  Windows,
+  System.SysUtils,
+  System.Classes,
+  Vcl.Graphics,
+  Vcl.Forms, Vcl.Controls, Vcl.StdCtrls,
+  Vcl.Buttons,
+  Vcl.ExtCtrls,
+  Vcl.ComCtrls,
+  ShellCtrls;
 
 type
   TFolderSel = class(TForm)
@@ -13,9 +21,9 @@ type
     ShellView: TShellTreeView;
     Label1: TLabel;
   private
-     
+
   public
-     
+
   end;
 
 var

AdvDemos/PakEdit/Frm_CompressionRatio.dfm

@@ -43,7 +43,6 @@ object FrmCompressionRatio: TFrmCompressionRatio
     Width = 161
     Height = 21
     Style = csDropDownList
-    ItemHeight = 13
     TabOrder = 2
   end
 end

AdvDemos/PakEdit/Frm_CompressionRatio.pas

@@ -3,8 +3,13 @@ unit Frm_CompressionRatio;
 interface
 
 uses
-  Windows, Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms,
-  Dialogs, Vcl.StdCtrls, GLVfsPAK;
+  Winapi.Windows, Winapi.Messages,
+  System.SysUtils,
+  System.Variants, System.Classes,
+  Vcl.Graphics, Vcl.Controls, Vcl.Forms,
+  Vcl.Dialogs,
+  Vcl.StdCtrls,
+  GLS.FileVfsPAK;
 
 type
   TFrmCompressionRatio = class(TForm)

AdvDemos/PakEdit/Main.dfm

@@ -1,9 +1,9 @@
 object Form1: TForm1
   Left = 253
   Top = 218
-  Width = 555
-  Height = 299
   Caption = 'GLScene Pak Editor'
+  ClientHeight = 240
+  ClientWidth = 539
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
@@ -15,8 +15,8 @@ object Form1: TForm1
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   DesignSize = (
-    547
-    245)
+    539
+    240)
   PixelsPerInch = 96
   TextHeight = 13
   object Bevel1: TBevel
@@ -31,7 +31,7 @@ object Form1: TForm1
     Left = 8
     Top = 8
     Width = 161
-    Height = 241
+    Height = 221
     Anchors = [akLeft, akTop, akBottom]
     Images = ImageList1
     Indent = 19
@@ -43,10 +43,10 @@ object Form1: TForm1
     OnKeyDown = TreeViewKeyDown
   end
   object ListView: TListView
-    Left = 176
+    Left = 175
     Top = 8
     Width = 365
-    Height = 241
+    Height = 221
     Anchors = [akLeft, akTop, akRight, akBottom]
     Columns = <
       item
@@ -58,9 +58,10 @@ object Form1: TForm1
         Width = 70
       end>
     Enabled = False
-    Items.Data = {
-      370000000100000000000000FFFFFFFFFFFFFFFF00000000000000001A4F7065
-      6E206F72206372656174652070616B2066696C652E2E2E}
+    Items.ItemData = {
+      054E0000000100000000000000FFFFFFFFFFFFFFFF00000000FFFFFFFF000000
+      001A4F00700065006E0020006F00720020006300720065006100740065002000
+      700061006B002000660069006C0065002E002E002E00}
     MultiSelect = True
     SmallImages = ImageList1
     TabOrder = 1

AdvDemos/PakEdit/Main.pas

@@ -1,15 +1,22 @@
-{
-	<b>History :</b><font size=-1><ul>
-       <li>03/08/04 - Orchestraman - Modified to support the compression feature of GLVfsPAK.
-	</ul></font>
-}
 unit Main;
 
 interface
 
 uses
-  Winapi.Windows, System.SysUtils, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms,
-  Vcl.Dialogs, Vcl.StrUtils, Vcl.Menus, Vcl.ImgList, Vcl.ExtCtrls, Vcl.ComCtrls, GLVfsPAK;
+  Winapi.Windows,
+  System.SysUtils,
+  System.Classes,
+  System.ImageList,
+  Vcl.Graphics,
+  Vcl.Controls,
+  Vcl.Forms,
+  Vcl.Dialogs,
+  StrUtils,
+  Vcl.Menus,
+  Vcl.ImgList,
+  Vcl.ExtCtrls,
+  Vcl.ComCtrls,
+  GLS.FileVfsPAK;
 
 type
   TForm1 = class(TForm)
@@ -42,11 +49,11 @@ type
     procedure AddNode(text: string; node: TTreeNode);
     function TreeIndexOf(s: string; node: TTreeNode): integer;
     function ListIndexOf(s: string): integer;
-    procedure TreeViewCollapsing(Sender: TObject; Node: TTreeNode;
+    procedure TreeViewCollapsing(Sender: TObject; node: TTreeNode;
       var AllowCollapse: Boolean);
     procedure ListViewClick(Sender: TObject);
     procedure ListViewDblClick(Sender: TObject);
-    procedure TreeViewChange(Sender: TObject; Node: TTreeNode);
+    procedure TreeViewChange(Sender: TObject; node: TTreeNode);
     procedure ListViewKeyDown(Sender: TObject; var Key: Word;
       Shift: TShiftState);
     procedure ListViewChange(Sender: TObject; Item: TListItem;
@@ -65,301 +72,339 @@ type
     procedure ConverttocompressedClick(Sender: TObject);
     procedure ConverttouncompressedClick(Sender: TObject);
   private
-     
+
   public
-     
+
     procedure RefreshMenu;
   end;
 
 var
   Form1: TForm1;
-  CurPath,
-  Selection: string;
+  CurPath, Selection: string;
   Pak: TGLVfsPak;
 
 implementation
 
-uses FolderDialog, FolderSelect, Frm_CompressionRatio, ShellApi;
+uses
+  FolderDialog, FolderSelect, Frm_CompressionRatio, ShellApi;
 
 {$R *.dfm}
 {$R icons.res}
 
 procedure TForm1.AddNode(text: string; node: TTreeNode);
 var
-   s: string;
-   c: integer;
+  s: string;
+  c: integer;
 begin
-   c:=Pos('/',Text);
-   if c=0 then exit;
-   s:=Copy(text,1,c-1);
-   Delete(text,1,c);
-   if TreeIndexOf(s,node)=-1 then
-   AddNode(text, TreeView.Items.AddChild(node,s)) else
-   AddNode(text, node[TreeIndexOf(s,node)]);
+  c := Pos('/', text);
+  if c = 0 then
+    exit;
+  s := Copy(text, 1, c - 1);
+  Delete(text, 1, c);
+  if TreeIndexOf(s, node) = -1 then
+    AddNode(text, TreeView.Items.AddChild(node, s))
+  else
+    AddNode(text, node[TreeIndexOf(s, node)]);
 end;
 
 function TForm1.TreeIndexOf(s: string; node: TTreeNode): integer;
 var
-   i: integer;
+  i: integer;
 begin
-   Result:=-1;
-      for i:=0 to node.Count-1 do
-         if node[i].Text=s then Result:=i;
+  Result := -1;
+  for i := 0 to node.Count - 1 do
+    if node[i].text = s then
+      Result := i;
 end;
 
 function TForm1.ListIndexOf(s: string): integer;
 var
-   i: integer;
+  i: integer;
 begin
-   Result:=-1;
-      for i:=0 to ListView.Items.Count-1 do
-         if ListView.Items[i].Caption=s then Result:=i;
+  Result := -1;
+  for i := 0 to ListView.Items.Count - 1 do
+    if ListView.Items[i].Caption = s then
+      Result := i;
 end;
 
 procedure TForm1.TreeViewRefresh;
 var
-   i: integer;
+  i: integer;
 begin
-   with TreeView do begin
-      Items.Clear;
-      Items.AddChild(Items.GetFirstNode,ExtractFileName(Pak.PakFileName));
-      for i:=0 to Pak.Files.Count-1 do
-         AddNode(Pak.Files[i],Items.GetFirstNode);
-      Items[0].Expanded:=True;
-      Items[0].SelectedIndex:=1;
-      Items[0].ImageIndex:=1;
-   end;
-   TreeView.Selected:=TreeView.Items.GetFirstNode;
+  with TreeView do
+  begin
+    Items.Clear;
+    Items.AddChild(Items.GetFirstNode, ExtractFileName(Pak.PakFileName));
+    for i := 0 to Pak.Files.Count - 1 do
+      AddNode(Pak.Files[i], Items.GetFirstNode);
+    Items[0].Expanded := True;
+    Items[0].SelectedIndex := 1;
+    Items[0].ImageIndex := 1;
+  end;
+  TreeView.Selected := TreeView.Items.GetFirstNode;
 end;
 
 function MakeMemSize(size: integer): string;
 const
-   kb=1024;
-   mb=kb*kb;
-   gb=mb*kb;
+  kb = 1024;
+  mb = kb * kb;
+  gb = mb * kb;
 begin
-   case size of
-      0..kb-1:Result:=IntToStr(size)+' B';
-      kb..mb-1:Result:=Format('%.2f KB',[size/kb]);
-      mb..gb-1:Result:=Format('%.2f MB',[size/mb]);
-   else
-      Result:=Format('%.2f GB',[size/gb]);
-   end;
+  case size of
+    0 .. kb - 1:
+      Result := IntToStr(size) + ' B';
+    kb .. mb - 1:
+      Result := Format('%.2f KB', [size / kb]);
+    mb .. gb - 1:
+      Result := Format('%.2f MB', [size / mb]);
+  else
+    Result := Format('%.2f GB', [size / gb]);
+  end;
 end;
 
 procedure TForm1.FileListRefresh;
 var
-   i, j: integer;
-   s, name: string;
-   n: TTreeNode;
-   dir: boolean;
+  i, j: integer;
+  s, name: string;
+  n: TTreeNode;
+  dir: Boolean;
 begin
-   n:=TreeView.Selected;
-   s:=n.Text;
-   if s=ExtractFileName(Pak.PakFileName) then s:='';
-   while Assigned(n.parent) do begin
-      n:=n.Parent;
-      if n.AbsoluteIndex<>0 then
-      s:=n.Text+'/'+s;
-   end;
-   if s<>'' then s:=s+'/';
-   CurPath:=s;
-
-   ListView.Clear;
-   for i:=0 to Pak.Files.Count-1 do
-      if Copy(Pak.Files[i],1,Length(s))=s then begin
-         name:=RightStr(Pak.Files[i],Length(Pak.Files[i])-Length(s));
-         j:=Pos('/',name);
-         if j=0 then
-            Dir:=False else
-            Dir:=True;
-
-         if Dir=True then
-            name:=Copy(name,1,j-1);
-         if ListIndexOf(name)=-1 then
-         with ListView.Items.Add do begin
-            Caption:=Name;
-            if Dir=True then begin
-                  SubItems.Add('-');
-                  SubItems.Add('-')
-               end else begin
-                  SubItems.Add(MakeMemSize(Pak.GetFileSize(i)));
-                  SubItems.Add(MakeMemSize(Pak.GetFileSize(i)))
-               end;
-
-            if Dir=True then
-               ImageIndex:=0 else
-               ImageIndex:=2;
-         end;
-      end;
+  n := TreeView.Selected;
+  s := n.text;
+  if s = ExtractFileName(Pak.PakFileName) then
+    s := '';
+  while Assigned(n.parent) do
+  begin
+    n := n.parent;
+    if n.AbsoluteIndex <> 0 then
+      s := n.text + '/' + s;
+  end;
+  if s <> '' then
+    s := s + '/';
+  CurPath := s;
+
+  ListView.Clear;
+  for i := 0 to Pak.Files.Count - 1 do
+    if Copy(Pak.Files[i], 1, Length(s)) = s then
+    begin
+      name := RightStr(Pak.Files[i], Length(Pak.Files[i]) - Length(s));
+      j := Pos('/', name);
+      if j = 0 then
+        dir := False
+      else
+        dir := True;
+
+      if dir = True then
+        name := Copy(name, 1, j - 1);
+      if ListIndexOf(name) = -1 then
+        with ListView.Items.Add do
+        begin
+          Caption := Name;
+          if dir = True then
+          begin
+            SubItems.Add('-');
+            SubItems.Add('-')
+          end
+          else
+          begin
+            SubItems.Add(MakeMemSize(Pak.GetFileSize(i)));
+            SubItems.Add(MakeMemSize(Pak.GetFileSize(i)))
+          end;
+
+          if dir = True then
+            ImageIndex := 0
+          else
+            ImageIndex := 2;
+        end;
+    end;
 end;
 
 procedure TForm1.FormCreate(Sender: TObject);
 var
-   Bmp: TBitmap;
+  Bmp: TBitmap;
 begin
-   Pak := TGLVfsPAK.Create(nil);
-   Bmp:=TBitmap.Create;
-   Bmp.LoadFromResourceName(HInstance, 'ICONS');
-   ImageList1.AddMasked(Bmp,clWhite);
-   Bmp.Free;
-   RefreshMenu;
+  Pak := TGLVfsPak.Create(nil);
+  Bmp := TBitmap.Create;
+  Bmp.LoadFromResourceName(HInstance, 'ICONS');
+  ImageList1.AddMasked(Bmp, clWhite);
+  Bmp.Free;
+  RefreshMenu;
 end;
 
-procedure TForm1.TreeViewCollapsing(Sender: TObject; Node: TTreeNode;
+procedure TForm1.TreeViewCollapsing(Sender: TObject; node: TTreeNode;
   var AllowCollapse: Boolean);
 begin
-   if Node.AbsoluteIndex=0 then
-   AllowCollapse:=False else
-   AllowCollapse:=True;
+  if node.AbsoluteIndex = 0 then
+    AllowCollapse := False
+  else
+    AllowCollapse := True;
 end;
 
 procedure TForm1.ListViewClick(Sender: TObject);
 var
-   s: string;
+  s: string;
 begin
-   if not Assigned(ListView.Selected) then Exit;
-   s:=ListView.Selected.Caption;
-   Selection:=CurPath+s;
+  if not Assigned(ListView.Selected) then
+    exit;
+  s := ListView.Selected.Caption;
+  Selection := CurPath + s;
 end;
 
 procedure TForm1.ListViewDblClick(Sender: TObject);
 var
-   s: string;
-   n: TTreeNode;
+  s: string;
+  n: TTreeNode;
 begin
-   if not Assigned(ListView.Selected) then Exit;
-   if ListView.Selected.ImageIndex=2 then Exit;
-   s:=ListView.Selected.Caption;
-   n:=TreeView.Selected;
-   TreeView.Selected:=n[TreeIndexOf(s,n)];
+  if not Assigned(ListView.Selected) then
+    exit;
+  if ListView.Selected.ImageIndex = 2 then
+    exit;
+  s := ListView.Selected.Caption;
+  n := TreeView.Selected;
+  TreeView.Selected := n[TreeIndexOf(s, n)];
 end;
 
-procedure TForm1.TreeViewChange(Sender: TObject; Node: TTreeNode);
+procedure TForm1.TreeViewChange(Sender: TObject; node: TTreeNode);
 begin
-   FileListRefresh;
+  FileListRefresh;
 end;
 
 procedure TForm1.ListViewKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
-   if ListView.Enabled=False then Exit;
-   ListViewClick(Sender);
-   if Key=VK_RETURN then ListViewDblClick(Sender);
-   if Key=VK_DELETE then Deleteselectedfile1Click(Self);
+  if ListView.Enabled = False then
+    exit;
+  ListViewClick(Sender);
+  if Key = VK_RETURN then
+    ListViewDblClick(Sender);
+  if Key = VK_DELETE then
+    Deleteselectedfile1Click(Self);
 end;
 
 procedure TForm1.ListViewChange(Sender: TObject; Item: TListItem;
   Change: TItemChange);
 begin
-   ListViewClick(Sender);
+  ListViewClick(Sender);
 end;
 
 procedure TForm1.New1Click(Sender: TObject);
 begin
-   if SaveDialog1.Execute then begin
-      Pak.ClearPakFiles;
-      Pak.LoadFromFile(SaveDialog1.FileName, fmCreate or fmShareDenyWrite);
-      TreeViewRefresh;
-      ListView.Enabled:=True;
-      RefreshMenu;
-   end;
+  if SaveDialog1.Execute then
+  begin
+    Pak.ClearPakFiles;
+    Pak.LoadFromFile(SaveDialog1.FileName, fmCreate or fmShareDenyWrite);
+    TreeViewRefresh;
+    ListView.Enabled := True;
+    RefreshMenu;
+  end;
 end;
 
 procedure TForm1.Open1Click(Sender: TObject);
 begin
-   OpenDialog1.DefaultExt:=SaveDialog1.DefaultExt;
-   OpenDialog1.Filter:=SaveDialog1.Filter;
-   OpenDialog1.Options:=OpenDialog1.Options-[ofAllowMultiSelect];
-   if OpenDialog1.Execute then begin
-      Pak.ClearPakFiles;
-      Pak.LoadFromFile(OpenDialog1.FileName, fmOpenReadWrite or fmShareDenyWrite);
-      TreeViewRefresh;
-      ListView.Enabled:=True;
-      RefreshMenu;
-   end;
+  OpenDialog1.DefaultExt := SaveDialog1.DefaultExt;
+  OpenDialog1.Filter := SaveDialog1.Filter;
+  OpenDialog1.Options := OpenDialog1.Options - [ofAllowMultiSelect];
+  if OpenDialog1.Execute then
+  begin
+    Pak.ClearPakFiles;
+    Pak.LoadFromFile(OpenDialog1.FileName, fmOpenReadWrite or fmShareDenyWrite);
+    TreeViewRefresh;
+    ListView.Enabled := True;
+    RefreshMenu;
+  end;
 end;
 
 procedure TForm1.Createfolder1Click(Sender: TObject);
 begin
-   if not Assigned(Pak) then Exit;
-   if FDialog.ShowModal=mrOk then begin
-      Pak.AddEmptyFile('temp.tmp',CurPath+FDialog.Edit1.Text+'/');
-      TreeViewRefresh;
-   end;
+  if not Assigned(Pak) then
+    exit;
+  if FDialog.ShowModal = mrOk then
+  begin
+    Pak.AddEmptyFile('temp.tmp', CurPath + FDialog.Edit1.text + '/');
+    TreeViewRefresh;
+  end;
 end;
 
 procedure TForm1.Addfiles1Click(Sender: TObject);
 var
-   i: integer;
+  i: integer;
 begin
-   if not Assigned(Pak) then Exit;
-   OpenDialog1.DefaultExt:='';
-   OpenDialog1.Filter:='All Files|*.*';
-   OpenDialog1.Options:=OpenDialog1.Options+[ofAllowMultiSelect];
-   if OpenDialog1.Execute then begin
-      for i:=0 to OpenDialog1.Files.Count-1 do
-         if ExtractFileName(OpenDialog1.Files[i])<>'' then
-            Pak.AddFromFile(OpenDialog1.Files[i],CurPath);
-      TreeViewRefresh;
-   end;
+  if not Assigned(Pak) then
+    exit;
+  OpenDialog1.DefaultExt := '';
+  OpenDialog1.Filter := 'All Files|*.*';
+  OpenDialog1.Options := OpenDialog1.Options + [ofAllowMultiSelect];
+  if OpenDialog1.Execute then
+  begin
+    for i := 0 to OpenDialog1.Files.Count - 1 do
+      if ExtractFileName(OpenDialog1.Files[i]) <> '' then
+        Pak.AddFromFile(OpenDialog1.Files[i], CurPath);
+    TreeViewRefresh;
+  end;
 end;
 
 procedure TForm1.Deleteselectedfile1Click(Sender: TObject);
 var
-   i: integer;
-   S: TStrings;
+  i: integer;
+  s: TStrings;
 begin
-   if ListView.SelCount=0 then Exit;
-   S:=TStringList.Create;
-   for i:=0 to ListView.Items.Count-1 do
-      if ListView.Items[i].Selected then S.Add(CurPath+ListView.Items[i].Caption);
-   for i:=0 to S.Count-1 do
-      Pak.RemoveFile(S[i]);
-
-   S.Free;
-   FileListRefresh;
-   if ListView.Items.Count=0 then TreeViewRefresh;
+  if ListView.SelCount = 0 then
+    exit;
+  s := TStringList.Create;
+  for i := 0 to ListView.Items.Count - 1 do
+    if ListView.Items[i].Selected then
+      s.Add(CurPath + ListView.Items[i].Caption);
+  for i := 0 to s.Count - 1 do
+    Pak.RemoveFile(s[i]);
+
+  s.Free;
+  FileListRefresh;
+  if ListView.Items.Count = 0 then
+    TreeViewRefresh;
 end;
 
 procedure TForm1.Deleteselectedfolder1Click(Sender: TObject);
 var
-   i, l: integer;
-   S: TStrings;
-begin                       
-   s:=TStringList.Create;
-   s.AddStrings(Pak.Files);
-   l:=Length(CurPath);
-   for i:=0 to S.Count-1 do
-      if Copy(S[i],1,l)=CurPath then
-         Pak.RemoveFile(S[i]);
-   s.Free;
-   TreeViewRefresh;
+  i, l: integer;
+  s: TStrings;
+begin
+  s := TStringList.Create;
+  s.AddStrings(Pak.Files);
+  l := Length(CurPath);
+  for i := 0 to s.Count - 1 do
+    if Copy(s[i], 1, l) = CurPath then
+      Pak.RemoveFile(s[i]);
+  s.Free;
+  TreeViewRefresh;
 end;
 
 procedure TForm1.TreeViewKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
-   if ListView.Enabled=False then Exit;
-   if Key=VK_DELETE then Deleteselectedfolder1Click(Self);
+  if ListView.Enabled = False then
+    exit;
+  if Key = VK_DELETE then
+    Deleteselectedfolder1Click(Self);
 end;
 
 procedure TForm1.Extractselectedfiles1Click(Sender: TObject);
 var
-   i: integer;
+  i: integer;
 begin
-   if ListView.SelCount=0 then Exit;
-   if FolderSel.ShowModal=mrOK then begin
-      for i:=0 to ListView.Items.Count-1 do
-         if ListView.Items[i].Selected then
-            Pak.Extract(CurPath+ListView.Items[i].Caption, FolderSel.ShellView.Path+'\'+ListView.Items[i].Caption);
-   end;
+  if ListView.SelCount = 0 then
+    exit;
+  if FolderSel.ShowModal = mrOk then
+  begin
+    for i := 0 to ListView.Items.Count - 1 do
+      if ListView.Items[i].Selected then
+        Pak.Extract(CurPath + ListView.Items[i].Caption,
+          FolderSel.ShellView.Path + '\' + ListView.Items[i].Caption);
+  end;
 end;
 
-
 procedure TForm1.Exit1Click(Sender: TObject);
 begin
-   Application.Terminate;
+  Application.Terminate;
 end;
 
 procedure TForm1.FormDestroy(Sender: TObject);
@@ -373,31 +418,34 @@ end;
 procedure TForm1.ConverttocompressedClick(Sender: TObject);
 var
   cbrRatio: TZCompressedMode;
-  newPak, oldPak: TGLVfsPAK;
-  I: Integer;
+  newPak, oldPak: TGLVfsPak;
+  i: integer;
   oldFileName, newFileName: String;
 begin
   cbrRatio := SelectCompressionRatio;
-  if cbrRatio <> None then begin
+  if cbrRatio <> None then
+  begin
     oldFileName := Pak.PakFileName;
     Pak.Free;
     Pak := nil;
     newFileName := ChangeFileExt(oldFileName, '.bak');
-    if FileExists(newFileName) then DeleteFile(newFileName);
+    if FileExists(newFileName) then
+      DeleteFile(newFileName);
     RenameFile(oldFileName, newFileName);
-    newPak := TGLVfsPAK.Create(nil, cbrRatio);
+    newPak := TGLVfsPak.Create(nil, cbrRatio);
     newPak.LoadFromFile(oldFileName, fmCreate or fmShareDenyWrite);
-    oldPak := TGLVfsPAK.Create(nil);
+    oldPak := TGLVfsPak.Create(nil);
     oldPak.LoadFromFile(newFileName, fmOpenRead or fmShareDenyWrite);
-    for I := 0 to oldPak.FileCount - 1 do begin
-      newPak.AddFromStream(ExtractFileName(oldPak.Files[I]),
-                           ExtractFilePath(oldPak.Files[I]), oldPak.GetFile(I));
+    for i := 0 to oldPak.FileCount - 1 do
+    begin
+      newPak.AddFromStream(ExtractFileName(oldPak.Files[i]),
+        ExtractFilePath(oldPak.Files[i]), oldPak.GetFile(i));
     end;
     oldPak.Free;
     oldPak := nil;
     Pak := newPak;
     TreeViewRefresh;
-    ListView.Enabled:=True;
+    ListView.Enabled := True;
     RefreshMenu;
   end;
 end;
@@ -406,30 +454,33 @@ end;
 //
 procedure TForm1.ConverttouncompressedClick(Sender: TObject);
 var
-  newPak, oldPak: TGLVfsPAK;
-  I: Integer;
+  newPak, oldPak: TGLVfsPak;
+  i: integer;
   oldFileName, newFileName: String;
 begin
-  if not Pak.Compressed then exit;
+  if not Pak.Compressed then
+    exit;
   oldFileName := Pak.PakFileName;
   Pak.Free;
   Pak := nil;
   newFileName := ChangeFileExt(oldFileName, '.bak');
-  if FileExists(newFileName) then DeleteFile(newFileName);
+  if FileExists(newFileName) then
+    DeleteFile(newFileName);
   RenameFile(oldFileName, newFileName);
-  newPak := TGLVfsPAK.Create(nil);
+  newPak := TGLVfsPak.Create(nil);
   newPak.LoadFromFile(oldFileName, fmCreate or fmShareDenyWrite);
-  oldPak := TGLVfsPAK.Create(nil);
+  oldPak := TGLVfsPak.Create(nil);
   oldPak.LoadFromFile(newFileName, fmOpenRead or fmShareDenyWrite);
-  for I := 0 to oldPak.FileCount - 1 do begin
-    newPak.AddFromStream(ExtractFileName(oldPak.Files[I]),
-                         ExtractFilePath(oldPak.Files[I]), oldPak.GetFile(I));
+  for i := 0 to oldPak.FileCount - 1 do
+  begin
+    newPak.AddFromStream(ExtractFileName(oldPak.Files[i]),
+      ExtractFilePath(oldPak.Files[i]), oldPak.GetFile(i));
   end;
   oldPak.Free;
   oldPak := nil;
   Pak := newPak;
   TreeViewRefresh;
-  ListView.Enabled:=True;
+  ListView.Enabled := True;
   RefreshMenu;
 end;
 

Demos/interface/CameraController/CameraController.cbproj

@@ -1,1032 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <ProjectGuid>{7FF8B7B3-4CB4-474C-8FCD-99A92818C4F3}</ProjectGuid>
-        <ProjectVersion>18.7</ProjectVersion>
-        <FrameworkType>VCL</FrameworkType>
-        <AppType>Application</AppType>
-        <MainSource>CameraController.cpp</MainSource>
-        <Base>True</Base>
-        <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
-        <TargetedPlatforms>1</TargetedPlatforms>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
-        <Base_Win32>true</Base_Win32>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
-        <Base_Win64>true</Base_Win64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
-        <Cfg_1>true</Cfg_1>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
-        <Cfg_1_Win32>true</Cfg_1_Win32>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </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)'=='Release' or '$(Cfg_2)'!=''">
-        <Cfg_2>true</Cfg_2>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
-        <Cfg_2_Win32>true</Cfg_2_Win32>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </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)'!=''">
-        <SanitizedProjectName>CameraController</SanitizedProjectName>
-        <IncludePath>D:\GLScene\Samples\CPP\Demos\interface\CameraController\;$(IncludePath)</IncludePath>
-        <Icon_MainIcon>$(BDS)\bin\cbuilder_PROJECTICON.ico</Icon_MainIcon>
-        <ILINK_LibraryPath>D:\GLScene\Samples\CPP\Demos\interface\CameraController\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-        <ProjectType>CppVCLApplication</ProjectType>
-        <AllPackageLibs>rtl.lib;vcl.lib;GLScene_RT.lib;fmx.lib;xmlrtl.lib;vclimg.lib</AllPackageLibs>
-        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
-        <_TCHARMapping>wchar_t</_TCHARMapping>
-        <Multithreaded>true</Multithreaded>
-        <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-        <DynamicRTL>true</DynamicRTL>
-        <UsePackages>true</UsePackages>
-        <IntermediateOutputDir>.\$(Platform)\$(Config)</IntermediateOutputDir>
-        <FinalOutputDir>.\$(Platform)\$(Config)</FinalOutputDir>
-        <BCC_wpar>false</BCC_wpar>
-        <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-        <BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <PackageImports>IndyIPClient;GLScene_Sounds_RT;frx17;fs17;GLScene_Physics_RT;GLScene_Cg_RT;bindcompfmx;GR32_RSXE3;DBXSqliteDriver;vcldbx;GLScene_Physics_RT;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;TeeDB;bindcomp;inetdb;inetdbbde;vclib;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DBXOdbcDriver;DataSnapServer;Tee;GLScene_RT;DataSnapProviderClient;xmlrtl;DBXSybaseASEDriver;ibxpress;DbxCommonDriver;vclimg;GLScene_Sounds_RT;IndyProtocols;DBXMySQLDriver;dbxcds;MetropolisUILiveTile;bindengine;vclactnband;vcldb;soaprtl;bindcompdbx;vcldsnap;bindcompvcl;FMXTee;TeeUI;vclie;GR32_DSGN_RSXE3;DBXDb2Driver;vcltouch;bcbsmp;websnap;DBXOracleDriver;CustomIPTransport;vclribbon;VclSmp;dsnap;DBXInformixDriver;IndyIPServer;fmxase;vcl;DataSnapConnectors;IndyCore;GLScene_Sounds_RT;DBXMSSQLDriver;CodeSiteExpressPkg;CloudService;DBXFirebirdDriver;dsnapcon;frxDB17;inet;fsDB17;fmxobj;IndyIPCommon;FmxTeeUI;vclx;frxe17;inetdbxpress;webdsnap;DBXSybaseASADriver;fmxdae;bdertl;dbexpress;DataSnapIndy10ServerTransport;adortl;bcbie;$(PackageImports)</PackageImports>
-        <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
-        <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>
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-        <IncludePath>$(BDSINCLUDE)\windows\vcl;$(IncludePath)</IncludePath>
-        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <UWP_CppLogo44>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_44.png</UWP_CppLogo44>
-        <UWP_CppLogo150>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_150.png</UWP_CppLogo150>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Win64)'!=''">
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <PackageImports>IndyIPClient;GLScene_Sounds_RT;frx17;fs17;GLScene_Physics_RT;GLScene_Cg_RT;bindcompfmx;GR32_RSXE3;DBXSqliteDriver;vcldbx;GLScene_Physics_RT;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;TeeDB;bindcomp;inetdb;inetdbbde;vclib;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DBXOdbcDriver;DataSnapServer;Tee;GLScene_RT;DataSnapProviderClient;xmlrtl;DBXSybaseASEDriver;ibxpress;DbxCommonDriver;vclimg;GLScene_Sounds_RT;IndyProtocols;DBXMySQLDriver;dbxcds;MetropolisUILiveTile;bindengine;vclactnband;vcldb;soaprtl;bindcompdbx;vcldsnap;bindcompvcl;FMXTee;TeeUI;vclie;GR32_DSGN_RSXE3;DBXDb2Driver;vcltouch;bcbsmp;websnap;DBXOracleDriver;CustomIPTransport;vclribbon;VclSmp;dsnap;DBXInformixDriver;IndyIPServer;fmxase;vcl;DataSnapConnectors;IndyCore;GLScene_Sounds_RT;DBXMSSQLDriver;CodeSiteExpressPkg;CloudService;DBXFirebirdDriver;dsnapcon;frxDB17;inet;fsDB17;fmxobj;IndyIPCommon;FmxTeeUI;vclx;frxe17;inetdbxpress;webdsnap;DBXSybaseASADriver;fmxdae;bdertl;dbexpress;DataSnapIndy10ServerTransport;adortl;bcbie;$(PackageImports)</PackageImports>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
-        <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
-        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <UWP_CppLogo44>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_44.png</UWP_CppLogo44>
-        <UWP_CppLogo150>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_150.png</UWP_CppLogo150>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1)'!=''">
-        <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-        <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-        <DCC_Optimize>false</DCC_Optimize>
-        <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-        <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-        <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-        <DCC_Define>DEBUG</DCC_Define>
-        <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-        <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-        <BCC_StackFrames>true</BCC_StackFrames>
-        <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-        <TASM_Debugging>Full</TASM_Debugging>
-        <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-        <BCC_EnableCPPExceptions>true</BCC_EnableCPPExceptions>
-        <BCC_DisableFramePtrElimOpt>true</BCC_DisableFramePtrElimOpt>
-        <BCC_DisableSpellChecking>true</BCC_DisableSpellChecking>
-        <CLANG_UnwindTables>true</CLANG_UnwindTables>
-        <ILINK_LibraryPath>$(BDSLIB)\$(PLATFORM)\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
-        <ILINK_LibraryPath>$(BDSCOMMONDIR)\Dcp;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-        <Defines>_DEBUG;$(Defines)</Defines>
-        <LinkPackageImports>rtl.bpi;vcl.bpi;GLScene_RT.bpi;fmx.bpi;xmlrtl.bpi;vclimg.bpi</LinkPackageImports>
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
-        <Defines>_DEBUG;$(Defines)</Defines>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2)'!=''">
-        <TASM_Debugging>None</TASM_Debugging>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <Defines>NDEBUG;$(Defines)</Defines>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-        <Defines>NDEBUG;$(Defines)</Defines>
-    </PropertyGroup>
-    <ItemGroup>
-        <CppCompile Include="CameraController.cpp">
-            <BuildOrder>0</BuildOrder>
-        </CppCompile>
-        <CppCompile Include="Unit1.cpp">
-            <Form>Form1</Form>
-            <FormType>dfm</FormType>
-            <DependentOn>Unit1.h</DependentOn>
-            <BuildOrder>2</BuildOrder>
-        </CppCompile>
-        <FormResources Include="Unit1.dfm"/>
-        <BuildConfiguration Include="Release">
-            <Key>Cfg_2</Key>
-            <CfgParent>Base</CfgParent>
-        </BuildConfiguration>
-        <BuildConfiguration Include="Base">
-            <Key>Base</Key>
-        </BuildConfiguration>
-        <BuildConfiguration Include="Debug">
-            <Key>Cfg_1</Key>
-            <CfgParent>Base</CfgParent>
-        </BuildConfiguration>
-    </ItemGroup>
-    <ProjectExtensions>
-        <Borland.Personality>CPlusPlusBuilder.Personality.12</Borland.Personality>
-        <Borland.ProjectType>CppVCLApplication</Borland.ProjectType>
-        <BorlandProject>
-            <CPlusPlusBuilder.Personality>
-                <Source>
-                    <Source Name="MainSource">CameraController.cpp</Source>
-                </Source>
-                <VersionInfo>
-                    <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
-                    <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-                    <VersionInfo Name="MajorVer">1</VersionInfo>
-                    <VersionInfo Name="MinorVer">0</VersionInfo>
-                    <VersionInfo Name="Release">0</VersionInfo>
-                    <VersionInfo Name="Build">0</VersionInfo>
-                    <VersionInfo Name="Debug">False</VersionInfo>
-                    <VersionInfo Name="PreRelease">False</VersionInfo>
-                    <VersionInfo Name="Special">False</VersionInfo>
-                    <VersionInfo Name="Private">False</VersionInfo>
-                    <VersionInfo Name="DLL">False</VersionInfo>
-                    <VersionInfo Name="Locale">1049</VersionInfo>
-                    <VersionInfo Name="CodePage">1251</VersionInfo>
-                </VersionInfo>
-                <VersionInfoKeys>
-                    <VersionInfoKeys Name="CompanyName"/>
-                    <VersionInfoKeys Name="FileDescription"/>
-                    <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-                    <VersionInfoKeys Name="InternalName"/>
-                    <VersionInfoKeys Name="LegalCopyright"/>
-                    <VersionInfoKeys Name="LegalTrademarks"/>
-                    <VersionInfoKeys Name="OriginalFilename"/>
-                    <VersionInfoKeys Name="ProductName"/>
-                    <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-                    <VersionInfoKeys Name="Comments"/>
-                    <VersionInfoKeys Name="CFBundleName"/>
-                    <VersionInfoKeys Name="CFBundleDisplayName"/>
-                    <VersionInfoKeys Name="CFBundleIdentifier"/>
-                    <VersionInfoKeys Name="CFBundleVersion"/>
-                    <VersionInfoKeys Name="CFBundlePackageType"/>
-                    <VersionInfoKeys Name="CFBundleSignature"/>
-                    <VersionInfoKeys Name="CFBundleAllowMixedLocalizations"/>
-                    <VersionInfoKeys Name="CFBundleExecutable"/>
-                </VersionInfoKeys>
-                <ProjectProperties>
-                    <ProjectProperties Name="AutoShowDeps">False</ProjectProperties>
-                    <ProjectProperties Name="ManagePaths">True</ProjectProperties>
-                    <ProjectProperties Name="VerifyPackages">True</ProjectProperties>
-                    <ProjectProperties Name="IndexFiles">False</ProjectProperties>
-                </ProjectProperties>
-            </CPlusPlusBuilder.Personality>
-            <Deployment Version="3">
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule">
-                    <Platform Name="Win32">
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin64\borlndmm.dll" Class="DependencyModule">
-                    <Platform Name="Win64">
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgcrtl.dylib" Class="DependencyModule">
-                    <Platform Name="OSX32">
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin\borlndmm.dll" Class="DependencyModule">
-                    <Platform Name="Win32">
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32160mt.dll" Class="DependencyModule"/>
-                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx32\libcgstl.dylib" Class="DependencyModule">
-                    <Platform Name="OSX32">
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgstl.dylib" Class="DependencyModule">
-                    <Platform Name="OSX64">
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32260mt.dll" Class="DependencyModule">
-                    <Platform Name="Win32">
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32260.dll" Class="DependencyModule">
-                    <Platform Name="Win32">
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64260mt.dll" Class="DependencyModule">
-                    <Platform Name="Win64">
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32160.dll" Class="DependencyModule"/>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule">
-                    <Platform Name="Win64">
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile LocalName=".\Win32\Debug\CameraController.tds" Configuration="Debug" Class="DebugSymbols"/>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin\cc32c260mt.dll" Class="DependencyModule">
-                    <Platform Name="Win32">
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile LocalName=".\Win32\Debug\CameraController.exe" Configuration="Debug" Class="ProjectOutput"/>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64160.dll" Class="DependencyModule"/>
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64160mt.dll" Class="DependencyModule"/>
-                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule">
-                    <Platform Name="OSX64">
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployClass Name="AdditionalDebugSymbols">
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidClassesDexFile">
-                    <Platform Name="Android">
-                        <RemoteDir>classes</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidFileProvider">
-                    <Platform Name="Android">
-                        <RemoteDir>res\xml</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidGDBServer">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidLibnativeArmeabiFile">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidLibnativeMipsFile">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\mips</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidServiceOutput">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidSplashImageDef">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidSplashStyles">
-                    <Platform Name="Android">
-                        <RemoteDir>res\values</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="AndroidSplashStylesV21">
-                    <Platform Name="Android">
-                        <RemoteDir>res\values-v21</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_Colors">
-                    <Platform Name="Android">
-                        <RemoteDir>res\values</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_DefaultAppIcon">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon144">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon36">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-ldpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon48">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-mdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon72">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-hdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_LauncherIcon96">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_NotificationIcon24">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-mdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_NotificationIcon36">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-hdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_NotificationIcon48">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_NotificationIcon72">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_NotificationIcon96">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_SplashImage426">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-small</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_SplashImage470">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-normal</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_SplashImage640">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-large</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_SplashImage960">
-                    <Platform Name="Android">
-                        <RemoteDir>res\drawable-xlarge</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="Android_Strings">
-                    <Platform Name="Android">
-                        <RemoteDir>res\values</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="DebugSymbols">
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="DependencyFramework">
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                        <Extensions>.framework</Extensions>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                        <Extensions>.framework</Extensions>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Required="true" Name="DependencyPackage">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.bpl</Extensions>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="File">
-                    <Platform Name="Android">
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice32">
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\Resources\StartUp\</RemoteDir>
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <RemoteDir>Contents\Resources\StartUp\</RemoteDir>
-                        <Operation>0</Operation>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch1024">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch1024x768">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch1536">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch1536x2048">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch1668">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch1668x2388">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch2048">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch2048x1536">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch2048x2732">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch2224">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch2388x1668">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch2732x2048">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch768">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPad_Launch768x1024">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch1125">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch1136x640">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch1242">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch1242x2688">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch1334">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch1792">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch2208">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch2436">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch2688x1242">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch320">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch640">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch640x1136">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch750">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="iPhone_Launch828">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectAndroidManifest">
-                    <Platform Name="Android">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectiOSDeviceDebug">
-                    <Platform Name="iOSDevice32">
-                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectiOSDeviceResourceRules">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectiOSEntitlements">
-                    <Platform Name="iOSDevice32">
-                        <RemoteDir>..\</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <RemoteDir>..\</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectiOSInfoPList">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectiOSResource">
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectOSXDebug">
-                    <Platform Name="OSX64">
-                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectOSXEntitlements">
-                    <Platform Name="OSX32">
-                        <RemoteDir>..\</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <RemoteDir>..\</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectOSXInfoPList">
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <RemoteDir>Contents</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectOSXResource">
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\Resources</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <RemoteDir>Contents\Resources</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Required="true" Name="ProjectOutput">
-                    <Platform Name="Android">
-                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSDevice64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Linux64">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="OSX64">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="ProjectUWPManifest">
-                    <Platform Name="Win32">
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win64">
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="UWP_CppLogo150">
-                    <Platform Name="Win32">
-                        <RemoteDir>Assets</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win64">
-                        <RemoteDir>Assets</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <DeployClass Name="UWP_CppLogo44">
-                    <Platform Name="Win32">
-                        <RemoteDir>Assets</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                    <Platform Name="Win64">
-                        <RemoteDir>Assets</RemoteDir>
-                        <Operation>1</Operation>
-                    </Platform>
-                </DeployClass>
-                <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
-            </Deployment>
-            <Platforms>
-                <Platform value="Win32">True</Platform>
-                <Platform value="Win64">False</Platform>
-            </Platforms>
-        </BorlandProject>
-        <ProjectFileVersion>12</ProjectFileVersion>
-    </ProjectExtensions>
-    <Import Project="$(BDS)\Bin\CodeGear.Cpp.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Cpp.Targets')"/>
-    <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
-    <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
-</Project>

Demos/interface/CameraController/CameraController.dpr

@@ -8,7 +8,7 @@ program CameraController;
 
 uses
   Forms,
-  CameraControllerFm in 'CameraControllerFm.pas' {Form1};
+  fCameraController in 'fCameraController.pas' {Form1};
 
 {$R *.res}
 

Demos/interface/CameraController/CameraController.dproj

@@ -122,7 +122,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="CameraControllerFm.pas">
+        <DCCReference Include="fCameraController.pas">
             <Form>Form1</Form>
         </DCCReference>
         <BuildConfiguration Include="Debug">

Demos/interface/CameraController/CameraController.cpp → Demos/interface/CameraController/CameraControllerC.cpp

@@ -6,7 +6,7 @@
 #pragma hdrstop
 #include <tchar.h>
 //---------------------------------------------------------------------------
-USEFORM("Unit1.cpp", Form1);
+USEFORM("fCameraControllerC.cpp", Form1);
 //---------------------------------------------------------------------------
 int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
 {

Demos/interface/CameraController/CameraControllerFm.pas → Demos/interface/CameraController/fCameraController.pas

@@ -1,4 +1,4 @@
-unit CameraControllerFm;
+unit fCameraController;
 
 interface
 

Demos/interface/CameraController/Unit1.cpp → Demos/interface/CameraController/fCameraControllerC.cpp

@@ -5,7 +5,7 @@
 
 #pragma hdrstop
 
-#include "Unit1.h"
+#include "fCameraControllerC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLS.BaseClasses"

Demos/interface/CameraController/Unit1.dfm → Demos/interface/CameraController/fCameraControllerC.dfm

@@ -525,6 +525,7 @@ object Form1: TForm1
     Camera = GLCamera
     VSync = vsmSync
     FieldOfView = 103.419670104980500000
+    PenAsTouch = False
     Align = alClient
     OnMouseDown = GLSceneViewer1MouseDown
     OnMouseMove = GLSceneViewer1MouseMove
@@ -659,7 +660,6 @@ object Form1: TForm1
       object dcSphere: TGLDummyCube
         ObjectsSorting = osRenderBlendedLast
         ShowAxes = True
-        Up.Coordinates = {000000000000803F0000008000000000}
         CubeSize = 4.000000000000000000
         object GLSphere1: TGLSphere
           Material.MaterialLibrary = GLMaterialLibrary1

Demos/interface/CameraController/Unit1.h → Demos/interface/CameraController/fCameraControllerC.h

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 
-#ifndef Unit1H
-#define Unit1H
+#ifndef fCameraControllerCH
+#define fCameraControllerCH
 //---------------------------------------------------------------------------
 #include <System.Classes.hpp>
 #include <Vcl.Controls.hpp>

Demos/interface/Console/Console.cpp

@@ -1,32 +0,0 @@
-//---------------------------------------------------------------------------
-
-#include <vcl.h>
-#pragma hdrstop
-#include <tchar.h>
-//---------------------------------------------------------------------------
-int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
-{
-	try
-	{
-		Application->Initialize();
-		Application->MainFormOnTaskBar = true;
-		Application->Run();
-	}
-	catch (Exception &exception)
-	{
-		Application->ShowException(&exception);
-	}
-	catch (...)
-	{
-		try
-		{
-			throw Exception("");
-		}
-		catch (Exception &exception)
-		{
-			Application->ShowException(&exception);
-		}
-	}
-	return 0;
-}
-//---------------------------------------------------------------------------

Demos/interface/Console/Console.dpr

@@ -9,7 +9,7 @@ program Console;
 
 uses
   Forms,
-  ConsoleFm in 'ConsoleFm.pas' {FormConsole};
+  fConsole in 'fConsole.pas' {FormConsole};
 
 {$R *.RES}
 

Demos/interface/Console/Console.dproj

@@ -123,7 +123,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="ConsoleFm.pas">
+        <DCCReference Include="fConsole.pas">
             <Form>FormConsole</Form>
         </DCCReference>
         <BuildConfiguration Include="Debug">

Demos/interface/Console/Console.cbproj → Demos/interface/Console/ConsoleC.cbproj

@@ -4,7 +4,7 @@
         <ProjectVersion>18.7</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
-        <MainSource>Console.cpp</MainSource>
+        <MainSource>ConsoleC.cpp</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -58,7 +58,7 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <SanitizedProjectName>Console</SanitizedProjectName>
+        <SanitizedProjectName>ConsoleC</SanitizedProjectName>
         <IncludePath>D:\GLScene\Samples\CPP\Demos\interface\Console\;$(IncludePath)</IncludePath>
         <Icon_MainIcon>$(BDS)\bin\cbuilder_PROJECTICON.ico</Icon_MainIcon>
         <ILINK_LibraryPath>D:\GLScene\Samples\CPP\Demos\interface\Console\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
@@ -138,9 +138,16 @@
         <Defines>NDEBUG;$(Defines)</Defines>
     </PropertyGroup>
     <ItemGroup>
-        <CppCompile Include="Console.cpp">
+        <CppCompile Include="ConsoleC.cpp">
             <BuildOrder>0</BuildOrder>
         </CppCompile>
+        <CppCompile Include="fConsoleC.cpp">
+            <Form>Form1</Form>
+            <FormType>dfm</FormType>
+            <DependentOn>fConsoleC.h</DependentOn>
+            <BuildOrder>1</BuildOrder>
+        </CppCompile>
+        <FormResources Include="fConsoleC.dfm"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -159,7 +166,7 @@
         <BorlandProject>
             <CPlusPlusBuilder.Personality>
                 <Source>
-                    <Source Name="MainSource">Console.cpp</Source>
+                    <Source Name="MainSource">ConsoleC.cpp</Source>
                 </Source>
                 <VersionInfo>
                     <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
@@ -252,6 +259,18 @@
                     </Platform>
                 </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32160.dll" Class="DependencyModule"/>
+                <DeployFile LocalName=".\Win32\Debug\ConsoleC.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>ConsoleC.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName=".\Win32\Debug\ConsoleC.tds" Configuration="Debug" Class="DebugSymbols">
+                    <Platform Name="Win32">
+                        <RemoteName>ConsoleC.tds</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule">
                     <Platform Name="Win64">
                         <Overwrite>true</Overwrite>

Demos/interface/SimpleNavigation/SimpleNavigation.cpp → Demos/interface/Console/ConsoleC.cpp

@@ -4,7 +4,7 @@
 #pragma hdrstop
 #include <tchar.h>
 //---------------------------------------------------------------------------
-USEFORM("Unit1.cpp", Form1);
+USEFORM("fConsoleC.cpp", Form1);
 //---------------------------------------------------------------------------
 int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
 {

Demos/interface/Console/ConsoleFm.pas → Demos/interface/Console/fConsole.pas

@@ -1,4 +1,4 @@
-unit ConsoleFm;
+unit fConsole;
 
 interface
 
@@ -18,7 +18,7 @@ uses
   GLS.Cadencer,
   GLS.SceneViewer,
   GLS.BaseClasses,
- 
+
   GLS.Texture,
   GLS.BitmapFont,
   GLS.WindowsFont,
@@ -30,17 +30,17 @@ uses
 
 type
   TFormConsole = class(TForm)
-    Viewer:    TGLSceneViewer;
+    Viewer: TGLSceneViewer;
     GLCadencer1: TGLCadencer;
     Scene: TGLScene;
     GLCamera1: TGLCamera;
     Font1: TGLWindowsBitmapFont;
-    GLCube1:   TGLCube;
+    GLCube1: TGLCube;
     GLLightSource1: TGLLightSource;
     Splitter1: TSplitter;
-    Panel1:    TPanel;
+    Panel1: TPanel;
     GroupBox1: TGroupBox;
-    ListBox1:  TListBox;
+    ListBox1: TListBox;
     Splitter2: TSplitter;
     CheckBox1: TCheckBox;
     CheckBox2: TCheckBox;
@@ -53,11 +53,13 @@ type
     Button6: TButton;
     Button7: TButton;
     GLSimpleNavigation1: TGLSimpleNavigation;
-    procedure GLCadencer1Progress(Sender: TObject; const deltaTime, newTime: double);
+    procedure GLCadencer1Progress(Sender: TObject;
+      const deltaTime, newTime: double);
     procedure FormCreate(Sender: TObject);
     procedure FormKeyPress(Sender: TObject; var Key: char);
     procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
-    procedure ViewerMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: integer);
+    procedure ViewerMouseDown(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; X, Y: integer);
     procedure FormResize(Sender: TObject);
     procedure CheckBox1Click(Sender: TObject);
     procedure CheckBox2Click(Sender: TObject);
@@ -68,16 +70,15 @@ type
     procedure Button7Click(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
   private
-     
     procedure OnHelloCommand(const Sender: TGLConsoleCommand;
-          const Console: TGLCustomConsole; var Command: TGLUserInputCommand);
+      const Console: TGLCustomConsole; var Command: TGLUserInputCommand);
   public
     procedure OnCommand(const Sender: TGLConsoleCommand;
-          const Console: TGLCustomConsole;  var Command: TGLUserInputCommand);
+      const Console: TGLCustomConsole; var Command: TGLUserInputCommand);
   end;
 
 var
-  FormConsole:   TFormConsole;
+  FormConsole: TFormConsole;
   Console: TGLConsole;
 
 implementation
@@ -85,8 +86,7 @@ implementation
 {$R *.DFM}
 
 procedure TFormConsole.OnHelloCommand(const Sender: TGLConsoleCommand;
-  const Console: TGLCustomConsole;
-  var Command: TGLUserInputCommand);
+  const Console: TGLCustomConsole; var Command: TGLUserInputCommand);
 begin
   Console.AddLine('Hi, dude!');
 end;
@@ -94,7 +94,7 @@ end;
 procedure TFormConsole.OnCommand(const Sender: TGLConsoleCommand;
   const Console: TGLCustomConsole; var Command: TGLUserInputCommand);
 var
-  I:   integer;
+  I: integer;
   str: string;
 begin
   if Command.CommandCount = 0 then
@@ -107,21 +107,19 @@ begin
     Console.AddLine('You just typed: ' + str);
     Command.UnknownCommand := False;
   end
-  else
-  if Command.strings[0] = 'exit' then
+  else if Command.strings[0] = 'exit' then
   begin
     Application.Terminate;
     Command.UnknownCommand := False; // user won't see it anyway, but you should
-                                     // get used to puting this line in every
-                                     // command you recognize :)
+    // get used to puting this line in every
+    // command you recognize :)
   end;
 
   if Command.UnknownCommand then
     Console.AddLine('Current supported external commands are:' +
-                    '"echo" and "exit"!');
+      '"echo" and "exit"!');
 end;
 
-
 procedure TFormConsole.FormCreate(Sender: TObject);
 begin
   Console := TGLConsole.CreateAsChild(Scene.Objects);
@@ -129,32 +127,28 @@ begin
   Console.SceneViewer := Viewer;
   Console.Font := Font1;
 
-  //optional stuff:
+  // optional stuff:
   SetGLSceneMediaDir();
   Console.HudSprite.Material.Texture.Image.LoadFromFile('GLScene.bmp');
   Console.AddLine('Console started');
   Console.HUDSpriteColor := clWhite;
   Console.FontColor := clBlue;
 
-  //two ways of processing commands:
-     //1) manual
+  // two ways of processing commands:
+  // 1) manual
   Console.OnCommandIssued := OnCommand;
-     //2)using built-in objects (prefered)
-  with Console.Commands.Add do
-  begin
-    CommandName := 'hello';
-    ShortHelp := 'Says hi to you too';
-    LongHelp.Add('Well, the console really does say "Hi, dude" to you, because');
-    LongHelp.Add('it is roude not to greet someone, when he says "hello" to you ;)');
-    OnCommand := OnHelloCommand;
-  end;
+  // 2)using built-in objects (prefered)
+  Console.Commands.Add.CommandName := 'hello';
+  Console.Commands.Add.ShortHelp := 'Says hi to you too';
+  Console.Commands.Add.LongHelp.Add
+    ('Well, the console really does say "Hi, dude" to you, because');
+  Console.Commands.Add.LongHelp.Add
+    ('it is roude not to greet someone, when he says "hello" to you ;)');
+  Console.Commands.Add.OnCommand := OnHelloCommand;
 
-  //register additional commands to enable auto-completion function
-  with Console.AdditionalCommands do
-  begin
-    Add('echo');
-    Add('exit');
-  end;
+  // register additional commands to enable auto-completion function
+  Console.AdditionalCommands.Add('echo');
+  Console.AdditionalCommands.Add('exit');
 end;
 
 procedure TFormConsole.GLCadencer1Progress(Sender: TObject;
@@ -163,26 +157,23 @@ begin
   Viewer.Invalidate();
 end;
 
-
 procedure TFormConsole.FormKeyPress(Sender: TObject; var Key: char);
 begin
   Console.ProcessKeyPress(Key);
 end;
 
-
-procedure TFormConsole.FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
+procedure TFormConsole.FormKeyDown(Sender: TObject; var Key: word;
+  Shift: TShiftState);
 begin
   Console.ProcessKeyDown(Key);
 end;
 
-
 procedure TFormConsole.ViewerMouseDown(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: integer);
 begin
   Console.Visible := not Console.Visible;
 end;
 
-
 procedure TFormConsole.FormResize(Sender: TObject);
 begin
   Console.RefreshHudSize();
@@ -249,5 +240,4 @@ begin
   Console.Destroy;
 end;
 
-
 end.

Demos/interface/Console/Unit1.cpp → Demos/interface/Console/fConsoleC.cpp

@@ -7,7 +7,7 @@
 
 #pragma hdrstop
 
-#include "Unit1.h"
+#include "fConsoleC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLS.BaseClasses"
@@ -34,7 +34,7 @@ __fastcall TForm1::TForm1(TComponent* Owner)
 void __fastcall TForm1::OnHelloCommand(const TGLConsoleCommand *ConsoleCommand,
 		  const TGLCustomConsole *Console, TGLUserInputCommand &Command)
 {
-///  Console->AddLine("Hi, dude!");    // yet not works!
+ /// Console->AddLine("Hi, dude!");    // yet not works!
 }
 
 //---------------------------------------------------------------------------

Demos/interface/Console/Unit1.dfm → Demos/interface/Console/fConsoleC.dfm

@@ -38,6 +38,7 @@ object Form1: TForm1
     Buffer.BackgroundColor = clMoneyGreen
     Buffer.AmbientColor.Color = {9A99993E9A99993E9A99993E0000803F}
     FieldOfView = 148.109207153320300000
+    PenAsTouch = False
     Align = alClient
     OnMouseDown = ViewerMouseDown
     TabOrder = 0

Demos/interface/Console/Unit1.h → Demos/interface/Console/fConsoleC.h

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 
-#ifndef Unit1H
-#define Unit1H
+#ifndef fConsoleCH
+#define fConsoleCH
 //---------------------------------------------------------------------------
 #include <System.Classes.hpp>
 #include <Vcl.Controls.hpp>

Demos/interface/GameMenu/GameMenu.cpp

@@ -1,38 +0,0 @@
-//
-//  22/01/13 - PW - First draft of conversion to Cpp
-//
-//---------------------------------------------------------------------------
-
-#include <vcl.h>
-#pragma hdrstop
-#include <tchar.h>
-//---------------------------------------------------------------------------
-USEFORM("Unit1.cpp", Form1);
-//---------------------------------------------------------------------------
-int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
-{
-	try
-	{
-		Application->Initialize();
-		Application->MainFormOnTaskBar = true;
-		Application->CreateForm(__classid(TForm1), &Form1);
-		Application->Run();
-	}
-	catch (Exception &exception)
-	{
-		Application->ShowException(&exception);
-	}
-	catch (...)
-	{
-		try
-		{
-			throw Exception("");
-		}
-		catch (Exception &exception)
-		{
-			Application->ShowException(&exception);
-		}
-	}
-	return 0;
-}
-//---------------------------------------------------------------------------

Demos/interface/GameMenu/GameMenu.dpr

@@ -9,7 +9,7 @@ program GameMenu;
 
 uses
   Forms,
-  GameMenuFm in 'GameMenuFm.pas' {FormGameMenu};
+  fGameMenu in 'fGameMenu.pas' {FormGameMenu};
 
 {$R *.res}
 

Demos/interface/GameMenu/GameMenu.dproj

@@ -123,7 +123,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="GameMenuFm.pas">
+        <DCCReference Include="fGameMenu.pas">
             <Form>FormGameMenu</Form>
         </DCCReference>
         <BuildConfiguration Include="Debug">

Demos/interface/GameMenu/GameMenu.cbproj → Demos/interface/GameMenu/GameMenuC.cbproj

@@ -4,7 +4,7 @@
         <ProjectVersion>18.7</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
-        <MainSource>GameMenu.cpp</MainSource>
+        <MainSource>GameMenuC.cpp</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -58,7 +58,7 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <SanitizedProjectName>GameMenu</SanitizedProjectName>
+        <SanitizedProjectName>GameMenuC</SanitizedProjectName>
         <AllPackageLibs>rtl.lib;vcl.lib;GLScene_RT.lib;fmx.lib;xmlrtl.lib;vclimg.lib</AllPackageLibs>
         <Multithreaded>true</Multithreaded>
         <_TCHARMapping>wchar_t</_TCHARMapping>
@@ -138,16 +138,16 @@
         <Defines>NDEBUG;$(Defines)</Defines>
     </PropertyGroup>
     <ItemGroup>
-        <CppCompile Include="GameMenu.cpp">
-            <BuildOrder>0</BuildOrder>
-        </CppCompile>
-        <CppCompile Include="Unit1.cpp">
+        <CppCompile Include="fGameMenuC.cpp">
             <Form>Form1</Form>
             <FormType>dfm</FormType>
-            <DependentOn>Unit1.h</DependentOn>
+            <DependentOn>fGameMenuC.h</DependentOn>
             <BuildOrder>2</BuildOrder>
         </CppCompile>
-        <FormResources Include="Unit1.dfm"/>
+        <CppCompile Include="GameMenuC.cpp">
+            <BuildOrder>0</BuildOrder>
+        </CppCompile>
+        <FormResources Include="fGameMenuC.dfm"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -166,7 +166,7 @@
         <BorlandProject>
             <CPlusPlusBuilder.Personality>
                 <Source>
-                    <Source Name="MainSource">GameMenu.cpp</Source>
+                    <Source Name="MainSource">GameMenuC.cpp</Source>
                 </Source>
                 <VersionInfo>
                     <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
@@ -211,7 +211,7 @@
                 </ProjectProperties>
             </CPlusPlusBuilder.Personality>
             <Deployment Version="3">
-                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64160mt.dll" Class="DependencyModule"/>
+                <DeployFile LocalName=".\Win32\Debug\GameMenu.tds" Configuration="Debug" Class="DebugSymbols"/>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule">
                     <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
@@ -260,6 +260,12 @@
                 </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32160.dll" Class="DependencyModule"/>
                 <DeployFile LocalName=".\Win32\Debug\GameMenu.exe" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName=".\Win32\Debug\GameMenuC.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>GameMenuC.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule">
                     <Platform Name="Win64">
                         <Overwrite>true</Overwrite>
@@ -270,13 +276,19 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName=".\Win32\Debug\GameMenuC.tds" Configuration="Debug" Class="DebugSymbols">
+                    <Platform Name="Win32">
+                        <RemoteName>GameMenuC.tds</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64160mt.dll" Class="DependencyModule"/>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64160.dll" Class="DependencyModule"/>
                 <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule">
                     <Platform Name="OSX64">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName=".\Win32\Debug\GameMenu.tds" Configuration="Debug" Class="DebugSymbols"/>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>

Demos/interface/fadingintf/Fading.cpp → Demos/interface/GameMenu/GameMenuC.cpp

@@ -7,7 +7,7 @@
 #pragma hdrstop
 #include <tchar.h>
 //---------------------------------------------------------------------------
-USEFORM("Unit1.cpp", Form1);
+USEFORM("fGameMenuC.cpp", Form1);
 //---------------------------------------------------------------------------
 int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
 {

Demos/interface/GameMenu/GameMenuFm.pas → Demos/interface/GameMenu/fGameMenu.pas

@@ -1,4 +1,4 @@
-unit GameMenuFm;
+unit fGameMenu;
 
 interface
 

Demos/interface/GameMenu/Unit1.cpp → Demos/interface/GameMenu/fGameMenuC.cpp

@@ -4,7 +4,7 @@
 #include <tchar.h>
 #pragma hdrstop
 
-#include "Unit1.h"
+#include "fGameMenuC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLS.BaseClasses"

Demos/interface/GameMenu/Unit1.dfm → Demos/interface/GameMenu/fGameMenuC.dfm

@@ -23,6 +23,7 @@ object Form1: TForm1
     Camera = GLCamera1
     Buffer.BackgroundColor = clGray
     FieldOfView = 152.521591186523400000
+    PenAsTouch = False
     Align = alClient
     OnMouseDown = GLSceneViewer1MouseDown
     OnMouseMove = GLSceneViewer1MouseMove

Demos/interface/GameMenu/Unit1.h → Demos/interface/GameMenu/fGameMenuC.h

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 
-#ifndef Unit1H
-#define Unit1H
+#ifndef fGameMenuCH
+#define fGameMenuCH
 //---------------------------------------------------------------------------
 #include <Windows.hpp>
 #include <Messages.hpp>

Demos/interface/GizmoEx/GizmoExC.cbproj

@@ -63,7 +63,6 @@
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
         <AllPackageLibs>rtl.lib;vcl.lib;GLScene_RT.lib;fmx.lib;xmlrtl.lib;vclimg.lib</AllPackageLibs>
         <Icon_MainIcon>$(BDS)\bin\cbuilder_PROJECTICON.ico</Icon_MainIcon>
-        <IncludePath>D:\GLScene\Samples\CPP\Demos\interface\GizmoEx\;$(IncludePath)</IncludePath>
         <ILINK_LibraryPath>D:\GLScene\Samples\CPP\Demos\interface\GizmoEx\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
         <ProjectType>CppVCLApplication</ProjectType>
         <Multithreaded>true</Multithreaded>
@@ -124,6 +123,9 @@
         <Defines>_DEBUG;$(Defines)</Defines>
         <LinkPackageImports>rtl.bpi;vcl.bpi;GLScene_RT.bpi;fmx.bpi;xmlrtl.bpi;vclimg.bpi</LinkPackageImports>
         <BT_BuildType>Debug</BT_BuildType>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <Defines>_DEBUG;$(Defines)</Defines>
@@ -209,6 +211,13 @@
                     <ProjectProperties Name="VerifyPackages">True</ProjectProperties>
                     <ProjectProperties Name="IndexFiles">False</ProjectProperties>
                 </ProjectProperties>
+                <Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\20.0\Bpl\GR32_DT.bpl">Graphics32 Design Time Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k260.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp260.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k260.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp260.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                </Excluded_Packages>
             </CPlusPlusBuilder.Personality>
             <Deployment Version="3">
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule">

Demos/interface/GuiDemo/GuiDemo.cpp

@@ -1,35 +0,0 @@
-//
-// First draft of conversion to Cppb
-//
-//---------------------------------------------------------------------------
-
-#include <vcl.h>
-#pragma hdrstop
-#include <tchar.h>
-//---------------------------------------------------------------------------
-int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
-{
-	try
-	{
-		Application->Initialize();
-		Application->MainFormOnTaskBar = true;
-		Application->Run();
-	}
-	catch (Exception &exception)
-	{
-		Application->ShowException(&exception);
-	}
-	catch (...)
-	{
-		try
-		{
-			throw Exception("");
-		}
-		catch (Exception &exception)
-		{
-			Application->ShowException(&exception);
-		}
-	}
-	return 0;
-}
-//---------------------------------------------------------------------------

Demos/interface/GuiDemo/GuiDemo.cbproj → Demos/interface/GuiDemo/GuiDemoC.cbproj

@@ -4,7 +4,7 @@
         <ProjectVersion>18.7</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
-        <MainSource>GuiDemo.cpp</MainSource>
+        <MainSource>GuiDemoC.cpp</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -58,14 +58,12 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <SanitizedProjectName>GuiDemo</SanitizedProjectName>
+        <SanitizedProjectName>GuiDemoC</SanitizedProjectName>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
         <Multithreaded>true</Multithreaded>
         <Icon_MainIcon>$(BDS)\bin\cbuilder_PROJECTICON.ico</Icon_MainIcon>
         <ProjectType>CppVCLApplication</ProjectType>
         <_TCHARMapping>wchar_t</_TCHARMapping>
-        <IncludePath>D:\GLScene\Samples\CPP\Demos\interface\GuiDemo\;$(IncludePath)</IncludePath>
-        <ILINK_LibraryPath>D:\GLScene\Samples\CPP\Demos\interface\GuiDemo\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
         <AllPackageLibs>rtl.lib;vcl.lib;GLScene_RT.lib;fmx.lib;xmlrtl.lib;vclimg.lib</AllPackageLibs>
         <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
         <DynamicRTL>true</DynamicRTL>
@@ -127,6 +125,7 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <LinkPackageImports>rtl.bpi;vcl.bpi;GLScene_RT.bpi;fmx.bpi;xmlrtl.bpi;vclimg.bpi</LinkPackageImports>
         <BT_BuildType>Debug</BT_BuildType>
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <Defines>_DEBUG;$(Defines)</Defines>
@@ -141,9 +140,16 @@
         <Defines>NDEBUG;$(Defines)</Defines>
     </PropertyGroup>
     <ItemGroup>
-        <CppCompile Include="GuiDemo.cpp">
+        <CppCompile Include="fGuiDemoC.cpp">
+            <Form>Form1</Form>
+            <FormType>dfm</FormType>
+            <DependentOn>fGuiDemoC.h</DependentOn>
+            <BuildOrder>1</BuildOrder>
+        </CppCompile>
+        <CppCompile Include="GuiDemoC.cpp">
             <BuildOrder>0</BuildOrder>
         </CppCompile>
+        <FormResources Include="fGuiDemoC.dfm"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -162,7 +168,7 @@
         <BorlandProject>
             <CPlusPlusBuilder.Personality>
                 <Source>
-                    <Source Name="MainSource">GuiDemo.cpp</Source>
+                    <Source Name="MainSource">GuiDemoC.cpp</Source>
                 </Source>
                 <VersionInfo>
                     <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
@@ -205,6 +211,13 @@
                     <ProjectProperties Name="VerifyPackages">True</ProjectProperties>
                     <ProjectProperties Name="IndexFiles">False</ProjectProperties>
                 </ProjectProperties>
+                <Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\20.0\Bpl\GR32_DT.bpl">Graphics32 Design Time Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k260.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp260.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k260.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp260.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                </Excluded_Packages>
             </CPlusPlusBuilder.Personality>
             <Deployment Version="3">
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule">
@@ -212,6 +225,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName=".\GuiDemoC.tds" Configuration="Debug" Class="DebugSymbols">
+                    <Platform Name="Win32">
+                        <RemoteName>GuiDemoC.tds</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin64\borlndmm.dll" Class="DependencyModule">
                     <Platform Name="Win64">
                         <Overwrite>true</Overwrite>
@@ -255,6 +274,12 @@
                 </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32160.dll" Class="DependencyModule"/>
                 <DeployFile LocalName=".\GuiDemo.exe" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName=".\GuiDemoC.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>GuiDemoC.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule">
                     <Platform Name="Win64">
                         <Overwrite>true</Overwrite>

Demos/interface/GuiDemo/GuiDemoC.cpp

@@ -0,0 +1,38 @@
+//
+// First draft of conversion to Cppb
+//
+//---------------------------------------------------------------------------
+
+#include <vcl.h>
+#pragma hdrstop
+#include <tchar.h>
+//---------------------------------------------------------------------------
+USEFORM("fGuiDemoC.cpp", Form1);
+//---------------------------------------------------------------------------
+int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
+{
+	try
+	{
+		Application->Initialize();
+		Application->MainFormOnTaskBar = true;
+		Application->CreateForm(__classid(TForm1), &Form1);
+		Application->Run();
+	}
+	catch (Exception &exception)
+	{
+		Application->ShowException(&exception);
+	}
+	catch (...)
+	{
+		try
+		{
+			throw Exception("");
+		}
+		catch (Exception &exception)
+		{
+			Application->ShowException(&exception);
+		}
+	}
+	return 0;
+}
+//---------------------------------------------------------------------------

Demos/interface/GuiDemo/Guidemo.dpr

@@ -37,7 +37,7 @@ program Guidemo;
 
 uses
   Forms,
-  GuidemoFm in 'GuidemoFm.pas' {FormGuidemo};
+  fGuiDemo in 'fGuiDemo.pas' {FormGuidemo};
 
 {$R *.RES}
 

Demos/interface/GuiDemo/Guidemo.dproj

@@ -123,7 +123,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="GuidemoFm.pas">
+        <DCCReference Include="fGuiDemo.pas">
             <Form>FormGuidemo</Form>
         </DCCReference>
         <BuildConfiguration Include="Debug">

Demos/interface/GuiDemo/GuidemoFm.pas → Demos/interface/GuiDemo/fGuiDemo.pas

@@ -1,4 +1,4 @@
-unit GuidemoFm;
+unit fGuiDemo;
 
 interface
 

Demos/interface/GuiDemo/Unit1.cpp → Demos/interface/GuiDemo/fGuiDemoC.cpp

@@ -3,7 +3,7 @@
 #include <vcl.h>
 #pragma hdrstop
 
-#include "Unit1.h"
+#include "fGuiDemoC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLS.BaseClasses"
@@ -11,7 +11,6 @@
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 
-#pragma link "GLS.Gui"
 #pragma link "GLS.Material"
 #pragma link "GLS.Scene"
 #pragma link "GLS.SceneViewer"
@@ -28,7 +27,10 @@ __fastcall TForm1::TForm1(TComponent* Owner)
 //---------------------------------------------------------------------------
 void __fastcall TForm1::FormCreate(TObject *Sender)
 {
+  TFileName MediaDir;
   SetGLSceneMediaDir();
+
+  GLMaterialLibrary1->TexturePaths = GetCurrentDir();
   GLForm1->Caption = "Unicode caption..."; //#$0699#$069A#$963f#$54c0;
   WindowsBitmapFont1->EnsureString(GLForm1->Caption);
 }

Demos/interface/GuiDemo/Unit1.dfm → Demos/interface/GuiDemo/fGuiDemoC.dfm

@@ -26,6 +26,7 @@ object Form1: TForm1
     Camera = GLCamera1
     Buffer.BackgroundColor = clBackground
     FieldOfView = 150.586914062500000000
+    PenAsTouch = False
     Align = alClient
     OnMouseDown = GLSceneViewer1MouseDown
     OnMouseMove = GLSceneViewer1MouseMove

Demos/interface/GuiDemo/Unit1.h → Demos/interface/GuiDemo/fGuiDemoC.h

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 
-#ifndef Unit1H
-#define Unit1H
+#ifndef fGuiDemoCH
+#define fGuiDemoCH
 //---------------------------------------------------------------------------
 #include <System.Classes.hpp>
 #include <Vcl.Controls.hpp>

Demos/interface/GuiPaint/GuiPaint.dpr

@@ -44,7 +44,7 @@ program GuiPaint;
 
 uses
   Forms,
-  GuiPaintFm in 'GuiPaintFm.pas' {FormGuiPaint};
+  fGuiPaint in 'fGuiPaint.pas' {FormGuiPaint};
 
 {$R *.RES}
 

Demos/interface/GuiPaint/GuiPaint.dproj

@@ -122,7 +122,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="GuiPaintFm.pas">
+        <DCCReference Include="fGuiPaint.pas">
             <Form>FormGuiPaint</Form>
         </DCCReference>
         <BuildConfiguration Include="Debug">

Demos/interface/GuiPaint/GuiPaint.cbproj → Demos/interface/GuiPaint/GuiPaintC.cbproj

@@ -4,7 +4,7 @@
         <ProjectVersion>18.7</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
-        <MainSource>GuiPaint.cpp</MainSource>
+        <MainSource>GuiPaintC.cpp</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -58,7 +58,7 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <SanitizedProjectName>GuiPaint</SanitizedProjectName>
+        <SanitizedProjectName>GuiPaintC</SanitizedProjectName>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
         <Multithreaded>true</Multithreaded>
         <Icon_MainIcon>$(BDS)\bin\cbuilder_PROJECTICON.ico</Icon_MainIcon>
@@ -142,16 +142,16 @@
         <Defines>NDEBUG;$(Defines)</Defines>
     </PropertyGroup>
     <ItemGroup>
-        <CppCompile Include="GuiPaint.cpp">
-            <BuildOrder>0</BuildOrder>
-        </CppCompile>
-        <CppCompile Include="Unit1.cpp">
+        <CppCompile Include="fGuiPaintC.cpp">
             <Form>Form1</Form>
             <FormType>dfm</FormType>
-            <DependentOn>Unit1.h</DependentOn>
+            <DependentOn>fGuiPaintC.h</DependentOn>
             <BuildOrder>2</BuildOrder>
         </CppCompile>
-        <FormResources Include="Unit1.dfm"/>
+        <CppCompile Include="GuiPaintC.cpp">
+            <BuildOrder>0</BuildOrder>
+        </CppCompile>
+        <FormResources Include="fGuiPaintC.dfm"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -170,7 +170,7 @@
         <BorlandProject>
             <CPlusPlusBuilder.Personality>
                 <Source>
-                    <Source Name="MainSource">GuiPaint.cpp</Source>
+                    <Source Name="MainSource">GuiPaintC.cpp</Source>
                 </Source>
                 <VersionInfo>
                     <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
@@ -270,6 +270,12 @@
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32160.dll" Class="DependencyModule"/>
                 <DeployFile LocalName=".\GuiPaint.tds" Configuration="Debug" Class="DebugSymbols"/>
                 <DeployFile LocalName=".\GuiPaint.exe" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName=".\GuiPaintC.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>GuiPaintC.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule">
                     <Platform Name="Win64">
                         <Overwrite>true</Overwrite>
@@ -280,6 +286,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName=".\GuiPaintC.tds" Configuration="Debug" Class="DebugSymbols">
+                    <Platform Name="Win32">
+                        <RemoteName>GuiPaintC.tds</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64160.dll" Class="DependencyModule"/>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64160mt.dll" Class="DependencyModule"/>
                 <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule">

Demos/interface/HFPick/HFPick.cpp → Demos/interface/GuiPaint/GuiPaintC.cpp

@@ -4,7 +4,7 @@
 #pragma hdrstop
 #include <tchar.h>
 //---------------------------------------------------------------------------
-USEFORM("Unit1.cpp", Form1);
+USEFORM("fGuiPaintC.cpp", Form1);
 //---------------------------------------------------------------------------
 int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
 {

Demos/interface/GuiPaint/GuiPaintFm.pas → Demos/interface/GuiPaint/fGuiPaint.pas

@@ -1,4 +1,4 @@
-unit GuiPaintFm;
+unit fGuiPaint;
 
 interface
 

Demos/interface/GuiPaint/Unit1.cpp → Demos/interface/GuiPaint/fGuiPaintC.cpp

@@ -4,7 +4,7 @@
 #include <tchar.h>
 #pragma hdrstop
 
-#include "Unit1.h"
+#include "fGuiPaintC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLS.BaseClasses"
@@ -12,7 +12,6 @@
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 
-#pragma link "GLS.Gui"
 #pragma link "GLS.Material"
 #pragma link "GLS.Scene"
 #pragma link "GLS.SceneViewer"
@@ -24,11 +23,12 @@ TForm1 *Form1;
 __fastcall TForm1::TForm1(TComponent* Owner)
 	: TForm(Owner)
 {
-  SetGLSceneMediaDir();
 }
 //---------------------------------------------------------------------------
 void __fastcall TForm1::FormCreate(TObject *Sender)
 {
+  SetGLSceneMediaDir();
+  GLMaterialLibrary1->TexturePaths = GetCurrentDir();
   GLCanvas->MaxInvalidRenderCount = 40;
   StartX = -1;
 }

Demos/interface/GuiPaint/Unit1.h → Demos/interface/GuiPaint/fGuiPaintC.h

@@ -1,7 +1,7 @@
 // ---------------------------------------------------------------------------
 
-#ifndef Unit1H
-#define Unit1H
+#ifndef fGuiPaintCH
+#define fGuiPaintCH
 // ---------------------------------------------------------------------------
 #include <System.Classes.hpp>
 #include <Vcl.Controls.hpp>

Demos/interface/HFPick/HFPick.cbproj → Demos/interface/HFPick/HFPickC.cbproj

@@ -4,7 +4,7 @@
         <ProjectVersion>18.7</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
-        <MainSource>HFPick.cpp</MainSource>
+        <MainSource>HFPickC.cpp</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -58,7 +58,7 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <SanitizedProjectName>HFPick</SanitizedProjectName>
+        <SanitizedProjectName>HFPickC</SanitizedProjectName>
         <Icon_MainIcon>$(BDS)\bin\cbuilder_PROJECTICON.ico</Icon_MainIcon>
         <_TCHARMapping>wchar_t</_TCHARMapping>
         <ProjectType>CppVCLApplication</ProjectType>
@@ -138,16 +138,16 @@
         <Defines>NDEBUG;$(Defines)</Defines>
     </PropertyGroup>
     <ItemGroup>
-        <CppCompile Include="HFPick.cpp">
-            <BuildOrder>0</BuildOrder>
-        </CppCompile>
-        <CppCompile Include="Unit1.cpp">
-            <Form>Form1</Form>
+        <CppCompile Include="fHFPickC.cpp">
+            <Form>FormHFPick</Form>
             <FormType>dfm</FormType>
-            <DependentOn>Unit1.h</DependentOn>
+            <DependentOn>fHFPickC.h</DependentOn>
             <BuildOrder>2</BuildOrder>
         </CppCompile>
-        <FormResources Include="Unit1.dfm"/>
+        <CppCompile Include="HFPickC.cpp">
+            <BuildOrder>0</BuildOrder>
+        </CppCompile>
+        <FormResources Include="fHFPickC.dfm"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -166,7 +166,7 @@
         <BorlandProject>
             <CPlusPlusBuilder.Personality>
                 <Source>
-                    <Source Name="MainSource">HFPick.cpp</Source>
+                    <Source Name="MainSource">HFPickC.cpp</Source>
                 </Source>
                 <VersionInfo>
                     <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
@@ -259,6 +259,12 @@
                     </Platform>
                 </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32160.dll" Class="DependencyModule"/>
+                <DeployFile LocalName=".\Win32\Debug\HFPickC.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>HFPickC.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName=".\Win32\Debug\HFPick.tds" Configuration="Debug" Class="DebugSymbols"/>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule">
                     <Platform Name="Win64">
@@ -270,6 +276,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName=".\Win32\Debug\HFPickC.tds" Configuration="Debug" Class="DebugSymbols">
+                    <Platform Name="Win32">
+                        <RemoteName>HFPickC.tds</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64160.dll" Class="DependencyModule"/>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64160mt.dll" Class="DependencyModule"/>
                 <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule">

Demos/interface/HFPick/HFPickC.cpp

@@ -0,0 +1,35 @@
+//---------------------------------------------------------------------------
+
+#include <vcl.h>
+#pragma hdrstop
+#include <tchar.h>
+//---------------------------------------------------------------------------
+USEFORM("fHFPickC.cpp", FormHFPick);
+//---------------------------------------------------------------------------
+int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
+{
+	try
+	{
+		Application->Initialize();
+		Application->MainFormOnTaskBar = true;
+		Application->CreateForm(__classid(TFormHFPick), &FormHFPick);
+		Application->Run();
+	}
+	catch (Exception &exception)
+	{
+		Application->ShowException(&exception);
+	}
+	catch (...)
+	{
+		try
+		{
+			throw Exception("");
+		}
+		catch (Exception &exception)
+		{
+			Application->ShowException(&exception);
+		}
+	}
+	return 0;
+}
+//---------------------------------------------------------------------------

Demos/interface/HFPick/HFpick.dpr

@@ -26,12 +26,12 @@ program HFpick;
 
 uses
   Forms,
-  HFPickFm in 'HFPickFm.pas' {FormHFPickFm};
+  fHFPick in 'fHFPick.pas' {FormHFPick};
 
 {$R *.res}
 
 begin
   Application.Initialize;
-  Application.CreateForm(TFormHFPickFm, FormHFPickFm);
+  Application.CreateForm(TFormHFPick, FormHFPick);
   Application.Run;
 end.

Demos/interface/HFPick/HFpick.dproj

@@ -116,8 +116,8 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="HFPickFm.pas">
-            <Form>FormHFPickFm</Form>
+        <DCCReference Include="fHFPick.pas">
+            <Form>FormHFPick</Form>
         </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>

Demos/interface/HFPick/HFPickFm.dfm → Demos/interface/HFPick/fHFPick.dfm

@@ -1,4 +1,4 @@
-object FormHFPickFm: TFormHFPickFm
+object FormHFPick: TFormHFPick
   Left = 133
   Top = 72
   Caption = 'Heightfield Pick'

Demos/interface/HFPick/HFPickFm.pas → Demos/interface/HFPick/fHFPick.pas

@@ -1,4 +1,4 @@
-unit HFPickFm;
+unit fHFPick;
 
 interface
 
@@ -13,7 +13,6 @@ uses
   Vcl.StdCtrls,
   Vcl.ExtCtrls,
 
-  
   GLS.Scene,
   GLS.Graph,
   GLS.SceneViewer,
@@ -22,12 +21,11 @@ uses
   GLS.Texture,
   GLS.Objects,
   GLS.Color,
- 
   GLS.Coordinates,
   GLS.BaseClasses;
 
 type
-  TFormHFPickFm = class(TForm)
+  TFormHFPick = class(TForm)
     GLScene1: TGLScene;
     GLSceneViewer: TGLSceneViewer;
     GLCamera1: TGLCamera;
@@ -46,21 +44,21 @@ type
       x, y: Integer);
     procedure FormCreate(Sender: TObject);
   private
-     
+
   public
-     
+
     mx, my: Integer;
     grid: array [-5 .. 5, -5 .. 5] of TColor;
   end;
 
 var
-  FormHFPickFm: TFormHFPickFm;
+  FormHFPick: TFormHFPick;
 
 implementation
 
 {$R *.dfm}
 
-procedure TFormHFPickFm.FormCreate(Sender: TObject);
+procedure TFormHFPick.FormCreate(Sender: TObject);
 var
   ix, iy: Integer;
 begin
@@ -73,7 +71,7 @@ begin
         grid[ix, iy] := clSilver;
 end;
 
-procedure TFormHFPickFm.HeightFieldGetHeight(const x, y: Single; var z: Single;
+procedure TFormHFPick.HeightFieldGetHeight(const x, y: Single; var z: Single;
   var color: TVector4f; var texPoint: TTexPoint);
 var
   ix, iy: Integer;
@@ -87,7 +85,7 @@ begin
   z := Cos(VectorLength(x, y) * 1.5);
 end;
 
-procedure TFormHFPickFm.GLSceneViewerMouseDown(Sender: TObject; Button: TMouseButton;
+procedure TFormHFPick.GLSceneViewerMouseDown(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; x, y: Integer);
 var
   v: TAffineVector;
@@ -121,7 +119,7 @@ begin
   end;
 end;
 
-procedure TFormHFPickFm.GLSceneViewerMouseMove(Sender: TObject; Shift: TShiftState;
+procedure TFormHFPick.GLSceneViewerMouseMove(Sender: TObject; Shift: TShiftState;
   x, y: Integer);
 begin
   if RBPaint.Checked then

Demos/interface/HFPick/Unit1.cpp → Demos/interface/HFPick/fHFPickC.cpp

@@ -4,7 +4,7 @@
 #include <tchar.h>
 #pragma hdrstop
 
-#include "Unit1.h"
+#include "fHFPickC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLS.BaseClasses"
@@ -14,16 +14,16 @@
 #pragma link "GLS.Scene"
 #pragma link "GLS.SceneViewer"
 #pragma resource "*.dfm"
-TForm1 *Form1;
+TFormHFPick *FormHFPick;
 TColor grid[11][11];
 
 //---------------------------------------------------------------------------
-__fastcall TForm1::TForm1(TComponent* Owner)
+__fastcall TFormHFPick::TFormHFPick(TComponent* Owner)
 	: TForm(Owner)
 {
 }
 //---------------------------------------------------------------------------
-void __fastcall TForm1::FormCreate(TObject *Sender)
+void __fastcall TFormHFPick::FormCreate(TObject *Sender)
 {
  int ix, iy;
 
@@ -37,7 +37,7 @@ void __fastcall TForm1::FormCreate(TObject *Sender)
 }
 //---------------------------------------------------------------------------
 
-void __fastcall TForm1::HeightFieldGetHeight(const float x, const float y, float &z,
+void __fastcall TFormHFPick::HeightFieldGetHeight(const float x, const float y, float &z,
           TVector4f &Color, TTexPoint &TexPoint)
 {
    int ix, iy;
@@ -52,7 +52,7 @@ void __fastcall TForm1::HeightFieldGetHeight(const float x, const float y, float
 }
 //---------------------------------------------------------------------------
 
-void __fastcall TForm1::GLSceneViewerMouseDown(TObject *Sender, TMouseButton Button,
+void __fastcall TFormHFPick::GLSceneViewerMouseDown(TObject *Sender, TMouseButton Button,
           TShiftState Shift, int X, int Y)
 {
    TAffineVector v;
@@ -88,7 +88,7 @@ void __fastcall TForm1::GLSceneViewerMouseDown(TObject *Sender, TMouseButton But
 }
 //---------------------------------------------------------------------------
 
-void __fastcall TForm1::GLSceneViewerMouseMove(TObject *Sender, TShiftState Shift,
+void __fastcall TFormHFPick::GLSceneViewerMouseMove(TObject *Sender, TShiftState Shift,
           int X, int Y)
 {
    if (RBPaint->Checked)

Demos/interface/HFPick/Unit1.dfm → Demos/interface/HFPick/fHFPickC.dfm

@@ -1,4 +1,4 @@
-object Form1: TForm1
+object FormHFPick: TFormHFPick
   Left = 0
   Top = 0
   Caption = 'Heightfield Pick'

Demos/interface/HFPick/Unit1.h → Demos/interface/HFPick/fHFPickC.h

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 
-#ifndef Unit1H
-#define Unit1H
+#ifndef fHFPickCH
+#define fHFPickCH
 //---------------------------------------------------------------------------
 #include <System.Classes.hpp>
 #include <Vcl.Controls.hpp>
@@ -15,7 +15,7 @@
 #include "GLS.SceneViewer.hpp"
 #include <Vcl.ExtCtrls.hpp>
 //---------------------------------------------------------------------------
-class TForm1 : public TForm
+class TFormHFPick : public TForm
 {
 __published:	// IDE-managed Components
 	TGLSceneViewer *GLSceneViewer;
@@ -39,9 +39,9 @@ __published:	// IDE-managed Components
 private:	// User declarations
 	int mx, my;
 public:		// User declarations
-	__fastcall TForm1(TComponent* Owner);
+	__fastcall TFormHFPick(TComponent* Owner);
 };
 //---------------------------------------------------------------------------
-extern PACKAGE TForm1 *Form1;
+extern PACKAGE TFormHFPick *FormHFPick;
 //---------------------------------------------------------------------------
 #endif

Demos/interface/Interface.groupproj

@@ -15,22 +15,34 @@
         <Projects Include="camera\CameraC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="CameraController\CameraController.cbproj">
+        <Projects Include="CameraController\CameraController.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="Console\Console.cbproj">
+        <Projects Include="CameraController\CameraControllerC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="cursor\Cursor.cbproj">
+        <Projects Include="Console\Console.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="fadingintf\Fading.cbproj">
+        <Projects Include="Console\ConsoleC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="fontcolor\Fontcolor.cbproj">
+        <Projects Include="cursor\Cursor.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="GameMenu\GameMenu.cbproj">
+        <Projects Include="cursor\CursorC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="fontcolor\Fontcolor.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="fontcolor\FontColorC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="GameMenu\GameMenu.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="GameMenu\GameMenuC.cbproj">
             <Dependencies/>
         </Projects>
         <Projects Include="Gizmo\Gizmo.dproj">
@@ -45,22 +57,40 @@
         <Projects Include="GizmoEx\GizmoExC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="GuiDemo\GuiDemo.cbproj">
+        <Projects Include="GuiDemo\Guidemo.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="GuiDemo\GuiDemoC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="GuiPaint\GuiPaint.cbproj">
+        <Projects Include="GuiPaint\GuiPaint.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="HFPick\HFPick.cbproj">
+        <Projects Include="GuiPaint\GuiPaintC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="Pick\Pick.cbproj">
+        <Projects Include="HFPick\HFpick.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="SimpleNavigation\SimpleNavigation.cbproj">
+        <Projects Include="HFPick\HFPickC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="WinFont\WinFont.cbproj">
+        <Projects Include="Pick\Pick.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Pick\PickC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="SimpleNavigation\SimpleNavi.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="SimpleNavigation\SimpleNaviC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="WinFont\WinFontC.cbproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="WinFont\Winfont.dproj">
             <Dependencies/>
         </Projects>
     </ItemGroup>
@@ -108,58 +138,94 @@
         <MSBuild Projects="camera\CameraC.cbproj" Targets="Make"/>
     </Target>
     <Target Name="CameraController">
-        <MSBuild Projects="CameraController\CameraController.cbproj"/>
+        <MSBuild Projects="CameraController\CameraController.dproj"/>
     </Target>
     <Target Name="CameraController:Clean">
-        <MSBuild Projects="CameraController\CameraController.cbproj" Targets="Clean"/>
+        <MSBuild Projects="CameraController\CameraController.dproj" Targets="Clean"/>
     </Target>
     <Target Name="CameraController:Make">
-        <MSBuild Projects="CameraController\CameraController.cbproj" Targets="Make"/>
+        <MSBuild Projects="CameraController\CameraController.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="CameraControllerC">
+        <MSBuild Projects="CameraController\CameraControllerC.cbproj"/>
+    </Target>
+    <Target Name="CameraControllerC:Clean">
+        <MSBuild Projects="CameraController\CameraControllerC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="CameraControllerC:Make">
+        <MSBuild Projects="CameraController\CameraControllerC.cbproj" Targets="Make"/>
     </Target>
     <Target Name="Console">
-        <MSBuild Projects="Console\Console.cbproj"/>
+        <MSBuild Projects="Console\Console.dproj"/>
     </Target>
     <Target Name="Console:Clean">
-        <MSBuild Projects="Console\Console.cbproj" Targets="Clean"/>
+        <MSBuild Projects="Console\Console.dproj" Targets="Clean"/>
     </Target>
     <Target Name="Console:Make">
-        <MSBuild Projects="Console\Console.cbproj" Targets="Make"/>
+        <MSBuild Projects="Console\Console.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="ConsoleC">
+        <MSBuild Projects="Console\ConsoleC.cbproj"/>
+    </Target>
+    <Target Name="ConsoleC:Clean">
+        <MSBuild Projects="Console\ConsoleC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="ConsoleC:Make">
+        <MSBuild Projects="Console\ConsoleC.cbproj" Targets="Make"/>
     </Target>
     <Target Name="Cursor">
-        <MSBuild Projects="cursor\Cursor.cbproj"/>
+        <MSBuild Projects="cursor\Cursor.dproj"/>
     </Target>
     <Target Name="Cursor:Clean">
-        <MSBuild Projects="cursor\Cursor.cbproj" Targets="Clean"/>
+        <MSBuild Projects="cursor\Cursor.dproj" Targets="Clean"/>
     </Target>
     <Target Name="Cursor:Make">
-        <MSBuild Projects="cursor\Cursor.cbproj" Targets="Make"/>
+        <MSBuild Projects="cursor\Cursor.dproj" Targets="Make"/>
     </Target>
-    <Target Name="Fading">
-        <MSBuild Projects="fadingintf\Fading.cbproj"/>
+    <Target Name="CursorC">
+        <MSBuild Projects="cursor\CursorC.cbproj"/>
     </Target>
-    <Target Name="Fading:Clean">
-        <MSBuild Projects="fadingintf\Fading.cbproj" Targets="Clean"/>
+    <Target Name="CursorC:Clean">
+        <MSBuild Projects="cursor\CursorC.cbproj" Targets="Clean"/>
     </Target>
-    <Target Name="Fading:Make">
-        <MSBuild Projects="fadingintf\Fading.cbproj" Targets="Make"/>
+    <Target Name="CursorC:Make">
+        <MSBuild Projects="cursor\CursorC.cbproj" Targets="Make"/>
     </Target>
     <Target Name="Fontcolor">
-        <MSBuild Projects="fontcolor\Fontcolor.cbproj"/>
+        <MSBuild Projects="fontcolor\Fontcolor.dproj"/>
     </Target>
     <Target Name="Fontcolor:Clean">
-        <MSBuild Projects="fontcolor\Fontcolor.cbproj" Targets="Clean"/>
+        <MSBuild Projects="fontcolor\Fontcolor.dproj" Targets="Clean"/>
     </Target>
     <Target Name="Fontcolor:Make">
-        <MSBuild Projects="fontcolor\Fontcolor.cbproj" Targets="Make"/>
+        <MSBuild Projects="fontcolor\Fontcolor.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="FontColorC">
+        <MSBuild Projects="fontcolor\FontColorC.cbproj"/>
+    </Target>
+    <Target Name="FontColorC:Clean">
+        <MSBuild Projects="fontcolor\FontColorC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="FontColorC:Make">
+        <MSBuild Projects="fontcolor\FontColorC.cbproj" Targets="Make"/>
     </Target>
     <Target Name="GameMenu">
-        <MSBuild Projects="GameMenu\GameMenu.cbproj"/>
+        <MSBuild Projects="GameMenu\GameMenu.dproj"/>
     </Target>
     <Target Name="GameMenu:Clean">
-        <MSBuild Projects="GameMenu\GameMenu.cbproj" Targets="Clean"/>
+        <MSBuild Projects="GameMenu\GameMenu.dproj" Targets="Clean"/>
     </Target>
     <Target Name="GameMenu:Make">
-        <MSBuild Projects="GameMenu\GameMenu.cbproj" Targets="Make"/>
+        <MSBuild Projects="GameMenu\GameMenu.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="GameMenuC">
+        <MSBuild Projects="GameMenu\GameMenuC.cbproj"/>
+    </Target>
+    <Target Name="GameMenuC:Clean">
+        <MSBuild Projects="GameMenu\GameMenuC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="GameMenuC:Make">
+        <MSBuild Projects="GameMenu\GameMenuC.cbproj" Targets="Make"/>
     </Target>
     <Target Name="Gizmo">
         <MSBuild Projects="Gizmo\Gizmo.dproj"/>
@@ -197,68 +263,122 @@
     <Target Name="GizmoExC:Make">
         <MSBuild Projects="GizmoEx\GizmoExC.cbproj" Targets="Make"/>
     </Target>
-    <Target Name="GuiDemo">
-        <MSBuild Projects="GuiDemo\GuiDemo.cbproj"/>
+    <Target Name="Guidemo">
+        <MSBuild Projects="GuiDemo\Guidemo.dproj"/>
     </Target>
-    <Target Name="GuiDemo:Clean">
-        <MSBuild Projects="GuiDemo\GuiDemo.cbproj" Targets="Clean"/>
+    <Target Name="Guidemo:Clean">
+        <MSBuild Projects="GuiDemo\Guidemo.dproj" Targets="Clean"/>
     </Target>
-    <Target Name="GuiDemo:Make">
-        <MSBuild Projects="GuiDemo\GuiDemo.cbproj" Targets="Make"/>
+    <Target Name="Guidemo:Make">
+        <MSBuild Projects="GuiDemo\Guidemo.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="GuiDemoC">
+        <MSBuild Projects="GuiDemo\GuiDemoC.cbproj"/>
+    </Target>
+    <Target Name="GuiDemoC:Clean">
+        <MSBuild Projects="GuiDemo\GuiDemoC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="GuiDemoC:Make">
+        <MSBuild Projects="GuiDemo\GuiDemoC.cbproj" Targets="Make"/>
     </Target>
     <Target Name="GuiPaint">
-        <MSBuild Projects="GuiPaint\GuiPaint.cbproj"/>
+        <MSBuild Projects="GuiPaint\GuiPaint.dproj"/>
     </Target>
     <Target Name="GuiPaint:Clean">
-        <MSBuild Projects="GuiPaint\GuiPaint.cbproj" Targets="Clean"/>
+        <MSBuild Projects="GuiPaint\GuiPaint.dproj" Targets="Clean"/>
     </Target>
     <Target Name="GuiPaint:Make">
-        <MSBuild Projects="GuiPaint\GuiPaint.cbproj" Targets="Make"/>
+        <MSBuild Projects="GuiPaint\GuiPaint.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="GuiPaintC">
+        <MSBuild Projects="GuiPaint\GuiPaintC.cbproj"/>
+    </Target>
+    <Target Name="GuiPaintC:Clean">
+        <MSBuild Projects="GuiPaint\GuiPaintC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="GuiPaintC:Make">
+        <MSBuild Projects="GuiPaint\GuiPaintC.cbproj" Targets="Make"/>
     </Target>
-    <Target Name="HFPick">
-        <MSBuild Projects="HFPick\HFPick.cbproj"/>
+    <Target Name="HFpick">
+        <MSBuild Projects="HFPick\HFpick.dproj"/>
     </Target>
-    <Target Name="HFPick:Clean">
-        <MSBuild Projects="HFPick\HFPick.cbproj" Targets="Clean"/>
+    <Target Name="HFpick:Clean">
+        <MSBuild Projects="HFPick\HFpick.dproj" Targets="Clean"/>
     </Target>
-    <Target Name="HFPick:Make">
-        <MSBuild Projects="HFPick\HFPick.cbproj" Targets="Make"/>
+    <Target Name="HFpick:Make">
+        <MSBuild Projects="HFPick\HFpick.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="HFPickC">
+        <MSBuild Projects="HFPick\HFPickC.cbproj"/>
+    </Target>
+    <Target Name="HFPickC:Clean">
+        <MSBuild Projects="HFPick\HFPickC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="HFPickC:Make">
+        <MSBuild Projects="HFPick\HFPickC.cbproj" Targets="Make"/>
     </Target>
     <Target Name="Pick">
-        <MSBuild Projects="Pick\Pick.cbproj"/>
+        <MSBuild Projects="Pick\Pick.dproj"/>
     </Target>
     <Target Name="Pick:Clean">
-        <MSBuild Projects="Pick\Pick.cbproj" Targets="Clean"/>
+        <MSBuild Projects="Pick\Pick.dproj" Targets="Clean"/>
     </Target>
     <Target Name="Pick:Make">
-        <MSBuild Projects="Pick\Pick.cbproj" Targets="Make"/>
+        <MSBuild Projects="Pick\Pick.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="PickC">
+        <MSBuild Projects="Pick\PickC.cbproj"/>
+    </Target>
+    <Target Name="PickC:Clean">
+        <MSBuild Projects="Pick\PickC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="PickC:Make">
+        <MSBuild Projects="Pick\PickC.cbproj" Targets="Make"/>
+    </Target>
+    <Target Name="SimpleNavi">
+        <MSBuild Projects="SimpleNavigation\SimpleNavi.dproj"/>
+    </Target>
+    <Target Name="SimpleNavi:Clean">
+        <MSBuild Projects="SimpleNavigation\SimpleNavi.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="SimpleNavi:Make">
+        <MSBuild Projects="SimpleNavigation\SimpleNavi.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="SimpleNaviC">
+        <MSBuild Projects="SimpleNavigation\SimpleNaviC.cbproj"/>
+    </Target>
+    <Target Name="SimpleNaviC:Clean">
+        <MSBuild Projects="SimpleNavigation\SimpleNaviC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="SimpleNaviC:Make">
+        <MSBuild Projects="SimpleNavigation\SimpleNaviC.cbproj" Targets="Make"/>
     </Target>
-    <Target Name="SimpleNavigation">
-        <MSBuild Projects="SimpleNavigation\SimpleNavigation.cbproj"/>
+    <Target Name="WinFontC">
+        <MSBuild Projects="WinFont\WinFontC.cbproj"/>
     </Target>
-    <Target Name="SimpleNavigation:Clean">
-        <MSBuild Projects="SimpleNavigation\SimpleNavigation.cbproj" Targets="Clean"/>
+    <Target Name="WinFontC:Clean">
+        <MSBuild Projects="WinFont\WinFontC.cbproj" Targets="Clean"/>
     </Target>
-    <Target Name="SimpleNavigation:Make">
-        <MSBuild Projects="SimpleNavigation\SimpleNavigation.cbproj" Targets="Make"/>
+    <Target Name="WinFontC:Make">
+        <MSBuild Projects="WinFont\WinFontC.cbproj" Targets="Make"/>
     </Target>
-    <Target Name="WinFont">
-        <MSBuild Projects="WinFont\WinFont.cbproj"/>
+    <Target Name="Winfont">
+        <MSBuild Projects="WinFont\Winfont.dproj"/>
     </Target>
-    <Target Name="WinFont:Clean">
-        <MSBuild Projects="WinFont\WinFont.cbproj" Targets="Clean"/>
+    <Target Name="Winfont:Clean">
+        <MSBuild Projects="WinFont\Winfont.dproj" Targets="Clean"/>
     </Target>
-    <Target Name="WinFont:Make">
-        <MSBuild Projects="WinFont\WinFont.cbproj" Targets="Make"/>
+    <Target Name="Winfont:Make">
+        <MSBuild Projects="WinFont\Winfont.dproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="Bmpfont;BmpfontC;Camera;CameraC;CameraController;Console;Cursor;Fading;Fontcolor;GameMenu;Gizmo;GizmoC;GizmoEx;GizmoExC;GuiDemo;GuiPaint;HFPick;Pick;SimpleNavigation;WinFont"/>
+        <CallTarget Targets="Bmpfont;BmpfontC;Camera;CameraC;CameraController;CameraControllerC;Console;ConsoleC;Cursor;CursorC;Fontcolor;FontColorC;GameMenu;GameMenuC;Gizmo;GizmoC;GizmoEx;GizmoExC;Guidemo;GuiDemoC;GuiPaint;GuiPaintC;HFpick;HFPickC;Pick;PickC;SimpleNavi;SimpleNaviC;WinFontC;Winfont"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="Bmpfont:Clean;BmpfontC:Clean;Camera:Clean;CameraC:Clean;CameraController:Clean;Console:Clean;Cursor:Clean;Fading:Clean;Fontcolor:Clean;GameMenu:Clean;Gizmo:Clean;GizmoC:Clean;GizmoEx:Clean;GizmoExC:Clean;GuiDemo:Clean;GuiPaint:Clean;HFPick:Clean;Pick:Clean;SimpleNavigation:Clean;WinFont:Clean"/>
+        <CallTarget Targets="Bmpfont:Clean;BmpfontC:Clean;Camera:Clean;CameraC:Clean;CameraController:Clean;CameraControllerC:Clean;Console:Clean;ConsoleC:Clean;Cursor:Clean;CursorC:Clean;Fontcolor:Clean;FontColorC:Clean;GameMenu:Clean;GameMenuC:Clean;Gizmo:Clean;GizmoC:Clean;GizmoEx:Clean;GizmoExC:Clean;Guidemo:Clean;GuiDemoC:Clean;GuiPaint:Clean;GuiPaintC:Clean;HFpick:Clean;HFPickC:Clean;Pick:Clean;PickC:Clean;SimpleNavi:Clean;SimpleNaviC:Clean;WinFontC:Clean;Winfont:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="Bmpfont:Make;BmpfontC:Make;Camera:Make;CameraC:Make;CameraController:Make;Console:Make;Cursor:Make;Fading:Make;Fontcolor:Make;GameMenu:Make;Gizmo:Make;GizmoC:Make;GizmoEx:Make;GizmoExC:Make;GuiDemo:Make;GuiPaint:Make;HFPick:Make;Pick:Make;SimpleNavigation:Make;WinFont:Make"/>
+        <CallTarget Targets="Bmpfont:Make;BmpfontC:Make;Camera:Make;CameraC:Make;CameraController:Make;CameraControllerC:Make;Console:Make;ConsoleC:Make;Cursor:Make;CursorC:Make;Fontcolor:Make;FontColorC:Make;GameMenu:Make;GameMenuC:Make;Gizmo:Make;GizmoC:Make;GizmoEx:Make;GizmoExC:Make;Guidemo:Make;GuiDemoC:Make;GuiPaint:Make;GuiPaintC:Make;HFpick:Make;HFPickC:Make;Pick:Make;PickC:Make;SimpleNavi:Make;SimpleNaviC:Make;WinFontC:Make;Winfont:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Demos/interface/Pick/Pick.dpr

@@ -14,7 +14,7 @@ program Pick;
 
 uses
   Forms,
-  PickFm in 'PickFm.pas' {Form1};
+  fPick in 'fPick.pas' {Form1};
 
 {$R *.RES}
 

Demos/interface/Pick/Pick.dproj

@@ -123,7 +123,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="PickFm.pas">
+        <DCCReference Include="fPick.pas">
             <Form>Form1</Form>
         </DCCReference>
         <BuildConfiguration Include="Debug">

Demos/interface/Pick/Pick.cbproj → Demos/interface/Pick/PickC.cbproj

@@ -4,11 +4,11 @@
         <ProjectVersion>18.7</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
-        <MainSource>Pick.cpp</MainSource>
+        <MainSource>PickC.cpp</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
-        <TargetedPlatforms>1</TargetedPlatforms>
+        <TargetedPlatforms>3</TargetedPlatforms>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -58,15 +58,15 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <SanitizedProjectName>Pick</SanitizedProjectName>
+        <SanitizedProjectName>PickC</SanitizedProjectName>
         <Icon_MainIcon>$(BDS)\bin\cbuilder_PROJECTICON.ico</Icon_MainIcon>
         <_TCHARMapping>wchar_t</_TCHARMapping>
         <ProjectType>CppVCLApplication</ProjectType>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)</DCC_Namespace>
         <Multithreaded>true</Multithreaded>
-        <IncludePath>D:\GLScene\Samples\CPP\Demos\interface\Pick\;$(IncludePath)</IncludePath>
+        <IncludePath>Pick\;..\;D:\GLScene\Samples\CPP\Demos\interface\Pick\;$(IncludePath)</IncludePath>
         <AllPackageLibs>rtl.lib;vcl.lib;GLScene_RT.lib;fmx.lib;xmlrtl.lib;vclimg.lib</AllPackageLibs>
-        <ILINK_LibraryPath>D:\GLScene\Samples\CPP\Demos\interface\Pick\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+        <ILINK_LibraryPath>Pick\;..\;D:\GLScene\Samples\CPP\Demos\interface\Pick\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
         <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
         <DynamicRTL>true</DynamicRTL>
         <UsePackages>true</UsePackages>
@@ -89,7 +89,7 @@
         <UWP_CppLogo150>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_150.png</UWP_CppLogo150>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <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_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <PackageImports>IndyIPClient;GLScene_Sounds_RT;frx17;fs17;GLScene_Physics_RT;GLScene_Cg_RT;bindcompfmx;GR32_RSXE3;DBXSqliteDriver;vcldbx;GLScene_Physics_RT;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;TeeDB;bindcomp;inetdb;inetdbbde;vclib;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DBXOdbcDriver;DataSnapServer;Tee;GLScene_RT;DataSnapProviderClient;xmlrtl;DBXSybaseASEDriver;ibxpress;DbxCommonDriver;vclimg;GLScene_Sounds_RT;IndyProtocols;DBXMySQLDriver;dbxcds;MetropolisUILiveTile;bindengine;vclactnband;vcldb;soaprtl;bindcompdbx;vcldsnap;bindcompvcl;FMXTee;TeeUI;vclie;GR32_DSGN_RSXE3;DBXDb2Driver;vcltouch;bcbsmp;websnap;DBXOracleDriver;CustomIPTransport;vclribbon;VclSmp;dsnap;DBXInformixDriver;IndyIPServer;fmxase;vcl;DataSnapConnectors;IndyCore;GLScene_Sounds_RT;DBXMSSQLDriver;CodeSiteExpressPkg;CloudService;DBXFirebirdDriver;dsnapcon;frxDB17;inet;fsDB17;fmxobj;IndyIPCommon;FmxTeeUI;vclx;frxe17;inetdbxpress;webdsnap;DBXSybaseASADriver;fmxdae;bdertl;dbexpress;DataSnapIndy10ServerTransport;adortl;bcbie;$(PackageImports)</PackageImports>
         <VerInfo_Locale>1033</VerInfo_Locale>
@@ -98,6 +98,7 @@
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <UWP_CppLogo44>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_44.png</UWP_CppLogo44>
         <UWP_CppLogo150>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_150.png</UWP_CppLogo150>
+        <BT_BuildType>Debug</BT_BuildType>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
         <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
@@ -127,6 +128,9 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <Defines>_DEBUG;$(Defines)</Defines>
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <LinkPackageImports>rtl.bpi;vcl.bpi;GLScene_RT.bpi;fmx.bpi;xmlrtl.bpi;vclimg.bpi</LinkPackageImports>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <TASM_Debugging>None</TASM_Debugging>
@@ -136,18 +140,20 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <Defines>NDEBUG;$(Defines)</Defines>
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
     </PropertyGroup>
     <ItemGroup>
-        <CppCompile Include="Pick.cpp">
-            <BuildOrder>0</BuildOrder>
-        </CppCompile>
-        <CppCompile Include="Unit1.cpp">
+        <CppCompile Include="fPickC.cpp">
             <Form>Form1</Form>
             <FormType>dfm</FormType>
-            <DependentOn>Unit1.h</DependentOn>
+            <DependentOn>fPickC.h</DependentOn>
             <BuildOrder>2</BuildOrder>
         </CppCompile>
-        <FormResources Include="Unit1.dfm"/>
+        <CppCompile Include="PickC.cpp">
+            <BuildOrder>0</BuildOrder>
+        </CppCompile>
+        <FormResources Include="fPickC.dfm"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -166,7 +172,7 @@
         <BorlandProject>
             <CPlusPlusBuilder.Personality>
                 <Source>
-                    <Source Name="MainSource">Pick.cpp</Source>
+                    <Source Name="MainSource">PickC.cpp</Source>
                 </Source>
                 <VersionInfo>
                     <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
@@ -211,6 +217,11 @@
                 </ProjectProperties>
             </CPlusPlusBuilder.Personality>
             <Deployment Version="3">
+                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule">
+                    <Platform Name="OSX64">
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName=".\Win32\Debug\Pick.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32c260.dll" Class="DependencyModule">
                     <Platform Name="Win32">
@@ -260,6 +271,12 @@
                     </Platform>
                 </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32160.dll" Class="DependencyModule"/>
+                <DeployFile LocalName=".\Win32\Debug\PickC.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>PickC.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule">
                     <Platform Name="Win64">
                         <Overwrite>true</Overwrite>
@@ -272,8 +289,9 @@
                 </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64160.dll" Class="DependencyModule"/>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'=='true'" LocalName="$(BDS)\bin64\cc64160mt.dll" Class="DependencyModule"/>
-                <DeployFile Condition="'$(DynamicRTL)'=='true'" LocalName="$(BDS)\Redist\osx64\libcgcrtl.dylib" Class="DependencyModule">
-                    <Platform Name="OSX64">
+                <DeployFile LocalName=".\Win32\Debug\PickC.tds" Configuration="Debug" Class="DebugSymbols">
+                    <Platform Name="Win32">
+                        <RemoteName>PickC.tds</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
@@ -1021,7 +1039,7 @@
             </Deployment>
             <Platforms>
                 <Platform value="Win32">True</Platform>
-                <Platform value="Win64">False</Platform>
+                <Platform value="Win64">True</Platform>
             </Platforms>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Demos/interface/GuiPaint/GuiPaint.cpp → Demos/interface/Pick/PickC.cpp

@@ -4,7 +4,7 @@
 #pragma hdrstop
 #include <tchar.h>
 //---------------------------------------------------------------------------
-USEFORM("Unit1.cpp", Form1);
+USEFORM("fPickC.cpp", Form1);
 //---------------------------------------------------------------------------
 int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
 {

Demos/interface/Pick/PickFm.dfm → Demos/interface/Pick/fPick.dfm

@@ -27,8 +27,6 @@ object Form1: TForm1
     OnMouseDown = GLSceneViewer1MouseDown
     OnMouseMove = GLSceneViewer1MouseMove
     TabOrder = 0
-    ExplicitWidth = 669
-    ExplicitHeight = 475
   end
   object GLScene1: TGLScene
     Left = 32

Demos/interface/Pick/PickFm.pas → Demos/interface/Pick/fPick.pas

@@ -1,4 +1,4 @@
-unit PickFm;
+unit fPick;
 
 interface
 

Demos/interface/Pick/Unit1.cpp → Demos/interface/Pick/fPickC.cpp

@@ -4,7 +4,7 @@
 #include <tchar.h>
 #pragma hdrstop
 
-#include "Unit1.h"
+#include "fPickC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLS.BaseClasses"

Demos/interface/Pick/Unit1.dfm → Demos/interface/Pick/fPickC.dfm

@@ -20,6 +20,7 @@ object Form1: TForm1
     Height = 275
     Camera = GLCamera1
     FieldOfView = 140.033782958984400000
+    PenAsTouch = False
     Align = alClient
     OnMouseDown = GLSceneViewer1MouseDown
     OnMouseMove = GLSceneViewer1MouseMove

Demos/interface/Pick/Unit1.h → Demos/interface/Pick/fPickC.h

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 
-#ifndef Unit1H
-#define Unit1H
+#ifndef fPickCH
+#define fPickCH
 //---------------------------------------------------------------------------
 #include <System.Classes.hpp>
 #include <Vcl.Controls.hpp>

Demos/interface/SimpleNavigation/SimpleNavigation.dpr → Demos/interface/SimpleNavigation/SimpleNavi.dpr

@@ -1,9 +1,9 @@
 // a Demo with absolutely no code :)
-program SimpleNavigation;
+program SimpleNavi;
 
 uses
   Forms,
-  SimpleNavigationFm in 'SimpleNavigationFm.pas' {FormSimpleNavigation};
+  fSimpleNavi in 'fSimpleNavi.pas' {FormSimpleNavigation};
 
 {$R *.res}
 

Demos/interface/SimpleNavigation/SimpleNavigation.dproj → Demos/interface/SimpleNavigation/SimpleNavi.dproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{078A95C8-6751-4D05-BA8C-83C3176EAD6F}</ProjectGuid>
-        <MainSource>SimpleNavigation.dpr</MainSource>
+        <MainSource>SimpleNavi.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <TargetedPlatforms>3</TargetedPlatforms>
@@ -59,7 +59,7 @@
         <VerInfo_Locale>1049</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
         <DCC_S>false</DCC_S>
-        <SanitizedProjectName>SimpleNavigation</SanitizedProjectName>
+        <SanitizedProjectName>SimpleNavi</SanitizedProjectName>
         <DCC_E>false</DCC_E>
         <DCC_N>false</DCC_N>
     </PropertyGroup>
@@ -123,7 +123,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="SimpleNavigationFm.pas">
+        <DCCReference Include="fSimpleNavi.pas">
             <Form>FormSimpleNavigation</Form>
         </DCCReference>
         <BuildConfiguration Include="Debug">
@@ -144,7 +144,7 @@
         <BorlandProject>
             <Delphi.Personality>
                 <Source>
-                    <Source Name="MainSource">SimpleNavigation.dpr</Source>
+                    <Source Name="MainSource">SimpleNavi.dpr</Source>
                 </Source>
                 <Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
@@ -158,9 +158,9 @@
                 <Platform value="Win64">True</Platform>
             </Platforms>
             <Deployment Version="3">
-                <DeployFile LocalName="Win64\Debug\SimpleNavigation.exe" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="Win64\Debug\SimpleNavi.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win64">
-                        <RemoteName>SimpleNavigation.exe</RemoteName>
+                        <RemoteName>SimpleNavi.exe</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>

Demos/interface/SimpleNavigation/SimpleNavigation.cbproj → Demos/interface/SimpleNavigation/SimpleNaviC.cbproj

@@ -4,7 +4,7 @@
         <ProjectVersion>18.7</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
-        <MainSource>SimpleNavigation.cpp</MainSource>
+        <MainSource>SimpleNaviC.cpp</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -58,7 +58,7 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <SanitizedProjectName>SimpleNavigation</SanitizedProjectName>
+        <SanitizedProjectName>SimpleNaviC</SanitizedProjectName>
         <Icon_MainIcon>$(BDS)\bin\cbuilder_PROJECTICON.ico</Icon_MainIcon>
         <_TCHARMapping>wchar_t</_TCHARMapping>
         <ProjectType>CppVCLApplication</ProjectType>
@@ -144,16 +144,16 @@
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
     </PropertyGroup>
     <ItemGroup>
-        <CppCompile Include="SimpleNavigation.cpp">
-            <BuildOrder>0</BuildOrder>
-        </CppCompile>
-        <CppCompile Include="Unit1.cpp">
+        <CppCompile Include="fSimpleNaviC.cpp">
             <Form>Form1</Form>
             <FormType>dfm</FormType>
-            <DependentOn>Unit1.h</DependentOn>
+            <DependentOn>fSimpleNaviC.h</DependentOn>
             <BuildOrder>2</BuildOrder>
         </CppCompile>
-        <FormResources Include="Unit1.dfm"/>
+        <CppCompile Include="SimpleNaviC.cpp">
+            <BuildOrder>0</BuildOrder>
+        </CppCompile>
+        <FormResources Include="fSimpleNaviC.dfm"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -172,7 +172,7 @@
         <BorlandProject>
             <CPlusPlusBuilder.Personality>
                 <Source>
-                    <Source Name="MainSource">SimpleNavigation.cpp</Source>
+                    <Source Name="MainSource">SimpleNaviC.cpp</Source>
                 </Source>
                 <VersionInfo>
                     <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
@@ -223,6 +223,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName=".\Win32\Debug\SimpleNaviC.tds" Configuration="Debug" Class="DebugSymbols">
+                    <Platform Name="Win32">
+                        <RemoteName>SimpleNaviC.tds</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin64\borlndmm.dll" Class="DependencyModule">
                     <Platform Name="Win64">
                         <Overwrite>true</Overwrite>
@@ -266,6 +272,12 @@
                 </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32160.dll" Class="DependencyModule"/>
                 <DeployFile LocalName=".\Win32\Debug\SimpleNavigation.exe" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName=".\Win32\Debug\SimpleNaviC.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>SimpleNaviC.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule">
                     <Platform Name="Win64">
                         <Overwrite>true</Overwrite>

Demos/interface/SimpleNavigation/SimpleNaviC.cpp

@@ -0,0 +1,35 @@
+//---------------------------------------------------------------------------
+
+#include <vcl.h>
+#pragma hdrstop
+#include <tchar.h>
+//---------------------------------------------------------------------------
+USEFORM("fSimpleNaviC.cpp", Form1);
+//---------------------------------------------------------------------------
+int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
+{
+	try
+	{
+		Application->Initialize();
+		Application->MainFormOnTaskBar = true;
+		Application->CreateForm(__classid(TForm1), &Form1);
+		Application->Run();
+	}
+	catch (Exception &exception)
+	{
+		Application->ShowException(&exception);
+	}
+	catch (...)
+	{
+		try
+		{
+			throw Exception("");
+		}
+		catch (Exception &exception)
+		{
+			Application->ShowException(&exception);
+		}
+	}
+	return 0;
+}
+//---------------------------------------------------------------------------

Demos/interface/SimpleNavigation/SimpleNavigationFm.pas → Demos/interface/SimpleNavigation/fSimpleNavi.pas

@@ -1,4 +1,4 @@
-unit SimpleNavigationFm;
+unit fSimpleNavi;
 
 interface
 

Demos/interface/SimpleNavigation/Unit1.cpp → Demos/interface/SimpleNavigation/fSimpleNaviC.cpp

@@ -4,7 +4,7 @@
 #include <tchar.h>
 #pragma hdrstop
 
-#include "Unit1.h"
+#include "fSimpleNaviC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLS.BaseClasses"

Demos/interface/SimpleNavigation/Unit1.h → Demos/interface/SimpleNavigation/fSimpleNaviC.h

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 
-#ifndef Unit1H
-#define Unit1H
+#ifndef fSimpleNaviCH
+#define fSimpleNaviCH
 //---------------------------------------------------------------------------
 #include <System.Classes.hpp>
 #include <Vcl.Controls.hpp>

Demos/interface/WinFont/WinFont.cbproj → Demos/interface/WinFont/WinFontC.cbproj

@@ -4,7 +4,7 @@
         <ProjectVersion>18.7</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <AppType>Application</AppType>
-        <MainSource>WinFont.cpp</MainSource>
+        <MainSource>WinFontC.cpp</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -58,7 +58,7 @@
         <Base>true</Base>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
-        <SanitizedProjectName>WinFont</SanitizedProjectName>
+        <SanitizedProjectName>WinFontC</SanitizedProjectName>
         <Icon_MainIcon>$(BDS)\bin\cbuilder_PROJECTICON.ico</Icon_MainIcon>
         <_TCHARMapping>wchar_t</_TCHARMapping>
         <ProjectType>CppVCLApplication</ProjectType>
@@ -138,23 +138,23 @@
         <Defines>NDEBUG;$(Defines)</Defines>
     </PropertyGroup>
     <ItemGroup>
-        <CppCompile Include="Unit1.cpp">
+        <CppCompile Include="fWinfontC.cpp">
             <Form>Form1</Form>
             <FormType>dfm</FormType>
-            <DependentOn>Unit1.h</DependentOn>
+            <DependentOn>fWinfontC.h</DependentOn>
             <BuildOrder>2</BuildOrder>
         </CppCompile>
-        <CppCompile Include="Unit2.cpp">
+        <CppCompile Include="fWintextureC.cpp">
             <Form>Form2</Form>
             <FormType>dfm</FormType>
-            <DependentOn>Unit2.h</DependentOn>
+            <DependentOn>fWintextureC.h</DependentOn>
             <BuildOrder>3</BuildOrder>
         </CppCompile>
-        <CppCompile Include="WinFont.cpp">
+        <CppCompile Include="WinFontC.cpp">
             <BuildOrder>0</BuildOrder>
         </CppCompile>
-        <FormResources Include="Unit2.dfm"/>
-        <FormResources Include="Unit1.dfm"/>
+        <FormResources Include="fWintextureC.dfm"/>
+        <FormResources Include="fWinfontC.dfm"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -173,7 +173,7 @@
         <BorlandProject>
             <CPlusPlusBuilder.Personality>
                 <Source>
-                    <Source Name="MainSource">WinFont.cpp</Source>
+                    <Source Name="MainSource">WinFontC.cpp</Source>
                 </Source>
                 <VersionInfo>
                     <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
@@ -266,6 +266,18 @@
                 </DeployFile>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin\cc32160.dll" Class="DependencyModule"/>
                 <DeployFile LocalName=".\Win32\Debug\WinFont.exe" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName=".\Win32\Debug\WinFontC.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>WinFontC.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName=".\Win32\Debug\WinFontC.tds" Configuration="Debug" Class="DebugSymbols">
+                    <Platform Name="Win32">
+                        <RemoteName>WinFontC.tds</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName=".\Win32\Debug\WinFont.tds" Configuration="Debug" Class="DebugSymbols"/>
                 <DeployFile Condition="'$(DynamicRTL)'=='true' And '$(Multithreaded)'!='true'" LocalName="$(BDS)\bin64\cc64260.dll" Class="DependencyModule">
                     <Platform Name="Win64">

Demos/interface/WinFont/WinFont.cpp → Demos/interface/WinFont/WinFontC.cpp

@@ -4,8 +4,8 @@
 #pragma hdrstop
 #include <tchar.h>
 //---------------------------------------------------------------------------
-USEFORM("Unit1.cpp", Form1);
-USEFORM("Unit2.cpp", Form2);
+USEFORM("fWintextureC.cpp", Form2);
+USEFORM("fWinfontC.cpp", Form1);
 //---------------------------------------------------------------------------
 int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
 {

Demos/interface/WinFont/WinFontFm.pas

@@ -1,132 +0,0 @@
-unit WinFontFm;
-
-interface
-
-uses
-  Winapi.OpenGL,
-  System.SysUtils,
-  System.Classes,
-  Vcl.Graphics,
-  Vcl.Controls,
-  Vcl.Forms,
-  Vcl.Dialogs,
-  Vcl.ExtCtrls,
-  Vcl.Menus,
-
-  
-  GLS.Scene,
-  GLS.VectorTypes,
-  GLS.HUDObjects,
-  GLS.Objects,
-  GLS.Cadencer,
-  GLS.SceneViewer,
-  GLS.WindowsFont,
-  GLS.GeomObjects,
-  GLS.Coordinates,
- 
-  GLS.BaseClasses,
-  GLS.BitmapFont;
-
-type
-  TFormWinFont = class(TForm)
-    GLScene1: TGLScene;
-    GLSceneViewer1: TGLSceneViewer;
-    GLLightSource1: TGLLightSource;
-    GLCamera1: TGLCamera;
-    HUDText1: TGLHUDText;
-    GLCadencer1: TGLCadencer;
-    Timer1: TTimer;
-    HUDText2: TGLHUDText;
-    HUDText3: TGLHUDText;
-    Teapot1: TGLTeapot;
-    WindowsBitmapFont1: TGLWindowsBitmapFont;
-    MainMenu1: TMainMenu;
-    MIPickFont: TMenuItem;
-    FontDialog1: TFontDialog;
-    MIViewTexture: TMenuItem;
-    MIFPS: TMenuItem;
-    procedure GLCadencer1Progress(Sender: TObject; const deltaTime,
-      newTime: Double);
-    procedure Timer1Timer(Sender: TObject);
-    procedure FormCreate(Sender: TObject);
-    procedure GLSceneViewer1Click(Sender: TObject);
-    procedure MIPickFontClick(Sender: TObject);
-    procedure MIViewTextureClick(Sender: TObject);
-  private
-     
-  public
-     
-  end;
-
-var
-  FormWinFont: TFormWinFont;
-
-implementation
-
-uses
-  WinFontTextureFm;
-
-{$R *.DFM}
-
-procedure TFormWinFont.FormCreate(Sender: TObject);
-begin
-   // sorry, couldn't resist again...
-   HUDText1.Text:= 'Lorem ipsum dolor sit amer, consectetaur adipisicing elit,'#13#10
-                  +'sed do eiusmod tempor incididunt ut labore et dolore magna'#13#10
-                  +'aliqua. Ut enim ad minim veniam, quis nostrud exercitation'#13#10
-                  +'ullamco laboris nisi ut aliquip ex ea commodo consequat.'#13#10
-                  +'Duis aute irure dolor in reprehenderit in voluptate velit'#13#10
-                  +'esse cillum dolore eu fugiat nulla pariatur. Excepteur sint'#13#10
-                  +'occaecat cupidatat non proident, sunt in culpa qui officia'#13#10
-                  +'deserunt mollit anim id est laborum.'#13#10
-                  +'Woblis ten caracuro Zapothek it Setag!'; // I needed an uppercase 'W' too...
-
-  HUDText1.Text := HUDText1.Text + #13#10'Unicode text...' +
-    WideChar($0699)+WideChar($069A)+WideChar($963f)+WideChar($54c0);
-  WindowsBitmapFont1.EnsureString(HUDText1.Text);
-end;
-
-procedure TFormWinFont.MIPickFontClick(Sender: TObject);
-begin
-   FontDialog1.Font:=WindowsBitmapFont1.Font;
-   if FontDialog1.Execute then begin
-      WindowsBitmapFont1.Font:=FontDialog1.Font;
-      HUDText1.ModulateColor.AsWinColor:=FontDialog1.Font.Color;
-   end;
-end;
-
-procedure TFormWinFont.MIViewTextureClick(Sender: TObject);
-begin
-   with FormFontTexture.Image1 do begin
-      Picture:=WindowsBitmapFont1.Glyphs;
-      FormFontTexture.Width:=Picture.Width;
-      FormFontTexture.Height:=Picture.Height;
-   end;
-   FormFontTexture.Show;
-end;
-
-procedure TFormWinFont.GLCadencer1Progress(Sender: TObject; const deltaTime,
-  newTime: Double);
-begin
-   // make things move a little
-   HUDText2.Rotation:=HUDText2.Rotation+15*deltaTime;
-   HUDText3.Scale.X:=sin(newTime)+1.5;
-   HUDText3.Scale.Y:=cos(newTime)+1.5;
-   GLSceneViewer1.Invalidate;
-end;
-
-procedure TFormWinFont.Timer1Timer(Sender: TObject);
-begin
-   miFPS.Caption:=Format('%.1f FPS - %d x %d Font Texture',
-                   [GLSceneViewer1.FramesPerSecond,
-                    WindowsBitmapFont1.FontTextureWidth,
-                    WindowsBitmapFont1.FontTextureHeight]);
-   GLSceneViewer1.ResetPerformanceMonitor;
-end;
-
-procedure TFormWinFont.GLSceneViewer1Click(Sender: TObject);
-begin
-   Teapot1.Visible:=not Teapot1.Visible;
-end;
-
-end.

Demos/interface/WinFont/Winfont.dpr

@@ -16,8 +16,8 @@ program Winfont;
 
 uses
   Forms,
-  WinFontFm in 'WinFontFm.pas' {FormWinFont},
-  WinFontTextureFm in 'WinFontTextureFm.pas' {FormFontTexture};
+  fWinFont in 'fWinFont.pas' {FormWinFont},
+  fWinTexture in 'fWinTexture.pas' {FormFontTexture};
 
 {$R *.RES}
 

Demos/interface/WinFont/Winfont.dproj

@@ -123,10 +123,10 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="WinFontFm.pas">
+        <DCCReference Include="fWinFont.pas">
             <Form>FormWinFont</Form>
         </DCCReference>
-        <DCCReference Include="WinFontTextureFm.pas">
+        <DCCReference Include="fWinTexture.pas">
             <Form>FormFontTexture</Form>
         </DCCReference>
         <BuildConfiguration Include="Debug">
@@ -161,13 +161,13 @@
                 <Platform value="Win64">True</Platform>
             </Platforms>
             <Deployment Version="3">
-                <DeployFile LocalName="Win32\Debug\Winfont.exe" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="\Winfont.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
                         <RemoteName>Winfont.exe</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="\Winfont.exe" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="Win32\Debug\Winfont.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
                         <RemoteName>Winfont.exe</RemoteName>
                         <Overwrite>true</Overwrite>

Demos/interface/WinFont/fWinFont.pas

@@ -0,0 +1,134 @@
+unit fWinFont;
+
+interface
+
+uses
+  Winapi.OpenGL,
+  System.SysUtils,
+  System.Classes,
+  Vcl.Graphics,
+  Vcl.Controls,
+  Vcl.Forms,
+  Vcl.Dialogs,
+  Vcl.ExtCtrls,
+  Vcl.Menus,
+
+  GLS.Scene,
+  GLS.VectorTypes,
+  GLS.HUDObjects,
+  GLS.Objects,
+  GLS.Cadencer,
+  GLS.SceneViewer,
+  GLS.WindowsFont,
+  GLS.GeomObjects,
+  GLS.Coordinates,
+
+  GLS.BaseClasses,
+  GLS.BitmapFont;
+
+type
+  TFormWinFont = class(TForm)
+    GLScene1: TGLScene;
+    GLSceneViewer1: TGLSceneViewer;
+    GLLightSource1: TGLLightSource;
+    GLCamera1: TGLCamera;
+    HUDText1: TGLHUDText;
+    GLCadencer1: TGLCadencer;
+    Timer1: TTimer;
+    HUDText2: TGLHUDText;
+    HUDText3: TGLHUDText;
+    Teapot1: TGLTeapot;
+    WindowsBitmapFont1: TGLWindowsBitmapFont;
+    MainMenu1: TMainMenu;
+    MIPickFont: TMenuItem;
+    FontDialog1: TFontDialog;
+    MIViewTexture: TMenuItem;
+    MIFPS: TMenuItem;
+    procedure GLCadencer1Progress(Sender: TObject;
+      const deltaTime, newTime: Double);
+    procedure Timer1Timer(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure GLSceneViewer1Click(Sender: TObject);
+    procedure MIPickFontClick(Sender: TObject);
+    procedure MIViewTextureClick(Sender: TObject);
+  private
+
+  public
+
+  end;
+
+var
+  FormWinFont: TFormWinFont;
+
+implementation
+
+uses
+  fWinTexture;
+
+{$R *.DFM}
+
+procedure TFormWinFont.FormCreate(Sender: TObject);
+begin
+  // sorry, couldn't resist again...
+  HUDText1.Text :=
+    'Lorem ipsum dolor sit amer, consectetaur adipisicing elit,'#13#10 +
+    'sed do eiusmod tempor incididunt ut labore et dolore magna'#13#10 +
+    'aliqua. Ut enim ad minim veniam, quis nostrud exercitation'#13#10 +
+    'ullamco laboris nisi ut aliquip ex ea commodo consequat.'#13#10 +
+    'Duis aute irure dolor in reprehenderit in voluptate velit'#13#10 +
+    'esse cillum dolore eu fugiat nulla pariatur. Excepteur sint'#13#10 +
+    'occaecat cupidatat non proident, sunt in culpa qui officia'#13#10 +
+    'deserunt mollit anim id est laborum.'#13#10 +
+    'Woblis ten caracuro Zapothek it Setag!';
+  // I needed an uppercase 'W' too...
+
+  HUDText1.Text := HUDText1.Text + #13#10'Unicode text...' + WideChar($0699) +
+    WideChar($069A) + WideChar($963F) + WideChar($54C0);
+  WindowsBitmapFont1.EnsureString(HUDText1.Text);
+end;
+
+procedure TFormWinFont.MIPickFontClick(Sender: TObject);
+begin
+  FontDialog1.Font := WindowsBitmapFont1.Font;
+  if FontDialog1.Execute then
+  begin
+    WindowsBitmapFont1.Font := FontDialog1.Font;
+    HUDText1.ModulateColor.AsWinColor := FontDialog1.Font.Color;
+  end;
+end;
+
+procedure TFormWinFont.MIViewTextureClick(Sender: TObject);
+begin
+  with FormFontTexture.Image1 do
+  begin
+    Picture := WindowsBitmapFont1.Glyphs;
+    FormFontTexture.Width := Picture.Width;
+    FormFontTexture.Height := Picture.Height;
+  end;
+  FormFontTexture.Show;
+end;
+
+procedure TFormWinFont.GLCadencer1Progress(Sender: TObject;
+  const deltaTime, newTime: Double);
+begin
+  // make things move a little
+  HUDText2.Rotation := HUDText2.Rotation + 15 * deltaTime;
+  HUDText3.Scale.X := sin(newTime) + 1.5;
+  HUDText3.Scale.Y := cos(newTime) + 1.5;
+  GLSceneViewer1.Invalidate;
+end;
+
+procedure TFormWinFont.Timer1Timer(Sender: TObject);
+begin
+  MIFPS.Caption := Format('%.1f FPS - %d x %d Font Texture',
+    [GLSceneViewer1.FramesPerSecond, WindowsBitmapFont1.FontTextureWidth,
+    WindowsBitmapFont1.FontTextureHeight]);
+  GLSceneViewer1.ResetPerformanceMonitor;
+end;
+
+procedure TFormWinFont.GLSceneViewer1Click(Sender: TObject);
+begin
+  Teapot1.Visible := not Teapot1.Visible;
+end;
+
+end.

Demos/interface/WinFont/WinFontTextureFm.pas → Demos/interface/WinFont/fWinTexture.pas

@@ -1,4 +1,4 @@
-unit WinFontTextureFm;
+unit fWinTexture;
 
 interface
 

Demos/interface/WinFont/Unit1.cpp → Demos/interface/WinFont/fWinfontC.cpp

@@ -4,7 +4,7 @@
 #include <tchar.h>
 #pragma hdrstop
 
-#include "Unit1.h"
+#include "fWinfontC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLS.BaseClasses"

Demos/interface/WinFont/Unit1.dfm → Demos/interface/WinFont/fWinfontC.dfm

@@ -23,6 +23,7 @@ object Form1: TForm1
     Camera = GLCamera1
     Buffer.BackgroundColor = clBackground
     FieldOfView = 151.023590087890600000
+    PenAsTouch = False
     Align = alClient
     OnClick = GLSceneViewer1Click
     TabOrder = 0

Demos/interface/WinFont/Unit1.h → Demos/interface/WinFont/fWinfontC.h

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 
-#ifndef Unit1H
-#define Unit1H
+#ifndef fWinfontCH
+#define fWinfontCH
 //---------------------------------------------------------------------------
 #include <System.Classes.hpp>
 #include <Vcl.Controls.hpp>

Demos/interface/WinFont/Unit2.cpp → Demos/interface/WinFont/fWintextureC.cpp

@@ -3,7 +3,7 @@
 #include <vcl.h>
 #pragma hdrstop
 
-#include "Unit2.h"
+#include "fWintextureC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma resource "*.dfm"

Demos/interface/WinFont/Unit2.h → Demos/interface/WinFont/fWintextureC.h

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 
-#ifndef Unit2H
-#define Unit2H
+#ifndef fWintextureCH
+#define fWintextureCH
 //---------------------------------------------------------------------------
 #include <System.Classes.hpp>
 #include <Vcl.Controls.hpp>

Demos/interface/cursor/Cursor.cpp

@@ -1,35 +0,0 @@
-//---------------------------------------------------------------------------
-
-#include <vcl.h>
-#pragma hdrstop
-#include <tchar.h>
-//---------------------------------------------------------------------------
-USEFORM("Unit1.cpp", Form1);
-//---------------------------------------------------------------------------
-int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int)
-{
-	try
-	{
-		Application->Initialize();
-		Application->MainFormOnTaskBar = true;
-		Application->CreateForm(__classid(TForm1), &Form1);
-		Application->Run();
-	}
-	catch (Exception &exception)
-	{
-		Application->ShowException(&exception);
-	}
-	catch (...)
-	{
-		try
-		{
-			throw Exception("");
-		}
-		catch (Exception &exception)
-		{
-			Application->ShowException(&exception);
-		}
-	}
-	return 0;
-}
-//---------------------------------------------------------------------------

Demos/interface/cursor/Cursor.dpr

@@ -20,7 +20,7 @@ program Cursor;
 
 uses
   Forms,
-  CursorFm in 'CursorFm.pas' {FormCursor};
+  fCursor in 'fCursor.pas' {FormCursor};
 
 {$R *.RES}