Upgraded demos

Examples/AdvDemoc.groupproj

@@ -27,9 +27,6 @@
         <Projects Include="AdvDemos\TexCombine\TexCombineC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="AdvDemos\Archipelago\Splitter\SplitterD.dproj">
-            <Dependencies/>
-        </Projects>
         <Projects Include="AdvDemos\Archipelago\Splitter\SplitterC.cbproj">
             <Dependencies/>
         </Projects>
@@ -113,15 +110,6 @@
     <Target Name="TexCombineC:Make">
         <MSBuild Projects="AdvDemos\TexCombine\TexCombineC.cbproj" Targets="Make"/>
     </Target>
-    <Target Name="SplitterD">
-        <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterD.dproj"/>
-    </Target>
-    <Target Name="SplitterD:Clean">
-        <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterD.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="SplitterD:Make">
-        <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterD.dproj" Targets="Make"/>
-    </Target>
     <Target Name="SplitterC">
         <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterC.cbproj"/>
     </Target>
@@ -132,13 +120,13 @@
         <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterC.cbproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="ActorMS3dC;ArchipelagoC;ChristmasC;GLSViewerC;IntensityMeshC;PanoViewerC;QuakeActorC;TexCombineC;SplitterD;SplitterC"/>
+        <CallTarget Targets="ActorMS3dC;ArchipelagoC;ChristmasC;GLSViewerC;IntensityMeshC;PanoViewerC;QuakeActorC;TexCombineC;SplitterC"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="ActorMS3dC:Clean;ArchipelagoC:Clean;ChristmasC:Clean;GLSViewerC:Clean;IntensityMeshC:Clean;PanoViewerC:Clean;QuakeActorC:Clean;TexCombineC:Clean;SplitterD:Clean;SplitterC:Clean"/>
+        <CallTarget Targets="ActorMS3dC:Clean;ArchipelagoC:Clean;ChristmasC:Clean;GLSViewerC:Clean;IntensityMeshC:Clean;PanoViewerC:Clean;QuakeActorC:Clean;TexCombineC:Clean;SplitterC:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="ActorMS3dC:Make;ArchipelagoC:Make;ChristmasC:Make;GLSViewerC:Make;IntensityMeshC:Make;PanoViewerC:Make;QuakeActorC:Make;TexCombineC:Make;SplitterD:Make;SplitterC:Make"/>
+        <CallTarget Targets="ActorMS3dC:Make;ArchipelagoC:Make;ChristmasC:Make;GLSViewerC:Make;IntensityMeshC:Make;PanoViewerC:Make;QuakeActorC:Make;TexCombineC:Make;SplitterC:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Examples/AdvDemos.groupproj

@@ -33,6 +33,9 @@
         <Projects Include="AdvDemos\TexCombine\TexCombineD.dproj">
             <Dependencies/>
         </Projects>
+        <Projects Include="AdvDemos\Archipelago\Splitter\SplitterD.dproj">
+            <Dependencies/>
+        </Projects>
     </ItemGroup>
     <ProjectExtensions>
         <Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -131,14 +134,23 @@
     <Target Name="TexCombineD:Make">
         <MSBuild Projects="AdvDemos\TexCombine\TexCombineD.dproj" Targets="Make"/>
     </Target>
+    <Target Name="SplitterD">
+        <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterD.dproj"/>
+    </Target>
+    <Target Name="SplitterD:Clean">
+        <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterD.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="SplitterD:Make">
+        <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterD.dproj" Targets="Make"/>
+    </Target>
     <Target Name="Build">
-        <CallTarget Targets="Actorms3dD;ArchipelagoD;ChristmasD;EarthD;ForestD;GLSViewerD;IntensityMeshD;PanoViewerD;QuakeActorD;TexCombineD"/>
+        <CallTarget Targets="Actorms3dD;ArchipelagoD;ChristmasD;EarthD;ForestD;GLSViewerD;IntensityMeshD;PanoViewerD;QuakeActorD;TexCombineD;SplitterD"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="Actorms3dD:Clean;ArchipelagoD:Clean;ChristmasD:Clean;EarthD:Clean;ForestD:Clean;GLSViewerD:Clean;IntensityMeshD:Clean;PanoViewerD:Clean;QuakeActorD:Clean;TexCombineD:Clean"/>
+        <CallTarget Targets="Actorms3dD:Clean;ArchipelagoD:Clean;ChristmasD:Clean;EarthD:Clean;ForestD:Clean;GLSViewerD:Clean;IntensityMeshD:Clean;PanoViewerD:Clean;QuakeActorD:Clean;TexCombineD:Clean;SplitterD:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="Actorms3dD:Make;ArchipelagoD:Make;ChristmasD:Make;EarthD:Make;ForestD:Make;GLSViewerD:Make;IntensityMeshD:Make;PanoViewerD:Make;QuakeActorD:Make;TexCombineD:Make"/>
+        <CallTarget Targets="Actorms3dD:Make;ArchipelagoD:Make;ChristmasD:Make;EarthD:Make;ForestD:Make;GLSViewerD:Make;IntensityMeshD:Make;PanoViewerD:Make;QuakeActorD:Make;TexCombineD:Make;SplitterD:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Examples/AdvDemos/Archipelago/fArchipelagoD.dfm

