Replaced in common folder

Examples/AdvDemos/Archipelago/fArchipelagoC.h

@@ -46,7 +46,7 @@
 #include "GLS.Keyboard.hpp"
 #include "GLS.Context.hpp"
 #include "GLS.State.hpp"
-#include "Scenario.TextureFormat.hpp"
+#include "Scena.TextureFormat.hpp"
 #include "GLS.File3DS.hpp"
 
 //---------------------------------------------------------------------------

Examples/AdvDemos/Archipelago/fArchipelagoD.pas

@@ -42,7 +42,7 @@ uses
   GLS.OpenGLTokens,
   GLS.Context,
   GLS.State,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLS.File3DS,
   GLS.Utils,
   GLS.Navigator;

Examples/AdvDemos/Earth/fEarthD.dfm

@@ -48,7 +48,10 @@ object Form1: TForm1
           StopColor.Color = {938C0C3E938C0C3E938E0E3F0000803F}
           Stacks = 4
         end>
-      Stars = <>
+      Stars = <
+        item
+          Color = clBlack
+        end>
       object ConstellationLines: TGLLines
         Direction.Coordinates = {0000803F000000000000008000000000}
         Scale.Coordinates = {00A00C4600A00C4600A00C4600000000}

Examples/AdvDemos/Earth/fEarthD.pas

@@ -31,7 +31,7 @@ uses
   GLS.State,
   GLS.Utils,
   GLS.Context,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLSL.TextureShaders,
   GLS.BaseClasses;
 

Examples/AdvDemos/Forest/fForestD.pas

@@ -41,7 +41,7 @@ uses
   GLS.XOpenGL,
   GLS.BaseClasses,
   GLS.TextureCombiners,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLS.Material,
   GLS.Coordinates,
   GLS.TerrainRenderer,

Examples/AdvDemos/GLSViewer/Source/fMain.pas

@@ -46,7 +46,7 @@ uses
   GLS.BaseClasses,
   GLS.State,
   GLS.RenderContextInfo,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLS.Color,
   GLS.Keyboard,
   GLS.Graphics,

Examples/AdvDemos/IntensityMesh/fIntensityMeshC.h

@@ -29,7 +29,7 @@
 #include "GLS.RenderContextInfo.hpp"
 #include "GLS.Graphics.hpp"
 #include "GLS.State.hpp"
-#include "Scenario.TextureFormat.hpp"
+#include "Scena.TextureFormat.hpp"
 #include "GLSL.UserShader.hpp"
 
 //---------------------------------------------------------------------------

Examples/AdvDemos/IntensityMesh/fIntensityMeshD.pas

@@ -36,7 +36,7 @@ uses
   GLS.RenderContextInfo,
   GLS.Graphics,
   GLS.State,
-  Scenario.TextureFormat;
+  Scena.TextureFormat;
 
 type
   TForm1 = class(TForm)

Examples/Demos/cgshaders/BumpMapping/fBumpMap.pas

@@ -29,7 +29,7 @@ uses
   GLS.Material,
   GLS.Coordinates,
   GLS.BaseClasses,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLS.Utils, GLS.SimpleNavigation;
 
 type

Examples/Demos/cgshaders/BumpMapping/fBumpMapD.pas

@@ -29,7 +29,7 @@ uses
   GLS.Material,
   GLS.Coordinates,
   GLS.BaseClasses,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLS.Utils, GLS.SimpleNavigation;
 
 type

Examples/Demos/computing/SimpleCUDATexture/fSimpleTexD.pas

@@ -23,7 +23,7 @@ uses
   CUDA.Utility,
 
   GLS.Graphics,
-  Scenario.TextureFormat;
+  Scena.TextureFormat;
 
 type
   TForm1 = class(TForm)

Examples/Demos/glslshaders/Ocean/fOceanC.h

@@ -20,7 +20,7 @@
 #include "GLS.SkyDome.hpp"
 #include "GLSL.UserShader.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "Scenario.TextureFormat.hpp"
+#include "Scena.TextureFormat.hpp"
 #include "GLS.Color.hpp"
 #include "GLS.OpenGLTokens.hpp"
 #include "GLS.OpenGLAdapter.hpp"

Examples/Demos/glslshaders/Ocean/fOceanD.pas

@@ -36,7 +36,7 @@ uses
   GLS.BaseClasses,
   GLS.RenderContextInfo,
   GLS.SimpleNavigation,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLS.Color;
 
 type

Examples/Demos/glslshaders/ShadersLab/fShaderLabD.pas

@@ -41,7 +41,7 @@ uses
 
   GLS.State,
   GLS.RenderContextInfo,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLS.Color,
   GLS.Graphics,
   GLS.MeshUtils,

Examples/Demos/glslshaders/SkyboxShader/fSkyboxShaderD.pas

@@ -17,7 +17,7 @@ uses
   GLS.Objects,
   GLS.GeomObjects,
   GLS.Texture,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLS.CompositeImage,
   GLS.Material,
   GLS.Coordinates,

Examples/Demos/materials/proceduralclouds/fProcCloudsD.pas

@@ -24,7 +24,7 @@ uses
   GLS.Cadencer,
   GLS.SceneViewer,
   GLS.ProcTextures,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLS.Coordinates,
   GLS.BaseClasses;
 

Examples/Demos/materials/texformat/fTexFormatD.pas

@@ -65,7 +65,7 @@ implementation
 {$R *.DFM}
 
 uses
-  Scenario.TextureFormat, GLS.Utils;
+  Scena.TextureFormat, GLS.Utils;
 
 procedure TFormTexFormat.FormCreate(Sender: TObject);
 var

Examples/Demos/meshes/tiles/fTilesD.pas

@@ -31,7 +31,7 @@ uses
   GLS.Coordinates,
   GLS.BaseClasses,
   GLS.RenderContextInfo,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLS.Keyboard,
   GLS.Utils,
   GLS.SimpleNavigation;

Packages/GLScene_RT.dpk

@@ -25,7 +25,7 @@ package GLScene_RT;
 {$IMAGEBASE $400000}
 {$DEFINE DEBUG}
 {$ENDIF IMPLICITBUILDING}
-{$DESCRIPTION 'GLScene Graphics'}
+{$DESCRIPTION 'GLScene Platform'}
 {$RUNONLY}
 {$IMPLICITBUILD ON}
 
@@ -36,12 +36,12 @@ requires
   xmlrtl;
 
 contains
-  Formats.m3DSConst in '..\Source\Formats.m3DSConst.pas',
-  Formats.m3DSTypes in '..\Source\Formats.m3DSTypes.pas',
-  Formats.m3DSUtils in '..\Source\Formats.m3DSUtils.pas',
+  Formats.m3DSConst in '..\Source\Common\Formats.m3DSConst.pas',
+  Formats.m3DSTypes in '..\Source\Common\Formats.m3DSTypes.pas',
+  Formats.m3DSUtils in '..\Source\Common\Formats.m3DSUtils.pas',
   Formats.DDSImage in '..\Source\Formats.DDSImage.pas',
   Formats.DXTC in '..\Source\Formats.DXTC.pas',
-  Formats.m3DS in '..\Source\Formats.m3DS.pas',
+  Formats.m3DS in '..\Source\Common\Formats.m3DS.pas',
   Formats.HDRImage in '..\Source\Formats.HDRImage.pas',
   Formats.Q3BSP in '..\Source\Formats.Q3BSP.pas',
   Formats.B3D in '..\Source\Formats.B3D.pas',
@@ -52,7 +52,7 @@ contains
   Formats.OCT in '..\Source\Formats.OCT.pas',
   Formats.TGA in '..\Source\Formats.TGA.pas',
   Formats.X in '..\Source\Formats.X.pas',
-  Formats.VFW in '..\Source\Formats.VFW.pas',
+  Formats.VFW in '..\Source\Common\Formats.VFW.pas',
   Formats.VRML in '..\Source\Formats.VRML.pas',
   GLS.AVIRecorder in '..\Source\GLS.AVIRecorder.pas',
   GLS.AnimatedSprite in '..\Source\GLS.AnimatedSprite.pas',
