doubled texture moved to asset dir

Examples/AdvDemos/AdvDemos.groupproj

@@ -3,16 +3,16 @@
         <ProjectGuid>{02A55F1F-28A9-4F0B-BC74-BAC6D4030B89}</ProjectGuid>
     </PropertyGroup>
     <ItemGroup>
-        <Projects Include="ActorMS3D\Actorms3dD.dproj">
+        <Projects Include="Archipelago\ArchipelagoD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="ActorMS3D\ActorMS3dC.cbproj">
+        <Projects Include="Archipelago\ArchipelagoC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="Archipelago\ArchipelagoD.dproj">
+        <Projects Include="ActorMS3D\Actorms3dD.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="Archipelago\ArchipelagoC.cbproj">
+        <Projects Include="ActorMS3D\ActorMS3dC.cbproj">
             <Dependencies/>
         </Projects>
         <Projects Include="Christmas\ChristmasD.dproj">
@@ -62,24 +62,6 @@
             <Default.Personality/>
         </BorlandProject>
     </ProjectExtensions>
-    <Target Name="Actorms3dD">
-        <MSBuild Projects="ActorMS3D\Actorms3dD.dproj"/>
-    </Target>
-    <Target Name="Actorms3dD:Clean">
-        <MSBuild Projects="ActorMS3D\Actorms3dD.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="Actorms3dD:Make">
-        <MSBuild Projects="ActorMS3D\Actorms3dD.dproj" Targets="Make"/>
-    </Target>
-    <Target Name="ActorMS3dC">
-        <MSBuild Projects="ActorMS3D\ActorMS3dC.cbproj"/>
-    </Target>
-    <Target Name="ActorMS3dC:Clean">
-        <MSBuild Projects="ActorMS3D\ActorMS3dC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="ActorMS3dC:Make">
-        <MSBuild Projects="ActorMS3D\ActorMS3dC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="ArchipelagoD">
         <MSBuild Projects="Archipelago\ArchipelagoD.dproj"/>
     </Target>
@@ -98,6 +80,24 @@
     <Target Name="ArchipelagoC:Make">
         <MSBuild Projects="Archipelago\ArchipelagoC.cbproj" Targets="Make"/>
     </Target>
+    <Target Name="Actorms3dD">
+        <MSBuild Projects="ActorMS3D\Actorms3dD.dproj"/>
+    </Target>
+    <Target Name="Actorms3dD:Clean">
+        <MSBuild Projects="ActorMS3D\Actorms3dD.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="Actorms3dD:Make">
+        <MSBuild Projects="ActorMS3D\Actorms3dD.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="ActorMS3dC">
+        <MSBuild Projects="ActorMS3D\ActorMS3dC.cbproj"/>
+    </Target>
+    <Target Name="ActorMS3dC:Clean">
+        <MSBuild Projects="ActorMS3D\ActorMS3dC.cbproj" Targets="Clean"/>
+    </Target>
+    <Target Name="ActorMS3dC:Make">
+        <MSBuild Projects="ActorMS3D\ActorMS3dC.cbproj" Targets="Make"/>
+    </Target>
     <Target Name="ChristmasD">
         <MSBuild Projects="Christmas\ChristmasD.dproj"/>
     </Target>
@@ -216,13 +216,13 @@
         <MSBuild Projects="Quake3Demo\Q3DemoC.cbproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="Actorms3dD;ActorMS3dC;ArchipelagoD;ArchipelagoC;ChristmasD;ChristmasC;EarthD;EarthC;ForestD;GLSViewerD;IntensityMeshD;IntensityMeshC;PanoViewerD;PanoViewerC;TtbD;Q3DemoD;Q3DemoC"/>
