Updated and upgraded

Examples/Demox/Sailboat/fdSailboat.fmx

@@ -258649,7 +258649,7 @@ object FormSailboatDemo: TFormSailboatDemo
         '(-0.676084518432617,-0.175750553607941,0.375997841358185,0.60880' +
         '1543712616)'
     end
-    object OceanSurface: TOceanSurface
+    object OceanSurface: TgxOceanSurface
       RotationAngle.X = 270.000000000000000000
       Locked = True
       Width = 60.000000000000000000
@@ -291006,7 +291006,7 @@ object FormSailboatDemo: TFormSailboatDemo
             Height = 1.000000000000000000
             Depth = 1.000000000000000000
             Quanternion = '(0.199367925524712,0,0,0.97992467880249)'
-            object JibSail: TomSailSurface
+            object JibSail: TgxSailSurface
               Position.X = 0.500000000000000000
               Position.Y = -1.860000014305115000
               Position.Z = -0.610000014305114700
@@ -291076,7 +291076,7 @@ object FormSailboatDemo: TFormSailboatDemo
             Height = 1.000000000000000000
             Depth = 1.000000000000000000
             Quanternion = '(0.0261769481003284,0,0,0.999657332897186)'
-            object MainSail: TomSailSurface
+            object MainSail: TgxSailSurface
               Position.X = 0.270000010728836100
               Position.Y = -2.410000085830688000
               Position.Z = -0.970000028610229500
@@ -291102,7 +291102,7 @@ object FormSailboatDemo: TFormSailboatDemo
                 '(0.707106709480286,5.96046412226769E-8,-0.707106709480286,5.9604' +
                 '6412226769E-8)'
             end
-            object birutaSail: TomSailSurface
+            object birutaSail: TgxSailSurface
               Position.X = 0.000000013777833985
               Position.Y = -4.445847988128662000
               Position.Z = 0.202431291341781600
@@ -300810,7 +300810,7 @@ object FormSailboatDemo: TFormSailboatDemo
       MaterialSource = materialSilver
       Quanternion = '(0,0,0.0272461157292128,-0.999628782272339)'
     end
-    object OceanSurfaceTop: TOceanSurface
+    object OceanSurfaceTop: TgxOceanSurface
       Position.Y = 1.000000000000000000
       Position.Z = 45.000000000000000000
       RotationAngle.X = 270.000000000000000000
@@ -300901,7 +300901,7 @@ object FormSailboatDemo: TFormSailboatDemo
         Quanternion = '(0,-0.707106828689575,0,-0.707106709480286)'
       end
     end
-    object OceanSurfaceLeft: TOceanSurface
+    object OceanSurfaceLeft: TgxOceanSurface
       Position.X = -45.000000000000000000
       Position.Y = 1.000000000000000000
       RotationAngle.X = 270.000000000000000000
@@ -300919,7 +300919,7 @@ object FormSailboatDemo: TFormSailboatDemo
       MaterialLines = ColorMaterialSource1
       Quanternion = '(0.70710676908493,0,0,-0.70710676908493)'
     end
-    object OceanSurfaceBot: TOceanSurface
+    object OceanSurfaceBot: TgxOceanSurface
       Position.Y = 1.000000000000000000
       Position.Z = -45.000000000000000000
       RotationAngle.X = 270.000000000000000000
@@ -300937,7 +300937,7 @@ object FormSailboatDemo: TFormSailboatDemo
       MaterialLines = ColorMaterialSource1
       Quanternion = '(0.70710676908493,0,0,-0.70710676908493)'
     end
-    object OceanSurfaceRight: TOceanSurface
+    object OceanSurfaceRight: TgxOceanSurface
       Position.X = 45.000000000000000000
       Position.Y = 1.000000000000000000
       RotationAngle.X = 270.000000000000000000
@@ -302688,7 +302688,6 @@ object FormSailboatDemo: TFormSailboatDemo
                 0B00638C316682580018638C3113C402C018638C99201600C61863CC04B10030
                 C618632688058031C61833412C008C31C698096201608C31C64C100B00638C31
                 6682580018638C3113E4FF01176868D027F6D05B0000000049454E44AE426082}
-              FileName = 'C:\dpr4\SailBoat\SailboatApp\Images\testTerrainHeightmap.png'
             end>
           HitTest = False
           Margins.Left = 5.000000000000000000
@@ -303459,7 +303458,7 @@ object FormSailboatDemo: TFormSailboatDemo
       Height = 1.000000000000000000
       Depth = 1.000000000000000000
       Quanternion = '(0,0.70710676908493,0,0.70710676908493)'
-      object WindArrow1: TWindArrowSurface
+      object WindArrow1: TgxWindArrowSurface
         Position.X = -5.000000000000000000
         Position.Y = -0.738866150379180900
         Position.Z = 0.396044462919235200
@@ -329606,7 +329605,7 @@ object FormSailboatDemo: TFormSailboatDemo
       FF01111CA5E7F9B7FEA10000000049454E44AE426082}
     Shininess = 30
   end
-  object WaveSystem1: TWaveSystem
+  object WaveSystem1: TgxWaveSystem
     Amplitude = 2.099999904632568000
     Longueur = 3.500000000000000000
     Vitesse = 2.000000000000000000
@@ -329625,7 +329624,7 @@ object FormSailboatDemo: TFormSailboatDemo
     Left = 56
     Top = 144
   end
-  object WaveSystem2: TWaveSystem
+  object WaveSystem2: TgxWaveSystem
     Amplitude = 3.000000000000000000
     Longueur = 2.000000000000000000
     Vitesse = 1.000000000000000000

Examples/Demox/Sailboat/fdSailboat.pas

@@ -44,9 +44,9 @@ uses
   // TfmxStateBox - component persists form control states to ini file
   // Note: fmxStateBox.pas must be installed as a design component, prior to loading this form
 {$ENDIF OPYC}