@@ -1,35 +1,26 @@
 object Form1: TForm1
   Left = 155
   Top = 126
-  Margins.Left = 5
-  Margins.Top = 5
-  Margins.Right = 5
-  Margins.Bottom = 5
   Align = alClient
   BorderStyle = bsNone
   Caption = 'Form1'
-  ClientHeight = 700
-  ClientWidth = 1055
+  ClientHeight = 400
+  ClientWidth = 603
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -19
+  Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   OnCreate = FormCreate
   OnKeyPress = FormKeyPress
   OnShow = FormShow
-  PixelsPerInch = 168
-  TextHeight = 24
+  TextHeight = 13
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 1055
-    Height = 700
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Width = 603
+    Height = 400
     Camera = Camera
     BeforeRender = GLSceneViewerBeforeRender
     Buffer.FogEnvironment.FogColor.Color = {0000803F0000803F0000803F0000803F}
@@ -39,49 +30,34 @@ object Form1: TForm1
     Buffer.BackgroundColor = clGray
     Buffer.ContextOptions = [roDoubleBuffer, roStencilBuffer, roRenderToWindow]
     Buffer.FogEnable = True
-    FieldOfView = 155.810485839843800000
+    FieldOfView = 138.887908935546900000
     PenAsTouch = False
     Align = alClient
     TabOrder = 0
   end
   object PAProgress: TPanel
-    Left = 350
-    Top = 294
-    Width = 324
-    Height = 86
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Left = 200
+    Top = 168
+    Width = 185
+    Height = 49
     BorderWidth = 6
     TabOrder = 1
     Visible = False
     object Label1: TLabel
-      Left = 7
-      Top = 7
-      Width = 310
-      Height = 35
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
+      Left = 4
+      Top = 4
+      Width = 177
+      Height = 20
       Align = alTop
       Alignment = taCenter
       AutoSize = False
       Caption = 'Loading && compressing textures'
-      ExplicitLeft = 12
-      ExplicitTop = 12
-      ExplicitWidth = 300
     end
     object ProgressBar: TProgressBar
-      Left = 7
-      Top = 42
-      Width = 310
-      Height = 37
-      Margins.Left = 5
-      Margins.Top = 5
-      Margins.Right = 5
-      Margins.Bottom = 5
+      Left = 4
+      Top = 24
+      Width = 177
+      Height = 21
       Align = alClient
       Max = 16
       TabOrder = 0

Examples/AdvDemos/Archipelago/fArchipelagoD.pas

@@ -17,17 +17,18 @@ uses
   Vcl.Dialogs,
   Vcl.Imaging.Jpeg,
 
-  GLS.Coordinates,
-  GLS.BaseClasses,
-  GLS.VectorLists,
+  Stage.OpenGLTokens,
   Stage.VectorTypes,
   Stage.VectorGeometry,
-  GLS.XCollection,
   Stage.TextureFormat,
   Stage.Keyboard,
   Stage.Utils,
 
   GLS.Scene,
+  GLS.Coordinates,
+  GLS.BaseClasses,
+  GLS.VectorLists,
+  GLS.XCollection,
   GLS.Cadencer,
   GLS.Objects,
   GLS.TerrainRenderer,

Examples/AdvDemos/GLSViewer/GLSViewerD.ini

@@ -1,4 +1,4 @@
 [FormOptions]
 CheckBoxAxis=1
-rgLanguage=25
+rgLanguage=9
 PanelBackground=0

Examples/AdvDemos/GLSViewer/Source/fGLAbout.dfm

@@ -2416,7 +2416,7 @@ inherited GLAbout: TGLAbout
       Width = 144
       Height = 17
       BevelOuter = bvNone
-      Caption = ' '#169'  2002, 2024'
+      Caption = ' '#169'  2002, 2025'
       TabOrder = 0
     end
   end

