Upgraded v.2.5

Examples/AdvDemos/Archipelago/fArchipelagoD.pas

@@ -38,7 +38,7 @@ uses
   GLScene.VectorLists,
   GLScene.VectorTypes,
   GLScene.VectorGeometry,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.Context,
   GLS.State,
   GLScene.TextureFormat,

Examples/AdvDemos/Forest/fForestD.pas

@@ -25,7 +25,7 @@ uses
   GLS.Scene,
   GLS.Objects,
   GLS.Tree,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLScene.VectorLists,
   GLS.BitmapFont,
   GLS.Context,

Examples/AdvDemos/GLSViewer/Source/fGLSViewer.pas

@@ -52,7 +52,7 @@ uses
   GLS.RenderContextInfo,
   GLScene.TextureFormat,
   GLS.Color,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.Graphics,
   GLScene.PersistentClasses,
   GLS.MeshUtils,

Examples/AdvDemos/PanoramViewer/fPanoViewerD.pas

@@ -22,7 +22,7 @@ uses
   GLS.Scene,
   GLS.Objects,
   GLS.Texture,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.Cadencer,
   GLS.SceneViewer,
   GLS.Material,

Examples/Demos/behaviours/DCEDemo/fDceDemoD.pas

@@ -35,7 +35,7 @@ uses
   GLS.Context,
   GLS.EllipseCollision,
   GLS.RenderContextInfo,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.ProxyObjects,
   GLS.State,
   GLScene.Utils,

Examples/Demos/behaviours/FPSMovement/fFPSMovementD.pas

@@ -20,7 +20,7 @@ uses
   GLS.Texture,
   GLS.Cadencer,
   GLS.FPSMovement,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.State,
   GLS.SceneViewer,
   GLS.Objects,

Examples/Demos/cgshaders/CloudSky/fCloudSkyD.pas

@@ -25,7 +25,7 @@ uses
   GLS.SkyDome,
   GLS.Texture,
   GLS.FileTGA,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.Material,
   GLScene.Coordinates,
   GLScene.BaseClasses,

Examples/Demos/collisions/boxedin/fBoxedinD.pas

@@ -13,7 +13,7 @@ uses
   Vcl.StdCtrls,
   Vcl.ComCtrls,
 
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLScene.VectorGeometry,
   GLS.Scene,
   GLS.VectorFileObjects,

Examples/Demos/glslshaders/Mandelbrot/fMandelbrotD.pas

@@ -23,7 +23,7 @@ uses
   GLS.Cadencer,
   GLS.Scene,
   GLS.Context,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLScene.Utils,
   GLS.FileTGA,
   GLS.HUDObjects,

Examples/Demos/glslshaders/ShadersLab/fShaderLabD.pas

@@ -27,7 +27,7 @@ uses
   GLScene.VectorGeometry,
   GLScene.BaseClasses,
   GLScene.PersistentClasses,
-  GLS.Keyboard,
+  GLScene.XCollection,
 
   GLS.Material,
   GLS.Scene,

Examples/Demos/glslshaders/Shadertoy/fShadertoyD.pas

@@ -17,7 +17,7 @@ uses
   GLS.Objects,
   GLS.Cadencer,
   GLS.SceneViewer,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.RenderContextInfo,
   GLS.OpenGLAdapter,
   GLScene.TextureFormat,

Examples/Demos/interface/GameMenu/fGameMenuD.pas

@@ -26,7 +26,7 @@ uses
   GLS.GameMenu,
   GLS.Cadencer,
   GLS.Texture,
-  GLS.Keyboard,
+  GLScene.XCollection,
  
   GLS.Material,
   GLScene.Coordinates,

Examples/Demos/interface/GizmoEx/fGizmoExD.pas

@@ -22,7 +22,7 @@ uses
   GLS.Objects,
   GLScene.VectorTypes,
   GLS.SceneViewer,
-  GLS.Keyboard,
+  GLScene.XCollection,
 
   GLScene.Utils,
   GLS.GizmoEx,

Examples/Demos/materials/TransparAdv/fTransparAdvD.pas

@@ -38,7 +38,7 @@ uses
   GLS.HUDObjects,
   GLS.BitmapFont,
   GLS.WindowsFont,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.CompositeImage,
 
   GLScene.Utils;

Examples/Demos/meshes/actortwocam/fActorTwocamD.pas

@@ -33,7 +33,7 @@ uses
   GLScene.BaseClasses,
   GLScene.Utils,
   GLScene.VectorGeometry,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLScene.PersistentClasses, GLS.DCE;
 
 type
@@ -133,7 +133,7 @@ var
   moving: String;
   boost: Single;
 begin
-  // This function uses asynchronous keyboard check (see GLS.Keyboard.pas)
+  // This function uses asynchronous keyboard check (see GLScene.XCollection.pas)
   if IsKeyDown(VK_ESCAPE) then
     Close;
   if IsKeyDown('A') then

Examples/Demos/meshes/portal/fPortalD.pas

@@ -30,7 +30,7 @@ uses
   GLS.Material,
   GLScene.Coordinates,
   GLScene.BaseClasses,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLScene.Utils, GLS.SimpleNavigation;
 
 type

Examples/Demos/meshes/shadedterrain/fShadedTerrainD.pas

@@ -21,7 +21,7 @@ uses
   GLS.Scene,
   GLScene.BaseClasses,
   GLS.Objects,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.TerrainRenderer,
   GLS.ROAMPatch,
   GLS.HeightData,

Examples/Demos/meshes/synthterr/fSynthTerrainD.pas

@@ -29,7 +29,7 @@ uses
   GLS.Material,
   GLScene.Coordinates,
   GLScene.BaseClasses,
-  GLS.Keyboard, GLS.ShadowHDS;
+  GLScene.XCollection, GLS.ShadowHDS;
 
 type
   TFormSynthTerrain = class(TForm)

Examples/Demos/meshes/terrain/fTerrainD.pas

@@ -27,7 +27,7 @@ uses
   GLS.Cadencer,
   GLS.Texture,
   GLS.BitmapFont,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.SkyDome,
   GLS.SceneViewer,
   GLS.SoundManager,

Examples/Demos/meshes/tiles/fTilesD.pas