-  // GBE3D
-  omSailSurface,
-  GBE.omOceanWaves,
+
+  GXS.SailSurface,
+  GXS.OceanWaves,
   GBE.Clouds,
   GBE.Heightmap;
 
@@ -96,7 +96,7 @@ type
     tbOpacite: TTrackBar;
     textureOceanSurface: TLightMaterialSource;
     Light1: TLight;
-    OceanSurface: TOceanSurface;
+    OceanSurface: TgxOceanSurface;
     modelBoat: TModel3D;
     Camera1: TCamera;
     Label9: TLabel;
@@ -113,8 +113,8 @@ type
     modelBoatMat01: TLightMaterialSource;
     modelBoatMat11: TLightMaterialSource;
     modelBoatMat12: TLightMaterialSource;
-    MainSail: TomSailSurface;
-    JibSail: TomSailSurface;
+    MainSail: TgxSailSurface;
+    JibSail: TgxSailSurface;
     materialMainSail: TLightMaterialSource;
     texJibSail: TLightMaterialSource;
     Label11: TLabel;
@@ -165,10 +165,10 @@ type
     labOpacite: TLabel;
     labCameraViewAngle: TLabel;
     comboWave: TComboBox;
-    WaveSystem1: TWaveSystem;
-    OceanSurfaceTop: TOceanSurface;
+    WaveSystem1: TgxWaveSystem;
+    OceanSurfaceTop: TgxOceanSurface;
     diskSeaHorizon: TDisk;
-    OceanSurfaceLeft: TOceanSurface;
+    OceanSurfaceLeft: TgxOceanSurface;
     cylinderLighthouse: TCylinder;
     materialFarol: TLightMaterialSource;
     cylinderLighthouseTop: TCylinder;
@@ -189,9 +189,9 @@ type
     Label19: TLabel;
     tbCameraElev: TTrackBar;
     labCameraElev: TLabel;
-    WaveSystem2: TWaveSystem;
-    OceanSurfaceBot: TOceanSurface;
-    OceanSurfaceRight: TOceanSurface;
+    WaveSystem2: TgxWaveSystem;
+    OceanSurfaceBot: TgxOceanSurface;
+    OceanSurfaceRight: TgxOceanSurface;
     text3dSouth: TText3D;
     btnRandomizeWaveSystem1: TSpeedButton;
     btnCloseControls: TSpeedButton;
@@ -217,7 +217,7 @@ type
     cubeContainer: TCube;
     btnSetWaveOrigine: TSpeedButton;
     materialFlag: TLightMaterialSource;
-    birutaSail: TomSailSurface;
+    birutaSail: TgxSailSurface;
     ImageTerrain: TImage;
     heightmapTerrain: TGBEHeightmap;
     Label16: TLabel;
@@ -257,7 +257,7 @@ type
     planeIvone: TPlane;
     textureWindArrow: TLightMaterialSource;
     dummyWindArrow: TDummy;
-    WindArrow1: TWindArrowSurface;
+    WindArrow1: TgxWindArrowSurface;
     dummyShip: TDummy;
     modelShip: TModel3D;
     modelShipMat01: TLightMaterialSource;
@@ -368,7 +368,7 @@ type
 var
   FormSailboatDemo: TFormSailboatDemo = nil;
 
-implementation
+implementation //-------------------------------------------------------------
 
 {$IFDEF OPYC}
 // undef for SailboatDemo, define for OPYC ( integration to sailing game )
@@ -848,7 +848,7 @@ end;
 procedure TFormSailboatDemo.SetSailShape(ixSail: Integer;
   aPtArray: TPointF_Array); // 0=main, 1=bow sail
 var
-  aSail: TomSailSurface;
+  aSail: TgxSailSurface;
   n: Integer;
 begin
   case ixSail of
@@ -868,8 +868,8 @@ begin
     n := Length(aPtArray) - 1;
     if (n > 0) then
     begin
-      aSail.SubdivisionsWidth := n; // upd mesh width  ( Spis are wilder )
-      aSail.SetMeshWith2Dline(omSailSurface.TPointF_Array(aPtArray));
+      aSail.SubdivisionsWidth := n; // upd mesh width  (Spis are wilder )
+      aSail.SetMeshWith2Dline(GXS.SailSurface.TPointF_Array(aPtArray));
     end;
   end;
 end;

GLXEngine.groupproj

@@ -18,7 +18,10 @@
         <Projects Include="Packages\GXScene_GPU_RT.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="Packages\GXScene_DTRT.dproj">
+        <Projects Include="Packages\GXScene_GBE_DTRT.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="Packages\GLXEngine_DTRT.dproj">
             <Dependencies/>
         </Projects>
     </ItemGroup>
@@ -74,23 +77,32 @@
     <Target Name="GXScene_GPU_RT:Make">
         <MSBuild Projects="Packages\GXScene_GPU_RT.dproj" Targets="Make"/>
     </Target>
-    <Target Name="GXScene_DTRT">
-        <MSBuild Projects="Packages\GXScene_DTRT.dproj"/>
+    <Target Name="GXScene_GBE_DTRT">
+        <MSBuild Projects="Packages\GXScene_GBE_DTRT.dproj"/>
+    </Target>
+    <Target Name="GXScene_GBE_DTRT:Clean">
+        <MSBuild Projects="Packages\GXScene_GBE_DTRT.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="GXScene_GBE_DTRT:Make">
+        <MSBuild Projects="Packages\GXScene_GBE_DTRT.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="GLXEngine_DTRT">
+        <MSBuild Projects="Packages\GLXEngine_DTRT.dproj"/>
     </Target>
-    <Target Name="GXScene_DTRT:Clean">
-        <MSBuild Projects="Packages\GXScene_DTRT.dproj" Targets="Clean"/>
+    <Target Name="GLXEngine_DTRT:Clean">
+        <MSBuild Projects="Packages\GLXEngine_DTRT.dproj" Targets="Clean"/>
     </Target>