@@ -229,7 +229,7 @@ contains
   GLS.TexLensFlare in '..\Source\GLS.TexLensFlare.pas',
   GLS.Texture in '..\Source\GLS.Texture.pas',
   GLS.TextureCombiners in '..\Source\GLS.TextureCombiners.pas',
-  Scenario.TextureFormat in '..\Source\Scenario.TextureFormat.pas',
+  Scena.TextureFormat in '..\Source\Common\Scena.TextureFormat.pas',
   GLS.TextureImageEditors in '..\Source\GLS.TextureImageEditors.pas',
   GLS.TexturedHDS in '..\Source\GLS.TexturedHDS.pas',
   GLS.ThorFX in '..\Source\GLS.ThorFX.pas',
@@ -261,7 +261,7 @@ contains
   GLS.VectorTypes in '..\Source\GLS.VectorTypes.pas',
   GLS.ScriptBase in '..\Source\GLS.ScriptBase.pas',
   GLS.Spline in '..\Source\GLS.Spline.pas',
-  Scenario.Strings in '..\Source\Scenario.Strings.pas',
+  Scena.Strings in '..\Source\Common\Scena.Strings.pas',
   GLS.XCollection in '..\Source\GLS.XCollection.pas',
   GLS.XOpenGL in '..\Source\GLS.XOpenGL.pas',
   PasGLTF in '..\Source\Common\PasGLTF.pas',

Packages/GLScene_RT.dproj

@@ -123,7 +123,7 @@
         <DCC_ObjOutput>..\lib\$(Platform)</DCC_ObjOutput>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
         <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 Graphics</DCC_Description>
+        <DCC_Description>GLScene Platform</DCC_Description>
         <VerInfo_MajorVer>2023</VerInfo_MajorVer>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
@@ -140,12 +140,12 @@
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="vclimg.dcp"/>
         <DCCReference Include="xmlrtl.dcp"/>
-        <DCCReference Include="..\Source\Formats.m3DSConst.pas"/>
-        <DCCReference Include="..\Source\Formats.m3DSTypes.pas"/>
-        <DCCReference Include="..\Source\Formats.m3DSUtils.pas"/>
+        <DCCReference Include="..\Source\Common\Formats.m3DSConst.pas"/>
+        <DCCReference Include="..\Source\Common\Formats.m3DSTypes.pas"/>
+        <DCCReference Include="..\Source\Common\Formats.m3DSUtils.pas"/>
         <DCCReference Include="..\Source\Formats.DDSImage.pas"/>
         <DCCReference Include="..\Source\Formats.DXTC.pas"/>
-        <DCCReference Include="..\Source\Formats.m3DS.pas"/>
+        <DCCReference Include="..\Source\Common\Formats.m3DS.pas"/>
         <DCCReference Include="..\Source\Formats.HDRImage.pas"/>
         <DCCReference Include="..\Source\Formats.Q3BSP.pas"/>
         <DCCReference Include="..\Source\Formats.B3D.pas"/>
@@ -156,7 +156,7 @@
         <DCCReference Include="..\Source\Formats.OCT.pas"/>
         <DCCReference Include="..\Source\Formats.TGA.pas"/>
         <DCCReference Include="..\Source\Formats.X.pas"/>
-        <DCCReference Include="..\Source\Formats.VFW.pas"/>
+        <DCCReference Include="..\Source\Common\Formats.VFW.pas"/>
         <DCCReference Include="..\Source\Formats.VRML.pas"/>
         <DCCReference Include="..\Source\GLS.AVIRecorder.pas"/>
         <DCCReference Include="..\Source\GLS.AnimatedSprite.pas"/>
@@ -333,7 +333,7 @@
         <DCCReference Include="..\Source\GLS.TexLensFlare.pas"/>
         <DCCReference Include="..\Source\GLS.Texture.pas"/>
         <DCCReference Include="..\Source\GLS.TextureCombiners.pas"/>
-        <DCCReference Include="..\Source\Scenario.TextureFormat.pas"/>
+        <DCCReference Include="..\Source\Common\Scena.TextureFormat.pas"/>
         <DCCReference Include="..\Source\GLS.TextureImageEditors.pas"/>
         <DCCReference Include="..\Source\GLS.TexturedHDS.pas"/>
         <DCCReference Include="..\Source\GLS.ThorFX.pas"/>
@@ -365,14 +365,14 @@
         <DCCReference Include="..\Source\GLS.VectorTypes.pas"/>
         <DCCReference Include="..\Source\GLS.ScriptBase.pas"/>
         <DCCReference Include="..\Source\GLS.Spline.pas"/>
-        <DCCReference Include="..\Source\Scenario.Strings.pas"/>
+        <DCCReference Include="..\Source\Common\Scena.Strings.pas"/>
         <DCCReference Include="..\Source\GLS.XCollection.pas"/>
         <DCCReference Include="..\Source\GLS.XOpenGL.pas"/>
         <DCCReference Include="..\Source\Common\PasGLTF.pas"/>
         <DCCReference Include="..\Source\Common\PasJSON.pas"/>
         <DCCReference Include="..\Source\Common\PasDblStrUtils.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.InitOpenGL.pas"/>
-        <None Include="..\Source\Scenario.inc"/>
+        <None Include="..\Source\Common\Scena.inc"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -394,10 +394,12 @@
                     <Source Name="MainSource">GLScene_RT.dpk</Source>
                 </Source>
                 <Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GLScene_GPU_DT.bpl">GLScene GPU Computing</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcboffice2k280.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcbofficexp280.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GLScene_Cg_DT.bpl">GLScene Cg Shaders</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Packagex/GLArena_RT.dpk

@@ -256,9 +256,8 @@ contains
   GLX.GeometryBB in '..\Source\FMX\GLX.GeometryBB.pas',
   GLX.GeometryCoordinates in '..\Source\FMX\GLX.GeometryCoordinates.pas',
   GLX.OpenGL in '..\Source\FMX\GLX.OpenGL.pas',
-  Scenario.Strings in '..\Source\Scenario.Strings.pas',
   Vulkan.Import in '..\Source\Common\Vulkan.Import.pas',
   GLSLx.Parameter in '..\Source\FMX\GLSLx.Parameter.pas',
-  Scenario.TextureFormat in '..\Source\Scenario.TextureFormat.pas';
+  Scena.Strings in '..\Source\Common\Scena.Strings.pas';
 
 end.

Packagex/GLArena_RT.dproj

@@ -4,7 +4,7 @@
         <MainSource>GLArena_RT.dpk</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>130</TargetedPlatforms>
+        <TargetedPlatforms>131</TargetedPlatforms>
         <AppType>Package</AppType>
         <FrameworkType>FMX</FrameworkType>
         <ProjectVersion>19.4</ProjectVersion>
@@ -376,11 +376,10 @@
         <DCCReference Include="..\Source\FMX\GLX.GeometryBB.pas"/>
         <DCCReference Include="..\Source\FMX\GLX.GeometryCoordinates.pas"/>
         <DCCReference Include="..\Source\FMX\GLX.OpenGL.pas"/>
-        <DCCReference Include="..\Source\Scenario.Strings.pas"/>
         <DCCReference Include="..\Source\Common\Vulkan.Import.pas"/>
         <DCCReference Include="..\Source\FMX\GLSLx.Parameter.pas"/>
-        <DCCReference Include="..\Source\Scenario.TextureFormat.pas"/>
-        <None Include="..\Source\Scenario.inc"/>
+        <DCCReference Include="..\Source\Common\Scena.Strings.pas"/>
+        <None Include="..\Source\Common\Scena.inc"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -410,7 +409,7 @@
             </Delphi.Personality>
             <Platforms>
                 <Platform value="Linux64">True</Platform>
-                <Platform value="Win32">False</Platform>
+                <Platform value="Win32">True</Platform>
                 <Platform value="Win64">True</Platform>
             </Platforms>
             <Deployment Version="3">