@@ -32,7 +32,7 @@ uses
   GLScene.BaseClasses,
   GLS.RenderContextInfo,
   GLScene.TextureFormat,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLScene.Utils,
   GLS.SimpleNavigation;
 

Examples/Demos/movements/smoothnavi/fSmoothNaviD.pas

@@ -14,7 +14,7 @@ uses
 
   GLS.Cadencer, 
   GLS.SceneViewer, 
-  GLS.Keyboard, 
+  GLScene.XCollection, 
   GLScene.VectorGeometry, 
   GLS.GeomObjects,
   GLS.Scene, 

Examples/Demos/physics/ClothActor/fClothActorD.pas

@@ -26,7 +26,7 @@ uses
   GLS.VerletTypes,
   GLS.VerletClothify,
   GLS.ShadowVolume,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLScene.VectorGeometry,
   GLScene.GeometryBB,
   GLS.SpacePartition,

Examples/Demos/physics/NewtonJoints/fNewtonJointsD.pas

@@ -23,7 +23,7 @@ uses
   GLScene.BaseClasses,
   GLScene.VectorGeometry,
   GLS.SimpleNavigation,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.GeomObjects,
   GLS.HUDObjects,
   GLS.BitmapFont,

Examples/Demos/physics/NewtonWalkCarry/fNewtonWalkCarryD.pas

@@ -33,7 +33,7 @@ uses
   GLScene.Coordinates,
   GLS.File3DS,
   GLS.Navigator,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLScene.VectorTypes,
   GLS.Color,
   GLS.HUDObjects,

Examples/Demos/physics/NewtonWalkShoot/fNGDWalkShootD.pas

@@ -30,7 +30,7 @@ uses
   GLS.File3DS,
   GLScene.VectorGeometry,
   GLS.Material,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLScene.Utils;
 
 type

Examples/Demos/physics/OdeConveyor/fOdeConveyorD.pas

@@ -27,7 +27,7 @@ uses
   GLScene.BaseClasses,
   GLS.SceneViewer,
   GLScene.VectorGeometry,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.SimpleNavigation;
 
 type

Examples/Demos/physics/OdeFurball/fOdeFurballD.pas

@@ -29,7 +29,7 @@ uses
   GLS.ShadowPlane,
   GLS.Navigator,
   GLS.VerletTypes,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.Color,
  
   GLScene.Coordinates,

Examples/Demos/physics/OdeRagdoll/fOdeRagdollD.pas

@@ -26,7 +26,7 @@ uses
   GLS.BitmapFont,
   GLS.WindowsFont,
   GLS.HUDObjects,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.VectorFileObjects,
   GLS.Ragdoll,
   GLS.Texture,

Examples/Demos/physics/OdeTerrain/fOdeTerrainD.pas

@@ -21,7 +21,7 @@ uses
   GLS.TerrainRenderer,
   GLS.Objects,
   GLS.HeightData,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.Cadencer,
   GLS.Texture,
   GLS.HUDObjects,

Examples/Demos/physics/PhysXScatter/PhysXScatterFm.pas

@@ -21,7 +21,7 @@ uses
   GLScene.VectorTypes,
   GLS.SceneViewer,
   GLS.Color,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLScene.BaseClasses,
   GLScene.VectorGeometry,
   GLS.GeomObjects,

Examples/Demos/rendering/Grass/fGrassD.pas

@@ -29,7 +29,7 @@ uses
   GLS.AsyncTimer,
   GLS.Material,
   GLScene.Coordinates,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLScene.BaseClasses,
   GLS.RenderContextInfo,
   GLScene.TextureFormat,

Examples/Demos/rendering/MultiTexture/fMultiTexturesD.pas

@@ -35,7 +35,7 @@ uses
   GLS.SimpleNavigation,
   GLS.State,
   GLS.Context,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.MultiSampleImage;
 
 type

Examples/Demos/rendering/QuadTreeCulling/fQuadtreeCullingD.pas

@@ -21,7 +21,7 @@ uses
   GLS.SceneViewer,
   GLS.SkyDome,
   GLS.Objects,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.HeightData,
   GLS.TerrainRenderer,
   GLS.Texture,

Examples/Demos/rendering/SkyBox/fSkyBoxD.pas

@@ -22,7 +22,7 @@ uses
   GLS.Cadencer,
   GLS.Navigator,
   GLS.SceneViewer,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.LensFlare,
   GLS.Objects,
   GLS.Material,

Examples/Demos/rendering/celshading/fCelShadingD.pas

@@ -29,7 +29,7 @@ uses
   GLScene.Coordinates,
   GLScene.BaseClasses,
   GLS.FileMD2,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLScene.Utils,
   GLSL.ShapeShaders;
 

Examples/Demos/specialsFX/PFXCursor/PfxCursorD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">PfxCursorD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -782,6 +783,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1075,6 +1079,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/PFXCursor/fPfxCursorD.pas

@@ -22,7 +22,7 @@ uses
   GLS.Scene,
   GLScene.VectorGeometry,
   GLS.Graphics,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.ParticleFX,
   GLS.Objects,
   GLS.HUDObjects,

Examples/Demos/specialsFX/PFXGallery/PFXGalleryD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">PFXGalleryD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -815,6 +816,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1108,6 +1112,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/PFXGallery/fPFXGalleryD.pas

@@ -28,7 +28,7 @@ uses
   GLS.Texture,
   GLS.Navigator,
   GLS.GeomObjects,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.SpaceText,
   GLS.Behaviours,
   GLS.PerlinPFX,

Examples/Demos/specialsFX/ParticleMasking/ParticleMaskingD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">ParticleMaskingD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>