-    <Target Name="GXScene_DTRT:Make">
-        <MSBuild Projects="Packages\GXScene_DTRT.dproj" Targets="Make"/>
+    <Target Name="GLXEngine_DTRT:Make">
+        <MSBuild Projects="Packages\GLXEngine_DTRT.dproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="GXScene_RT;GXScene_Sounds_RT;GXScene_Cg_RT;GXScene_Physics_RT;GXScene_GPU_RT;GXScene_DTRT"/>
+        <CallTarget Targets="GXScene_RT;GXScene_Sounds_RT;GXScene_Cg_RT;GXScene_Physics_RT;GXScene_GPU_RT;GXScene_GBE_DTRT;GLXEngine_DTRT"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="GXScene_RT:Clean;GXScene_Sounds_RT:Clean;GXScene_Cg_RT:Clean;GXScene_Physics_RT:Clean;GXScene_GPU_RT:Clean;GXScene_DTRT:Clean"/>
+        <CallTarget Targets="GXScene_RT:Clean;GXScene_Sounds_RT:Clean;GXScene_Cg_RT:Clean;GXScene_Physics_RT:Clean;GXScene_GPU_RT:Clean;GXScene_GBE_DTRT:Clean;GLXEngine_DTRT:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="GXScene_RT:Make;GXScene_Sounds_RT:Make;GXScene_Cg_RT:Make;GXScene_Physics_RT:Make;GXScene_GPU_RT:Make;GXScene_DTRT:Make"/>
+        <CallTarget Targets="GXScene_RT:Make;GXScene_Sounds_RT:Make;GXScene_Cg_RT:Make;GXScene_Physics_RT:Make;GXScene_GPU_RT:Make;GXScene_GBE_DTRT:Make;GLXEngine_DTRT:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Packages/GLXEngine_DTRT.dpk

@@ -0,0 +1,41 @@
+package GLXEngine_DTRT;
+
+{$R *.res}
+{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
+{$ALIGN 8}
+{$ASSERTIONS ON}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS ON}
+{$LOCALSYMBOLS ON}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION OFF}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO ON}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES ON}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST OFF}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $400000}
+{$DEFINE DEBUG}
+{$ENDIF IMPLICITBUILDING}
+{$DESCRIPTION 'GLXEngine'}
+{$IMPLICITBUILD ON}
+
+requires
+  rtl,
+  fmx,
+  GXScene_RT,
+  GXScene_GBE_DTRT;
+
+contains
+  GXS.SailSurface in '..\Sourcex\GXS.SailSurface.pas',
+  GXS.OceanWaves in '..\Sourcex\GXS.OceanWaves.pas';
+
+end.

Packages/GXScene_DT.dpk

@@ -1,57 +0,0 @@
-package GXScene_DT;
-
-{$R *.res}
-{$R 'GXSceneObjects.res'}
-{$R 'GXScene.res'}
-{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO OFF}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION OFF}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES ON}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
-{$DEFINE DEBUG}
-{$ENDIF IMPLICITBUILDING}
-{$DESCRIPTION 'GLXEngine'}
-{$RUNONLY}
-{$DESIGNONLY}
-{$IMPLICITBUILD ON}
-
-requires
-  rtl,
-  fmx,
-  GXScene_RT;
-
-contains
-  FMxGuiLayoutEditor in '..\SourceX\FMxGuiLayoutEditor.pas',
-  FMxInfo in '..\SourceX\FMxInfo.pas',
-  FRxTextureEdit in '..\SourceX\FRxTextureEdit.pas',
-  FMxXCollectionEditor in '..\SourceX\FMxXCollectionEditor.pas',
-  FMxLibMaterialPicker in '..\SourceX\FMxLibMaterialPicker.pas',
-  FRxMaterialPreview in '..\SourceX\FRxMaterialPreview.pas',
-  FRxFaceEditor in '..\SourceX\FRxFaceEditor.pas',
-  FRxColorEditor in '..\SourceX\FRxColorEditor.pas',
-  FMxMaterialEditor in '..\SourceX\FMxMaterialEditor.pas',
-  FMxShaderMemo in '..\SourceX\FMxShaderMemo.pas',
-  FMxShaderUniformEditor in '..\SourceX\FMxShaderUniformEditor.pas',
-  FMxSkinEditor in '..\SourceX\FMxSkinEditor.pas',
-  FMxSceneEditor in '..\SourceX\FMxSceneEditor.pas',
-  GXS.SceneRegister in '..\SourceX\GXS.SceneRegister.pas',
-  GXS.XCollectionRegister in '..\SourceX\GXS.XCollectionRegister.pas';
-
-end.

Packages/GXScene_DTRT.dpk → Packages/GXScene_GBE_DTRT.dpk