GLSEngine.groupproj

@@ -33,12 +33,6 @@
         <Projects Include="Packages\GLScene_GPU_DT.dproj">
             <Dependencies>Packages\GLScene_GPU_RT.dproj;Packages\GLScene_DT.dproj</Dependencies>
         </Projects>
-        <Projects Include="Packages\GLScene_SDL_RT.dproj">
-            <Dependencies/>
-        </Projects>
-        <Projects Include="Packages\GLScene_SDL_DT.dproj">
-            <Dependencies/>
-        </Projects>
     </ItemGroup>
     <ProjectExtensions>
         <Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -137,32 +131,14 @@
     <Target Name="GLScene_GPU_DT:Make" DependsOnTargets="GLScene_GPU_RT:Make;GLScene_DT:Make">
         <MSBuild Projects="Packages\GLScene_GPU_DT.dproj" Targets="Make"/>
     </Target>
-    <Target Name="GLScene_SDL_RT">
-        <MSBuild Projects="Packages\GLScene_SDL_RT.dproj"/>
-    </Target>
-    <Target Name="GLScene_SDL_RT:Clean">
-        <MSBuild Projects="Packages\GLScene_SDL_RT.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="GLScene_SDL_RT:Make">
-        <MSBuild Projects="Packages\GLScene_SDL_RT.dproj" Targets="Make"/>
-    </Target>
-    <Target Name="GLScene_SDL_DT">
-        <MSBuild Projects="Packages\GLScene_SDL_DT.dproj"/>
-    </Target>
-    <Target Name="GLScene_SDL_DT:Clean">
-        <MSBuild Projects="Packages\GLScene_SDL_DT.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="GLScene_SDL_DT:Make">
-        <MSBuild Projects="Packages\GLScene_SDL_DT.dproj" Targets="Make"/>
-    </Target>
     <Target Name="Build">
-        <CallTarget Targets="GLScene_RT;GLScene_DT;GLScene_Sounds_RT;GLScene_Sounds_DT;GLScene_Physics_RT;GLScene_Physics_DT;GLScene_Cg_RT;GLScene_Cg_DT;GLScene_GPU_RT;GLScene_GPU_DT;GLScene_SDL_RT;GLScene_SDL_DT"/>
+        <CallTarget Targets="GLScene_RT;GLScene_DT;GLScene_Sounds_RT;GLScene_Sounds_DT;GLScene_Physics_RT;GLScene_Physics_DT;GLScene_Cg_RT;GLScene_Cg_DT;GLScene_GPU_RT;GLScene_GPU_DT"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="GLScene_RT:Clean;GLScene_DT:Clean;GLScene_Sounds_RT:Clean;GLScene_Sounds_DT:Clean;GLScene_Physics_RT:Clean;GLScene_Physics_DT:Clean;GLScene_Cg_RT:Clean;GLScene_Cg_DT:Clean;GLScene_GPU_RT:Clean;GLScene_GPU_DT:Clean;GLScene_SDL_RT:Clean;GLScene_SDL_DT:Clean"/>
+        <CallTarget Targets="GLScene_RT:Clean;GLScene_DT:Clean;GLScene_Sounds_RT:Clean;GLScene_Sounds_DT:Clean;GLScene_Physics_RT:Clean;GLScene_Physics_DT:Clean;GLScene_Cg_RT:Clean;GLScene_Cg_DT:Clean;GLScene_GPU_RT:Clean;GLScene_GPU_DT:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="GLScene_RT:Make;GLScene_DT:Make;GLScene_Sounds_RT:Make;GLScene_Sounds_DT:Make;GLScene_Physics_RT:Make;GLScene_Physics_DT:Make;GLScene_Cg_RT:Make;GLScene_Cg_DT:Make;GLScene_GPU_RT:Make;GLScene_GPU_DT:Make;GLScene_SDL_RT:Make;GLScene_SDL_DT:Make"/>
+        <CallTarget Targets="GLScene_RT:Make;GLScene_DT:Make;GLScene_Sounds_RT:Make;GLScene_Sounds_DT:Make;GLScene_Physics_RT:Make;GLScene_Physics_DT:Make;GLScene_Cg_RT:Make;GLScene_Cg_DT:Make;GLScene_GPU_RT:Make;GLScene_GPU_DT:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Help/GLXEngineTeam.txt → Help/Contributors.txt

@@ -1,5 +1,5 @@
-GLXEngine Team
-Developers and Contributors
+Contributors and Developers 
+of GLScene & GXScene
 
 ===========================
  