Examples/Demos/specialsFX/ShadowPlane/ShadowPlaneD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">ShadowPlaneD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -817,6 +818,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1110,6 +1114,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/Trail/TrailsD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">TrailsD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -817,6 +818,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1110,6 +1114,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/beer/BeerD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">BeerD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -840,6 +841,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1133,6 +1137,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/boom/BoomD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">BoomD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -816,6 +817,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1109,6 +1113,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/candles/CandlesD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">CandlesD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -817,6 +818,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1110,6 +1114,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/fire/FireD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">FireD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -815,6 +816,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1108,6 +1112,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/meshexplosion/MeshExplosionD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">MeshExplosionD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -817,6 +818,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1110,6 +1114,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/motionblur/MotionBlurD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">MotionBlurD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -818,6 +819,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1111,6 +1115,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/motionblur2/MotionBlur2D.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">MotionBlur2D</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -815,6 +816,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1108,6 +1112,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/posteffect/PostEffectD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">PostEffectD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -818,6 +819,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1111,6 +1115,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/projtextures/ProjTexturesD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">ProjTexturesD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -817,6 +818,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1110,6 +1114,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/shadows/ShadowsD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">ShadowsD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -817,6 +818,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1110,6 +1114,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/shadowvolumes/ShadowVolumesD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">ShadowVolumesD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -819,6 +820,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1112,6 +1116,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/spiral/SpiralD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">SpiralD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -818,6 +819,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1111,6 +1115,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/thor/ThorD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">ThorD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -818,6 +819,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1111,6 +1115,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/warping/WarpingD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">WarpingD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -818,6 +819,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1111,6 +1115,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/specialsFX/waterplane/WaterPlaneD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">WaterPlaneD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -817,6 +818,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1110,6 +1114,7 @@
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/sprites/imposters/fImpostersD.pas

@@ -21,7 +21,7 @@ uses
   GLS.Objects,
   GLS.Cadencer,
   GLS.SceneViewer,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.VectorFileObjects,
   GLS.RenderContextInfo,
   GLScene.Utils,

Examples/Demos/utilities/GLInfos/fGLInfosD.pas

@@ -36,7 +36,7 @@ uses
   GLSL.CustomShader,
   GLSL.Shader,
   GLScene.Utils,
-  GLS.Keyboard,
+  GLScene.XCollection,
   GLS.SoundManager,
   GLS.Sounds.BASS,
   GLS.FileWAV,

Examples/Demos/utilities/keymap/fKeymapD.pas

@@ -7,7 +7,7 @@ uses
   Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs,
   Vcl.StdCtrls, Vcl.ExtCtrls, Vcl.Buttons,
   
-  GLS.Keyboard;
+  GLScene.XCollection;
 
 type
   TForm1 = class(TForm)

Packages/GLScene_RT.dpk

@@ -131,7 +131,7 @@ contains
   GLS.FileDEL in '..\Source\GLS.FileDEL.pas',
   GLS.FileVOR in '..\Source\GLS.FileVOR.pas',
   GLS.FullScreenViewer in '..\Source\GLS.FullScreenViewer.pas',
-  GLS.Keyboard in '..\Source\GLS.Keyboard.pas',
+  GLScene.Keyboard in '..\Source\GLScene.Keyboard.pas',
   GLS.GameMenu in '..\Source\GLS.GameMenu.pas',
   GLS.GeomObjects in '..\Source\GLS.GeomObjects.pas',
   GLScene.GeometryBB in '..\Source\GLScene.GeometryBB.pas',
@@ -250,7 +250,7 @@ contains
   GLS.InitOpenGL in '..\Source\GLS.InitOpenGL.pas',
   GLScene.OpenGLTokens in '..\Source\GLScene.OpenGLTokens.pas',
   GLS.PipelineTransformation in '..\Source\GLS.PipelineTransformation.pas',
-  GLS.Polynomials in '..\Source\GLS.Polynomials.pas',
+  GLScene.Polynomials in '..\Source\GLScene.Polynomials.pas',
   GLScene.Spline in '..\Source\GLScene.Spline.pas',
   GLScene.Strings in '..\Source\GLScene.Strings.pas',
   GLScene.RandomLib in '..\Source\GLScene.RandomLib.pas',

Packages/GLScene_RT.dproj

@@ -256,7 +256,7 @@
         <DCCReference Include="..\Source\GLS.FileDEL.pas"/>
         <DCCReference Include="..\Source\GLS.FileVOR.pas"/>
         <DCCReference Include="..\Source\GLS.FullScreenViewer.pas"/>
-        <DCCReference Include="..\Source\GLS.Keyboard.pas"/>
+        <DCCReference Include="..\Source\GLScene.Keyboard.pas"/>
         <DCCReference Include="..\Source\GLS.GameMenu.pas"/>
         <DCCReference Include="..\Source\GLS.GeomObjects.pas"/>
         <DCCReference Include="..\Source\GLScene.GeometryBB.pas"/>
@@ -375,7 +375,7 @@
         <DCCReference Include="..\Source\GLS.InitOpenGL.pas"/>
         <DCCReference Include="..\Source\GLScene.OpenGLTokens.pas"/>
         <DCCReference Include="..\Source\GLS.PipelineTransformation.pas"/>
-        <DCCReference Include="..\Source\GLS.Polynomials.pas"/>
+        <DCCReference Include="..\Source\GLScene.Polynomials.pas"/>
         <DCCReference Include="..\Source\GLScene.Spline.pas"/>
         <DCCReference Include="..\Source\GLScene.Strings.pas"/>
         <DCCReference Include="..\Source\GLScene.RandomLib.pas"/>

Packages/GXScene_RT.dpk

@@ -122,7 +122,6 @@ contains
   GXS.HeightTileFile in '..\SourceX\GXS.HeightTileFile.pas',
   GXS.HeightTileFileHDS in '..\SourceX\GXS.HeightTileFileHDS.pas',
   GXS.HiddenLineShader in '..\SourceX\GXS.HiddenLineShader.pas',
-  GXS.Keyboard in '..\SourceX\GXS.Keyboard.pas',
   GXS.ImageUtils in '..\SourceX\GXS.ImageUtils.pas',
   GXS.Imposter in '..\SourceX\GXS.Imposter.pas',
   GXS.Isolines in '..\SourceX\GXS.Isolines.pas',
@@ -208,7 +207,6 @@ contains
   GXS.PAKArchive in '..\SourceX\GXS.PAKArchive.pas',
   GXS.Polynomials in '..\SourceX\GXS.Polynomials.pas',
   GXS.SpacePartition in '..\SourceX\GXS.SpacePartition.pas',
-  GXS.XCollection in '..\SourceX\GXS.XCollection.pas',
   GXS.XOpenGL in '..\SourceX\GXS.XOpenGL.pas',
   GXS.PipelineTransformation in '..\SourceX\GXS.PipelineTransformation.pas',
   GXS.OpenGL in '..\SourceX\GXS.OpenGL.pas',