@@ -1,4 +1,4 @@
-package GXScene_DTRT;
+package GXScene_GBE_DTRT;
 
 {$R *.res}
 {$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
@@ -25,7 +25,7 @@ package GXScene_DTRT;
 {$IMAGEBASE $400000}
 {$DEFINE DEBUG}
 {$ENDIF IMPLICITBUILDING}
-{$DESCRIPTION 'GXScene GBE'}
+{$DESCRIPTION 'Composants 3D pour FMX'}
 {$IMPLICITBUILD ON}
 
 requires
@@ -39,7 +39,6 @@ contains
   GBE.Cubemap in '..\Sourcex\GBE.Cubemap.pas',
   GBE.Viewport3D in '..\Sourcex\GBE.Viewport3D.pas',
   GBE.SphereExtend in '..\Sourcex\GBE.SphereExtend.pas',
-  uGBEUtils3D in '..\Sourcex\uGBEUtils3D.pas',
   uGBEImageUtils in '..\Sourcex\uGBEImageUtils.pas',
   GBE.PlayerPosition in '..\Sourcex\GBE.PlayerPosition.pas',
   GBE.Joystick in '..\Sourcex\GBE.Joystick.pas',
@@ -52,8 +51,7 @@ contains
   uGBESound in '..\Sourcex\uGBESound.pas',
   uGBEPathFinder in '..\Sourcex\uGBEPathFinder.pas',
   GBE.TimeLine in '..\Sourcex\GBE.TimeLine.pas',
-  GBE.omOceanWaves in '..\Sourcex\GBE.omOceanWaves.pas',
-  omSailSurface in '..\Sourcex\omSailSurface.pas',
-  GBE.Terrain in '..\Sourcex\GBE.Terrain.pas';
+  GBE.Terrain in '..\Sourcex\GBE.Terrain.pas',
+  uGBEUtils3D in '..\Sourcex\uGBEUtils3D.pas';
 
 end.

Packages/GXScene_DTRT.dproj → Packages/GXScene_GBE_DTRT.dproj

@@ -1,15 +1,15 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{530DEA65-D16B-4C85-B494-52344316F36E}</ProjectGuid>
-        <MainSource>GXScene_DTRT.dpk</MainSource>
+        <MainSource>GXScene_GBE_DTRT.dpk</MainSource>
         <ProjectVersion>20.2</ProjectVersion>
         <FrameworkType>FMX</FrameworkType>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
-        <TargetedPlatforms>1</TargetedPlatforms>
+        <TargetedPlatforms>1048579</TargetedPlatforms>
         <AppType>Package</AppType>
-        <ProjectName Condition="'$(ProjectName)'==''">GXScene_DTRT</ProjectName>
+        <ProjectName Condition="'$(ProjectName)'==''">GXScene_GBE_DTRT</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -73,6 +73,18 @@
         <Cfg_2>true</Cfg_2>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
+        <Cfg_2_Win64>true</Cfg_2_Win64>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64x' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64x)'!=''">
+        <Cfg_2_Win64x>true</Cfg_2_Win64x>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <DCC_E>false</DCC_E>
@@ -85,7 +97,7 @@
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <DCC_Description>Composants 3D pour FMX</DCC_Description>
-        <SanitizedProjectName>GXScene_DTRT</SanitizedProjectName>
+        <SanitizedProjectName>GXScene_GBE_DTRT</SanitizedProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Android)'!=''">
         <Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
@@ -115,6 +127,7 @@
         <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>
+        <DCC_UnitSearchPath>..\Source;..\Sourcex  ;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64x)'!=''">
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
@@ -122,6 +135,7 @@
         <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>
+        <DCC_UnitSearchPath>..\Source;..\Sourcex;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
         <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -165,6 +179,14 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win64x)'!=''">
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+    </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
@@ -177,7 +199,6 @@
         <DCCReference Include="..\Sourcex\GBE.Cubemap.pas"/>
         <DCCReference Include="..\Sourcex\GBE.Viewport3D.pas"/>
         <DCCReference Include="..\Sourcex\GBE.SphereExtend.pas"/>
-        <DCCReference Include="..\Sourcex\uGBEUtils3D.pas"/>
         <DCCReference Include="..\Sourcex\uGBEImageUtils.pas"/>
         <DCCReference Include="..\Sourcex\GBE.PlayerPosition.pas"/>
         <DCCReference Include="..\Sourcex\GBE.Joystick.pas"/>
@@ -190,9 +211,8 @@
         <DCCReference Include="..\Sourcex\uGBESound.pas"/>
         <DCCReference Include="..\Sourcex\uGBEPathFinder.pas"/>
         <DCCReference Include="..\Sourcex\GBE.TimeLine.pas"/>
-        <DCCReference Include="..\Sourcex\GBE.omOceanWaves.pas"/>
-        <DCCReference Include="..\Sourcex\omSailSurface.pas"/>
         <DCCReference Include="..\Sourcex\GBE.Terrain.pas"/>
+        <DCCReference Include="..\Sourcex\uGBEUtils3D.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -211,7 +231,7 @@
         <BorlandProject>
             <Delphi.Personality>
                 <Source>
-                    <Source Name="MainSource">GXScene_DTRT.dpk</Source>
+                    <Source Name="MainSource">GXScene_GBE_DTRT.dpk</Source>
                 </Source>
                 <Excluded_Packages>
                     <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GXScene_GBE.bpl">GXScene GBE</Excluded_Packages>
@@ -242,13 +262,19 @@
                 <DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule"/>
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\Win64\GBE3D.bpl" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GBE3D.bpl" Configuration="Debug" Class="ProjectOutput"/>
-                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GXScene_DTRT.bpl" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GXScene_GBE.bpl" Configuration="Debug" Class="ProjectOutput"/>
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GXScene_GBE_DTRT.bpl" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
-                        <RemoteName>GXScene_DTRT.bpl</RemoteName>
+                        <RemoteName>GXScene_GBE_DTRT.bpl</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\Win64x\GXScene_GBE_DTRT.bpl" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win64x">
+                        <RemoteName>GXScene_GBE_DTRT.bpl</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GXScene_GBE.bpl" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="OSX32">
                         <Operation>1</Operation>
@@ -1096,8 +1122,8 @@
                 <Platform value="Android">False</Platform>
                 <Platform value="Android64">False</Platform>
                 <Platform value="Win32">True</Platform>
-                <Platform value="Win64">False</Platform>
-                <Platform value="Win64x">False</Platform>
+                <Platform value="Win64">True</Platform>
+                <Platform value="Win64x">True</Platform>
             </Platforms>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Packages/GXScene_GPU_RT.dproj

@@ -116,11 +116,11 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-        <DCC_DcuOutput>..\..\lib\Win32</DCC_DcuOutput>
         <DCC_BpiOutput>..\..\lib\Win32</DCC_BpiOutput>
         <DCC_ObjOutput>..\..\lib\Win32</DCC_ObjOutput>
         <DCC_HppOutput>..\..\include\Win32</DCC_HppOutput>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
