Updated gls & gxs

Examples/Demos/behaviours/DCEDemo/DceDemoD.dproj

@@ -9,6 +9,7 @@
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>20.1</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectName Condition="'$(ProjectName)'==''">DceDemoD</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -68,6 +69,7 @@
         <DCC_E>false</DCC_E>
         <SanitizedProjectName>DceDemoD</SanitizedProjectName>
         <DCC_F>false</DCC_F>
+        <DCC_Define>SKIA;$(DCC_Define)</DCC_Define>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
@@ -181,6 +183,70 @@
                 <Platform value="Win64">True</Platform>
             </Platforms>
             <Deployment Version="4">
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin64\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin64\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win32\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win32\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win64\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win64\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName="Win32\Debug\DceDemoD.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="iOSSimulator">
@@ -836,6 +902,9 @@
                     <Platform Name="Win64">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="Win64x">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -1129,6 +1198,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/behaviours/DCEDemo/fDceDemoD.dfm

@@ -1,35 +1,46 @@
 object FormDCE: TFormDCE
   Left = 192
   Top = 114
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'GLScene Dynamic Collision Engine'
-  ClientHeight = 631
-  ClientWidth = 898
+  ClientHeight = 1104
+  ClientWidth = 1572
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   KeyPreview = True
   Position = poScreenCenter
   OnKeyDown = FormKeyDown
   OnShow = FormShow
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 24
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 898
-    Height = 631
+    Width = 1572
+    Height = 1104
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.FogEnvironment.FogStart = 50.000000000000000000
     Buffer.FogEnvironment.FogEnd = 250.000000000000000000
     Buffer.BackgroundColor = clBlack
     Buffer.FogEnable = True
-    FieldOfView = 161.989471435546900000
+    FieldOfView = 169.648574829101600000
     PenAsTouch = False
     Align = alClient
     OnMouseMove = GLSceneViewer1MouseMove
     TabOrder = 0
+    ExplicitLeft = -10
+    ExplicitTop = 10
   end
   object GLScene1: TGLScene
     Left = 24

Examples/Demos/physics/NewtonDensity/NewtonDensityC.cbproj

@@ -94,6 +94,7 @@
         <BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
         <UWP_CppLogo44>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_44.png</UWP_CppLogo44>
         <UWP_CppLogo150>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_150.png</UWP_CppLogo150>
+        <BCC_Defines>SKIA;$(BCC_Defines)</BCC_Defines>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
@@ -285,6 +286,38 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin64\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin64\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win64x">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin64\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin64\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win64x">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile Condition="'$(UsingDelphiRTL)'=='true'" LocalName="$(BDS)\bin\borlndmm.dll" Class="DependencyModule">
                     <Platform Name="Win32">
                         <Overwrite>true</Overwrite>
@@ -322,6 +355,70 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'==''" Required="true" LocalName="$(BDS)\bin\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win32\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win32\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win32">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win64\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win64\sk4d.dll" Configuration="Debug" Class="Skia">
+                    <Platform Name="Win64x">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win64\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win64">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile Condition="'$(SKIADIR)'!=''" Required="true" LocalName="$(SKIADIR)\Binary\Shared\Win64\sk4d.dll" Configuration="Release" Class="Skia">
+                    <Platform Name="Win64x">
+                        <RemoteDir>.\</RemoteDir>
+                        <Operation>0</Operation>
+                        <RemoteName>sk4d.dll</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName=".\Win32\Debug\NewtonDensityC.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName=".\Win32\Debug\NewtonDensityC.tds" Configuration="Debug" Class="DebugSymbols"/>
                 <DeployClass Name="AdditionalDebugSymbols">

Examples/Demos/physics/NewtonDensity/fNewtonDensityC.cpp

@@ -15,13 +15,14 @@
 #pragma link "GLS.GeomObjects"
 #pragma link "GLS.HUDObjects"
 #pragma link "NGD.Import"
-#pragma link "Physics.NGDManager"
+#pragma link "GLS.NGDManager"
 #pragma link "GLS.Objects"
 #pragma link "GLS.Scene"
 #pragma link "GLS.SimpleNavigation"
 #pragma link "GLS.SceneViewer"
 
 #pragma link "GLS.BitmapFont"
+#pragma link "GLS.NGDManager"
 #pragma resource "*.dfm"
 TForm1 *Form1;
 

Examples/Demos/physics/NewtonDensity/fNewtonDensityC.dfm

@@ -1,35 +1,48 @@
 object Form1: TForm1
   Left = 0
   Top = 0
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'Newton Density'
-  ClientHeight = 383
-  ClientWidth = 635
+  ClientHeight = 670
+  ClientWidth = 1125
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'Tahoma'
   Font.Style = []
   Position = poScreenCenter
   OnCreate = FormCreate
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 23
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 635
-    Height = 383
+    Width = 1125
+    Height = 670
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
-    FieldOfView = 150.733886718750000000
+    FieldOfView = 163.022109985351600000
     PenAsTouch = False
     Align = alClient
     OnMouseDown = GLSceneViewer1MouseDown
     TabOrder = 0
   end
   object SpinEdit1: TSpinEdit
-    Left = 16
-    Top = 103
-    Width = 75
-    Height = 22
+    Left = 28
+    Top = 180
+    Width = 131
+    Height = 31
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     EditorEnabled = False
     MaxValue = 20
     MinValue = 0
@@ -37,10 +50,14 @@ object Form1: TForm1
     Value = 1
   end
   object SpinEdit2: TSpinEdit
-    Left = 16
-    Top = 159
-    Width = 75
-    Height = 22
+    Left = 28
+    Top = 278
+    Width = 131
+    Height = 31
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     EditorEnabled = False
     MaxValue = 10
     MinValue = 0
@@ -48,10 +65,14 @@ object Form1: TForm1
     Value = 1
   end
   object SpinEdit3: TSpinEdit
-    Left = 16
-    Top = 215
-    Width = 75
-    Height = 22
+    Left = 28
+    Top = 376
+    Width = 131
+    Height = 31
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     EditorEnabled = False
     MaxValue = 10
     MinValue = 0

Examples/Demos/physics/NewtonDensity/fNewtonDensityC.h

@@ -15,12 +15,13 @@
 #include "GLS.GeomObjects.hpp"
 #include "GLS.HUDObjects.hpp"
 #include "NGD.Import.hpp"