@@ -270,6 +268,8 @@ contains
   Formats.B3D in '..\Source\Formats.B3D.pas',
   Formats.LWO in '..\Source\Formats.LWO.pas',
   gnuGettext in '..\Source\gnuGettext.pas',
-  gnuGettextInit in '..\Source\gnuGettextInit.pas';
+  gnuGettextInit in '..\Source\gnuGettextInit.pas',
+  GLScene.XCollection in '..\Source\GLScene.XCollection.pas',
+  GLScene.Keyboard in '..\Source\GLScene.Keyboard.pas';
 
 end.

Packages/GXScene_RT.dproj

@@ -271,7 +271,6 @@
         <DCCReference Include="..\SourceX\GXS.HeightTileFile.pas"/>
         <DCCReference Include="..\SourceX\GXS.HeightTileFileHDS.pas"/>
         <DCCReference Include="..\SourceX\GXS.HiddenLineShader.pas"/>
-        <DCCReference Include="..\SourceX\GXS.Keyboard.pas"/>
         <DCCReference Include="..\SourceX\GXS.ImageUtils.pas"/>
         <DCCReference Include="..\SourceX\GXS.Imposter.pas"/>
         <DCCReference Include="..\SourceX\GXS.Isolines.pas"/>
@@ -357,7 +356,6 @@
         <DCCReference Include="..\SourceX\GXS.PAKArchive.pas"/>
         <DCCReference Include="..\SourceX\GXS.Polynomials.pas"/>
         <DCCReference Include="..\SourceX\GXS.SpacePartition.pas"/>
-        <DCCReference Include="..\SourceX\GXS.XCollection.pas"/>
         <DCCReference Include="..\SourceX\GXS.XOpenGL.pas"/>
         <DCCReference Include="..\SourceX\GXS.PipelineTransformation.pas"/>
         <DCCReference Include="..\SourceX\GXS.OpenGL.pas"/>
@@ -420,6 +418,8 @@
         <DCCReference Include="..\Source\Formats.LWO.pas"/>
         <DCCReference Include="..\Source\gnuGettext.pas"/>
         <DCCReference Include="..\Source\gnuGettextInit.pas"/>
+        <DCCReference Include="..\Source\GLScene.XCollection.pas"/>
+        <DCCReference Include="..\Source\GLScene.Keyboard.pas"/>
         <None Include="..\Sourcex\GXS.Scene.inc"/>
         <None Include="..\Source\GLScene.Defines.inc"/>
         <BuildConfiguration Include="Base">

Source/GLS.ApplicationFileIO.pas

@@ -2,12 +2,10 @@
 // The graphics engine GLScene https://github.com/glscene
 //
 unit GLS.ApplicationFileIO;
-
 (*
   Components and functions that abstract file I/O access for an application.
   Allows re-routing file reads to reads from a single archive file f.i.
 *)
-
 interface
 
 {$I GLScene.Defines.inc}
@@ -28,7 +26,6 @@ const
   GLS_RC_String_Type = RT_RCDATA;
 
 type
-
   TGLApplicationResource = (aresNone, aresSplash, aresTexture, aresMaterial,
     aresSampler, aresFont, aresMesh);
 
@@ -257,4 +254,6 @@ begin
     Result := aresNone;
 end;
 
+//----------------------------------------------------------------------------
+
 end.

Source/GLS.Canvas.pas

@@ -164,9 +164,7 @@ type
     property ArcDirection: TGLArcDirection read FArcDirection write FArcDirection;
   end;
 
-//-------------------------------------------------------------
-implementation
-//-------------------------------------------------------------
+implementation //-------------------------------------------------------------
 
 const
   cNoPrimitive = MaxInt;
@@ -761,5 +759,7 @@ begin
   pY^ := tmp;
 end;
 
+//---------------------------------------------------------------------------
+
 end.
 

Source/GLS.Color.pas

@@ -13,9 +13,7 @@ uses
   System.Types,
   System.SysUtils,
   System.Classes,
-  System.UITypes,
-
-  Vcl.Graphics,   // clWhite
+  System.UITypes,  // Colors
 
   GLScene.VectorTypes,
   GLScene.VectorGeometry,
@@ -183,11 +181,12 @@ const
   clActiveBackground = TColor(clBackground - cloActive);
   clActiveShadow = TColor(clShadow - cloActive);
   clActiveHighlight = TColor(clHighlight - cloActive);
-  clActiveHighlightedText = TColor(clHighlightedText - cloActive);
 
+  clActiveHighlightedText = TColor(clHighlightedText - cloActive);
   clFirstSpecialColor = clActiveHighlightedText;
-  clMask = clWhite;
-  clDontMask = clBlack;
+
+  clMask = TColor($000000); //clWhite;
+  clDontMask = TColor($FFFFFF); // clBlack;
 
   // Window's colors (must be filled at program startup,
   // since they depend on the desktop scheme)
@@ -390,7 +389,7 @@ var
   winColor: Integer;
 begin
   // Delphi color to Windows color
-  winColor := ColorToRGB(aColor);
+  winColor := TColorRec.ColorToRGB(aColor);
   // convert 0..255 range into 0..1 range
   Result.X := (winColor and $FF) * (1 / 255);
   Result.Y := ((winColor shr 8) and $FF) * (1 / 255);
@@ -415,29 +414,29 @@ end;
 
 procedure InitGLSceneColors;
 begin