+        <DCC_UnitSearchPath>..\Source;..\Sourcex;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -128,6 +128,7 @@
         <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>
         <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
+        <DCC_UnitSearchPath>..\Source;..\Sourcex;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64x)'!=''">
         <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
@@ -147,13 +148,11 @@
         <DCC_BpiOutput>..\lib\$(Platform)</DCC_BpiOutput>
         <DCC_HppOutput>..\include\$(Platform)</DCC_HppOutput>
         <DCC_ObjOutput>..\lib\$(Platform)</DCC_ObjOutput>
-        <DCC_DcuOutput>..\lib\$(Platform)</DCC_DcuOutput>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <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>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
-        <DCC_DcuOutput>..\lib\$(Platform)</DCC_DcuOutput>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <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>
@@ -173,7 +172,6 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <DCC_DcuOutput>..\lib\$(Platform)</DCC_DcuOutput>
         <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>
         <DCC_Description>GXScene GPU Computing</DCC_Description>
@@ -190,7 +188,6 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-        <DCC_UnitSearchPath>..\sourcex;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64x)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>

Packages/GXScene_Physics_RT.dproj

@@ -95,12 +95,12 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-        <DCC_DcuOutput>..\..\lib\Win32</DCC_DcuOutput>
         <DCC_BpiOutput>$(GXSCENE)\lib\$(Platform)</DCC_BpiOutput>
         <DCC_ObjOutput>$(GXSCENE)\lib\$(Platform)</DCC_ObjOutput>
         <DCC_HppOutput>$(GXSCENE)\include\$(Platform)</DCC_HppOutput>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <DCC_Description>GXScene Physics Managers</DCC_Description>
+        <DCC_UnitSearchPath>..\Source;..\Sourcex;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -113,6 +113,7 @@
         <DCC_BpiOutput>$(GXSCENE)\lib\$(Platform)</DCC_BpiOutput>
         <DCC_HppOutput>$(GXSCENE)\include\$(Platform)</DCC_HppOutput>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
+        <DCC_UnitSearchPath>..\Source;..\Sourcex;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64x)'!=''">
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
@@ -136,7 +137,6 @@
         <DCC_BpiOutput>..\lib\$(Platform)</DCC_BpiOutput>
         <DCC_HppOutput>..\include\$(Platform)</DCC_HppOutput>
         <DCC_ObjOutput>..\lib\$(Platform)</DCC_ObjOutput>
-        <DCC_DcuOutput>..\lib\$(Platform)</DCC_DcuOutput>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <VerInfo_Locale>1033</VerInfo_Locale>
@@ -147,7 +147,6 @@
         <DCC_HppOutput>..\include\$(Platform)</DCC_HppOutput>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <DCC_Description>GXScene Physics Managers</DCC_Description>
-        <DCC_DcuOutput>..\lib\$(Platform)</DCC_DcuOutput>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64x)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -168,7 +167,6 @@
         <DCC_BpiOutput>..\lib\$(Platform)</DCC_BpiOutput>
         <DCC_ObjOutput>..\lib\$(Platform)</DCC_ObjOutput>
         <DCC_HppOutput>..\include\$(Platform)</DCC_HppOutput>
-        <DCC_DcuOutput>..\lib\$(Platform)</DCC_DcuOutput>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <DCC_ObjOutput>..\lib\$(Platform)</DCC_ObjOutput>

Packages/GXScene_RT.dproj

@@ -162,7 +162,6 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-        <DCC_DcuOutput>..\lib\$(Platform)</DCC_DcuOutput>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <DCC_Description>GXScene Engine</DCC_Description>
     </PropertyGroup>

Sourcex/GBE.Heightmap.pas

@@ -6,21 +6,22 @@ unit GBE.Heightmap;
 interface
 
 uses
+  System.Types,
   System.SysUtils,
   System.Classes,
   System.RTLConsts,
+  System.Math,
+  System.UITypes,
+  System.UIConsts,
+
   FMX.Types,
   FMX.Controls3D,
   FMX.Objects3D,
   FMX.Graphics,
   System.Math.Vectors,
   FMX.types3D,
-  System.UITypes,
-  System.UIConsts,
   FMX.Effects,
   FMX.MaterialSources,
-  System.Types,
-  Math,
   uGBEUtils3D;
 
 type
@@ -116,9 +117,9 @@ begin
     self.Data.Clear;
     fHeightmap.LoadFromFile(FileName);
     fSubdivisionsX := fHeightmap.Width;
-    fHalfSubdivisionsX := Math.Floor(fSubdivisionsX / 2);
+    fHalfSubdivisionsX := Floor(fSubdivisionsX / 2);
     fSubdivisionsZ := fHeightmap.Height;
-    fHalfSubdivisionsZ := Math.Floor(fSubdivisionsZ / 2);
+    fHalfSubdivisionsZ := Floor(fSubdivisionsZ / 2);
     GenerateHeightmap(self.Data);
   end;
 end;
@@ -128,9 +129,9 @@ begin
   self.Data.Clear;
   fHeightmap.LoadFromStream(Stream);
   fSubdivisionsX := fHeightmap.Width;
-  fHalfSubdivisionsX := Math.Floor(fSubdivisionsX / 2);
+  fHalfSubdivisionsX := Floor(fSubdivisionsX / 2);
   fSubdivisionsZ := fHeightmap.Height;
-  fHalfSubdivisionsZ := Math.Floor(fSubdivisionsZ / 2);
+  fHalfSubdivisionsZ := Floor(fSubdivisionsZ / 2);
   GenerateHeightmap(self.Data);
 end;
 
@@ -179,9 +180,9 @@ begin
   begin
     FUseRamp := Value;
     fSubdivisionsX := fHeightmap.Width;