@@ -419,12 +418,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>

Packagex/GLArena_Scripts_RT.dproj

@@ -4,7 +4,7 @@
         <MainSource>GLArena_Scripts_RT.dpk</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>130</TargetedPlatforms>
+        <TargetedPlatforms>131</TargetedPlatforms>
         <AppType>Package</AppType>
         <FrameworkType>None</FrameworkType>
         <ProjectVersion>19.4</ProjectVersion>
@@ -132,7 +132,7 @@
             </Delphi.Personality>
             <Platforms>
                 <Platform value="Linux64">True</Platform>
-                <Platform value="Win32">False</Platform>
+                <Platform value="Win32">True</Platform>
                 <Platform value="Win64">True</Platform>
             </Platforms>
             <Deployment Version="3">

Source/CUDA.APIComps.pas

@@ -7,7 +7,7 @@ unit CUDA.APIComps;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Types,
@@ -21,7 +21,7 @@ uses
   GLS.VectorTypes,
   GLS.VectorLists,
   GLS.Graphics,
-  Scenario.Strings,
+  Scena.Strings,
   GLS.Utils,
 
   CUDA.Import,

Source/CUDA.Context.pas

@@ -10,7 +10,7 @@ interface
 uses
   System.Classes,
   System.SysUtils,
-  Scenario.Strings,
+  Scena.Strings,
   GLS.BaseClasses,
   GLS.Context,
   GLS.Generics,

Source/CUDA.EditorFm.pas

@@ -7,7 +7,7 @@ unit CUDA.EditorFm;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.Windows, 
@@ -27,7 +27,7 @@ uses
   Vcl.ToolWin,
   DesignIntf,
   VCLEditors,
-  Scenario.Strings,
+  Scena.Strings,
 
   CUDA.APIComps,
   CUDA.FFTPlan,

Source/CUDA.FFTPlan.pas

@@ -7,7 +7,7 @@ unit CUDA.FFTPlan;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
@@ -18,7 +18,7 @@ uses
   CUDA.APIComps,
   CUDA.FourierTransform,
 
-  Scenario.Strings,
+  Scena.Strings,
   GLS.Logger;
 
 type

Source/CUDA.Graphics.pas

@@ -7,7 +7,7 @@ unit CUDA.Graphics;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -23,8 +23,8 @@ uses
   GLS.Scene,
   GLS.Graphics,
   GLS.Material,
-  Scenario.Strings,
-  Scenario.TextureFormat,
+  Scena.Strings,
+  Scena.TextureFormat,
   GLS.Texture,
   GLSL.Shader,
   GLSL.ShaderParameter,

Source/Cg.BombShader.pas

@@ -7,7 +7,7 @@ unit Cg.BombShader;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
@@ -16,10 +16,10 @@ uses
   GLS.Texture,
   GLS.Cadencer,
   GLS.Context,
-  Scenario.Strings,
+  Scena.Strings,
   GLS.Material,
   GLS.RenderContextInfo,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLS.State,
 
   Cg.GL,

Source/Cg.PostTransformationShader.pas

@@ -9,7 +9,7 @@ unit Cg.PostTransformationShader;
 *)
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
@@ -20,7 +20,7 @@ uses
   GLS.Context, 
   GLS.Scene, 
   GLS.RenderContextInfo,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
 
   Cg.Import,
   Cg.GL,

Source/Cg.Register.pas

@@ -7,7 +7,7 @@ unit Cg.Register;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,

Source/Cg.Shader.pas

@@ -17,18 +17,18 @@ uses
   GLS.VectorLists,
   GLS.VectorTypes,
   GLS.Texture,
-  Scenario.Strings,
+  Scena.Strings,
   GLS.Cadencer,
   GLS.Context,
   GLS.BaseClasses,
   GLS.RenderContextInfo,
   GLS.Material,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
 
   Cg.Import,
   Cg.GL;
 
-{.$I GLScene.inc}
+{.$I Scena.inc}
 { .$DEFINE OutputCompilerWarnings }
 
 (* Define OutputCompilerWarnings to output Cg compiler warnings to a file. Useful

Source/Common/FMOD.Import.pas

@@ -25,7 +25,7 @@ unit FMOD.Import;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
 

Source/Formats.VFW.pas → Source/Common/Formats.VFW.pas

@@ -77,7 +77,7 @@ unit Formats.VFW;
 interface
 
 {.$UNDEF UNICODE}
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
     Winapi.Windows,

Source/Formats.m3DS.pas → Source/Common/Formats.m3DS.pas

@@ -17,7 +17,7 @@ unit Formats.m3DS;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 {$ALIGN ON}
 {$MINENUMSIZE 4}
 {$RANGECHECKS OFF}

Source/Formats.m3DSTypes.pas → Source/Common/Formats.m3DSTypes.pas

@@ -16,7 +16,7 @@ unit Formats.m3DSTypes;
 
 interface
 
-{.$I GLScene.inc}
+{.$I Scena.inc}
 
 uses
    System.Classes, // for TStringList

Source/Formats.m3DSUtils.pas → Source/Common/Formats.m3DSUtils.pas

@@ -11,7 +11,7 @@ unit Formats.m3DSUtils;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 {$R-}
 
 uses
@@ -21,7 +21,7 @@ uses
   Formats.m3DSTypes,
   Formats.m3DSConst,
 
-  Scenario.Strings;
+  Scena.Strings;
 
 // functions to retrieve global settings of a specific 3DS database
 function GetAtmosphere(const Source: TFile3DS; var DB: TDatabase3DS): TAtmosphere3DS;

Source/Common/OpenAL.Import.pas

@@ -42,7 +42,7 @@ unit OpenAL.Import;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.SysUtils

Source/Scenario.Strings.pas → Source/Common/Scena.Strings.pas

@@ -1,7 +1,7 @@
 //
 // The graphics platform GLScene https://github.com/glscene
 //
-unit Scenario.Strings;
+unit Scena.Strings;
 
 (*
   String constants that are used for internationalization

Source/Scenario.TextureFormat.pas → Source/Common/Scena.TextureFormat.pas

@@ -1,7 +1,7 @@
 //
 // The graphics platform GLScene https://github.com/glscene
 //
-unit Scenario.TextureFormat;
+unit Scena.TextureFormat;
 
 (* Texture formats and functions *)
 
@@ -12,7 +12,7 @@ uses
   Winapi.OpenGLext,
 
   GLS.OpenGLTokens,
-  Scenario.Strings;
+  Scena.Strings;
 
 type
   // Texture addressing rules

Source/Scenario.inc → Source/Common/Scena.inc

@@ -1,12 +1,13 @@
 //
-// The graphics platform Scene https://github.com/glscene
+// The graphics platform GLScene https://github.com/glscene
 //
 
-{$DEFINE SCENARIO}
+// .$DEFINE SCENA for VCL & ARENA for FMX
+{$DEFINE SCENA}
+{.$DEFINE ARENA}
 
 //
 // Additionnal support & dependencies
-// .$DEFINE VCL vs FMX
 //
 
 // Activate support Graphics32 library

Source/FMX/CGx.BombShader.pas

@@ -7,7 +7,7 @@ unit CGx.BombShader;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
@@ -16,10 +16,10 @@ uses
   GLX.Texture,
   GLX.Cadencer,
   GLX.Context,
-  Scenario.Strings,
+  Scena.Strings,
   GLX.Material,
   GLX.RenderContextInfo,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLX.State,
 
   CG.GL,

Source/FMX/CGx.PostTransformationShader.pas

@@ -9,7 +9,7 @@ unit CGx.PostTransformationShader;
 *)
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
@@ -20,7 +20,7 @@ uses
   GLX.Context,
   GLX.Scene,
   GLX.RenderContextInfo,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
 
   GLSLx.CustomShader,
 

Source/FMX/CGx.Register.pas

@@ -7,7 +7,7 @@ unit CGx.Register;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,

Source/FMX/CGx.Shader.pas

@@ -17,13 +17,13 @@ uses
   GLX.VectorLists,
   GLX.VectorTypes,
   GLX.Texture,
-  Scenario.Strings,
+  Scena.Strings,
   GLX.Cadencer,
   GLX.Context,
   GLX.BaseClasses,
   GLX.RenderContextInfo,
   GLX.Material,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
 
   CG.Import,
   CG.GL;
@@ -198,7 +198,7 @@ type
     property Direction: TCGenum read FDirection write FDirection;
     property Variability: TCGenum read FVariability write FVariability;
     // GLScene-friendly properties
-    property AsVector: TgxVector write SetAsVector4f; // position f.i.
+    property AsVector: TVector4f write SetAsVector4f; // position f.i.
     property AsAffineVector: TAffineVector write SetAsVector3f; // normal f.i.
     property AsVector2f: TVector2f write SetAsVector2f; // texCoord f.i.
   end;

Source/FMX/CUDAx.API.pas

@@ -17,7 +17,7 @@ uses
   GLX.VectorGeometry,
   GLX.VectorTypes,
   GLX.VectorLists,
-  Scenario.Strings,
+  Scena.Strings,
   GLX.Context,
   GLX.Graphics,
 

Source/FMX/CUDAx.Compiler.pas

@@ -21,7 +21,7 @@ uses
   FMX.Dialogs,
 
   GLX.ApplicationFileIO,
-  Scenario.Strings,
+  Scena.Strings,
   CUDA.Parser;
 
 type

Source/FMX/CUDAx.Context.pas

@@ -15,7 +15,7 @@ uses
   CUDA.Import,
   CUDA.RunTime,
 
-  Scenario.Strings,
+  Scena.Strings,
   GLX.Generics,
   GLX.BaseClasses,
   GLX.Context;

Source/FMX/CUDAx.FFTPlan.pas

@@ -17,7 +17,7 @@ uses
 
   CUDAx.API,
   CUDAx.Context,
-  Scenario.Strings;
+  Scena.Strings;
 
 type
 

Source/FMX/CUDAx.Graphics.pas

@@ -222,8 +222,8 @@ implementation
 
 uses
   System.SysUtils,
-  Scenario.Strings,
-  Scenario.TextureFormat;
+  Scena.Strings,
+  Scena.TextureFormat;
 
 
 // ------------------

Source/FMX/DWSx.OpenGL.pas

@@ -8,7 +8,7 @@ unit DWSx.OpenGL;
 *)
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,