-#include "Physics.NGDManager.hpp"
+#include "GLS.NGDManager.hpp"
 #include "GLS.Objects.hpp"
 #include "GLS.Scene.hpp"
 #include "GLS.SimpleNavigation.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "GLS.BitmapFont.hpp";
+#include "GLS.BitmapFont.hpp"
+#include "GLS.NGDManager.hpp";
 
 //---------------------------------------------------------------------------
 class TForm1 : public TForm

Examples/Demos/physics/NewtonDensity/fNewtonDensityD.pas

@@ -16,7 +16,7 @@ uses
   
   GLS.Scene,
   GLS.VectorTypes,
-  Physics.NGDManager,
+  GLS.NGDManager,
   GLS.Objects,
   GLS.PersistentClasses,
   GLS.Coordinates,

Examples/Demos/physics/NewtonJoints/fNewtonJointsD.dfm

@@ -1,26 +1,35 @@
 object FormNewtonJoints: TFormNewtonJoints
   Left = 0
   Top = 0
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'Newton Joints'
-  ClientHeight = 412
-  ClientWidth = 637
+  ClientHeight = 721
+  ClientWidth = 1129
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'Tahoma'
   Font.Style = []
   Position = poScreenCenter
   OnCreate = FormCreate
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 23
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 637
-    Height = 412
+    Width = 1129
+    Height = 721
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.BackgroundColor = clBackground
-    FieldOfView = 152.714172363281300000
+    FieldOfView = 164.207336425781300000
     PenAsTouch = False
     Align = alClient
     OnMouseDown = GLSceneViewer1MouseDown
@@ -32,476 +41,7 @@ object FormNewtonJoints: TFormNewtonJoints
     Top = 16
     object GLLines1: TGLLines
       Pickable = False
-      Nodes = <
-        item
-          Y = -1.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = -4.000000000000000000
-          Y = 3.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = -4.000000000000000000
-          Y = 3.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = -4.000000000000000000
-          Y = 3.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = -4.000000000000000000
-          Y = 6.000000000000000000
-        end
-        item
-          X = -4.000000000000000000
-        end
-        item
-          X = -4.000000000000000000
-          Y = 3.000000000000000000
-          Z = 1.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -4.000000000000000000
-          Y = 3.000000000000000000
-          Z = -1.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -4.000000000000000000
-          Y = 4.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -4.000000000000000000
-          Y = 2.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -3.000000000000000000
-          Y = 3.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -5.000000000000000000
-          Y = 3.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = -1.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = -2.000000000000000000
-          Y = 3.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = -2.000000000000000000
-          Y = 3.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = -2.000000000000000000
-          Y = 3.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = -2.000000000000000000
-          Y = 6.000000000000000000
-        end
-        item
-          X = -2.000000000000000000
-        end
-        item
-          X = -2.000000000000000000
-          Y = 3.000000000000000000
-          Z = 1.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -2.000000000000000000
-          Y = 3.000000000000000000
-          Z = -1.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -2.000000000000000000
-          Y = 4.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -2.000000000000000000
-          Y = 2.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -1.000000000000000000
-          Y = 3.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -3.000000000000000000
-          Y = 3.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = -1.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          Y = 3.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          Y = 3.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          Y = 3.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          Y = 6.000000000000000000
-        end
-        item
-        end
-        item
-          Y = 3.000000000000000000
-          Z = 1.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = 3.000000000000000000
-          Z = -1.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = 4.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = 2.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 1.000000000000000000
-          Y = 3.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -1.000000000000000000
-          Y = 3.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = -1.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = 2.000000000000000000
-          Y = 6.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = 2.000000000000000000
-          Y = 6.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = 2.000000000000000000
-          Y = 6.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = 2.000000000000000000
-          Y = 9.000000000000000000
-        end
-        item
-          X = 2.000000000000000000
-          Y = 3.000000000000000000
-        end
-        item
-          X = 2.000000000000000000
-          Y = 6.000000000000000000
-          Z = 1.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 2.000000000000000000
-          Y = 6.000000000000000000
-          Z = -1.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 2.000000000000000000
-          Y = 7.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 2.000000000000000000
-          Y = 5.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 3.000000000000000000
-          Y = 6.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 1.000000000000000000
-          Y = 6.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = -1.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = 6.000000000000000000
-          Y = 6.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = 6.000000000000000000
-          Y = 6.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = 6.000000000000000000
-          Y = 6.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = 6.000000000000000000
-          Y = 9.000000000000000000
-        end
-        item
-          X = 6.000000000000000000
-          Y = 3.000000000000000000
-        end
-        item
-          X = 6.000000000000000000
-          Y = 6.000000000000000000
-          Z = 1.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 6.000000000000000000
-          Y = 6.000000000000000000
-          Z = -1.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 6.000000000000000000
-          Y = 7.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 6.000000000000000000
-          Y = 5.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 7.000000000000000000
-          Y = 6.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 5.000000000000000000
-          Y = 6.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = -1.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = -5.000000000000000000
-          Y = 1.000000000000000000
-          Z = 7.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = -5.000000000000000000
-          Y = 1.000000000000000000
-          Z = 7.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = -5.000000000000000000
-          Y = 1.000000000000000000
-          Z = 7.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = -3.000000000000000000
-          Y = 3.000000000000000000
-          Z = 7.000000000000000000
-        end
-        item
-          X = -7.000000000000000000
-          Y = -1.000000000000000000
-          Z = 7.000000000000000000
-        end
-        item
-          X = -5.000000000000000000
-          Y = -1.000000000000000000
-          Z = 9.000000000000000000
-        end
-        item
-          X = -5.000000000000000000
-          Y = 3.000000000000000000
-          Z = 5.000000000000000000
-        end
-        item
-          X = -5.000000000000000000
-          Y = 1.000000000000000000
-          Z = 8.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -5.000000000000000000
-          Y = 1.000000000000000000
-          Z = 6.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -5.000000000000000000
-          Y = 2.000000000000000000
-          Z = 7.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -5.000000000000000000
-          Z = 7.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -4.000000000000000000
-          Y = 1.000000000000000000
-          Z = 7.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -6.000000000000000000
-          Y = 1.000000000000000000
-          Z = 7.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = -1.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          Y = 3.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          Y = 3.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          Y = 1.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          Y = 3.000000000000000000
-          Z = 6.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = 3.000000000000000000
-          Z = 4.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = 4.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = 2.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 1.000000000000000000
-          Y = 3.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = -1.000000000000000000
-          Y = 3.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          Y = -1.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = 5.000000000000000000
-          Y = 4.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = 5.000000000000000000
-          Y = 4.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = 5.000000000000000000
-          Y = 2.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {000000000000803F0000803F0000803F}
-        end
-        item
-          X = 5.000000000000000000
-          Y = 4.000000000000000000
-          Z = 6.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 5.000000000000000000
-          Y = 4.000000000000000000
-          Z = 4.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 5.000000000000000000
-          Y = 5.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 5.000000000000000000
-          Y = 3.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 6.000000000000000000
-          Y = 4.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end
-        item
-          X = 4.000000000000000000
-          Y = 4.000000000000000000
-          Z = 5.000000000000000000
-          Color.Color = {EBE0E03EE4DB5B3F9A93133F0000803F}
-        end>
+      Nodes = <>
       NodesAspect = lnaInvisible
       SplineMode = lsmSegments
       Options = [loUseNodeColorForLines]