Packages/GLScene_Cg_RT.dpk

@@ -39,8 +39,8 @@ contains
   GLS.CgShader in '..\Source\GLS.CgShader.pas',
   GLS.CgBombShader in '..\Source\GLS.CgBombShader.pas',
   GLS.CgPostTransformationShader in '..\Source\GLS.CgPostTransformationShader.pas',
-  Cg.GL in '..\Source\Cg.GL.pas',
-  Cg.Import in '..\Source\Cg.Import.pas';
+  Cg.GL in '..\Src\Cg.GL.pas',
+  Cg.Import in '..\Src\Cg.Import.pas';
 
 end.
 

Packages/GLScene_Cg_RT.dproj

@@ -150,8 +150,8 @@
         <DCCReference Include="..\Source\GLS.CgShader.pas"/>
         <DCCReference Include="..\Source\GLS.CgBombShader.pas"/>
         <DCCReference Include="..\Source\GLS.CgPostTransformationShader.pas"/>
-        <DCCReference Include="..\Source\Cg.GL.pas"/>
-        <DCCReference Include="..\Source\Cg.Import.pas"/>
+        <DCCReference Include="..\Src\Cg.GL.pas"/>
+        <DCCReference Include="..\Src\Cg.Import.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -190,6 +190,12 @@
             <Deployment Version="5">
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\20.0\Bpl\GLScene_Cg_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_Cg_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_Cg_RT.bpl" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>GLScene_Cg_RT.bpl</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="OSX32">
                         <Operation>1</Operation>

Packages/GLScene_GPU_RT.dpk

@@ -43,13 +43,16 @@ contains
   GLS.CUDA.Graphics in '..\Source\GLS.CUDA.Graphics.pas',
   GLS.FilePGM in '..\Source\GLS.FilePGM.pas',
   GLS.CUDA.APIComps in '..\Source\GLS.CUDA.APIComps.pas',
-  CUDA.DataAccess in '..\Source\CUDA.DataAccess.pas',
-  CUDA.FourierTransform in '..\Source\CUDA.FourierTransform.pas',
-  CUDA.Import in '..\Source\CUDA.Import.pas',
-  CUDA.ParallelPrimitives in '..\Source\CUDA.ParallelPrimitives.pas',
-  CUDA.Parser in '..\Source\CUDA.Parser.pas',
-  CUDA.Runtime in '..\Source\CUDA.Runtime.pas',
-  CUDA.Utility in '..\Source\CUDA.Utility.pas';
+  OpenCL.GL in '..\Src\OpenCL.GL.pas',
+  OpenCL.Import in '..\Src\OpenCL.Import.pas',
+  OpenCL.Platform in '..\Src\OpenCL.Platform.pas',
+  CUDA.DataAccess in '..\Src\CUDA.DataAccess.pas',
+  CUDA.FourierTransform in '..\Src\CUDA.FourierTransform.pas',
+  CUDA.Import in '..\Src\CUDA.Import.pas',
+  CUDA.ParallelPrimitives in '..\Src\CUDA.ParallelPrimitives.pas',
+  CUDA.Parser in '..\Src\CUDA.Parser.pas',
+  CUDA.Runtime in '..\Src\CUDA.Runtime.pas',
+  CUDA.Utility in '..\Src\CUDA.Utility.pas';
 
 end.
 

Packages/GLScene_GPU_RT.dproj

@@ -151,13 +151,16 @@
         <DCCReference Include="..\Source\GLS.CUDA.Graphics.pas"/>
         <DCCReference Include="..\Source\GLS.FilePGM.pas"/>
         <DCCReference Include="..\Source\GLS.CUDA.APIComps.pas"/>