Source/FMX/FMxCUDAEditor.pas

@@ -24,7 +24,7 @@ uses
   FMX.StdCtrls,
   FMX.Controls.Presentation,
 
-  Scenario.Strings,
+  Scena.Strings,
   CUDAx.API,
   CUDAx.FFTPlan,
   CUDAx.Graphics;

Source/FMX/FMxInfo.pas

@@ -29,7 +29,7 @@ uses
   GLX.OpenGL,
   GLX.Scene,
   GLX.Context,
-  Scenario.Strings;
+  Scena.Strings;
 
 type
   TInfoForm = class(TForm)

Source/FMX/FMxSceneEditor.pas

@@ -36,7 +36,7 @@ uses
   GLX.Scene,
   GLX.SceneViewer,
   GLX.SceneRegister,
-  Scenario.Strings,
+  Scena.Strings,
   GLX.XCollection;
 
 type

Source/FMX/FMxShaderUniformEditor.pas

@@ -22,9 +22,9 @@ uses
   FMX.Controls.Presentation,
 
   GLSLx.Parameter,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLX.VectorGeometry,
-  Scenario.Strings;
+  Scena.Strings;
 
 type
   TShaderUniformEditorForm = class(TForm)

Source/FMX/FMxXCollectionEditor.pas

@@ -31,7 +31,7 @@ uses
   FMX.ListView,
 
   GLX.Scene,
-  Scenario.Strings,
+  Scena.Strings,
   GLX.Behaviours,
   GLX.XCollection;
 

Source/FMX/FRxTextureEdit.pas

@@ -25,7 +25,7 @@ uses
   FMX.ListBox,
   FMX.Controls.Presentation,
   GLX.Graphics,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLX.Texture,
   GLX.TextureImageEditors;
 

Source/FMX/Formatx.B3D.pas

@@ -7,7 +7,7 @@ unit Formatx.B3D;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 {$R-}
 
 uses
@@ -99,7 +99,7 @@ type
     frame: Integer; //where key occurs
     position: TAffineVector; //present if (flags&1)
     scale: TAffineVector; //present if (flags&2)
-    rotation: TgxVector; //present if (flags&4)
+    rotation: TVector4f; //present if (flags&4)
   end;
 
   PANIMChunk = ^TANIMChunk;
@@ -114,7 +114,7 @@ type
     name: array[0..255] of char; //name of node
     position: TAffineVector;  //local...
     scale: TAffineVector; //coord...
-    rotation: TgxVector; //system...
+    rotation: TVector4f; //system...
     //array of node elements
     //should be one of meshes or bones, support meshes only for now
     meshes: PMESHChunk; //what 'kind' of node this is - if unrecognized, just use a Blitz3D pivot.
@@ -542,7 +542,7 @@ begin
   Inc(Count, ReadString(aStream, Node^.name, 255));
   Inc(Count, aStream.Read(Node^.position.X, sizeof(TAffineVector)));
   Inc(Count, aStream.Read(Node^.scale.X, sizeof(TAffineVector)));
-  Inc(Count, aStream.Read(Node^.rotation.X, sizeof(TgxVector)));
+  Inc(Count, aStream.Read(Node^.rotation.X, sizeof(TVector4f)));
   while Count<aChunk.length do
   begin
     Inc(Count, aStream.Read(C, sizeof(TB3DChunk)));

Source/FMX/Formatx.DDSImage.pas

@@ -14,7 +14,7 @@ unit Formatx.DDSImage;
 *)
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -27,7 +27,7 @@ uses
   GLX.VectorGeometry,
   GLX.Graphics,
   GLX.Context,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLX.FileDDS,
   Formatx.DXTC;
 

Source/FMX/Formatx.DXTC.pas

@@ -7,7 +7,7 @@ unit Formatx.DXTC;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 {$Z4}  // Minimum enum size = dword
 
@@ -15,7 +15,7 @@ uses
   Winapi.OpenGL,
   Winapi.OpenGLext,
   System.SysUtils,
-  Scenario.TextureFormat;
+  Scena.TextureFormat;
 
 const
    DDSD_CAPS        = $00000001;

Source/FMX/Formatx.GL2.pas

@@ -126,7 +126,7 @@ type
       BoneIndices     : array of Integer;
       CompBonePool    : array of TgxACompQuatBone;
       function GetCompressedMatrix(Frame,Bone : Integer):TgxACompQuatBone;
-      function GetUnCompressedMatrix(Frame,Bone : Integer):TgxMatrix;
+      function GetUnCompressedMatrix(Frame,Bone : Integer):TMatrix4f;
       procedure LoadFromStream(aStream : TStream);
   end;
 
@@ -135,7 +135,7 @@ function G2_GetVertBoneIndex(vert:TgxMVertex; iWeightNum:Integer):Integer;
 function G2_GetVertBoneWeight(vert:TgxMVertex; iWeightNum:Cardinal;
   var fTotalWeight:Single; const iNumWeights:Cardinal):single;
 
-procedure MC_UnCompressQuat(var mat : TgxMatrix; const comp : TgxACompQuatBone);
+procedure MC_UnCompressQuat(var mat : TMatrix4f; const comp : TgxACompQuatBone);
 
 // ------------------------------------------------------------------
 implementation
@@ -189,7 +189,7 @@ end;
 // Adapted from matcomp.c
 // void MC_UnCompressQuat(float mat[3][4],const unsigned char * comp)
 