Examples/Demos/physics/NewtonJoints/fNewtonJointsD.pas

@@ -14,7 +14,7 @@ uses
 
   GLS.Scene,
   GLS.VectorTypes,
-  Physics.NGDManager,
+  GLS.NGDManager,
   GLS.Objects,
   GLS.Coordinates,
   GLS.Cadencer,

Examples/Demos/physics/NewtonMaterial/fNewtonMaterialC.cpp

@@ -10,7 +10,7 @@
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 
-#pragma link "Physics.NGDManager"
+#pragma link "GLS.NGDManager"
 #pragma link "GLS.Objects"
 #pragma link "GLS.Scene"
 #pragma link "GLS.SimpleNavigation"

Examples/Demos/physics/NewtonMaterial/fNewtonMaterialC.dfm

@@ -1,26 +1,35 @@
 object Form1: TForm1
   Left = 0
   Top = 0
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'Newton Material'
-  ClientHeight = 391
-  ClientWidth = 598
+  ClientHeight = 684
+  ClientWidth = 1061
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'Tahoma'
   Font.Style = []
   Position = poScreenCenter
   OnCreate = FormCreate
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 23
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 598
-    Height = 391
+    Width = 1061
+    Height = 684
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.BackgroundColor = clBackground
-    FieldOfView = 151.307739257812500000
+    FieldOfView = 163.364700317382800000
     PenAsTouch = False
     Align = alClient
     TabOrder = 0

Examples/Demos/physics/NewtonMaterial/fNewtonMaterialC.h

@@ -11,7 +11,7 @@
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 
-#include "Physics.NGDManager.hpp"
+#include "GLS.NGDManager.hpp"
 #include "GLS.Objects.hpp"
 #include "GLS.Scene.hpp"
 #include "GLS.SimpleNavigation.hpp"

Examples/Demos/physics/NewtonMaterial/fNewtonMaterialD.pas

@@ -14,12 +14,12 @@ uses
   GLS.SimpleNavigation,
   GLS.Scene,
   GLS.Coordinates,
-  Physics.NGDManager,
+  GLS.NGDManager,
   GLS.BitmapFont,
   GLS.WindowsFont,
   GLS.Cadencer,
   GLS.SceneViewer,
- 
+
   GLS.BaseClasses,
   GLS.Objects;
 
@@ -55,7 +55,7 @@ type
 var
   FormNewtonMaterial: TFormNewtonMaterial;
 
-implementation
+implementation //------------------------------------------------------------
 
 {$R *.dfm}
 

Examples/Demos/physics/NewtonPick/fNewtonMousePickD.pas

@@ -14,7 +14,7 @@ uses
   GLS.Scene,
   GLS.VectorTypes,
   GLS.Objects,
-  Physics.NGDManager,
+  GLS.NGDManager,
   GLS.Coordinates,
   GLS.Cadencer,
   GLS.SceneViewer,

Examples/Demos/physics/NewtonSimple/fNewtonSimpleD.pas

@@ -21,7 +21,7 @@ uses
   GLS.Color,
  
   GLS.BaseClasses,
-  Physics.NGDManager,
+  GLS.NGDManager,
   GLS.GeomObjects,
   GLS.BitmapFont,
   GLS.WindowsFont,

Examples/Demos/physics/NewtonWalkCarry/fNewtonWalkCarryD.pas

@@ -39,7 +39,7 @@ uses
   GLS.HUDObjects,
   GLS.Texture,
   GLS.Utils,
-  Physics.NGDManager;
+  GLS.NGDManager;
 
 type
 

Examples/Demos/physics/NewtonWalkShoot/fNGDWalkShootD.pas

@@ -19,7 +19,7 @@ uses
   GLS.Objects,
   GLS.Coordinates,
   GLS.Cadencer,
-  Physics.NGDManager,
+  GLS.NGDManager,
   GLS.SimpleNavigation,
   GLS.SceneViewer,
  

Examples/Demos/physics/OdeClothify/fOdeClothifyD.pas

@@ -44,7 +44,7 @@ uses
   GLS.BaseClasses,
 
   ODE.Import,
-  Physics.ODEUtils;
+  GLS.ODEUtils;
 
 type
   TFormClothify = class(TForm)

Examples/Demos/physics/OdeConveyor/fOdeConveyorC.cpp

@@ -13,7 +13,7 @@
 #pragma link "GLS.Coordinates"
 
 #pragma link "GLS.Objects"
-#pragma link "Physics.ODEManager"
+#pragma link "GLS.ODEManager"
 #pragma link "GLS.Scene"
 #pragma link "GLS.Utils"
 #pragma link "GLS.SimpleNavigation"

Examples/Demos/physics/OdeConveyor/fOdeConveyorC.h

@@ -15,7 +15,7 @@
 #include "GLS.Coordinates.hpp"
 
 #include "GLS.Objects.hpp"
-#include "Physics.ODEManager.hpp"
+#include "GLS.ODEManager.hpp"
 #include "GLS.Scene.hpp"
 #include "GLS.Utils.hpp"
 #include "GLS.SimpleNavigation.hpp"

Examples/Demos/physics/OdeConveyor/fOdeConveyorD.dfm