-        <DCCReference Include="..\Source\CUDA.DataAccess.pas"/>
-        <DCCReference Include="..\Source\CUDA.FourierTransform.pas"/>
-        <DCCReference Include="..\Source\CUDA.Import.pas"/>
-        <DCCReference Include="..\Source\CUDA.ParallelPrimitives.pas"/>
-        <DCCReference Include="..\Source\CUDA.Parser.pas"/>
-        <DCCReference Include="..\Source\CUDA.Runtime.pas"/>
-        <DCCReference Include="..\Source\CUDA.Utility.pas"/>
+        <DCCReference Include="..\Src\OpenCL.GL.pas"/>
+        <DCCReference Include="..\Src\OpenCL.Import.pas"/>
+        <DCCReference Include="..\Src\OpenCL.Platform.pas"/>
+        <DCCReference Include="..\Src\CUDA.DataAccess.pas"/>
+        <DCCReference Include="..\Src\CUDA.FourierTransform.pas"/>
+        <DCCReference Include="..\Src\CUDA.Import.pas"/>
+        <DCCReference Include="..\Src\CUDA.ParallelPrimitives.pas"/>
+        <DCCReference Include="..\Src\CUDA.Parser.pas"/>
+        <DCCReference Include="..\Src\CUDA.Runtime.pas"/>
+        <DCCReference Include="..\Src\CUDA.Utility.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -197,6 +200,12 @@
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\20.0\Bpl\GLScene_GPU_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\Win64\GLScene_GPU_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_GPU_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_GPU_RT.bpl" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>GLScene_GPU_RT.bpl</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="OSX32">
                         <Operation>1</Operation>

Packages/GLScene_Physics_RT.dpk

@@ -46,10 +46,11 @@ contains
   GLS.PhysInertias in '..\Source\GLS.PhysInertias.pas',
   GLS.PhysJoints in '..\Source\GLS.PhysJoints.pas',
   GLS.PhysManager in '..\Source\GLS.PhysManager.pas',
-  ModuleLoader in '..\Source\ModuleLoader.pas',
-  Newton.Import in '..\Source\Newton.Import.pas',
-  NGD.Import in '..\Source\NGD.Import.pas',
-  ODE.Import in '..\Source\ODE.Import.pas';
+  ModuleLoader in '..\Src\ModuleLoader.pas',
+  Newton.Import in '..\Src\Newton.Import.pas',
+  NGD.Import in '..\Src\NGD.Import.pas',
+  ODE.Import in '..\Src\ODE.Import.pas',
+  PhysX.Import in '..\Src\PhysX.Import.pas';
 
 end.
 

Packages/GLScene_Physics_RT.dproj

@@ -195,10 +195,11 @@
         <DCCReference Include="..\Source\GLS.PhysInertias.pas"/>
         <DCCReference Include="..\Source\GLS.PhysJoints.pas"/>
         <DCCReference Include="..\Source\GLS.PhysManager.pas"/>
-        <DCCReference Include="..\Source\ModuleLoader.pas"/>
-        <DCCReference Include="..\Source\Newton.Import.pas"/>
-        <DCCReference Include="..\Source\NGD.Import.pas"/>
-        <DCCReference Include="..\Source\ODE.Import.pas"/>
+        <DCCReference Include="..\Src\ModuleLoader.pas"/>
+        <DCCReference Include="..\Src\Newton.Import.pas"/>
+        <DCCReference Include="..\Src\NGD.Import.pas"/>
+        <DCCReference Include="..\Src\ODE.Import.pas"/>
+        <DCCReference Include="..\Src\PhysX.Import.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -237,6 +238,12 @@
             <Deployment Version="5">
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GLScene_Physics_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_Physics_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_Physics_RT.bpl" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>GLScene_Physics_RT.bpl</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="OSX32">
                         <Operation>1</Operation>

Packages/GLScene_SDL_RT.dpk

@@ -36,7 +36,7 @@ requires
 
 contains
   GLS.SDL.Window in '..\Source\GLS.SDL.Window.pas',
-  SDL.Import in '..\Source\SDL.Import.pas';
+  SDL.Import in '..\Src\SDL.Import.pas';
 
 end.
 

Packages/GLScene_SDL_RT.dproj

@@ -151,7 +151,7 @@
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
         <DCCReference Include="..\Source\GLS.SDL.Window.pas"/>
-        <DCCReference Include="..\Source\SDL.Import.pas"/>
+        <DCCReference Include="..\Src\SDL.Import.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -191,6 +191,12 @@
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GLScene_SDL_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\Win64\GLScene_SDL_rt.bpl" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_SDL_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_SDL_RT.bpl" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>GLScene_SDL_RT.bpl</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="OSX32">
                         <Operation>1</Operation>

Packages/GLScene_Sounds_RT.dpk

@@ -35,16 +35,16 @@ requires
   GLScene_RT;
 
 contains
-  FMOD.Import in '..\Source\FMOD.Import.pas',
-  FMOD.presets in '..\Source\FMOD.presets.pas',
-  FMOD.types in '..\Source\FMOD.types.pas',
-  FMOD.errors in '..\Source\FMOD.errors.pas',
-  BASS.Import in '..\Source\BASS.Import.pas',
-  OpenAL.Import in '..\Source\OpenAL.Import.pas',
+  BASS.Import in '..\Src\BASS.Import.pas',
   GLS.Sounds.FMOD in '..\Source\GLS.Sounds.FMOD.pas',
   GLS.Sounds.BASS in '..\Source\GLS.Sounds.BASS.pas',
   GLS.Sounds.OpenAL in '..\Source\GLS.Sounds.OpenAL.pas',