-    fHalfSubdivisionsX := Math.Floor(fSubdivisionsX / 2);
+    fHalfSubdivisionsX := Floor(fSubdivisionsX / 2);
     fSubdivisionsZ := fHeightmap.Height;
-    fHalfSubdivisionsZ := Math.Floor(fSubdivisionsZ / 2);
+    fHalfSubdivisionsZ := Floor(fSubdivisionsZ / 2);
     GenerateHeightmap(self.Data);
   end;
 end;

Sourcex/GBE.omOceanWaves.pas → Sourcex/GXS.OceanWaves.pas

@@ -1,10 +1,9 @@
-unit GBE.omOceanWaves;
+unit GXS.OceanWaves;
 (*
-  Om:  TTwoWavesOceanSurface
-  TGBEPlaneExtend has one wave. Added a second to TTwoWavesOceanSurface
+  Omar:  TgxTwoWavesOceanSurface
+  TGBEPlaneExtend has one wave. Added a second to TgxTwoWavesOceanSurface
   actually 3 waves... and counting
   set21: increased the wave system from 3 to 5 waves
-  jun22: fixed boat pitch calculation
 *)
 interface
 
@@ -26,7 +25,7 @@ uses
   GBE.PlaneExtend; // TGBEPlaneExtend and WaveRec
 
 type
-  TWaveSystem = class(TComponent)
+  TgxWaveSystem = class(TComponent)
   // collection of sea surface sinoid waves (3 for now)
   private
     fTime: Single; // Om: movd stuff to protected
@@ -85,9 +84,9 @@ type
     property Vitesse5: Single read fVitesse5 write fVitesse5;
   end;
 
-  TOceanSurface = class(TPlane)
+  TgxOceanSurface = class(TPlane)
   private
-    fWaveSystem: TWaveSystem;
+    fWaveSystem: TgxWaveSystem;
     procedure CalcWaves;
   protected
     fNbMesh: integer; // number of tiles in the mesh
@@ -109,17 +108,17 @@ type
   published
     property ActiveWaves: boolean read fActiveWaves write fActiveWaves;
     property ShowLines: boolean read fShowlines write fShowlines;
-    property WaveSystem: TWaveSystem read fWaveSystem write fWaveSystem;
+    property WaveSystem: TgxWaveSystem read fWaveSystem write fWaveSystem;
     property MaterialLines: TColorMaterialSource read fMaterialLignes
       write fMaterialLignes;
     property DivPerM: TPoint3D read fDivPerM;
   end;
 
-  TWindArrowSurface = class(TPlane)
+  TgxWindArrowSurface = class(TPlane)
   // Ondulating wind arrow. Less CPU intensive then OceanSurface
   private
     fVersion: integer;
-    fWaveSystem: TWaveSystem; // using only wave 1 here
+    fWaveSystem: TgxWaveSystem; // using only wave 1 here
     procedure CalcArrowMesh;
     procedure setVersion(const Value: integer);
   protected
@@ -143,15 +142,15 @@ type
     Property version: integer read fVersion write setVersion;
   end;
 
-  TTwoWavesOceanSurface = class(TOceanSurface); // compatibility w/ old forms
+  TgxTwoWavesOceanSurface = class(TgxOceanSurface); // compatibility w/ old forms
 
 procedure Register;
 
 implementation //--------------------------------------------------------------
 
-// TWaveSystem
+// TgxWaveSystem
 
-constructor TWaveSystem.Create(AOwner: TComponent);
+constructor TgxWaveSystem.Create(AOwner: TComponent);
 begin
   inherited;
 
@@ -184,44 +183,44 @@ begin
   fOrigine5 := Point3D(7, -8, 1);
 end;
 
-destructor TWaveSystem.Destroy;
+destructor TgxWaveSystem.Destroy;
 begin
   inherited;
 end;
 
-function TWaveSystem.GetWaveParams1: TPoint3D;
+function TgxWaveSystem.GetWaveParams1: TPoint3D;
 begin
   Result := Point3D(Amplitude, Longueur, Vitesse); // pack wave params
 end;
 
-function TWaveSystem.GetWaveParams2: TPoint3D;
+function TgxWaveSystem.GetWaveParams2: TPoint3D;
 begin
   Result := Point3D(fAmplitude2, fLongueur2, fVitesse2);
 end;
 
-function TWaveSystem.GetWaveParams3: TPoint3D;
+function TgxWaveSystem.GetWaveParams3: TPoint3D;
 begin
   Result := Point3D(fAmplitude3, fLongueur3, fVitesse3);
 end;
 
-function TWaveSystem.GetWaveParams4: TPoint3D;
+function TgxWaveSystem.GetWaveParams4: TPoint3D;
 begin
   Result := Point3D(fAmplitude4, fLongueur4, fVitesse4);
 end;
 
-function TWaveSystem.GetWaveParams5: TPoint3D;
+function TgxWaveSystem.GetWaveParams5: TPoint3D;
 begin
   Result := Point3D(fAmplitude5, fLongueur5, fVitesse5);
 end;
 
-procedure TWaveSystem.IncTime;
+procedure TgxWaveSystem.IncTime;
 begin
   fTime := fTime + 0.010; // advance wave time.. slow advance
 end;
 
-{ TOceanSurface }
+{ TgxOceanSurface }
 
-constructor TOceanSurface.Create(AOwner: TComponent);
+constructor TgxOceanSurface.Create(AOwner: TComponent);
 begin
   inherited;
 
@@ -238,7 +237,7 @@ begin
   fVirtualSeaOrigin := Point3D(0, 0, 0);
 end;
 
-destructor TOceanSurface.Destroy;
+destructor TgxOceanSurface.Destroy;
 begin
   inherited;
 end;
@@ -251,7 +250,7 @@ begin
 end;
 
 // MoveTextureBy uses existent mesh, by just displacing the tex pts