-procedure MC_UnCompressQuat(var mat : TgxMatrix; const comp : TgxACompQuatBone);
+procedure MC_UnCompressQuat(var mat : TMatrix4f; const comp : TgxACompQuatBone);
 begin
   mat:=QuaternionToMatrix(QuaternionMake([comp[1]-32726,comp[2]-32726,comp[3]-32726],comp[0]-32726));
   mat.W:=VectorMake(comp[4]/64-512,comp[5]/64-512,comp[6]/64-512,1);
@@ -277,7 +277,7 @@ begin
   Result:=CompBonePool[BoneIndices[Frame*AnimHeader.numBones+Bone]];
 end;
 
-function TFileGLA.GetUnCompressedMatrix(Frame, Bone: Integer): TgxMatrix;
+function TFileGLA.GetUnCompressedMatrix(Frame, Bone: Integer): TMatrix4f;
 begin
   MC_UnCompressQuat(Result,CompBonePool[BoneIndices[Frame*AnimHeader.numBones+Bone]]);
 end;

Source/FMX/Formatx.HDRImage.pas

@@ -8,7 +8,7 @@ unit Formatx.HDRImage;
 *)
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -35,7 +35,7 @@ implementation
 
 uses
   GLX.FileHDR,
-  Scenario.TextureFormat;
+  Scena.TextureFormat;
 
 // ------------------
 // ------------------ THDRImage ------------------

Source/FMX/Formatx.LWObjects.pas

@@ -5,7 +5,7 @@ unit Formatx.LWObjects;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,

Source/FMX/Formatx.MD2.pas

@@ -8,7 +8,7 @@ unit Formatx.MD2;
 interface
 
 {$R-}
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,

Source/FMX/Formatx.OCT.pas

@@ -7,7 +7,7 @@ unit Formatx.OCT;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
@@ -78,7 +78,7 @@ type
     procedure SaveToStream(aStream: TStream);
     procedure AddTriangles(vertexCoords: TgxAffineVectorList;
       texMapCoords: TgxAffineVectorList; const textureName: String);
-    procedure AddLight(const lightPos: TAffineVector; const lightColor: TgxVector;
+    procedure AddLight(const lightPos: TAffineVector; const lightColor: TVector4f;
       lightIntensity: Integer);
   end;
 
@@ -177,7 +177,7 @@ begin
 end;
 
 procedure TOCTFile.AddLight(const lightPos: TAffineVector;
-  const lightColor: TgxVector; lightIntensity: Integer);
+  const lightColor: TVector4f; lightIntensity: Integer);
 var
   n: Integer;
 begin

Source/FMX/Formatx.Q3MD3.pas

@@ -32,7 +32,7 @@ type
   public
     procedure LoadFromFile(FileName: String);
     procedure LoadFromStream(AStream: TStream);
-    function GetTransform(TagName: string; Frame: Integer): TgxMatrix;
+    function GetTransform(TagName: string; Frame: Integer): TMatrix4f;
     property TagCount: Integer read FNumTags;
     property FrameCount: Integer read FNumFrames;
     property Tags[index: Integer]: TMD3Tag read GetTag;
@@ -305,7 +305,7 @@ begin
   result := FTags[index];
 end;
 
-function TMD3TagList.GetTransform(TagName: string; Frame: Integer): TgxMatrix;
+function TMD3TagList.GetTransform(TagName: string; Frame: Integer): TMatrix4f;
 var
   TagIdx, i, j: Integer;
   Tag: TMD3Tag;

Source/FMX/Formatx.TGA.pas

@@ -7,7 +7,7 @@ unit Formatx.TGA;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -16,11 +16,11 @@ uses
   System.SysUtils,
 
   GLX.ApplicationFileIO,
-  Scenario.Strings,
+  Scena.Strings,
 
   GLX.Context,
   GLX.Graphics,
-  Scenario.TextureFormat;
+  Scena.TextureFormat;
 
 type
 

Source/FMX/Formatx.VFW.pas

@@ -46,7 +46,7 @@ interface
 
 {.$UNDEF UNICODE}
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
     Winapi.Windows,

Source/FMX/Formatx.VRML.pas

@@ -7,14 +7,14 @@ unit Formatx.VRML;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
   System.SysUtils,
   GLX.VectorTypes,
   GLX.VectorLists,
-  Scenario.Strings;
+  Scena.Strings;
 
 type
   TVRMLNode = class

Source/FMX/Formatx.VfsPAK.pas

@@ -10,13 +10,13 @@ unit Formatx.VfsPAK;
 *)
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
   System.Contnrs,
   System.SysUtils,
-  Scenario.Strings,
+  Scena.Strings,
   GLX.ApplicationFileIO;
 
 const

Source/FMX/Formatx.X.pas

@@ -7,13 +7,13 @@ unit Formatx.X;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
   System.SysUtils,
 
-  Scenario.Strings,
+  Scena.Strings,
 
   GLX.VectorTypes,
   GLX.VectorGeometry,
@@ -72,11 +72,11 @@ type
 
   TDXFrame = class(TDXNode)
   private
-    FMatrix: TgxMatrix;
+    FMatrix: TMatrix4f;
   public
     constructor Create; override;
-    function GlobalMatrix: TgxMatrix;
-    property Matrix: TgxMatrix read FMatrix write FMatrix;
+    function GlobalMatrix: TMatrix4f;
+    property Matrix: TMatrix4f read FMatrix write FMatrix;
   end;
 
   TDXMesh = class(TDXNode)
@@ -257,7 +257,7 @@ var
     Result := StrToFloatDef(str, 0);
   end;
 
-  function ReadMatrix: TgxMatrix;
+  function ReadMatrix: TMatrix4f;
   var
     i, j: Integer;
   begin
@@ -294,7 +294,7 @@ var
     end;
   end;
 
-  function ReadVector4f: TgxVector;
+  function ReadVector4f: TVector4f;
   var
     str: String;
   begin
@@ -670,7 +670,7 @@ begin
   FMatrix := IdentityHMGMatrix;
 end;
 
-function TDXFrame.GlobalMatrix: TgxMatrix;
+function TDXFrame.GlobalMatrix: TMatrix4f;
 begin
   if Owner is TDXFrame then
     Result := MatrixMultiply(TDXFrame(Owner).GlobalMatrix, FMatrix)

Source/FMX/GLSLx.AsmShader.pas

@@ -11,7 +11,7 @@ unit GLSLx.AsmShader;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -40,7 +40,7 @@ type
     function GetAsVector2i: TVector2i; override;
     function GetAsVector3f: TVector3f; override;
     function GetAsVector3i: TVector3i; override;
-    function GetAsVector4f: TgxVector; override;
+    function GetAsVector4f: TVector4f; override;
     function GetAsVector4i: TVector4i; override;
 
     procedure SetAsVector1f(const Value: Single); override;

Source/FMX/GLSLx.BumpShaders.pas

@@ -27,7 +27,7 @@ unit GLSLx.BumpShaders;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -44,7 +44,7 @@ uses
   GLX.Texture,
   GLX.Scene,
   GLX.Cadencer,
-  Scenario.Strings,
+  Scena.Strings,
   GLX.Color,
   GLX.RenderContextInfo,
   GLX.Material,
@@ -54,7 +54,7 @@ uses
 
   GLSLx.CustomShader,
   GLSLx.Shader,
-  Scenario.TextureFormat;
+  Scena.TextureFormat;
 
 type
   TBumpMethod = (bmDot3TexCombiner, bmBasicARBFP);