-  GLS.Sounds.WaveOut in '..\Source\GLS.Sounds.WaveOut.pas';
+  GLS.Sounds.WaveOut in '..\Source\GLS.Sounds.WaveOut.pas',
+  FMOD.errors in '..\Src\FMOD.errors.pas',
+  FMOD.Import in '..\Src\FMOD.Import.pas',
+  FMOD.presets in '..\Src\FMOD.presets.pas',
+  FMOD.types in '..\Src\FMOD.types.pas',
+  OpenAL.Import in '..\Src\OpenAL.Import.pas';
 
 end.
 

Packages/GLScene_Sounds_RT.dproj

@@ -181,16 +181,16 @@
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="..\Source\FMOD.Import.pas"/>
-        <DCCReference Include="..\Source\FMOD.presets.pas"/>
-        <DCCReference Include="..\Source\FMOD.types.pas"/>
-        <DCCReference Include="..\Source\FMOD.errors.pas"/>
-        <DCCReference Include="..\Source\BASS.Import.pas"/>
-        <DCCReference Include="..\Source\OpenAL.Import.pas"/>
+        <DCCReference Include="..\Src\BASS.Import.pas"/>
         <DCCReference Include="..\Source\GLS.Sounds.FMOD.pas"/>
         <DCCReference Include="..\Source\GLS.Sounds.BASS.pas"/>
         <DCCReference Include="..\Source\GLS.Sounds.OpenAL.pas"/>
         <DCCReference Include="..\Source\GLS.Sounds.WaveOut.pas"/>
+        <DCCReference Include="..\Src\FMOD.errors.pas"/>
+        <DCCReference Include="..\Src\FMOD.Import.pas"/>
+        <DCCReference Include="..\Src\FMOD.presets.pas"/>
+        <DCCReference Include="..\Src\FMOD.types.pas"/>
+        <DCCReference Include="..\Src\OpenAL.Import.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -228,6 +228,12 @@
             </Platforms>
             <Deployment Version="5">
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GLScene_Sounds_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_Sounds_RT.bpl" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>GLScene_Sounds_RT.bpl</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="OSX32">
                         <Operation>1</Operation>

Packages/GXScene_Cg_RT.dpk

@@ -36,7 +36,7 @@ contains
   GXS.CgShader in '..\Sourcex\GXS.CgShader.pas',
   GXS.CgBombShader in '..\Sourcex\GXS.CgBombShader.pas',
   GXS.CgPostTransformationShader in '..\Sourcex\GXS.CgPostTransformationShader.pas',
-  Cg.GL in '..\Source\Cg.GL.pas',
-  Cg.Import in '..\Source\Cg.Import.pas';
+  Cg.GL in '..\Src\Cg.GL.pas',
+  Cg.Import in '..\Src\Cg.Import.pas';
 
 end.

Packages/GXScene_Cg_RT.dproj

@@ -189,8 +189,8 @@
         <DCCReference Include="..\Sourcex\GXS.CgShader.pas"/>
         <DCCReference Include="..\Sourcex\GXS.CgBombShader.pas"/>
         <DCCReference Include="..\Sourcex\GXS.CgPostTransformationShader.pas"/>
-        <DCCReference Include="..\Source\Cg.GL.pas"/>
-        <DCCReference Include="..\Source\Cg.Import.pas"/>
+        <DCCReference Include="..\Src\Cg.GL.pas"/>
+        <DCCReference Include="..\Src\Cg.Import.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Packages/GXScene_GPU_RT.dpk

@@ -40,15 +40,15 @@ contains
   GXS.CUDA.Context in '..\Sourcex\GXS.CUDA.Context.pas',
   GXS.CUDA.FFTPlan in '..\Sourcex\GXS.CUDA.FFTPlan.pas',
   GXS.CUDA.Graphics in '..\Sourcex\GXS.CUDA.Graphics.pas',