@@ -1,26 +1,35 @@
 object FormOdeConveyor: TFormOdeConveyor
   Left = 0
   Top = 0
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'Conveyor'
-  ClientHeight = 391
-  ClientWidth = 584
+  ClientHeight = 684
+  ClientWidth = 1022
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'Tahoma'
   Font.Style = []
   OnCreate = FormCreate
   OnShow = FormShow
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 23
   object GLSceneViewer1: TGLSceneViewer
-    Left = 193
+    Left = 338
     Top = 0
-    Width = 391
-    Height = 391
+    Width = 684
+    Height = 684
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.BackgroundColor = clBackground
-    FieldOfView = 151.307739257812500000
+    FieldOfView = 163.364700317382800000
     PenAsTouch = False
     Align = alClient
     TabOrder = 0
@@ -28,127 +37,196 @@ object FormOdeConveyor: TFormOdeConveyor
   object Panel1: TPanel
     Left = 0
     Top = 0
-    Width = 193
-    Height = 391
+    Width = 338
+    Height = 684
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Align = alLeft
     Caption = ' '
     TabOrder = 1
     object Label1: TLabel
-      Left = 16
-      Top = 54
-      Width = 100
-      Height = 13
+      Left = 28
+      Top = 95
+      Width = 170
+      Height = 23
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Conveyor belt speed'
     end
     object Label2: TLabel
-      Left = 16
-      Top = 118
-      Width = 90
-      Height = 13
+      Left = 28
+      Top = 207
+      Width = 154
+      Height = 23
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Friction Coefficient'
     end
     object FrictionFeedback: TLabel
-      Left = 71
-      Top = 140
-      Width = 8
-      Height = 13
+      Left = 124
+      Top = 245
+      Width = 14
+      Height = 23
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = '='
     end
     object Label3: TLabel
-      Left = 16
-      Top = 174
-      Width = 91
-      Height = 13
+      Left = 28
+      Top = 305
+      Width = 155
+      Height = 23
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Conveyor direction'
     end
     object Label4: TLabel
-      Left = 18
-      Top = 204
-      Width = 6
-      Height = 13
+      Left = 32
+      Top = 357
+      Width = 11
+      Height = 23
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'X'
     end
     object Label5: TLabel
-      Left = 18
-      Top = 231
-      Width = 6
-      Height = 13
+      Left = 32
+      Top = 404
+      Width = 11
+      Height = 23
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Y'
     end
     object Label6: TLabel
-      Left = 18
-      Top = 258
-      Width = 6
-      Height = 13
+      Left = 32
+      Top = 452
+      Width = 11
+      Height = 23
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Z'
     end
     object NormZ: TLabel
-      Left = 85
-      Top = 259
-      Width = 6
-      Height = 13
+      Left = 149
+      Top = 453
+      Width = 11
+      Height = 23
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Z'
     end
     object NormY: TLabel
-      Left = 85
-      Top = 232
-      Width = 6
-      Height = 13
+      Left = 149
+      Top = 406
+      Width = 11
+      Height = 23
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Y'
     end
     object NormX: TLabel
-      Left = 85
-      Top = 205
-      Width = 6
-      Height = 13
+      Left = 149
+      Top = 359
+      Width = 11
+      Height = 23
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'X'
     end
     object TrackBarMotionSpeed: TTrackBar
-      Left = 8
-      Top = 73
-      Width = 179
-      Height = 45
+      Left = 14
+      Top = 128
+      Width = 313
+      Height = 79
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Max = 20
       TabOrder = 0
+      ThumbLength = 35
       OnChange = TrackBarMotionSpeedChange
     end
     object Friction: TEdit
-      Left = 16
-      Top = 137
-      Width = 49
-      Height = 21
+      Left = 28
+      Top = 240
+      Width = 86
+      Height = 31
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       TabOrder = 1
       OnChange = FrictionChange
     end
     object FDirX: TEdit
-      Left = 30
-      Top = 201
-      Width = 49
-      Height = 21
+      Left = 53
+      Top = 352
+      Width = 85
+      Height = 31
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       TabOrder = 2
       OnChange = FDirChange
     end
     object FDirY: TEdit
-      Left = 30
-      Top = 228
-      Width = 49
-      Height = 21
+      Left = 53
+      Top = 399
+      Width = 85
+      Height = 31
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       TabOrder = 3
       OnChange = FDirChange
     end
     object FDirZ: TEdit
-      Left = 30
-      Top = 255
-      Width = 49
-      Height = 21
+      Left = 53
+      Top = 446
+      Width = 85
+      Height = 31
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       TabOrder = 4
       OnChange = FDirChange
     end
     object AddODECube: TButton
-      Left = 16
-      Top = 8
-      Width = 90
-      Height = 25
+      Left = 28
+      Top = 14
+      Width = 158
+      Height = 44
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Add Cube'
       TabOrder = 5
       OnClick = AddODECubeClick

Examples/Demos/physics/OdeConveyor/fOdeConveyorD.pas

@@ -17,7 +17,7 @@ uses
   Vcl.ExtCtrls,
 
   ODE.Import,
-  Physics.ODEManager,
+  GLS.ODEManager,
   GLS.Scene,
   GLS.VectorTypes,
   GLS.Objects,
@@ -29,7 +29,7 @@ uses
   GLS.VectorGeometry,
   GLS.Keyboard,
   GLS.SimpleNavigation;
-
+ , GLS.ODEManager
 type
   TFormOdeConveyor = class(TForm)
     GLSceneViewer1: TGLSceneViewer;

Examples/Demos/physics/OdeFurball/fOdeFurballC.cpp

@@ -7,7 +7,7 @@
 
 #include "fOdeFurballC.h"
 
-#pragma link "Physics.ODEUtils"
+#pragma link "GLS.ODEManager"
 #pragma link "GLS.Navigator"
 #pragma link "GLS.ShadowPlane"
 #pragma link "GLS.VectorGeometry"
@@ -26,8 +26,7 @@
 
 #pragma link "GLS.BaseClasses"
 #pragma link "GLS.Coordinates"
-#pragma link "GLS.Objects"
-#pragma link "GLS.ShadowPlane"
+
 #pragma resource "*.dfm"
 TForm1 *Form1;
 

Examples/Demos/physics/OdeFurball/fOdeFurballC.dfm