+        <CallTarget Targets="ArchipelagoD;ArchipelagoC;Actorms3dD;ActorMS3dC;ChristmasD;ChristmasC;EarthD;EarthC;ForestD;GLSViewerD;IntensityMeshD;IntensityMeshC;PanoViewerD;PanoViewerC;TtbD;Q3DemoD;Q3DemoC"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="Actorms3dD:Clean;ActorMS3dC:Clean;ArchipelagoD:Clean;ArchipelagoC:Clean;ChristmasD:Clean;ChristmasC:Clean;EarthD:Clean;EarthC:Clean;ForestD:Clean;GLSViewerD:Clean;IntensityMeshD:Clean;IntensityMeshC:Clean;PanoViewerD:Clean;PanoViewerC:Clean;TtbD:Clean;Q3DemoD:Clean;Q3DemoC:Clean"/>
+        <CallTarget Targets="ArchipelagoD:Clean;ArchipelagoC:Clean;Actorms3dD:Clean;ActorMS3dC:Clean;ChristmasD:Clean;ChristmasC:Clean;EarthD:Clean;EarthC:Clean;ForestD:Clean;GLSViewerD:Clean;IntensityMeshD:Clean;IntensityMeshC:Clean;PanoViewerD:Clean;PanoViewerC:Clean;TtbD:Clean;Q3DemoD:Clean;Q3DemoC:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="Actorms3dD:Make;ActorMS3dC:Make;ArchipelagoD:Make;ArchipelagoC:Make;ChristmasD:Make;ChristmasC:Make;EarthD:Make;EarthC:Make;ForestD:Make;GLSViewerD:Make;IntensityMeshD:Make;IntensityMeshC:Make;PanoViewerD:Make;PanoViewerC:Make;TtbD:Make;Q3DemoD:Make;Q3DemoC:Make"/>
+        <CallTarget Targets="ArchipelagoD:Make;ArchipelagoC:Make;Actorms3dD:Make;ActorMS3dC:Make;ChristmasD:Make;ChristmasC:Make;EarthD:Make;EarthC:Make;ForestD:Make;GLSViewerD:Make;IntensityMeshD:Make;IntensityMeshC:Make;PanoViewerD:Make;PanoViewerC:Make;TtbD:Make;Q3DemoD:Make;Q3DemoC:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Examples/AdvDemos/Archipelago/Readme.txt