-  CUDA.Import in '..\Source\CUDA.Import.pas',
-  CUDA.DataAccess in '..\Source\CUDA.DataAccess.pas',
-  CUDA.FourierTransform in '..\Source\CUDA.FourierTransform.pas',
-  CUDA.ParallelPrimitives in '..\Source\CUDA.ParallelPrimitives.pas',
-  CUDA.Parser in '..\Source\CUDA.Parser.pas',
-  CUDA.Runtime in '..\Source\CUDA.Runtime.pas',
-  CUDA.Utility in '..\Source\CUDA.Utility.pas',
-  OpenCL.GL in '..\Source\OpenCL.GL.pas',
-  OpenCL.Import in '..\Source\OpenCL.Import.pas',
-  OpenCL.Platform in '..\Source\OpenCL.Platform.pas';
+  OpenCL.GL in '..\Src\OpenCL.GL.pas',
+  OpenCL.Import in '..\Src\OpenCL.Import.pas',
+  OpenCL.Platform in '..\Src\OpenCL.Platform.pas',
+  CUDA.DataAccess in '..\Src\CUDA.DataAccess.pas',
+  CUDA.FourierTransform in '..\Src\CUDA.FourierTransform.pas',
+  CUDA.Import in '..\Src\CUDA.Import.pas',
+  CUDA.ParallelPrimitives in '..\Src\CUDA.ParallelPrimitives.pas',
+  CUDA.Parser in '..\Src\CUDA.Parser.pas',
+  CUDA.Runtime in '..\Src\CUDA.Runtime.pas',
+  CUDA.Utility in '..\Src\CUDA.Utility.pas';
 
 end.

Packages/GXScene_GPU_RT.dproj

@@ -210,16 +210,16 @@
         <DCCReference Include="..\Sourcex\GXS.CUDA.Context.pas"/>
         <DCCReference Include="..\Sourcex\GXS.CUDA.FFTPlan.pas"/>
         <DCCReference Include="..\Sourcex\GXS.CUDA.Graphics.pas"/>
-        <DCCReference Include="..\Source\CUDA.Import.pas"/>
-        <DCCReference Include="..\Source\CUDA.DataAccess.pas"/>
-        <DCCReference Include="..\Source\CUDA.FourierTransform.pas"/>
-        <DCCReference Include="..\Source\CUDA.ParallelPrimitives.pas"/>
-        <DCCReference Include="..\Source\CUDA.Parser.pas"/>
-        <DCCReference Include="..\Source\CUDA.Runtime.pas"/>
-        <DCCReference Include="..\Source\CUDA.Utility.pas"/>
-        <DCCReference Include="..\Source\OpenCL.GL.pas"/>
-        <DCCReference Include="..\Source\OpenCL.Import.pas"/>
-        <DCCReference Include="..\Source\OpenCL.Platform.pas"/>
+        <DCCReference Include="..\Src\OpenCL.GL.pas"/>
+        <DCCReference Include="..\Src\OpenCL.Import.pas"/>
+        <DCCReference Include="..\Src\OpenCL.Platform.pas"/>
+        <DCCReference Include="..\Src\CUDA.DataAccess.pas"/>
+        <DCCReference Include="..\Src\CUDA.FourierTransform.pas"/>
+        <DCCReference Include="..\Src\CUDA.Import.pas"/>
+        <DCCReference Include="..\Src\CUDA.ParallelPrimitives.pas"/>
+        <DCCReference Include="..\Src\CUDA.Parser.pas"/>
+        <DCCReference Include="..\Src\CUDA.Runtime.pas"/>
+        <DCCReference Include="..\Src\CUDA.Utility.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Packages/GXScene_Physics_RT.dpk

@@ -49,10 +49,10 @@ contains
   GXS.PhysInertias in '..\Sourcex\GXS.PhysInertias.pas',
   GXS.PhysJoints in '..\Sourcex\GXS.PhysJoints.pas',
   GXS.PhysManager in '..\Sourcex\GXS.PhysManager.pas',
-  NGD.Import in '..\Source\NGD.Import.pas',
-  Newton.Import in '..\Source\Newton.Import.pas',
-  ODE.Import in '..\Source\ODE.Import.pas',
-  PhysX.Import in '..\Source\PhysX.Import.pas';
+  ModuleLoader in '..\Src\ModuleLoader.pas',
+  Newton.Import in '..\Src\Newton.Import.pas',
+  NGD.Import in '..\Src\NGD.Import.pas',
+  ODE.Import in '..\Src\ODE.Import.pas';
 
 end.
 

Packages/GXScene_Physics_RT.dproj

@@ -204,10 +204,10 @@
         <DCCReference Include="..\Sourcex\GXS.PhysInertias.pas"/>
         <DCCReference Include="..\Sourcex\GXS.PhysJoints.pas"/>
         <DCCReference Include="..\Sourcex\GXS.PhysManager.pas"/>