-procedure TOceanSurface.MoveTextureBy(var dx, dy: Single);
+procedure TgxOceanSurface.MoveTextureBy(var dx, dy: Single);
 // dx,dy in  3d units (m)
 var
   M: TMeshData;
@@ -305,7 +304,7 @@ begin
   // M.TexCoordinates :=
 end;
 
-procedure TOceanSurface.GetPointsTexCoordinates(var P, TC: String);
+procedure TgxOceanSurface.GetPointsTexCoordinates(var P, TC: String);
 var
   M: TMeshData;
 begin
@@ -315,7 +314,7 @@ begin
   TC := M.TexCoordinates;
 end;
 
-procedure TOceanSurface.CalcWaves; // Wx = Point3D(Amplitude, Longueur, Vitesse)
+procedure TgxOceanSurface.CalcWaves; // Wx = Point3D(Amplitude, Longueur, Vitesse)
 var
   M: TMeshData;
   x, y: integer;
@@ -387,7 +386,7 @@ begin
 end;
 
 // P in m
-function TOceanSurface.calcWaveAmplitudeAndPitch(P: TPoint3D;
+function TgxOceanSurface.calcWaveAmplitudeAndPitch(P: TPoint3D;
   const aCap: Single; var aAmplitude, aPitch: Single): boolean; // Om:
 var
   waveRec1, waveRec2, waveRec3, waveRec4, waveRec5: TWaveRec;
@@ -459,7 +458,7 @@ begin
 end;
 
 
-// function TOceanSurface.calcWaveAmplitudeAndPitch(P:TPoint3d; const aCap:Single; var aAmplitude,aPitch:Single ):boolean; //Om:
+// function TgxOceanSurface.calcWaveAmplitudeAndPitch(P:TPoint3d; const aCap:Single; var aAmplitude,aPitch:Single ):boolean; //Om:
 // var
 // M:TMeshData;
 // x,y,z,x1,y1,z1 : integer;
@@ -502,7 +501,7 @@ end;
 // else Result := false;
 // end;
 
-procedure TOceanSurface.Render;
+procedure TgxOceanSurface.Render;
 begin
   inherited;
 
@@ -527,14 +526,14 @@ begin
       TMaterialSource.ValidMaterial(fMaterialLignes), 1);
 end;
 
-{ TWindArrowSurface }
+{ TgxWindArrowSurface }
 
-constructor TWindArrowSurface.Create(AOwner: TComponent);
+constructor TgxWindArrowSurface.Create(AOwner: TComponent);
 begin
   inherited; // TPlane.Create
 
   // create an own wave system
-  fWaveSystem := TWaveSystem.Create(nil);
+  fWaveSystem := TgxWaveSystem.Create(nil);
 
   fWaveSystem.Amplitude := 0.8; // set wave 1
   fWaveSystem.Vitesse := 20.0;
@@ -558,14 +557,14 @@ begin
   fVersion := 0;
 end;
 
-destructor TWindArrowSurface.Destroy;
+destructor TgxWindArrowSurface.Destroy;
 begin
   fWaveSystem.Free;
   inherited;
 end;
 
 // transforms a plane into an arrow, by squeezing the x coordinate
-procedure TWindArrowSurface.CalcArrowMesh; //
+procedure TgxWindArrowSurface.CalcArrowMesh; //
 var // 0.0
   M: TMeshData; // Y       /\    0.5
   x, y: integer; // /  \
@@ -642,7 +641,7 @@ begin
   fWaveSystem.IncTime; // adv time by 0.01 sec
 end;
 
-procedure TWindArrowSurface.Render;
+procedure TgxWindArrowSurface.Render;
 begin
   inherited;
 
@@ -667,7 +666,7 @@ begin
       TMaterialSource.ValidMaterial(fMaterialLignes), 1);
 end;
 
-procedure TWindArrowSurface.setVersion(const Value: integer);
+procedure TgxWindArrowSurface.setVersion(const Value: integer);
 begin
   if (fVersion <> Value) then
   begin
@@ -676,7 +675,7 @@ begin
   end;
 end;
 
-procedure TWindArrowSurface.SetDepth(const Value: Single);
+procedure TgxWindArrowSurface.SetDepth(const Value: Single);
 // override TPlane tendency to set Depth to 0.01
 begin
   if (self.fDepth <> Value) then // this copies what TPlane removed
@@ -697,8 +696,8 @@ end;
 
 procedure Register;
 begin
-  RegisterComponents('GXScene GBE', [TWaveSystem, TOceanSurface,
-    TTwoWavesOceanSurface, TWindArrowSurface]);
+  RegisterComponents('GLXEngine', [TgxWaveSystem, TgxOceanSurface,
+    TgxTwoWavesOceanSurface, TgxWindArrowSurface]);
 end;
 
 end.

Sourcex/omSailSurface.pas → Sourcex/GXS.SailSurface.pas

@@ -1,6 +1,6 @@
-unit omSailSurface;
+unit GXS.SailSurface;
 (*
-  TomSailSurface - Sail surface 3d object by oMAR
+  TgxSailSurface - Sail surface 3d object by oMAR
 *)
 interface
 
@@ -47,7 +47,7 @@ type
    ---------------------------------------------------------------------------
   *)
 
-  TPointF_Array = array of System.Types.TPointF;
+  TPointF_Array = array of TPointF;
 
   TSailParams = record // Sail w/ quadratic leech
     Lb: Single; // sail chord at the bottom
@@ -66,10 +66,10 @@ type
   end;
 
   (*
-    TomSailSurface morphs a TPlane grid into a triangular sail with camber
+    TgxSailSurface morphs a TPlane grid into a triangular sail with camber
     ( or any other polygonal Shape)
   *)
-  TomSailSurface = class(TPlane)
+  TgxSailSurface = class(TPlane)
   private
     fSailShape: TSailShape;
     fVersion: integer;
@@ -214,9 +214,9 @@ begin
   end;
 end;
 