@@ -1,4 +1,4 @@
-Archipelago GLScene demo v1.01 (http://glscene.org)
+Archipelago GLScene demo v2.2 (http://glscene.org)
 
 >>>>>> BEFORE starting the demo: <<<<<<
 

Examples/AdvDemos/Archipelago/Splitter/fSplitterD.dfm

@@ -3,152 +3,111 @@ object Form1: TForm1
   Top = 105
   BorderStyle = bsDialog
   Caption = 'Splitter'
-  ClientHeight = 310
-  ClientWidth = 460
+  ClientHeight = 248
+  ClientWidth = 368
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -14
+  Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   Position = poScreenCenter
-  PixelsPerInch = 120
-  TextHeight = 16
+  TextHeight = 13
   object Label1: TLabel
-    Left = 10
-    Top = 10
-    Width = 329
-    Height = 38
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
+    Left = 8
+    Top = 8
+    Width = 276
+    Height = 32
     Caption = 
       'This utility will generate 16 1024x1024 BMP '#13#10'textures from the ' +
       #39'TextureMap.jpg'#39' files.'
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
-    Font.Height = -16
+    Font.Height = -13
     Font.Name = 'Arial'
     Font.Style = [fsBold]
     ParentFont = False
   end
   object LAAction: TLabel
-    Left = 60
-    Top = 224
-    Width = 53
-    Height = 16
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
+    Left = 48
+    Top = 179
+    Width = 43
+    Height = 13
     Caption = 'LAAction'
     Visible = False
   end
-  object EDFile: TEdit
-    Left = 10
-    Top = 58
-    Width = 331
-    Height = 24
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
+  object EditFile: TEdit
+    Left = 8
+    Top = 46
+    Width = 265
+    Height = 21
     Enabled = False
     TabOrder = 0
-    Text = 'TextureMap.jpg'
+    Text = 'ArchipelagoMap.jpg'
     Visible = False
   end
   object Button1: TButton
-    Left = 33
-    Top = 254
-    Width = 81
-    Height = 31
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
+    Left = 26
+    Top = 203
+    Width = 65
+    Height = 25
     Caption = 'Split'
     TabOrder = 1
     OnClick = Button1Click
   end
   object EDTileSize: TEdit
-    Left = 140
-    Top = 220
-    Width = 71
-    Height = 24
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
+    Left = 112
+    Top = 176
+    Width = 57
+    Height = 21
     Enabled = False
     TabOrder = 2
     Text = '1024'
     Visible = False
   end
-  object EDMask: TEdit
-    Left = 10
-    Top = 91
-    Width = 331
-    Height = 24
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
+  object EditMask: TEdit
+    Left = 8
+    Top = 73
+    Width = 265
+    Height = 21
     Enabled = False
     TabOrder = 3
     Text = 'Tex_%d_%d.bmp'
     Visible = False
   end
   object ProgressBar: TProgressBar
-    Left = 170
-    Top = 254
-    Width = 231
-    Height = 31
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
+    Left = 136
+    Top = 203
+    Width = 185
+    Height = 25
     Max = 16
     Smooth = True
     TabOrder = 4
   end
   object RBFull: TRadioButton
-    Left = 60
-    Top = 125
-    Width = 281
-    Height = 21
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
+    Left = 48
+    Top = 100
+    Width = 225
+    Height = 17
     Caption = 'Full Resolution (64 MB graphics memory)'
     TabOrder = 5
   end
   object RBHalf: TRadioButton
-    Left = 60
-    Top = 154
-    Width = 281
-    Height = 21
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
+    Left = 48
+    Top = 123
+    Width = 225
+    Height = 17
     Caption = 'Medium Resolution (16 MB)'
-    Checked = True
     TabOrder = 6
-    TabStop = True
   end
   object RBLow: TRadioButton
-    Left = 60
-    Top = 183
-    Width = 281
-    Height = 21
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
+    Left = 48
+    Top = 146
+    Width = 225
+    Height = 17
     Caption = 'Low Resolution (4 MB)'
+    Checked = True
     TabOrder = 7
+    TabStop = True
   end
 end

Examples/AdvDemos/Archipelago/Splitter/fSplitterD.pas

@@ -1,5 +1,5 @@
 //
-// The graphics rendering engine GLScene http://glscene.org
+// The graphics platform GLScene https://github.com/glscene
 //
 unit fSplitterD;
 
@@ -14,14 +14,16 @@ uses
   Vcl.Dialogs,
   Vcl.Imaging.Jpeg,
   Vcl.StdCtrls,
-  Vcl.ComCtrls;
+  Vcl.ComCtrls,
+
+  GLS.Utils;
 
 type
   TForm1 = class(TForm)
-    EDFile: TEdit;
+    EditFile: TEdit;
     Button1: TButton;
     EDTileSize: TEdit;
-    EDMask: TEdit;
+    EditMask: TEdit;
     ProgressBar: TProgressBar;
     Label1: TLabel;
     LAAction: TLabel;
@@ -30,9 +32,9 @@ type
     RBLow: TRadioButton;
     procedure Button1Click(Sender: TObject);
   private
-     
+    PathJpgIn, PathJpgOut: TFileName;
   public
-     
+
   end;
 
 var
@@ -52,7 +54,8 @@ var
   s, sd, f: Integer;
   x, y: Integer;
 begin
-  SetCurrentDir(ExtractFilePath(ParamStr(0)));
+  PathJpgIn := GetCurrentAssetPath() + '\map';
+  SetCurrentDir(PathJpgIn);
 
   s := StrToInt(EDTileSize.Text);
   pic := TPicture.Create;
@@ -86,7 +89,7 @@ begin
   LAAction.Caption := 'Loading Jpeg texture...';
   LAAction.Visible := True;
   Refresh;
-  pic.LoadFromFile(EDFile.Text);
+  pic.LoadFromFile(EditFile.Text);
   x := 0;
   while x < pic.Width do
   begin
@@ -103,7 +106,11 @@ begin
         bmp.Canvas.Draw(-x, -y, pic.Graphic);
       LAAction.Caption := Format('Generating tile %d-%d...', [x div s, y div s]);
       Refresh;
-      bmp.SaveToFile(Format(EDMask.Text, [x div s, y div s]));
+
+      PathJpgOut := ExtractFilePath(ParamStr(0));
+      SetCurrentDir(PathJpgOut);
+
+      bmp.SaveToFile(Format(EditMask.Text, [x div s, y div s]));
       ProgressBar.StepBy(1);
 
       Inc(y, s);

Examples/AdvDemos/Archipelago/fArchipelagoD.dfm

@@ -4,28 +4,23 @@ object Form1: TForm1
   Align = alClient
   BorderStyle = bsNone
   Caption = 'Form1'
-  ClientHeight = 500
-  ClientWidth = 754
+  ClientHeight = 400
+  ClientWidth = 603
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -14
+  Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   OnCreate = FormCreate
   OnKeyPress = FormKeyPress
-  PixelsPerInch = 120
-  TextHeight = 16
+  TextHeight = 13
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 754
-    Height = 500
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
-    Camera = GLCamera
+    Width = 603
+    Height = 400
+    Camera = Camera
     BeforeRender = GLSceneViewerBeforeRender
     Buffer.FogEnvironment.FogColor.Color = {0000803F0000803F0000803F0000803F}
     Buffer.FogEnvironment.FogStart = 500.000000000000000000
@@ -34,49 +29,37 @@ object Form1: TForm1
     Buffer.BackgroundColor = clGray
     Buffer.ContextOptions = [roDoubleBuffer, roStencilBuffer, roRenderToWindow]
     Buffer.FogEnable = True
-    FieldOfView = 146.601516723632800000
+    FieldOfView = 138.887908935546900000
     PenAsTouch = False
     Align = alClient
     TabOrder = 0
   end
   object PAProgress: TPanel
-    Left = 250
-    Top = 210
-    Width = 231
-    Height = 61
-    Margins.Left = 4
-    Margins.Top = 4
-    Margins.Right = 4
-    Margins.Bottom = 4
+    Left = 200
+    Top = 168
+    Width = 185
+    Height = 49
     BorderWidth = 6
     TabOrder = 1
     Visible = False
     object Label1: TLabel
       Left = 7
       Top = 7
-      Width = 217
-      Height = 25
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Width = 171
+      Height = 20
       Align = alTop
       Alignment = taCenter
       AutoSize = False
       Caption = 'Loading && compressing textures'
-      ExplicitLeft = 9
-      ExplicitTop = 9
-      ExplicitWidth = 214
+      ExplicitLeft = 6
+      ExplicitTop = 6
+      ExplicitWidth = 173
     end
     object ProgressBar: TProgressBar
       Left = 7
-      Top = 32
-      Width = 217
-      Height = 22
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Top = 27
+      Width = 171
+      Height = 15
       Align = alClient
       Max = 16
       TabOrder = 0
@@ -105,13 +88,13 @@ object Form1: TForm1
       Stars = <>
       Options = [sdoTwinkle]
     end
-    object DCCamera: TGLDummyCube
+    object dcCamera: TGLDummyCube
       Position.Coordinates = {0000000000000041000000000000803F}
       CubeSize = 1.000000000000000000
-      object GLCamera: TGLCamera
+      object Camera: TGLCamera
         DepthOfView = 1000.000000000000000000
         FocalLength = 75.000000000000000000
-        TargetObject = DCCamera
+        TargetObject = dcCamera
         Position.Coordinates = {000000000000803F000040400000803F}
         Left = 264
         Top = 160
@@ -129,13 +112,13 @@ object Form1: TForm1
       OnHeightDataPostRender = TerrainRendererHeightDataPostRender
       ContourWidth = 0
     end
-    object DOWake: TGLDirectOpenGL
-      OnProgress = DOWakeProgress
+    object doWake: TGLDirectOpenGL
+      OnProgress = doWakeProgress
       UseBuildList = False
-      OnRender = DOWakeRender
+      OnRender = doWakeRender
       Blend = False
     end
-    object LSSun: TGLLightSource
+    object lsSun: TGLLightSource
       Ambient.Color = {9A99993E9A99993E9A99993E0000803F}
       ConstAttenuation = 1.000000000000000000
       Diffuse.Color = {CDCC4C3FCDCC4C3FCDCC4C3F0000803F}
@@ -144,7 +127,7 @@ object Form1: TForm1
       SpotCutOff = 180.000000000000000000
       SpotDirection.Coordinates = {0000803F0000803F0000003F00000000}
     end
-    object HTFPS: TGLHUDText
+    object htFPS: TGLHUDText
       Position.Coordinates = {000096420000C841000000000000803F}
       BitmapFont = BFSmall
       Rotation = 0.000000000000000000
@@ -154,7 +137,7 @@ object Form1: TForm1
       BitmapFont = BFLarge
       Rotation = 0.000000000000000000
     end
-    object GLDummyCube1: TGLDummyCube
+    object dcSailBoat: TGLDummyCube
       Position.Coordinates = {000048C200007041000048420000803F}
       CubeSize = 1.000000000000000000
       object FFSailBoat: TGLFreeForm

Examples/AdvDemos/Archipelago/fArchipelagoD.pas

@@ -24,38 +24,39 @@ uses
   GLS.HeightData,
   GLS.HeightTileFileHDS,
   GLS.Texture,
-  GLS.HUDObjects, 
+  GLS.HUDObjects,
   GLS.Material,
-  GLS.SkyDome, 
-  GLS.SceneViewer, 
+  GLS.SkyDome,
+  GLS.SceneViewer,
   GLS.WindowsFont,
-  GLS.BitmapFont, 
-  GLS.Coordinates, 
-  GLS.RenderContextInfo, 
+  GLS.BitmapFont,
+  GLS.Coordinates,
+  GLS.RenderContextInfo,
   GLS.Color,
-  GLS.VectorFileObjects, 
-  GLS.BaseClasses, 
-  GLS.VectorLists, 
+  GLS.VectorFileObjects,
+  GLS.BaseClasses,
+  GLS.VectorLists,
   GLS.VectorTypes,
-  GLS.VectorGeometry, 
-  GLS.Keyboard, 
-  GLS.OpenGLTokens, 
-  GLS.Context, 
-  GLS.State, 
+  GLS.VectorGeometry,
+  GLS.Keyboard,
+  GLS.OpenGLTokens,
+  GLS.Context,
+  GLS.State,
   GLS.TextureFormat,
-  GLS.File3DS;
+  GLS.File3DS,
+  GLS.Utils;
 
 type
   TForm1 = class(TForm)
     GLSceneViewer1: TGLSceneViewer;
     GLScene1: TGLScene;
-    GLCamera: TGLCamera;
-    DCCamera: TGLDummyCube;
+    Camera: TGLCamera;
+    dcCamera: TGLDummyCube;
     TerrainRenderer: TGLTerrainRenderer;
     Timer1: TTimer;
     GLCadencer: TGLCadencer;
     MaterialLibrary: TGLMaterialLibrary;
-    HTFPS: TGLHUDText;
+    htFPS: TGLHUDText;
     SkyDome: TGLSkyDome;
     GLHeightTileFileHDS1: TGLHeightTileFileHDS;
     BFSmall: TGLWindowsBitmapFont;
@@ -66,11 +67,11 @@ type
     GLMemoryViewer1: TGLMemoryViewer;
     MLSailBoat: TGLMaterialLibrary;
     FFSailBoat: TGLFreeForm;
-    LSSun: TGLLightSource;
+    lsSun: TGLLightSource;
     BFLarge: TGLWindowsBitmapFont;
     HTHelp: TGLHUDText;
-    DOWake: TGLDirectOpenGL;
-    GLDummyCube1: TGLDummyCube;
+    doWake: TGLDirectOpenGL;
+    dcSailBoat: TGLDummyCube;
     procedure Timer1Timer(Sender: TObject);
     procedure GLCadencerProgress(Sender: TObject; const deltaTime,
       newTime: Double);
@@ -79,9 +80,9 @@ type
     procedure GLCustomHDS1MarkDirtyEvent(const area: TRect);
     procedure GLCustomHDS1StartPreparingData(heightData: TGLHeightData);
     procedure GLSceneViewerBeforeRender(Sender: TObject);
-    procedure DOWakeProgress(Sender: TObject; const deltaTime,
+    procedure doWakeProgress(Sender: TObject; const deltaTime,
       newTime: Double);
-    procedure DOWakeRender(Sender: TObject; var rci: TGLRenderContextInfo);
+    procedure doWakeRender(Sender: TObject; var rci: TGLRenderContextInfo);
     procedure TerrainRendererHeightDataPostRender(var rci: TGLRenderContextInfo;
       var HeightDatas: TList);
   public
@@ -91,13 +92,15 @@ type
     WaterPlane: Boolean;
     WasAboveWater: Boolean;
     HelpOpacity: Single;
-    DataPath : String;
     WakeVertices: TGLAffineVectorList;
     WakeStretch: TGLAffineVectorList;
     WakeTime: TGLSingleList;
     procedure ResetMousePos;
     function WaterPhase(const px, py: Single): Single;
     function WaterHeight(const px, py: Single): Single;
+  private
+    DataPath : TFileName;
+    AssetPath : TFileName;
   end;
 
 var
@@ -118,11 +121,12 @@ var
   name: string;
   libMat: TGLLibMaterial;
 begin
+  AssetPath := GetCurrentAssetPath() + '\texture';
+// SetCurrentDir(AssetPath); // for loading from assets dir
+
   DataPath := ExtractFilePath(ParamStr(0));
-  //Delete(DataPath, Length(DataPath) - 12, 12); // del if Win32\Debug\
   DataPath := DataPath + 'Data\';
   SetCurrentDir(DataPath);
-
   MaterialLibrary.TexturePaths := DataPath;
   MLSailBoat.TexturePaths := DataPath;
 
@@ -210,16 +214,16 @@ begin
     speed := 100 * deltaTime
   else
     speed := 20 * deltaTime;
-  with GLCamera.Position do
+  with Camera.Position do
   begin
     if IsKeyDown(VK_UP) then
-      DCCamera.Position.AddScaledVector(speed, GLCamera.AbsoluteVectorToTarget);
+      DCCamera.Position.AddScaledVector(speed, Camera.AbsoluteVectorToTarget);
     if IsKeyDown(VK_DOWN) then
-      DCCamera.Position.AddScaledVector(-speed, GLCamera.AbsoluteVectorToTarget);
+      DCCamera.Position.AddScaledVector(-speed, Camera.AbsoluteVectorToTarget);
     if IsKeyDown(VK_LEFT) then
-      DCCamera.Position.AddScaledVector(-speed, GLCamera.AbsoluteRightVectorToTarget);
+      DCCamera.Position.AddScaledVector(-speed, Camera.AbsoluteRightVectorToTarget);
     if IsKeyDown(VK_RIGHT) then
-      DCCamera.Position.AddScaledVector(speed, GLCamera.AbsoluteRightVectorToTarget);
+      DCCamera.Position.AddScaledVector(speed, Camera.AbsoluteRightVectorToTarget);
     if IsKeyDown(VK_PRIOR) then
       CamHeight := CamHeight + speed;
     if IsKeyDown(VK_NEXT) then
@@ -238,17 +242,17 @@ begin
   if IsKeyDown(VK_LBUTTON) then
   begin
     alpha := DCCamera.Position.Y;
-    DCCamera.Position.AddScaledVector(speed, GLCamera.AbsoluteVectorToTarget);
+    DCCamera.Position.AddScaledVector(speed, Camera.AbsoluteVectorToTarget);
     CamHeight := CamHeight + DCCamera.Position.Y - alpha;
   end;
   if IsKeyDown(VK_RBUTTON) then
   begin
     alpha := DCCamera.Position.Y;
-    DCCamera.Position.AddScaledVector(-speed, GLCamera.AbsoluteVectorToTarget);
+    DCCamera.Position.AddScaledVector(-speed, Camera.AbsoluteVectorToTarget);
     CamHeight := CamHeight + DCCamera.Position.Y - alpha;
   end;
   GetCursorPos(newMousePos);
-  GLCamera.MoveAroundTarget((Screen.Height div 2 - newMousePos.Y) * 0.25,
+  Camera.MoveAroundTarget((Screen.Height div 2 - newMousePos.Y) * 0.25,
     (Screen.Width div 2 - newMousePos.X) * 0.25);
   ResetMousePos;
 
@@ -262,7 +266,7 @@ begin
     Y := terrainHeight + CamHeight;
   end;
   // adjust fog distance/color for air/water
-  if (GLCamera.AbsolutePosition.Y > surfaceHeight) or (not WaterPlane) then
+  if (Camera.AbsolutePosition.Y > surfaceHeight) or (not WaterPlane) then
   begin
     if not WasAboveWater then
     begin
@@ -274,7 +278,7 @@ begin
         FogStart := 500;
       end;
       GLSceneViewer1.Buffer.BackgroundColor := clWhite;
-      GLCamera.DepthOfView := 1000;
+      Camera.DepthOfView := 1000;
       WasAboveWater := True;
     end;
   end
@@ -290,7 +294,7 @@ begin
         FogStart := 0;
       end;
       GLSceneViewer1.Buffer.BackgroundColor := clNavy;
-      GLCamera.DepthOfView := 100;
+      Camera.DepthOfView := 100;
       WasAboveWater := False;
     end;
   end;
@@ -405,7 +409,7 @@ end;
 
 procedure TForm1.Timer1Timer(Sender: TObject);
 begin
-  HTFPS.Text := Format('%.1f FPS - %d - %d',
+  htFPS.Text := Format('%.1f FPS - %d - %d',
     [GLSceneViewer1.FramesPerSecond,
     TerrainRenderer.LastTriangleCount,
       WaterPolyCount]);
@@ -526,7 +530,7 @@ begin
   Result := (cWaterLevel + Sin(alpha) * cWaveAmplitude) * (TerrainRenderer.Scale.Z * (1 / 128));
 end;
 
-procedure TForm1.DOWakeProgress(Sender: TObject; const deltaTime,
+procedure TForm1.doWakeProgress(Sender: TObject; const deltaTime,
   newTime: Double);
 var
   i: Integer;
@@ -577,7 +581,7 @@ begin
   end;
 end;
 
-procedure TForm1.DOWakeRender(Sender: TObject; var rci: TGLRenderContextInfo);
+procedure TForm1.doWakeRender(Sender: TObject; var rci: TGLRenderContextInfo);
 var
   i: Integer;
   p: PAffineVector;

Examples/AdvDemos/Earth/USolarSystem.pas

@@ -1,5 +1,5 @@
 //
-// The graphics rendering engine GLScene http://glscene.org
+// The graphics platform GLScene https://github.com/glscene
 //
 unit USolarSystem;
 

Examples/Demos/computing/FastFourierTransformation/FastFourierD.dpr

@@ -3,13 +3,12 @@ program FastFourierD;
 uses
   Forms,
   uCPUFFT in 'uCPUFFT.pas',
-  fFourier_D in 'fFourier_D.pas' {FormFFT};
+  fFourier_D in 'fFourier_D.pas';
 
 {$R *.res}
 
 begin
   ReportMemoryLeaksOnShutdown := True;
   Application.Initialize;
-  Application.CreateForm(TFormFFT, FormFFT);
   Application.Run;
 end.

Examples/Demos/computing/FastFourierTransformation/FastFourierD.dproj

@@ -128,9 +128,7 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="uCPUFFT.pas"/>
-        <DCCReference Include="fFourier_D.pas">
-            <Form>FormFFT</Form>
-        </DCCReference>
+        <DCCReference Include="fFourier_D.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Examples/Demos/computing/FastFourierTransformation/fFourier_D.pas

@@ -35,6 +35,9 @@ type
 
   TFormFFT = class(TForm)
     Panel1: TPanel;
+    Panel2: TPanel;
+    Label1: TLabel;
+
     But1DFFT: TButton;
     But2DFFT: TButton;
     BLenna: TButton;
@@ -47,8 +50,6 @@ type
     RBPhase: TRadioButton;
     RBReal: TRadioButton;
     RBImag: TRadioButton;
-    Panel2: TPanel;
-    Label1: TLabel;
     LDemoMode: TLabel;
     Label2: TLabel;
     Image2: TImage;