-  clrScrollBar := ConvertWinColor(clScrollBar);
-  clrActiveCaption := ConvertWinColor(clActiveCaption);
-  clrInactiveCaption := ConvertWinColor(clInactiveCaption);
-  clrMenu := ConvertWinColor(clMenu);
-  clrWindow := ConvertWinColor(clWindow);
-  clrWindowFrame := ConvertWinColor(clWindowFrame);
-  clrMenuText := ConvertWinColor(clMenuText);
-  clrWindowText := ConvertWinColor(clWindowText);
-  clrCaptionText := ConvertWinColor(clCaptionText);
-  clrActiveBorder := ConvertWinColor(clActiveBorder);
-  clrInactiveBorder := ConvertWinColor(clInactiveBorder);
-  clrAppWorkSpace := ConvertWinColor(clAppWorkSpace);
-  clrHighlightText := ConvertWinColor(clHighlightText);
-  clrBtnFace := ConvertWinColor(clBtnFace);
-  clrBtnShadow := ConvertWinColor(clBtnShadow);
-  clrGrayText := ConvertWinColor(clGrayText);
-  clrBtnText := ConvertWinColor(clBtnText);
-  clrInactiveCaptionText := ConvertWinColor(clInactiveCaptionText);
-  clrBtnHighlight := ConvertWinColor(clBtnHighlight);
-  clr3DDkShadow := ConvertWinColor(cl3DDkShadow);
-  clr3DLight := ConvertWinColor(cl3DLight);
-  clrInfoText := ConvertWinColor(clInfoText);
-  clrInfoBk := ConvertWinColor(clInfoBk);
+  clrScrollBar := ConvertWinColor(TColorRec.cSCROLLBAR);
+  clrActiveCaption := ConvertWinColor(TColorRec.cACTIVECAPTION);
+  clrInactiveCaption := ConvertWinColor(TColorRec.cINACTIVECAPTION);
+  clrMenu := ConvertWinColor(TColorRec.cMENU);
+  clrWindow := ConvertWinColor(TColorRec.cWINDOW);
+  clrWindowFrame := ConvertWinColor(TColorRec.cWINDOWFRAME);
+  clrMenuText := ConvertWinColor(TColorRec.cMENUTEXT);
+  clrWindowText := ConvertWinColor(TColorRec.cWINDOWTEXT);
+  clrCaptionText := ConvertWinColor(TColorRec.cCAPTIONTEXT);
+  clrActiveBorder := ConvertWinColor(TColorRec.cACTIVEBORDER);
+  clrInactiveBorder := ConvertWinColor(TColorRec.cINACTIVEBORDER);
+  clrAppWorkSpace := ConvertWinColor(TColorRec.cAPPWORKSPACE);
+  clrHighlightText := ConvertWinColor(TColorRec.cHIGHLIGHTTEXT);
+  clrBtnFace := ConvertWinColor(TColorRec.cBTNFACE);
+  clrBtnShadow := ConvertWinColor(TColorRec.cBTNSHADOW);
+  clrGrayText := ConvertWinColor(TColorRec.cGRAYTEXT);
+  clrBtnText := ConvertWinColor(TColorRec.cBTNTEXT);
+  clrInactiveCaptionText := ConvertWinColor(TColorRec.cINACTIVECAPTIONTEXT);
+  clrBtnHighlight := ConvertWinColor(TColorRec.cBTNHIGHLIGHT);
+  clr3DDkShadow := ConvertWinColor(TColorRec.c3DDKSHADOW);
+  clr3DLight := ConvertWinColor(TColorRec.c3DLIGHT);
+  clrInfoText := ConvertWinColor(TColorRec.cINFOTEXT);
+  clrInfoBk := ConvertWinColor(TColorRec.cINFOBK);
   clrHighlight := ConvertWinColor(clHighlight);
   clrBackground := ConvertWinColor(clBackground);
 end;
@@ -1037,13 +1036,11 @@ begin
   ColorManager.RemoveColor(aName);
 end;
 
-//-----------------------------------------------------------
-initialization
-//-----------------------------------------------------------
+initialization //-----------------------------------------------------------
 
 InitGLSceneColors;
 
-finalization
+finalization //-------------------------------------------------------------
 
 vColorManager.Free;
 

Source/GLS.CompositeImage.pas

@@ -51,9 +51,7 @@ type
     property Depth: Integer read GetDepth write SetDepth;
   end;
 
-//-----------------------------------------------------------------------
-implementation
-//-----------------------------------------------------------------------
+implementation //-------------------------------------------------------------
 
 constructor TGLCompositeImage.Create(AOwner: TPersistent);
 begin
@@ -266,9 +264,7 @@ begin
     Result := ttNoShape;
 end;
 
-//-------------------------------------------------
-initialization
-//-------------------------------------------------
+initialization //-------------------------------------------------
 
   RegisterGLTextureImageClass(TGLCompositeImage);
 

Source/GLS.Console.pas

@@ -2,7 +2,6 @@
 // The graphics engine GLScene https://github.com/glscene
 //
 unit GLS.Console;