@@ -1,29 +1,38 @@
 object Form1: TForm1
   Left = 0
   Top = 0
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'ODE Fur Ball'
-  ClientHeight = 442
-  ClientWidth = 753
+  ClientHeight = 774
+  ClientWidth = 1318
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'Tahoma'
   Font.Style = []
   OnClose = FormClose
   OnCreate = FormCreate
   OnMouseWheel = FormMouseWheel
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 23
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
-    Top = 57
-    Width = 753
-    Height = 385
+    Top = 100
+    Width = 1318
+    Height = 674
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.BackgroundColor = clSilver
     Buffer.ContextOptions = [roDoubleBuffer, roStencilBuffer, roRenderToWindow]
     Buffer.AntiAliasing = aa4xHQ
-    FieldOfView = 140.033782958984400000
+    FieldOfView = 156.531326293945300000
     PenAsTouch = False
     Align = alClient
     OnMouseMove = GLSceneViewer1MouseMove
@@ -32,42 +41,62 @@ object Form1: TForm1
   object Panel1: TPanel
     Left = 0
     Top = 0
-    Width = 753
-    Height = 57
+    Width = 1318
+    Height = 100
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Align = alTop
     TabOrder = 1
     DesignSize = (
-      753
-      57)
+      1318
+      100)
     object Label1: TLabel
-      Left = 327
-      Top = 10
-      Width = 153
-      Height = 13
+      Left = 572
+      Top = 18
+      Width = 268
+      Height = 23
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = '(Steer with A/D W/S UP/DOWN)'
     end
     object Label_FPS: TLabel
-      Left = 623
-      Top = 9
-      Width = 18
-      Height = 13
+      Left = 1091
+      Top = 16
+      Width = 31
+      Height = 23
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Alignment = taRightJustify
       Anchors = [akLeft, akTop, akRight]
       Caption = 'FPS'
     end
     object CheckBox_LockBall: TCheckBox
-      Left = 8
-      Top = 8
-      Width = 65
-      Height = 17
+      Left = 14
+      Top = 14
+      Width = 114
+      Height = 30
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = '&Lock Ball'
       TabOrder = 0
     end
     object CheckBox_Inertia: TCheckBox
-      Left = 8
-      Top = 24
-      Width = 65
-      Height = 17
+      Left = 14
+      Top = 42
+      Width = 114
+      Height = 30
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Fur &Inertia'
       Checked = True
       State = cbChecked
@@ -75,10 +104,14 @@ object Form1: TForm1
       OnClick = CheckBox_InertiaClick
     end
     object CheckBox_FurGravity: TCheckBox
-      Left = 80
-      Top = 8
-      Width = 81
-      Height = 17
+      Left = 140
+      Top = 14
+      Width = 142
+      Height = 30
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Fur &Gravity'
       Checked = True
       State = cbChecked
@@ -86,10 +119,14 @@ object Form1: TForm1
       OnClick = CheckBox_FurGravityClick
     end
     object CheckBox_WindResistence: TCheckBox
-      Left = 160
-      Top = 8
-      Width = 105
-      Height = 17
+      Left = 280
+      Top = 14
+      Width = 184
+      Height = 30
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = '&Wind Resistence'
       Checked = True
       State = cbChecked
@@ -97,31 +134,43 @@ object Form1: TForm1
       OnClick = CheckBox_WindResistenceClick
     end
     object TrackBar_WindForce: TTrackBar
-      Left = 160
-      Top = 24
-      Width = 105
-      Height = 17
+      Left = 280
+      Top = 42
+      Width = 184
+      Height = 30
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Max = 100
       Position = 50
       TabOrder = 4
-      ThumbLength = 10
+      ThumbLength = 18
       TickStyle = tsNone
       OnChange = TrackBar_WindForceChange
     end
     object CheckBox_Bald: TCheckBox
-      Left = 272
-      Top = 8
-      Width = 49
-      Height = 17
+      Left = 476
+      Top = 14
+      Width = 86
+      Height = 30
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = '&Bald'
       TabOrder = 5
       OnClick = CheckBox_BaldClick
     end
     object CheckBox_Shadows: TCheckBox
-      Left = 496
-      Top = 8
-      Width = 65
-      Height = 17
+      Left = 868
+      Top = 14
+      Width = 114
+      Height = 30
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = '&Shadows'
       TabOrder = 6
       OnClick = CheckBox_ShadowsClick

Examples/Demos/physics/OdeFurball/fOdeFurballC.h

@@ -16,7 +16,7 @@
 #include "GLS.Cadencer.hpp"
 
 #include "ODE.Import.hpp"
-#include "Physics.ODEUtils.hpp"
+#include "GLS.ODEManager.hpp"
 #include <GLS.Navigator.hpp>
 #include <GLS.ShadowPlane.hpp>
 #include <GLS.Extrusion.hpp>

Examples/Demos/physics/OdeFurball/fOdeFurballD.pas

@@ -17,7 +17,7 @@ uses
   Vcl.Imaging.Jpeg,
 
   ODE.Import,
-  Physics.ODEUtils,
+  GLS.ODEUtils,
   GLS.VectorTypes,
   GLS.SceneViewer,
   GLS.Scene,

Examples/Demos/physics/OdeMachine/fOdeMachineC.cpp

@@ -14,7 +14,7 @@
 #pragma link "GLS.GeomObjects"
 #pragma link "GLS.HUDObjects"
 #pragma link "GLS.Objects"
-#pragma link "Physics.ODEManager"
+#pragma link "GLS.ODEManager"
 #pragma link "GLS.Scene"
 #pragma link "GLS.SceneViewer"
 #pragma link "GLS.WindowsFont"

Examples/Demos/physics/OdeMachine/fOdeMachineC.h

@@ -15,7 +15,7 @@
 #include "GLS.GeomObjects.hpp"
 #include "GLS.HUDObjects.hpp"
 #include "GLS.Objects.hpp"
-#include "Physics.ODEManager.hpp"
+#include "GLS.ODEManager.hpp"
 #include "GLS.Scene.hpp"
 #include "GLS.SceneViewer.hpp"
 #include "GLS.WindowsFont.hpp"

Examples/Demos/physics/OdeMachine/fOdeMachineD.pas

@@ -13,7 +13,7 @@ uses
   GLS.Scene,
   GLS.Objects,
   GLS.SceneViewer,
-  Physics.ODEManager,
+  GLS.ODEManager,
   GLS.VectorGeometry,
   GLS.Cadencer,
   GLS.GeomObjects,

Examples/Demos/physics/OdeRagdoll/OdeRagdollC.cbproj

@@ -7,8 +7,8 @@
         <MainSource>OdeRagdollC.cpp</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