-        <DCCReference Include="..\Source\NGD.Import.pas"/>
-        <DCCReference Include="..\Source\Newton.Import.pas"/>
-        <DCCReference Include="..\Source\ODE.Import.pas"/>
-        <DCCReference Include="..\Source\PhysX.Import.pas"/>
+        <DCCReference Include="..\Src\ModuleLoader.pas"/>
+        <DCCReference Include="..\Src\Newton.Import.pas"/>
+        <DCCReference Include="..\Src\NGD.Import.pas"/>
+        <DCCReference Include="..\Src\ODE.Import.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -246,6 +246,12 @@
             <Deployment Version="5">
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\20.0\Bpl\GXScene_Physics_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\Win64\GXScene_Physics_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GXScene_Physics_RT.bpl" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>GXScene_Physics_RT.bpl</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\Win64\GXScene_Physics_RT.bpl" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="OSX32">

Packages/GXScene_Sounds_RT.dpk

@@ -37,11 +37,11 @@ contains
   GXS.Sounds.BASS in '..\Sourcex\GXS.Sounds.BASS.pas',
   GXS.Sounds.OpenAL in '..\Sourcex\GXS.Sounds.OpenAL.pas',
   GXS.Sounds.WaveOut in '..\Sourcex\GXS.Sounds.WaveOut.pas',
-  OpenAL.Import in '..\Unipas\OpenAL.Import.pas',
-  FMOD.errors in '..\Unipas\FMOD.errors.pas',
-  FMOD.Import in '..\Unipas\FMOD.Import.pas',
-  FMOD.presets in '..\Unipas\FMOD.presets.pas',
-  FMOD.types in '..\Unipas\FMOD.types.pas',
-  BASS.Import in '..\Source\BASS.Import.pas';
+  BASS.Import in '..\Src\BASS.Import.pas',
+  FMOD.errors in '..\Src\FMOD.errors.pas',
+  FMOD.Import in '..\Src\FMOD.Import.pas',
+  FMOD.presets in '..\Src\FMOD.presets.pas',
+  FMOD.types in '..\Src\FMOD.types.pas',
+  OpenAL.Import in '..\Src\OpenAL.Import.pas';
 
 end.

Packages/GXScene_Sounds_RT.dproj

@@ -212,12 +212,12 @@
         <DCCReference Include="..\Sourcex\GXS.Sounds.BASS.pas"/>
         <DCCReference Include="..\Sourcex\GXS.Sounds.OpenAL.pas"/>
         <DCCReference Include="..\Sourcex\GXS.Sounds.WaveOut.pas"/>
-        <DCCReference Include="..\Unipas\OpenAL.Import.pas"/>
-        <DCCReference Include="..\Unipas\FMOD.errors.pas"/>
-        <DCCReference Include="..\Unipas\FMOD.Import.pas"/>
-        <DCCReference Include="..\Unipas\FMOD.presets.pas"/>
-        <DCCReference Include="..\Unipas\FMOD.types.pas"/>
-        <DCCReference Include="..\Source\BASS.Import.pas"/>
+        <DCCReference Include="..\Src\BASS.Import.pas"/>
+        <DCCReference Include="..\Src\FMOD.errors.pas"/>
+        <DCCReference Include="..\Src\FMOD.Import.pas"/>
+        <DCCReference Include="..\Src\FMOD.presets.pas"/>
+        <DCCReference Include="..\Src\FMOD.types.pas"/>
+        <DCCReference Include="..\Src\OpenAL.Import.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Source/GLS.CUDA.APIComps.pas

@@ -14,16 +14,16 @@ uses
   System.Classes,
   System.SysUtils,
 
-  GLS.PersistentClasses,
-  GLS.BaseClasses,
-  GLS.Context,
   Stage.VectorGeometry,
   Stage.VectorTypes,
-  GLS.VectorLists,
-  GLS.Graphics,
   Stage.Strings,
   Stage.Utils,
 
+  GLS.PersistentClasses,
+  GLS.BaseClasses,
+  GLS.Context,
+  GLS.VectorLists,
+  GLS.Graphics,
   GLS.CUDA.Compiler,
   GLS.CUDA.Context,
   CUDA.Import,

Source/GLS.Sounds.Register.pas

@@ -17,9 +17,7 @@ uses
 
 procedure Register;
 
-// ------------------------------------------------------------------
-implementation
-// ------------------------------------------------------------------
+implementation // ----------------------------------------------------------
 
 procedure Register;
 begin