@@ -1584,7 +1584,7 @@ procedure TgxBumpShader.DoLightPass(var rci: TgxRenderContextInfo;
 var
   dummyHandle, tempHandle: Integer;
   lightPos, lightAtten,
-    materialDiffuse, lightDiffuse, lightSpecular: TgxVector;
+    materialDiffuse, lightDiffuse, lightSpecular: TVector4f;
 begin
   FVertexProgramHandle.Enable;
   FVertexProgramHandle.Bind;
@@ -1753,7 +1753,7 @@ end;
 
 function TgxBumpShader.DoUnApply(var rci: TgxRenderContextInfo): Boolean;
 var
-  ambient, LMaterialAmbient: TgxVector;
+  ambient, LMaterialAmbient: TVector4f;
 begin
   Result := False;
   if (csDesigning in ComponentState) and not DesignTimeEnabled then

Source/FMX/GLSLx.CustomShader.pas

@@ -12,7 +12,7 @@ unit GLSLx.CustomShader;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -25,12 +25,12 @@ uses
   GLX.Texture, 
   GLX.Cadencer, 
   GLX.Scene,
-  Scenario.Strings, 
+  Scena.Strings, 
   GLX.Context,
   GLX.RenderContextInfo,
   GLX.Material,
   GLX.VectorLists, 
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLSLx.Parameter;
 
 const
@@ -175,7 +175,7 @@ type
     function GetAsVector1f: Single; virtual; abstract;
     function GetAsVector2f: TVector2f; virtual; abstract;
     function GetAsVector3f: TVector3f; virtual; abstract;
-    function GetAsVector4f: TgxVector; virtual; abstract;
+    function GetAsVector4f: TVector4f; virtual; abstract;
 
     function GetAsVector1i: Integer; virtual; abstract;
     function GetAsVector2i: TVector2i; virtual; abstract;
@@ -242,7 +242,7 @@ type
     procedure SetToTextureOf(const Texture: TgxTexture; const TextureIndex: Integer); overload;
 
     // friendly properties.
-    property AsVector: TgxVector read GetAsVector4f write SetAsVector4f;
+    property AsVector: TVector4f read GetAsVector4f write SetAsVector4f;
     property AsAffineVector: TAffineVector read GetAsVector3f write SetAsVector3f;
 
     // Standard types.

Source/FMX/GLSLx.DiffuseSpecularShader.pas

@@ -21,7 +21,7 @@ unit GLSLx.DiffuseSpecularShader;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
@@ -30,7 +30,7 @@ uses
   GLX.Texture,
   GLX.Scene,
   GLX.VectorGeometry,
-  Scenario.Strings,
+  Scena.Strings,
   GLSLx.CustomShader,
   GLSLx.Shader,
   GLX.Color,

Source/FMX/GLSLx.Parameter.pas

@@ -5,7 +5,7 @@ unit GLSLx.Parameter;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 {$M-}
 
 uses
@@ -14,7 +14,7 @@ uses
   System.Classes,
 
   GLX.VectorTypes,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLX.RenderContextInfo;
 
 type

Source/FMX/GLSLx.PhongShader.pas

@@ -7,7 +7,7 @@ unit GLSLx.PhongShader;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -212,7 +212,7 @@ end;
 
 procedure TgxPhongShader.DoAmbientPass(var rci: TgxRenderContextInfo);
 var
-  ambient, materialAmbient: TgxVector;
+  ambient, materialAmbient: TVector4f;
 begin
   rci.gxStates.Disable(stLighting);
 
@@ -224,7 +224,7 @@ end;
 
 procedure TgxPhongShader.DoLightPass(lightID: Cardinal);
 var
-  LightParam: TgxVector;
+  LightParam: TVector4f;
 begin
   Self.ApplyShaderPrograms();
 

Source/FMX/GLSLx.PostEffects.pas

@@ -7,7 +7,7 @@ unit GLSLx.PostEffects;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -16,7 +16,7 @@ uses
 
   GLX.PersistentClasses,
   GLX.VectorGeometry,
-  Scenario.Strings,
+  Scena.Strings,
   GLX.Scene,
   GLX.Texture,
   GLX.Graphics,
@@ -24,7 +24,7 @@ uses
   GLX.Context,
   GLX.RenderContextInfo,
   GLX.Material,
-  Scenario.TextureFormat;
+  Scena.TextureFormat;
 
 type
   EGLPostShaderHolderException = class(Exception);

Source/FMX/GLSLx.PostShaders.pas

@@ -7,7 +7,7 @@ unit GLSLx.PostShaders;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
@@ -21,7 +21,7 @@ uses
   GLSLx.Shader,
   GLSLx.CustomShader,
   GLX.RenderContextInfo,
-  Scenario.TextureFormat;
+  Scena.TextureFormat;
 
 // Custom class for GLSLxPostBlurShader. A shader that blurs the entire scene }
 type

Source/FMX/GLSLx.ProjectedTextures.pas

@@ -20,7 +20,7 @@ unit GLSLx.ProjectedTextures;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
@@ -33,7 +33,7 @@ uses
   GLX.Context,
   GLX.Color,
   GLX.RenderContextInfo,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLX.PipelineTransformation,
   GLX.VectorTypes;
 
@@ -55,7 +55,7 @@ type
     FUseQuadraticAttenuation: boolean;
   protected
     ProjectedTexturesObject: TgxSLProjectedTextures;
-    TexMatrix: TgxMatrix;
+    TexMatrix: TMatrix4f;
     procedure SetupTexMatrix;
     procedure SetStyle(val: TgxSLProjectedTexturesStyle);
     procedure SetUseAttenuation(val: boolean);
@@ -189,7 +189,7 @@ end;
 
 procedure TgxSLTextureEmitter.SetupTexMatrix;
 const
-  cBaseMat: TgxMatrix = (V:((X:0.5; Y:0;   Z:0; W:0),
+  cBaseMat: TMatrix4f = (V:((X:0.5; Y:0;   Z:0; W:0),
                           (X:0;   Y:0.5; Z:0; W:0),
                           (X:0;   Y:0;   Z:1; W:0),
                           (X:0.5; Y:0.5; Z:0; W:1)));

Source/FMX/GLSLx.Shader.pas

@@ -7,7 +7,7 @@ unit GLSLx.Shader;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -20,7 +20,7 @@ uses
   GLX.Texture,
   GLX.Context,
   GLX.RenderContextInfo,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
 
   GLSLx.CustomShader,
   GLSLx.Parameter;
@@ -94,7 +94,7 @@ type
     function GetAsVector1f: Single; override;
     function GetAsVector2f: TVector2f; override;
     function GetAsVector3f: TVector3f; override;
-    function GetAsVector4f: TgxVector; override;
+    function GetAsVector4f: TVector4f; override;
     function GetAsVector1i: Integer; override;
     function GetAsVector2i: TVector2i; override;
     function GetAsVector3i: TVector3i; override;
@@ -471,7 +471,7 @@ begin
   glGetUniformiv(FGLSLProg.Handle, FParameterID, @Result);
 end;
 
-function TgxGLSLShaderParameter.GetAsVector4f: TgxVector;
+function TgxGLSLShaderParameter.GetAsVector4f: TVector4f;
 begin
   glGetUniformfv(FGLSLProg.Handle, FParameterID, @Result);
 end;

Source/FMX/GLSLx.ShaderCombiner.pas

@@ -14,7 +14,7 @@ unit GLSLx.ShaderCombiner;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
@@ -22,7 +22,7 @@ uses
   GLX.Material,
   GLX.Scene,
   GLX.VectorGeometry,
-  Scenario.Strings,
+  Scena.Strings,
   GLX.RenderContextInfo;
 
 type

Source/FMX/GLSLx.TextureShaders.pas

@@ -31,7 +31,7 @@ uses
   GLX.VectorGeometry,
   GLX.Color,
   GLX.Material,
-  Scenario.Strings,
+  Scena.Strings,
   GLX.VectorFileObjects,
   GLX.State,
   GLX.PersistentClasses,
@@ -45,7 +45,7 @@ type
 
   TgxShaderTextureSharingMaterial = class(TInterfacedCollectionItem, IgxMaterialLibrarySupported)
   private
-    FTextureMatrix: TgxMatrix;
+    FTextureMatrix: TMatrix4f;
     FNeedToUpdateTextureMatrix: Boolean;
     FTextureMatrixIsUnitary: Boolean;
     FLibMaterial: TgxLibMaterial;
@@ -70,7 +70,7 @@ type
     procedure SetLibMaterial(const Value: TgxLibMaterial);
     procedure SetTexOffset(const Value: TgxCoordinates2);
     procedure SetTexScale(const Value: TgxCoordinates2);
-    function GetTextureMatrix: TgxMatrix;
+    function GetTextureMatrix: TMatrix4f;
     function GetTextureMatrixIsUnitary: Boolean;
   protected
     procedure coordNotifychange(Sender: TObject);
@@ -85,7 +85,7 @@ type
     constructor Create(Collection: TCollection); override;
     destructor Destroy; override;
     property LibMaterial: TgxLibMaterial read FLibMaterial write SetLibMaterial;
-    property TextureMatrix: TgxMatrix read GetTextureMatrix;
+    property TextureMatrix: TMatrix4f read GetTextureMatrix;
     property TextureMatrixIsUnitary: Boolean read GetTextureMatrixIsUnitary;
   published
     property TexOffset: TgxCoordinates2 read FTexOffset write SetTexOffset;
@@ -374,7 +374,7 @@ begin
   Result := FMaterialLibrary;
 end;
 
-function TgxShaderTextureSharingMaterial.GetTextureMatrix: TgxMatrix;
+function TgxShaderTextureSharingMaterial.GetTextureMatrix: TMatrix4f;
 begin
   if FNeedToUpdateTextureMatrix then
   begin

Source/FMX/GLX.AVIRecorder.pas

@@ -7,7 +7,7 @@ unit GLX.AVIRecorder;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.Windows,

Source/FMX/GLX.AnimatedSprite.pas

@@ -7,7 +7,7 @@ unit GLX.AnimatedSprite;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -21,7 +21,7 @@ uses
   GLX.VectorTypes,
   GLX.VectorGeometry,
   GLX.PersistentClasses,
-  Scenario.Strings,
+  Scena.Strings,
 
   GLX.Scene,
   GLX.Context,
@@ -673,7 +673,7 @@ procedure TgxAnimatedSprite.BuildList(var rci: TgxRenderContextInfo);
 var
   vx, vy: TAffineVector;
   w, h, temp: Single;
-  mat: TgxMatrix;
+  mat: TMatrix4f;
   u0, v0, u1, v1: Single;
   x0, y0, x1, y1, TexWidth, TexHeight: Integer;
   Anim: TgxSpriteAnimation;

Source/FMX/GLX.AnimationUtils.pas

@@ -7,7 +7,7 @@ unit GLX.AnimationUtils;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.SysUtils,
@@ -61,7 +61,7 @@ type
   );
 
   function Tweener(Current, Target: TAffineVector; Time, Duration: Single; EaseType: TEaseType): TAffineVector; overload;
-  function Tweener(Current, Target: TgxVector; Time, Duration: Single; EaseType: TEaseType): TgxVector; overload;
+  function Tweener(Current, Target: TVector4f; Time, Duration: Single; EaseType: TEaseType): TVector4f; overload;
   function Tweener(Current, Target: TVector2f; Time, Duration: Single; EaseType: TEaseType): TVector2f; overload;
   function Tweener(Current, Target: Single; Time, Duration: Single; EaseType: TEaseType): Single; overload;
 
@@ -912,7 +912,7 @@ begin
   end;
 end;
 
-function Tweener(Current, Target: TgxVector; Time, Duration: Single; EaseType: TEaseType): TgxVector;
+function Tweener(Current, Target: TVector4f; Time, Duration: Single; EaseType: TEaseType): TVector4f;
 var
   i: integer;
   EaseFunction : TEaseFunction;

Source/FMX/GLX.ApplicationFileIO.pas

@@ -8,7 +8,7 @@ unit GLX.ApplicationFileIO;
 *)
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.Windows,
@@ -16,7 +16,7 @@ uses
   System.SysUtils,
 
   GLX.BaseClasses,
-  Scenario.Strings;
+  Scena.Strings;
 
 const
   RC_DDS_Type = RT_RCDATA;

Source/FMX/GLX.ArchiveManager.pas

@@ -3,7 +3,7 @@
 //
 unit GLX.ArchiveManager;
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 interface
 
@@ -11,7 +11,7 @@ uses
   System.Classes,
   System.SysUtils,
 
-  Scenario.Strings,
+  Scena.Strings,
   GLX.PersistentClasses,
   GLX.ApplicationFileIO;
 

Source/FMX/GLX.AsyncHDS.pas

@@ -18,7 +18,7 @@ unit GLX.AsyncHDS;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,

Source/FMX/GLX.AsyncTimer.pas

@@ -10,7 +10,7 @@ unit GLX.AsyncTimer;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,

Source/FMX/GLX.Atmosphere.pas

@@ -13,7 +13,7 @@ unit GLX.Atmosphere;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -25,7 +25,7 @@ uses
   GLX.Cadencer,
   GLX.VectorGeometry,
   GLX.Context,
-  Scenario.Strings,
+  Scena.Strings,
   GLX.Color,
   GLX.RenderContextInfo,
   GLX.State,
@@ -90,7 +90,7 @@ type
     // Main rendering procedure.
     procedure DoRender(var rci: TgxRenderContextInfo; renderSelf, renderChildren: Boolean); override;
     // Used to determine extents.
-    function AxisAlignedDimensionsUnscaled : TgxVector; override;
+    function AxisAlignedDimensionsUnscaled : TVector4f; override;
   end;
 
   TgxAtmosphere = class(TgxCustomAtmosphere)
@@ -165,14 +165,14 @@ end;
 procedure TgxCustomAtmosphere.DoRender(var rci: TgxRenderContextInfo; renderSelf, renderChildren: Boolean);
 var
   radius, invAtmosphereHeight:    Single;
-  sunPos, eyePos, lightingVector: TgxVector;
-  diskNormal, diskRight, diskUp:  TgxVector;
+  sunPos, eyePos, lightingVector: TVector4f;
+  diskNormal, diskRight, diskUp:  TVector4f;
 
 
-  function AtmosphereColor(const rayStart, rayEnd: TgxVector): TgxColorVector;
+  function AtmosphereColor(const rayStart, rayEnd: TVector4f): TgxColorVector;
   var
     I, n:     Integer;
-    atmPoint, normal: TgxVector;
+    atmPoint, normal: TVector4f;
     altColor: TgxColorVector;
     alt, rayLength, contrib, decay, intensity, invN: Single;
   begin
@@ -214,10 +214,10 @@ var
   end;
 
 
-  function ComputeColor(var rayDest: TgxVector; mayHitGround: Boolean): TgxColorVector;
+  function ComputeColor(var rayDest: TVector4f; mayHitGround: Boolean): TgxColorVector;
   var
-    ai1, ai2, pi1, pi2: TgxVector;
-    rayVector: TgxVector;
+    ai1, ai2, pi1, pi2: TVector4f;
+    rayVector: TVector4f;
   begin
     rayVector := VectorNormalize(VectorSubtract(rayDest, eyePos));
     if RayCastSphereIntersect(eyePos, rayVector, NullHmgPoint,
@@ -363,7 +363,7 @@ begin
   if FSun <> nil then FSun.FreeNotification(Self);
 end;
 
-function TgxCustomAtmosphere.AxisAlignedDimensionsUnscaled : TgxVector;
+function TgxCustomAtmosphere.AxisAlignedDimensionsUnscaled : TVector4f;
 begin
   Result.X := FAtmosphereRadius;
   Result.Y := Result.X;
@@ -431,8 +431,8 @@ begin
     SetLength(sinCache, FSlices + 1);
     PrepareSinCosCache(sinCache, cosCache, 0, 360);
 
-    GetMem(pVertex, 2 * (FSlices + 1) * SizeOf(TgxVector));
-    GetMem(pColor, 2 * (FSlices + 1) * SizeOf(TgxVector));
+    GetMem(pVertex, 2 * (FSlices + 1) * SizeOf(TVector4f));
+    GetMem(pColor, 2 * (FSlices + 1) * SizeOf(TVector4f));
   end
   else
     raise EGLAtmosphereException.Create('Slices must be more than 0!');

Source/FMX/GLX.BSP.pas

@@ -10,7 +10,7 @@ unit GLX.BSP;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.SysUtils,
@@ -28,13 +28,13 @@ uses
 type
 
   TBSPCullingSphere = record
-    position: TgxVector;
+    position: TVector4f;
     radius: Single;
   end;
 
   TBSPRenderContextInfo = record
     // Local coordinates of the camera (can be a vector or point)
-    cameraLocal: TgxVector;
+    cameraLocal: TVector4f;
     rci: PRenderContextInfo;
     faceGroups: TList;
     cullingSpheres: array of TBSPCullingSphere;
@@ -84,7 +84,7 @@ type
       of tree balancing (structurally speaking, not polygon-wise). *)
     function AverageDepth: Single;
     //  Traverses the tree to the given point and returns the node index.
-    function FindNodeByPoint(const aPoint: TgxVector): TFGBSPNode;
+    function FindNodeByPoint(const aPoint: TVector4f): TFGBSPNode;
     (* Rendering sort mode.
       This sort mode can currently *not* blend with the sort by materials
       flag, default mode is rsBackToFront.
@@ -277,10 +277,10 @@ var
   renderNode: Boolean;
   camNode: TFGBSPNode;
 
-  procedure AbsoluteSphereToLocal(const absPos: TgxVector; absRadius: Single;
+  procedure AbsoluteSphereToLocal(const absPos: TVector4f; absRadius: Single;
     var local: TBSPCullingSphere);
   var
-    v: TgxVector;
+    v: TVector4f;
   begin
     local.position := Owner.Owner.AbsoluteToLocal(absPos);
     SetVector(v, absRadius, absRadius, absRadius, 0);
@@ -499,7 +499,7 @@ begin
   end;
 end;
 
-function TBSPMeshObject.FindNodeByPoint(const aPoint: TgxVector): TFGBSPNode;
+function TBSPMeshObject.FindNodeByPoint(const aPoint: TVector4f): TFGBSPNode;
 
   function Traverse(nodeIndex: Integer): Integer;
   var

Source/FMX/GLX.BaseClasses.pas

@@ -11,7 +11,7 @@ uses
   System.Classes,
   System.SysUtils,
 
-  Scenario.Strings,
+  Scena.Strings,
   GLX.PersistentClasses;
 
 type

Source/FMX/GLX.BaseMeshSilhouette.pas

@@ -7,7 +7,7 @@ unit GLX.BaseMeshSilhouette;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,

Source/FMX/GLX.Behaviours.pas

@@ -10,7 +10,7 @@ unit GLX.Behaviours;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,
@@ -90,9 +90,9 @@ type
     procedure DoProgress(const progressTime: TgxProgressTimes); override;
     // Adds time-proportionned acceleration to the speed.
     procedure ApplyTranslationAcceleration(const deltaTime: double;
-      const accel: TgxVector);
+      const accel: TVector4f);
     // Applies a timed force to the inertia. If Mass is null, nothing is done.
-    procedure ApplyForce(const deltaTime: double; const force: TgxVector);
+    procedure ApplyForce(const deltaTime: double; const force: TVector4f);
     (* Applies a timed torque to the inertia (yuck!).
       This gets a "yuck!" because it is as false as the rest of the rotation  model. *)
     procedure ApplyTorque(const deltaTime: double;
@@ -102,7 +102,7 @@ type
     (* Bounce speed as if hitting a surface.
       restitution is the coefficient of restituted energy (1=no energy loss,
       0=no bounce). The normal is NOT assumed to be normalized. *)
-    procedure SurfaceBounce(const surfaceNormal: TgxVector; restitution: single);
+    procedure SurfaceBounce(const surfaceNormal: TVector4f; restitution: single);
   published
     property Mass: single read FMass write FMass;
     property TranslationSpeed: TgxCoordinates
@@ -408,7 +408,7 @@ end;
 
 procedure TgxBInertia.DoProgress(const progressTime: TgxProgressTimes);
 var
-  trnVector: TgxVector;
+  trnVector: TVector4f;
   speed, newSpeed: double;
 
   procedure ApplyRotationDamping(var rotationSpeed: single);
@@ -468,13 +468,13 @@ begin
 end;
 
 procedure TgxBInertia.ApplyTranslationAcceleration(const deltaTime: double;
-  const accel: TgxVector);
+  const accel: TVector4f);
 begin
   FTranslationSpeed.AsVector := VectorCombine(FTranslationSpeed.AsVector,
     accel, 1, deltaTime);
 end;
 
-procedure TgxBInertia.ApplyForce(const deltaTime: double; const force: TgxVector);
+procedure TgxBInertia.ApplyForce(const deltaTime: double; const force: TVector4f);
 begin
   if Mass <> 0 then
     FTranslationSpeed.AsVector :=
@@ -500,7 +500,7 @@ begin
   FTranslationSpeed.Invert;
 end;
 
-procedure TgxBInertia.SurfaceBounce(const surfaceNormal: TgxVector; restitution: single);
+procedure TgxBInertia.SurfaceBounce(const surfaceNormal: TVector4f; restitution: single);
 var
   f: single;
 begin

Source/FMX/GLX.BitmapFont.pas

@@ -7,7 +7,7 @@ unit GLX.BitmapFont;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -31,7 +31,7 @@ uses
   GLX.Color,
   GLX.BaseClasses,
   GLX.RenderContextInfo,
-  Scenario.TextureFormat,
+  Scena.TextureFormat,
   GLX.VectorTypes;
 
 type
@@ -191,7 +191,7 @@ type
     procedure RenderString(var ARci: TgxRenderContextInfo;
       const aText: UnicodeString; aAlignment: TAlignment;
       aLayout: TgxTextLayout; const aColor: TgxColorVector;
-      aPosition: PgxVector = nil; aReverseY: boolean = False); overload; virtual;
+      aPosition: PVector4f = nil; aReverseY: boolean = False); overload; virtual;
     (* A simpler canvas-style TextOut helper for RenderString.
       The rendering is reversed along Y by default, to allow direct use
       with TgxCanvas *)
@@ -835,7 +835,7 @@ end;
 
 procedure TgxCustomBitmapFont.RenderString(var ARci: TgxRenderContextInfo;
   const aText: UnicodeString; aAlignment: TAlignment; aLayout: TgxTextLayout;
-  const aColor: TgxColorVector; aPosition: PgxVector = nil;
+  const aColor: TgxColorVector; aPosition: PVector4f = nil;
   aReverseY: boolean = False);
 
   function AlignmentAdjustement(p: Integer): Single;
@@ -878,7 +878,7 @@ var
   i, chi: Integer;
   pch: PCharInfo;
   TopLeft, BottomRight: TTexPoint;
-  vTopLeft, vBottomRight: TgxVector;
+  vTopLeft, vBottomRight: TVector4f;
   deltaV, spaceDeltaH: Single;
   currentChar: WideChar;
 begin
@@ -969,7 +969,7 @@ end;
 procedure TgxCustomBitmapFont.TextOut(var rci: TgxRenderContextInfo; X, Y: Single;
   const Text: UnicodeString; const Color: TgxColorVector);
 var
-  V: TgxVector;
+  V: TVector4f;
 begin
   V.X := X;
   V.Y := Y;

Source/FMX/GLX.Blur.pas

@@ -7,7 +7,7 @@ unit GLX.Blur;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.OpenGL,
@@ -32,8 +32,8 @@ uses
   GLX.Graphics,
   GLX.Context,
   GLX.State,
-  Scenario.Strings,
-  Scenario.TextureFormat,
+  Scena.Strings,
+  Scena.TextureFormat,
   GLX.BaseClasses,
   GLX.RenderContextInfo;
 

Source/FMX/GLX.BumpmapHDS.pas

@@ -11,7 +11,7 @@ unit GLX.BumpmapHDS;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   System.Classes,

Source/FMX/GLX.Cadencer.pas

@@ -7,7 +7,7 @@ unit GLX.Cadencer;
 
 interface
 
-{$I Scenario.inc}
+{$I Scena.inc}
 
 uses
   Winapi.Windows,