-        <TargetedPlatforms>1</TargetedPlatforms>
+        <Platform Condition="'$(Platform)'==''">Win64x</Platform>
+        <TargetedPlatforms>1048577</TargetedPlatforms>
         <ProjectName Condition="'$(ProjectName)'==''">OdeRagdollC</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -40,6 +40,12 @@
         <Cfg_1>true</Cfg_1>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
+        <Cfg_1_Win64>true</Cfg_1_Win64>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win64x' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64x)'!=''">
         <Cfg_1_Win64x>true</Cfg_1_Win64x>
         <CfgParent>Cfg_1</CfgParent>
@@ -51,6 +57,12 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
+        <Cfg_2_Win64>true</Cfg_2_Win64>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win64x' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64x)'!=''">
         <Cfg_2_Win64x>true</Cfg_2_Win64x>
         <CfgParent>Cfg_2</CfgParent>
@@ -96,6 +108,12 @@
         <UWP_CppLogo44>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_44.png</UWP_CppLogo44>
         <PackageImports>adortl;bindcomp;bindcompdbx;bindcompfmx;bindcompvcl;bindengine;CloudService;CustomIPTransport;DataSnapClient;DataSnapCommon;DataSnapConnectors;DatasnapConnectorsFreePascal;DataSnapIndy10ServerTransport;DataSnapProviderClient;DataSnapServer;dbexpress;dbrtl;dbxcds;DbxClientDriver;DbxCommonDriver;DBXDb2Driver;DBXFirebirdDriver;DBXInformixDriver;DBXInterBaseDriver;DBXMSSQLDriver;DBXMySQLDriver;DBXOdbcDriver;DBXOracleDriver;DBXSqliteDriver;DBXSybaseASADriver;DBXSybaseASEDriver;dsnap;dsnapcon;FireDAC;FireDACADSDriver;FireDACASADriver;FireDACCommon;FireDACCommonDriver;FireDACDataSnapDriver;FireDACDb2Driver;FireDACDBXDriver;FireDACIBDriver;FireDACMSAccDriver;FireDACMSSQLDriver;FireDACMySQLDriver;FireDACODBCDriver;FireDACOracleDriver;FireDACPgDriver;FireDACSqliteDriver;fmx;fmxase;fmxdae;fmxFireDAC;fmxobj;FMXTee;FmxTeeUI;ibxpress;IndyCore;IndyIPClient;IndyIPCommon;IndyIPServer;IndyProtocols;IndySystem;inet;inetdb;inetdbxpress;Intraweb;MetropolisUILiveTile;RESTComponents;rtl;soaprtl;Tee;TeeDB;TeeUI;vcl;vclactnband;vcldb;vcldsnap;vclFireDAC;vclib;vclie;vclimg;VCLRESTComponents;vclribbon;VclSmp;vcltouch;vclx;xmlrtl;$(PackageImports)</PackageImports>
         <IncludePath>$(BDSINCLUDE)\windows\vcl;$(IncludePath)</IncludePath>
+        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
+        <BT_BuildType>Debug</BT_BuildType>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64x)'!=''">
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
@@ -132,13 +150,22 @@
         <LinkPackageImports>rtl.bpi;vcl.bpi;GLScene_RT.bpi;xmlrtl.bpi;vclimg.bpi;GLScene_Physics_RT.bpi</LinkPackageImports>
         <BT_BuildType>Debug</BT_BuildType>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
+        <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <LinkPackageImports>rtl.bpi;vcl.bpi;xmlrtl.bpi;vclimg.bpi</LinkPackageImports>
+        <LinkPackageStatics>GLScene_RT.lib;GLScene_Physics_RT.lib</LinkPackageStatics>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64x)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+        <LinkPackageStatics>rtl.lib;vcl.lib;GLScene_RT.lib;xmlrtl.lib;vclimg.lib;GLScene_Physics_RT.lib</LinkPackageStatics>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <Defines>NDEBUG;$(Defines)</Defines>
         <TASM_Debugging>None</TASM_Debugging>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
+        <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64x)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
     </PropertyGroup>
@@ -1266,7 +1293,7 @@
             <Platforms>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">False</Platform>
-                <Platform value="Win64x">False</Platform>
+                <Platform value="Win64x">True</Platform>
             </Platforms>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Examples/Demos/physics/OdeRagdoll/fOdeRagdollC.h

@@ -23,9 +23,9 @@
 #include "GLS.VectorFileObjects.hpp"
 #include "GLS.SceneViewer.hpp"
 #include "GLS.WindowsFont.hpp"
-#include "Physics.ODEUtils.hpp"
+#include "GLS.ODEManager.hpp"
 #include "ODE.Import.hpp"
-#include "Physics.ODERagdoll.hpp"
+#include "GLS.ODERagdoll.hpp"
 #include "GLS.Utils.hpp"
 
 //---------------------------------------------------------------------------

Examples/Demos/physics/OdeRagdoll/fOdeRagdollD.pas

@@ -35,9 +35,9 @@ uses
 
   GLS.BaseClasses,
   ODE.Import,
-  Physics.ODERagdoll,
+  GLS.ODERagdoll,
   GLS.FileSMD,
-  Physics.ODEUtils,
+  GLS.ODEUtils,
   GLS.Utils;
 
 

Examples/Demos/physics/OdeSimple/fOdeSimpleC.cpp

@@ -12,7 +12,7 @@
 
 #pragma link "GLS.Graph"
 #pragma link "GLS.Objects"
-#pragma link "Physics.ODEManager"
+#pragma link "GLS.ODEManager"
 #pragma link "GLS.Scene"
 #pragma link "GLS.SceneViewer"
 #pragma resource "*.dfm"

Examples/Demos/physics/OdeSimple/fOdeSimpleC.h

@@ -19,7 +19,7 @@
 #include "GLS.Objects.hpp"
 #include "GLS.GeomObjects.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "Physics.ODEManager.hpp"
+#include "GLS.ODEManager.hpp"
 
 //---------------------------------------------------------------------------
 class TForm1 : public TForm

Examples/Demos/physics/OdeSimple/fOdeSimpleD.pas

@@ -24,7 +24,7 @@ uses
   GLS.Coordinates,
   GLS.BaseClasses,
 
-  Physics.ODEManager;
+  GLS.ODEManager;
 
 type
   TFormOdeSimple = class(TForm)