-// TomSailSurface
+// TgxSailSurface
 
-constructor TomSailSurface.Create(AOwner: TComponent);
+constructor TgxSailSurface.Create(AOwner: TComponent);
 begin
   inherited;
 
@@ -259,42 +259,42 @@ begin
   fVersion := 1;
 end;
 
-destructor TomSailSurface.Destroy;
+destructor TgxSailSurface.Destroy;
 begin
   inherited;
 end;
 
-function TomSailSurface.GetChordBottom: Single;
+function TgxSailSurface.GetChordBottom: Single;
 begin
   Result := fSailParams.Lb;
 end;
 
-function TomSailSurface.GetChordMid: Single;
+function TgxSailSurface.GetChordMid: Single;
 begin
   Result := fSailParams.Lm;
 end;
 
-function TomSailSurface.GetChordTop: Single;
+function TgxSailSurface.GetChordTop: Single;
 begin
   Result := fSailParams.Lt;
 end;
 
-function TomSailSurface.GetChordX: Single;
+function TgxSailSurface.GetChordX: Single;
 begin
   Result := fSailParams.Lx;
 end;
 
-function TomSailSurface.GetHeightX: Single;
+function TgxSailSurface.GetHeightX: Single;
 begin
   Result := fSailParams.Hx;
 end;
 
-function TomSailSurface.GetSailHeight: Single;
+function TgxSailSurface.GetSailHeight: Single;
 begin
   Result := fSailParams.ht;
 end;
 
-procedure TomSailSurface.SetDepth(const Value: Single);
+procedure TgxSailSurface.SetDepth(const Value: Single);
 // override TPlane tendency to set Depth to 0.01
 begin
   if (self.fDepth <> Value) then // this copies what TPlane removed
@@ -313,7 +313,7 @@ end;
 
 // Calc sail surface mesh based on a line of points in 2D (planta)
 
-Procedure TomSailSurface.SetMeshWith2Dline(aPtArray: TPointF_Array);
+Procedure TgxSailSurface.SetMeshWith2Dline(aPtArray: TPointF_Array);
 var
   M: TMeshData;
   x, y, np: integer;
@@ -408,7 +408,7 @@ begin
   M.CalcTangentBinormals;
 end;
 
-procedure TomSailSurface.CalcSailSurfaceMesh; // create default sail mesh
+procedure TgxSailSurface.CalcSailSurfaceMesh; // create default sail mesh
 var
   M: TMeshData;
   x, y: integer;
@@ -520,7 +520,7 @@ begin
   // fTime := fTime + 0.01;  //??
 end;
 
-function TomSailSurface.Altura(P: TPoint3D): Single; // Om:
+function TgxSailSurface.Altura(P: TPoint3D): Single; // Om:
 var
   M: TMeshData;
   x, y: integer;
@@ -545,7 +545,7 @@ begin
     Result := 0;
 end;
 
-procedure TomSailSurface.SetSailParams(aSailParams: TSailParams);
+procedure TgxSailSurface.SetSailParams(aSailParams: TSailParams);
 begin
   fSailParams.Lb := aSailParams.Lb;
   fSailParams.Lt := aSailParams.Lt;
@@ -564,7 +564,7 @@ begin
   // CalcSailSurfaceMesh;
 end;
 
-procedure TomSailSurface.SetSailShape(const Value: TSailShape);
+procedure TgxSailSurface.SetSailShape(const Value: TSailShape);
 begin
   if fSailShape <> Value then
   begin
@@ -573,7 +573,7 @@ begin
   end;
 end;
 
-procedure TomSailSurface.setVersion(const Value: integer);
+procedure TgxSailSurface.setVersion(const Value: integer);
 begin
   if (fVersion <> Value) then
   begin
@@ -582,7 +582,7 @@ begin
   end;
 end;
 
-procedure TomSailSurface.Render;
+procedure TgxSailSurface.Render;
 begin
   inherited;
   // each render recalcs the mesh !
@@ -604,7 +604,7 @@ begin
       TMaterialSource.ValidMaterial(fMaterialLignes), 1);
 end;
 
-procedure TomSailSurface.SetChordBottom(const Value: Single);
+procedure TgxSailSurface.SetChordBottom(const Value: Single);
 begin
   if fSailParams.Lb <> Value then
   begin
@@ -613,7 +613,7 @@ begin
   end;
 end;
 
-procedure TomSailSurface.SetChordMid(const Value: Single);
+procedure TgxSailSurface.SetChordMid(const Value: Single);
 begin
   if fSailParams.Lm <> Value then
   begin
@@ -622,7 +622,7 @@ begin
   end;
 end;
 
-procedure TomSailSurface.SetChordTop(const Value: Single);
+procedure TgxSailSurface.SetChordTop(const Value: Single);
 begin
   if fSailParams.Lt <> Value then
   begin
@@ -631,7 +631,7 @@ begin
   end;
 end;
 
-procedure TomSailSurface.SetChordX(const Value: Single);
+procedure TgxSailSurface.SetChordX(const Value: Single);
 begin
   if fSailParams.Lx <> Value then
   begin
@@ -640,7 +640,7 @@ begin
   end;
 end;
 
-procedure TomSailSurface.SetHeightX(const Value: Single);
+procedure TgxSailSurface.SetHeightX(const Value: Single);
 begin
   if fSailParams.Hx <> Value then
   begin
@@ -649,7 +649,7 @@ begin
   end;
 end;
 
-procedure TomSailSurface.SetSailHeight(const Value: Single);
+procedure TgxSailSurface.SetSailHeight(const Value: Single);
 begin
   if fSailParams.ht <> Value then
   begin
@@ -662,7 +662,7 @@ end;
 
 procedure Register;
 begin
-  RegisterComponents('GXScene GBE', [TomSailSurface]);
+  RegisterComponents('GLXEngine', [TgxSailSurface]);
 end;
 
 end.