-
 (*
    The console is a popdown window that appears on a game for text output/input.
 
@@ -48,15 +47,15 @@ uses
   Vcl.Graphics,
 
   GLScene.VectorTypes,
+  GLScene.PersistentClasses,
+  GLScene.Coordinates,
   GLScene.Strings,
 
   GLS.Scene,
-  GLScene.Coordinates,
   GLS.Objects,
   GLS.HudObjects,
   GLS.SceneViewer,
   GLS.BitmapFont,
-  GLScene.PersistentClasses,
   GLS.Context,
   GLS.ImageUtils,
   GLS.Texture,

Source/GLS.DCE.pas

@@ -2,7 +2,6 @@
 // The graphics engine GLScene https://github.com/glscene
 //
 unit GLS.DCE;
-
 (*
   Dynamic Collision Engine
   How to use:
@@ -22,7 +21,6 @@ unit GLS.DCE;
   - SlideOrBounce: The object can bounce like a ball or slide like an FPS
   - BounceFactor: Restituition factor, 1 means that it will bounce forever
 *)
-
 interface
 
 {$I GLScene.Defines.inc}
@@ -34,18 +32,18 @@ uses
 
   GLScene.VectorTypes,
   GLScene.VectorGeometry,
-
-  GLS.Scene,
+  GLScene.BaseClasses,
+  GLScene.Coordinates,
+  GLScene.Manager,
   GLScene.XCollection,
   GLScene.VectorLists,
+
+  GLS.Scene,
   GLS.VectorFileObjects,
   GLS.EllipseCollision,
   GLS.TerrainRenderer,
-  GLScene.Coordinates,
-  GLScene.BaseClasses,
   GLS.ProxyObjects,
   GLS.MultiProxy,
-  GLScene.Manager,
   GLScene.Strings;
 
 type

Source/GLS.File3DSSceneObjects.pas

@@ -15,15 +15,15 @@ uses
   System.SysUtils,
   System.Math,
 
-  GLScene.OpenGLTokens,
   GLS.OpenGLAdapter,
+  GLScene.OpenGLTokens,
+  GLScene.PersistentClasses,
+  GLScene.Coordinates,
   GLScene.VectorTypes,
   GLScene.VectorGeometry,
   GLS.Context,
   GLS.Scene,
   GLS.VectorFileObjects,
-  GLScene.PersistentClasses,
-  GLScene.Coordinates,
   GLS.RenderContextInfo,
   GLS.State;
 

Source/GLS.FileGL2.pas

@@ -41,9 +41,7 @@ var
   // per vertex. Use this global
   // variable to set a different limit.
 
-// ------------------------------------------------------------------
-implementation
-// ------------------------------------------------------------------
+implementation // ------------------------------------------------------------
 
 // ------------------
 // ------------------ TGLMVectorFile ------------------
@@ -255,17 +253,12 @@ begin
   end;
 end;
 
-// ------------------------------------------------------------------
-// ------------------------------------------------------------------
-// ------------------------------------------------------------------
-initialization
-
-// ------------------------------------------------------------------
-// ------------------------------------------------------------------
-// ------------------------------------------------------------------
+initialization // ------------------------------------------------------------
 
 RegisterVectorFileFormat('glm', 'Ghoul2 (GLM) model files', TGLMVectorFile);
 RegisterVectorFileFormat('glx', 'Ghoul2 (GLX) model files', TGLMVectorFile);
 RegisterVectorFileFormat('gla', 'Ghoul2 (GLA) animation files', TGLAVectorFile);
 
+finalization // --------------------------------------------------------------
+
 end.

Source/GLS.GeomObjects.pas

@@ -20,12 +20,12 @@ uses
   System.Math,
   System.Classes,
 
-  GLScene.OpenGLTokens,
   GLS.OpenGLAdapter,
+  GLScene.OpenGLTokens,
   GLScene.VectorTypes,
   GLScene.VectorGeometry,
   GLS.PipelineTransformation,
-  GLS.Polynomials,
+  GLScene.Polynomials,
 
   GLS.Scene,
   GLS.State,

Source/GLS.Graph.pas

@@ -17,18 +17,18 @@ uses
   System.Classes,
   System.SysUtils,
   
-  GLS.Scene,
   GLScene.OpenGLTokens,
   GLScene.VectorTypes,
   GLScene.VectorGeometry,
+  GLScene.VectorLists,
+  GLScene.BaseClasses,
 
+  GLS.Scene,
   GLS.Context,
   GLS.XOpenGL,
   GLS.Material,
   GLS.Objects,
-  GLScene.VectorLists,
   GLS.Color,
-  GLScene.BaseClasses,
   GLS.RenderContextInfo,
   GLS.State;
 

Source/GLS.Isolines.pas

@@ -19,11 +19,11 @@ uses
   GLScene.VectorTypes,
   GLScene.VectorTypesExt,
   GLScene.Spline,
-
   GLScene.VectorLists,
+  GLScene.Coordinates,
+
   GLS.Objects,
   GLS.MultiPolygon,
-  GLScene.Coordinates,
   GLS.Color,
   GLS.SpaceText,
   GLS.VectorFileObjects;

Source/GLS.LensFlare.pas

@@ -17,17 +17,18 @@ uses
   System.Math,
 
   GLScene.OpenGLTokens,
-  GLS.Scene,
   GLScene.PersistentClasses,
-  GLS.PipelineTransformation,
   GLScene.VectorGeometry,
+  GLScene.BaseClasses,
+  GLScene.VectorTypes,
+
+  GLS.Scene,
+  GLS.PipelineTransformation,
   GLS.Objects,
   GLS.Context,
   GLS.Color,
-  GLScene.BaseClasses,
   GLS.RenderContextInfo,
   GLS.State,
-  GLScene.VectorTypes,
   GLScene.Utils,
   GLScene.TextureFormat;
 

Source/GLS.MeshBuilder.pas

@@ -16,11 +16,12 @@ uses
   System.SysUtils,
   System.Classes,
 
-  GLS.Scene,
   GLScene.VectorTypes,
   GLScene.VectorGeometry,
   GLScene.VectorLists,
   GLScene.PersistentClasses,
+
+  GLS.Scene,
   GLS.VectorFileObjects,
   GLS.MeshUtils;
 

Source/GLS.Movement.pas

@@ -19,14 +19,15 @@ uses
 
   GLScene.VectorTypes,
   GLScene.OpenGLTokens,
-  GLS.Scene,
   GLScene.PersistentClasses,
   GLScene.VectorGeometry,
   GLScene.XCollection,
   GLScene.Spline,
+  GLScene.BaseClasses,
+
+  GLS.Scene,
   GLS.Objects,
   GLScene.Strings,
-  GLScene.BaseClasses,
   GLScene.Utils;
 
 type

Source/GLS.MultiProxy.pas

@@ -15,9 +15,10 @@ uses
 
   GLScene.OpenGLTokens,
   GLScene.PersistentClasses,
+  GLScene.VectorGeometry,
+
   GLS.Context,
   GLS.Scene,
-  GLScene.VectorGeometry,
   GLS.Silhouette,
   GLS.RenderContextInfo,
   GLScene.BaseClasses,

Source/GLS.Navigator.pas

@@ -28,7 +28,7 @@ uses
   GLScene.PersistentClasses,
   GLScene.VectorTypes,
   GLScene.VectorGeometry,
-  GLS.Keyboard,
+  GLScene.Keyboard,
   GLS.HudObjects,
   GLScene.Coordinates,
   GLS.Screen,

Source/GLS.Objects.pas

@@ -29,22 +29,22 @@ uses
   System.SysUtils,
   System.Math,
 
+  GLS.OpenGLAdapter,
   GLScene.OpenGLTokens,
   GLScene.VectorGeometry,
-  GLS.Scene,
-  GLS.OpenGLAdapter,
   GLScene.VectorTypes,
-  GLS.PipelineTransformation,
+  GLScene.PersistentClasses,
+  GLScene.BaseClasses,
+  GLScene.Coordinates,
   GLScene.Spline,
   GLScene.VectorLists,
+  GLS.PipelineTransformation,
+  GLS.Scene,
   GLS.Context,
   GLS.Silhouette,
   GLS.Color,
   GLS.RenderContextInfo,
-  GLScene.PersistentClasses,
-  GLScene.BaseClasses,
   GLS.Nodes,
-  GLScene.Coordinates,
   GLS.XOpenGL,
   GLS.State;
 

Source/GLS.ParticleFX.pas

@@ -2,7 +2,6 @@
 // The graphics engine GLScene https://github.com/glscene
 //
 unit GLS.ParticleFX;
-
 (*
    Base classes for scene-wide blended particles FX.
 
@@ -10,7 +9,6 @@ unit GLS.ParticleFX;
    particle depth-sorting (allowing correct rendering of interwoven separate
    fire and smoke particle systems for instance).
 *)
-
 interface
 
 {$I GLScene.Defines.inc}

Source/GLS.Perlin.pas

@@ -2,7 +2,6 @@
 // The graphics engine GLScene https://github.com/glscene
 //
 unit GLS.Perlin;
-
 (*
   Classes and functions for generating perlin noise.
 
@@ -10,7 +9,6 @@ unit GLS.Perlin;
   A Perlin Height Data Source have been included as an example.
   Use this combined with a terrain renderer for an infinite random landscape
 *)
-
 interface
 
 {$I GLScene.Defines.inc}
@@ -358,7 +356,8 @@ begin
 
   Result := (P * x * x * x + Q * x * x + R * x + S);
   // If (Abs(Result) > 1) then
-  // Raise exception.create('Cubic_Interpolate result to high, '+FloatToStr(Result)+' values ['+FloatToStr(v0)+';'+FloatToStr(v1)+';'+FloatToStr(v2)+';'+FloatToStr(v3)+']');{}
+  // Raise exception.create('Cubic_Interpolate result to high, 
+  //'+FloatToStr(Result)+' values ['+FloatToStr(v0)+';'+FloatToStr(v1)+';'+FloatToStr(v2)+';'+FloatToStr(v3)+']');{}
 end;
 
 //-----------------------------------

Source/GLS.PhysFields.pas

@@ -9,8 +9,9 @@ uses
   System.Classes,
   GLScene.VectorGeometry,
   GLScene.XCollection,
-  GLS.Scene,
   GLScene.Coordinates,
+
+  GLS.Scene,
   GLS.Behaviours,
   (* GLS.RigidBodyInertia *)
   GLS.PhysInertias,

Source/GLS.PhysInertias.pas

@@ -12,13 +12,14 @@ uses
 
   GLScene.PersistentClasses,
   GLScene.XCollection,
-  GLS.Scene,
   GLScene.BaseClasses,
   GLScene.VectorGeometry,
   GLScene.VectorTypes,
   GLS.PhysManager,
   GLScene.Coordinates,
   GLScene.Strings,
+
+  GLS.Scene,
   GLS.Behaviours;
 
 type

Source/GLS.PipelineTransformation.pas

@@ -20,7 +20,6 @@ const
   MAX_MATRIX_STACK_DEPTH = 128;
 
 type
-
   TGLPipelineTransformationState =
   (
     trsModelViewChanged,
@@ -30,7 +29,6 @@ type
     trsViewProjChanged,
     trsFrustum
   );
-
   TGLPipelineTransformationStates = set of TGLPipelineTransformationState;
 
 const
@@ -52,7 +50,6 @@ type
   end;
 
 type
-
   TOnMatricesPush = procedure() of object;
 
   TGLTransformation = class(TObject)
@@ -98,9 +95,7 @@ type
     property LoadMatricesEnabled: Boolean read FLoadMatricesEnabled write FLoadMatricesEnabled;
   end;
 
-//=====================================================================
-implementation
-//=====================================================================
+implementation //------------------------------------------------------------
 
 constructor TGLTransformation.Create;
 begin
@@ -336,4 +331,6 @@ begin
   Result := FStack[FStackPos].FFrustum;
 end;
 
+//-----------------------------------------------------------------------------
+
 end.

Source/GLS.PolygonTesselation.pas

@@ -16,9 +16,10 @@ uses
   GLS.OpenGLAdapter,
   GLScene.OpenGLTokens,
   GLScene.VectorTypes,
+  GLScene.VectorLists,
   GLScene.VectorGeometry,
+
   GLS.VectorFileObjects,
-  GLScene.VectorLists,
   GLScene.PersistentClasses;
 
 (* Tesselates the polygon outlined by the Vertexes. And adds them to the first

Source/GLS.Portal.pas

@@ -2,7 +2,6 @@
 // The graphics engine GLScene https://github.com/glscene
 //
 unit GLS.Portal;
-
 (*
   Portal Rendering support for GLScene.
   The portal structures are subclasses of the Mesh structures, with a "sector"
@@ -11,7 +10,6 @@ unit GLS.Portal;
     [TGLPortal, TGLSectorMeshObject, TFGPolygon, TFGPortalPolygon]
 
 *)
-
 interface
 
 {$I GLScene.Defines.inc}

Source/GLS.ProcTextures.pas

@@ -720,13 +720,11 @@ begin
   PERM[255] := 52;
 end;
 
-// ------------------------------------------------------------------
-initialization
-// ------------------------------------------------------------------
+initialization // ------------------------------------------------------------
 
   RegisterGLTextureImageClass(TGLProcTextureNoise);
 
-finalization
+finalization // --------------------------------------------------------------
 
 end.
 

Source/GLS.State.pas

@@ -1,9 +1,7 @@
 //
 // The graphics engine GLScene https://github.com/glscene
 //
-
 unit GLS.State;
-
 (*  Tools for managing an application-side cache of OpenGL state. *)
 
 (*
@@ -42,7 +40,6 @@ const
   GLS_VERTEX_ATTR_NUM = 16;
 
 type
-
   TGLStateType = (sttCurrent, sttPoint, sttLine, sttPolygon, sttPolygonStipple,
     sttPixelMode, sttLighting, sttFog, sttDepthBuffer, sttAccumBuffer,
     sttStencilBuffer, sttViewport, sttTransform, sttEnable, sttColorBuffer,
@@ -3520,4 +3517,6 @@ begin
  {$WARN SYMBOL_DEPRECATED ON}
 end;
 
+//--------------------------------------------------------------------------
+
 end.

Source/GLS.TexturedHDS.pas

@@ -2,7 +2,6 @@
 // The graphics engine GLScene https://github.com/glscene
 //
 unit GLS.TexturedHDS;
-
 (*
    Implements a HDS, which automatically maps textures onto a parent HDS .
    This HDS links to and extracts its height data from a parent HDS. (like TGLHeightTileFile)
@@ -19,7 +18,6 @@ unit GLS.TexturedHDS;
    sure your texture edges are alligned to height tile edges, or gaps will show.
    (Of course you can still multitexture in a detail texture too.)
 *)
-
 interface
 
 {$I GLScene.Defines.inc}

Source/GLS.VectorFileObjects.pas

@@ -2,7 +2,6 @@
 // The graphics engine GLScene https://github.com/glscene
 //
 unit GLS.VectorFileObjects;
-
 (*
   Vector File related objects.
   The registered classes are:
@@ -15,7 +14,6 @@ unit GLS.VectorFileObjects;
     TGLFaceGroup, TGLVectorFile, TGLSMVectorFile, TGLFreeForm;
     TGLActor, TGLVectorFileFormat, TGLVectorFileFormatsList]
 *)
-
 interface
 
 {$I GLScene.Defines.inc}

Source/GLS.VerletTypes.pas

@@ -23,15 +23,15 @@ uses
 
   GLScene.VectorTypes,
   GLScene.PersistentClasses,
-
   GLScene.BaseClasses,
-  GLS.Objects,
-  GLS.Scene,
   GLScene.Coordinates,
   GLScene.VectorGeometry,
   GLScene.VectorLists,
-  GLS.SpacePartition,
   GLScene.GeometryBB,
+
+  GLS.Objects,
+  GLS.Scene,
+  GLS.SpacePartition,
   GLS.VectorFileObjects;
 
 const

Source/GLS.Windows.pas

@@ -42,7 +42,6 @@ uses
   GLScene.BaseClasses;
 
 type
-
   TGLBaseComponent = class(TGLBaseGuiObject)
   private
     FGUIRedraw: Boolean;
@@ -3628,11 +3627,10 @@ begin
   ReGetRootControl;
 end;
 
-//--------------------------------------------
-initialization
-//--------------------------------------------
+initialization //------------------------------------------------------------
+
+RegisterClasses([TGLBaseControl, TGLPopupMenu, TGLForm, TGLPanel, TGLButton,
+  TGLCheckBox, TGLEdit, TGLLabel, TGLAdvancedLabel, TGLScrollbar, TGLStringGrid,
+  TGLCustomControl]);
 
-  RegisterClasses([TGLBaseControl, TGLPopupMenu, TGLForm, TGLPanel, TGLButton,
-    TGLCheckBox, TGLEdit, TGLLabel, TGLAdvancedLabel, TGLScrollbar, TGLStringGrid,
-    TGLCustomControl]);
 end.

Source/GLS.WindowsFont.pas

@@ -72,9 +72,7 @@ type
     property Ranges stored StoreRanges;
   end;
 
-// ------------------------------------------------------------------
-implementation
-// ------------------------------------------------------------------
+implementation // ------------------------------------------------------------
 
 const
   cDefaultLast = '}';
@@ -377,13 +375,13 @@ begin
   Result := GL_ALPHA;
 end;
 
-// ------------------------------------------------------------------
-initialization
-// ------------------------------------------------------------------
+initialization // ------------------------------------------------------------
   Win32PlatformIsUnicode := (Win32Platform = VER_PLATFORM_WIN32_NT);
 
 
   RegisterClasses([TGLWindowsBitmapFont]);
 
+// ---------------------------------------------------------------------------
+
 end.
 

Source/GLScene.BaseClasses.pas

@@ -15,7 +15,6 @@ uses
   GLScene.PersistentClasses;
 
 type
-
   TGProgressTimes = packed record
     DeltaTime, NewTime: Double;
     SqrDeltaTime, InvSqrDeltaTime: Single;

Source/GLS.Keyboard.pas → Source/GLScene.Keyboard.pas

@@ -1,8 +1,7 @@
 //
 // The graphics engine GLScene https://github.com/glscene
 //
-unit GLS.Keyboard;
-
+unit GLScene.Keyboard;
 (*
   Provides on demand state of any key on the keyboard as well as a set of
   utility functions for working with virtual key codes.
@@ -12,7 +11,6 @@ unit GLS.Keyboard;
   See "Virtual-Key Codes" in the Win32 programmers references for a list of
   key code constants (VK_* constants are declared in the "Windows" unit).
 *)
-
 interface
 
 {$I GLScene.Defines.inc}
@@ -66,9 +64,7 @@ procedure KeyboardNotifyWheelMoved(wheelDelta: Integer);
 var
   vLastWheelDelta: Integer;
 
-// ---------------------------------------------------------------------
-implementation
-// ---------------------------------------------------------------------
+implementation // ------------------------------------------------------------
 
 const
   cLBUTTON = 'Left Mouse Button';
@@ -260,4 +256,6 @@ begin
   vLastWheelDelta := wheelDelta;
 end;
 
+//----------------------------------------------------------------------------
+
 end.

Source/GLS.Polynomials.pas → Source/GLScene.Polynomials.pas

@@ -1,8 +1,7 @@
 //
 // The graphics engine GLScene https://github.com/glscene
 //
-unit GLS.Polynomials;
-
+unit GLScene.Polynomials;
 (*
   Utility functions for manipulationg and solving polynomials.
 
@@ -18,7 +17,6 @@ unit GLS.Polynomials;
   properly handled, these are marked by comments in the code.
   Note: in progress - limited precision.
 *)
-
 interface
 
 {$I GLScene.Defines.inc}

Sourcex/FMxSceneEditor.pas

@@ -37,7 +37,7 @@ uses
   GXS.SceneViewer,
   GXS.SceneRegister,
   GLScene.Strings,
-  GXS.XCollection;
+  GLScene.XCollection;
 
 type
   TSceneEditorForm = class(TForm)

Sourcex/FMxXCollectionEditor.pas

@@ -33,7 +33,7 @@ uses
   GXS.Scene,
   GLScene.Strings,
   GXS.Behaviours,
-  GXS.XCollection;
+  GLScene.XCollection;
 
 type
   IDesigner = interface //in designintf -> (IDesigner200)