Examples/Demos/physics/OdeTerrain/fOdeTerrainC.cpp

@@ -23,7 +23,7 @@
 #pragma link "GLS.SkyDome"
 #pragma link "GLS.TerrainRenderer"
 #pragma link "GLS.SceneViewer"
-#pragma link "Physics.ODEManager"
+#pragma link "GLS.ODEManager"
 #pragma resource "*.dfm"
 TForm1 *Form1;
 //---------------------------------------------------------------------------

Examples/Demos/physics/OdeTerrain/fOdeTerrainC.h

@@ -20,7 +20,7 @@
 #include "GLS.Material.hpp"
 #include "GLS.Navigator.hpp"
 #include "GLS.Objects.hpp"
-#include "Physics.ODEManager.hpp"
+#include "GLS.ODEManager.hpp"
 #include "GLS.Scene.hpp"
 #include "GLS.SkyDome.hpp"
 #include "GLS.TerrainRenderer.hpp"
@@ -28,7 +28,7 @@
 #include "GLS.Utils.hpp"
 #include "JPeg.hpp"
 #include "GLS.Keyboard.hpp"
-#include "Physics.ODEManager.hpp"
+#include "GLS.ODEManager.hpp"
 
 //---------------------------------------------------------------------------
 class TForm1 : public TForm

Examples/Demos/physics/OdeTerrain/fOdeTerrainD.pas

@@ -30,7 +30,7 @@ uses
   GLS.SceneViewer,
   GLS.VectorGeometry,
   GLS.LensFlare,
-  Physics.ODEManager,
+  GLS.ODEManager,
   GLS.Navigator,
   GLS.GeomObjects,
   GLS.Color,

Packages/GLScene_Cg_DT.dproj

@@ -131,7 +131,6 @@
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <DCC_UnitSearchPath>..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>

Packages/GLScene_Cg_RT.dpk

@@ -36,11 +36,11 @@ requires
   GLScene_RT;
 
 contains
-  Cg.GL in '..\Unipas\Cg.GL.pas',
-  Cg.Import in '..\Unipas\Cg.Import.pas',
   GLS.CgShader in '..\Source\GLS.CgShader.pas',
   GLS.CgBombShader in '..\Source\GLS.CgBombShader.pas',
-  GLS.CgPostTransformationShader in '..\Source\GLS.CgPostTransformationShader.pas';
+  GLS.CgPostTransformationShader in '..\Source\GLS.CgPostTransformationShader.pas',
+  Cg.GL in '..\Source\Cg.GL.pas',
+  Cg.Import in '..\Source\Cg.Import.pas';
 
 end.
 

Packages/GLScene_Cg_RT.dproj

@@ -127,7 +127,6 @@
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <DCC_UnitSearchPath>..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -147,11 +146,11 @@
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="vclimg.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="..\Unipas\Cg.GL.pas"/>
-        <DCCReference Include="..\Unipas\Cg.Import.pas"/>
         <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"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -186,6 +185,12 @@
             </Platforms>
             <Deployment Version="4">
                 <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">
+                    <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_DT.dproj

@@ -118,7 +118,6 @@
         <DCC_Description>GLScene Engine</DCC_Description>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <VerInfo_MajorVer>2023</VerInfo_MajorVer>
-        <DCC_UnitSearchPath>..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">

Packages/GLScene_GPU_DT.dproj

@@ -109,7 +109,6 @@
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <DCC_UnitSearchPath>..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>

Packages/GLScene_GPU_RT.dpk

@@ -37,22 +37,19 @@ requires
   GLScene_RT;
 
 contains
-  CUDA.Import in '..\Unipas\CUDA.Import.pas',
-  OpenCL.Platform in '..\Unipas\OpenCL.Platform.pas',
-  OpenCL.Import in '..\Unipas\OpenCL.Import.pas',
-  CUDA.Parser in '..\Unipas\CUDA.Parser.pas',
-  CUDA.DataAccess in '..\Unipas\CUDA.DataAccess.pas',
-  OpenCL.GL in '..\Unipas\OpenCL.GL.pas',
-  CUDA.Utility in '..\Unipas\CUDA.Utility.pas',
-  CUDA.ParallelPrimitives in '..\Unipas\CUDA.ParallelPrimitives.pas',
-  CUDA.Runtime in '..\Unipas\CUDA.Runtime.pas',
-  CUDA.FourierTransform in '..\Unipas\CUDA.FourierTransform.pas',
   GLS.CUDA.Compiler in '..\Source\GLS.CUDA.Compiler.pas',
   GLS.CUDA.Context in '..\Source\GLS.CUDA.Context.pas',
   GLS.CUDA.FFTPlan in '..\Source\GLS.CUDA.FFTPlan.pas',
   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';
+  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';
 
 end.
 

Packages/GLScene_GPU_RT.dproj

@@ -127,7 +127,6 @@
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <DCC_UnitSearchPath>..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -145,22 +144,19 @@
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="xmlrtl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="..\Unipas\CUDA.Import.pas"/>
-        <DCCReference Include="..\Unipas\OpenCL.Platform.pas"/>
-        <DCCReference Include="..\Unipas\OpenCL.Import.pas"/>
-        <DCCReference Include="..\Unipas\CUDA.Parser.pas"/>
-        <DCCReference Include="..\Unipas\CUDA.DataAccess.pas"/>
-        <DCCReference Include="..\Unipas\OpenCL.GL.pas"/>
-        <DCCReference Include="..\Unipas\CUDA.Utility.pas"/>
-        <DCCReference Include="..\Unipas\CUDA.ParallelPrimitives.pas"/>
-        <DCCReference Include="..\Unipas\CUDA.Runtime.pas"/>
-        <DCCReference Include="..\Unipas\CUDA.FourierTransform.pas"/>
         <DCCReference Include="..\Source\GLS.CUDA.Compiler.pas"/>
         <DCCReference Include="..\Source\GLS.CUDA.Context.pas"/>
         <DCCReference Include="..\Source\GLS.CUDA.FFTPlan.pas"/>
         <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"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -196,6 +192,12 @@
             <Deployment Version="4">
                 <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">
+                    <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_DT.dproj

@@ -114,7 +114,6 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <DCC_UnitSearchPath>..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,11 +149,6 @@
                     <Source Name="MainSource">GLScene_Physics_DT.dpk</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GBComps.bpl">Geoblock - Components</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_Physics_DT.bpl">GLScene Physics Managers</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_Sounds_DT.bpl">GLScene Sound Managers</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_Cg_DT.bpl">GLScene Cg Shaders</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_GPU_DT.bpl">GLScene GPU Computing</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>

Packages/GLScene_Physics_RT.dpk

@@ -35,10 +35,6 @@ requires
   GLScene_RT;
 
 contains
-  Newton.Import in '..\Unipas\Newton.Import.pas',
-  NGD.Import in '..\Unipas\NGD.Import.pas',
-  ODE.Import in '..\Unipas\ODE.Import.pas',
-  PhysX.Import in '..\Unipas\PhysX.Import.pas',
   GLS.NGDManager in '..\Source\GLS.NGDManager.pas',
   GLS.NGDRagdoll in '..\Source\GLS.NGDRagdoll.pas',
   GLS.ODEManager in '..\Source\GLS.ODEManager.pas',
@@ -49,7 +45,11 @@ contains
   GLS.PhysForces in '..\Source\GLS.PhysForces.pas',
   GLS.PhysInertias in '..\Source\GLS.PhysInertias.pas',
   GLS.PhysJoints in '..\Source\GLS.PhysJoints.pas',
-  GLS.PhysManager in '..\Source\GLS.PhysManager.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';
 
 end.
 

Packages/GLScene_Physics_RT.dproj

@@ -148,7 +148,6 @@
         <DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
         <DCC_RangeChecking>true</DCC_RangeChecking>
         <DCC_BpiOutput>..\lib\$(Platform)</DCC_BpiOutput>
-        <DCC_UnitSearchPath>..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <DCC_BpiOutput>..\lib\$(Platform)</DCC_BpiOutput>
@@ -171,10 +170,6 @@
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="..\Unipas\Newton.Import.pas"/>
-        <DCCReference Include="..\Unipas\NGD.Import.pas"/>
-        <DCCReference Include="..\Unipas\ODE.Import.pas"/>
-        <DCCReference Include="..\Unipas\PhysX.Import.pas"/>
         <DCCReference Include="..\Source\GLS.NGDManager.pas"/>
         <DCCReference Include="..\Source\GLS.NGDRagdoll.pas"/>
         <DCCReference Include="..\Source\GLS.ODEManager.pas"/>
@@ -186,6 +181,10 @@
         <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"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -207,11 +206,6 @@
                     <Source Name="MainSource">GLScene_Physics_RT.dpk</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GBComps.bpl">Geoblock - Components</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_Physics_DT.bpl">GLScene Physics Managers</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_Sounds_DT.bpl">GLScene Sound Managers</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_Cg_DT.bpl">GLScene Cg Shaders</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_GPU_DT.bpl">GLScene GPU Computing</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>

Packages/GLScene_RT.dproj

@@ -142,7 +142,6 @@
         <VerInfo_Keys>CompanyName=;FileVersion=2023.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <DCC_Description>GLScene Platform</DCC_Description>
         <VerInfo_MajorVer>2023</VerInfo_MajorVer>
-        <DCC_UnitSearchPath>..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>

Packages/GLScene_SDL_RT.dpk

@@ -35,8 +35,8 @@ requires
   GLScene_RT;
 
 contains
-  SDL.Import in '..\Unipas\SDL.Import.pas',
-  GLS.SDL.Window in '..\Source\GLS.SDL.Window.pas';
+  GLS.SDL.Window in '..\Source\GLS.SDL.Window.pas',
+  SDL.Import in '..\Source\SDL.Import.pas';
 
 end.
 

Packages/GLScene_SDL_RT.dproj

@@ -133,7 +133,6 @@
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <DCC_UnitSearchPath>..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <DCC_HppOutput>..\include\$(Platform)</DCC_HppOutput>
@@ -149,8 +148,8 @@
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="..\Unipas\SDL.Import.pas"/>
         <DCCReference Include="..\Source\GLS.SDL.Window.pas"/>
+        <DCCReference Include="..\Source\SDL.Import.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -172,9 +171,6 @@
                     <Source Name="MainSource">GLScene_SDL_RT.dpk</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_DT.bpl">GLScene Engine</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_GPU_DT.bpl">GLScene GPU Computing</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLScene_Cg_DT.bpl">GLScene Cg Shaders</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>

Packages/GLScene_Sounds_DT.dproj

@@ -112,7 +112,6 @@
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <DCC_UnitSearchPath>..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">

Packages/GLScene_Sounds_RT.dpk

@@ -35,12 +35,12 @@ requires
   GLScene_RT;
 
 contains
-  FMOD.Import in '..\Unipas\FMOD.Import.pas',
-  FMOD.presets in '..\Unipas\FMOD.presets.pas',
-  FMOD.types in '..\Unipas\FMOD.types.pas',
-  FMOD.errors in '..\Unipas\FMOD.errors.pas',
-  BASS.Import in '..\Unipas\BASS.Import.pas',
-  OpenAL.Import in '..\Unipas\OpenAL.Import.pas',
+  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',
   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',

Packages/GLScene_Sounds_RT.dproj

@@ -147,7 +147,6 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <DCC_Description>GLScene Sound Managers</DCC_Description>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <DCC_UnitSearchPath>..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <DCC_BpiOutput>..\lib\$(Platform)</DCC_BpiOutput>
@@ -170,12 +169,12 @@
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="..\Unipas\FMOD.Import.pas"/>
-        <DCCReference Include="..\Unipas\FMOD.presets.pas"/>
-        <DCCReference Include="..\Unipas\FMOD.types.pas"/>
-        <DCCReference Include="..\Unipas\FMOD.errors.pas"/>
-        <DCCReference Include="..\Unipas\BASS.Import.pas"/>
-        <DCCReference Include="..\Unipas\OpenAL.Import.pas"/>
+        <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="..\Source\GLS.Sounds.FMOD.pas"/>
         <DCCReference Include="..\Source\GLS.Sounds.BASS.pas"/>
         <DCCReference Include="..\Source\GLS.Sounds.OpenAL.pas"/>

Source/GLS.SDL.Context.pas

@@ -301,9 +301,7 @@ begin
 end;
 
 
-// ------------------------------------------------------------------
-initialization
-// ------------------------------------------------------------------
+initialization // ------------------------------------------------------------
 
   RegisterClass(TSDLViewer);
   RegisterGLContextClass(TSDLContext);