Upgraded v.2.5

Examples/AdvDemos/Archipelago/fArchipelagoC.h

@@ -45,7 +45,7 @@
 #include "GLS.Keyboard.hpp"
 #include "GLS.Context.hpp"
 #include "GLS.State.hpp"
-#include "GLS.TextureFormat.hpp"
+#include "GLScene.TextureFormat.hpp"
 #include "GLS.File3DS.hpp"
 
 //---------------------------------------------------------------------------

Examples/AdvDemos/Archipelago/fArchipelagoD.pas

@@ -41,7 +41,7 @@ interface
   GLS.Keyboard,
   GLS.Context,
   GLS.State,
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLS.File3DS,
   GLScene.Utils,
   GLS.Navigator;

Examples/AdvDemos/Earth/fEarthD.pas

@@ -36,7 +36,7 @@ interface
   GLS.State,
   GLScene.Utils,
   GLS.Context,
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLSL.TextureShaders,
   GLScene.BaseClasses,
   GLScene.PersistentClasses,

Examples/AdvDemos/Forest/fForestD.pas

@@ -40,7 +40,7 @@ interface
   GLS.XOpenGL,
   GLScene.BaseClasses,
   GLS.TextureCombiners,
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLS.Material,
   GLScene.Coordinates,
   GLS.TerrainRenderer,

Examples/AdvDemos/GLSViewer/Source/fGLSViewer.pas

@@ -50,7 +50,7 @@ interface
   GLScene.BaseClasses,
   GLS.State,
   GLS.RenderContextInfo,
-  GLS.TextureFormat,
+  GLScene.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 "GLS.TextureFormat.hpp"
+#include "GLScene.TextureFormat.hpp"
 #include "GLSL.UserShader.hpp"
 
 //---------------------------------------------------------------------------

Examples/AdvDemos/IntensityMesh/fIntensityMeshD.pas

@@ -36,7 +36,7 @@ interface
   GLS.RenderContextInfo,
   GLS.Graphics,
   GLS.State,
-  GLS.TextureFormat;
+  GLScene.TextureFormat;
 
 type
   TFormIntensutyMesh = class(TForm)

Examples/Demos/cgshaders/BumpMap/fBumpMapD.pas

@@ -28,7 +28,7 @@ interface
   GLS.Material,
   GLScene.Coordinates,
   GLScene.BaseClasses,
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLScene.Utils,
   GLS.SimpleNavigation;
 

Examples/Demos/cgshaders/DistTex/fDisttexD.pas

@@ -13,7 +13,7 @@ interface
   Vcl.ExtCtrls,
   Vcl.StdCtrls,
 
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLS.Cadencer,
   GLS.Texture,
   GLS.SceneViewer,

Examples/Demos/computing/PostProcessing/fPostProcessingD.pas

@@ -14,7 +14,7 @@ interface
   Vcl.Dialogs,
   Vcl.ComCtrls,
 
-  GLS.TextureFormat
+  GLScene.TextureFormat
   GLS.Scene,
   GLScene.Coordinates,
   GLS.Objects,

Examples/Demos/computing/SimpleCUDA/fSimpleTexD.pas

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

Examples/Demos/glslshaders/FurShader/fFurShaderD.pas

@@ -26,7 +26,7 @@ interface
   GLS.Context,
   GLS.FileOBJ,
   GLScene.VectorGeometry,
-  GLS.TextureFormat
+  GLScene.TextureFormat
   GLS.XOpenGL,
   GLS.Graphics,
   GLScene.BaseClasses,

Examples/Demos/glslshaders/Ocean/fOceanC.h

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

Examples/Demos/glslshaders/Ocean/fOceanD.pas

@@ -35,7 +35,7 @@ interface
   GLScene.BaseClasses,
   GLS.RenderContextInfo,
   GLS.SimpleNavigation,
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLS.Color;
 
 type

Examples/Demos/glslshaders/ShadersLab/fShaderLabD.pas

@@ -41,7 +41,7 @@ interface
 
   GLS.State,
   GLS.RenderContextInfo,
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLS.Color,
   GLS.Graphics,
   GLS.MeshUtils,

Examples/Demos/glslshaders/Shadertoy/fShadertoyD.pas

@@ -20,7 +20,7 @@ interface
   GLS.Keyboard,
   GLS.RenderContextInfo,
   GLS.OpenGLAdapter,
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLScene.VectorGeometry,
 
   GLS.AsyncTimer,

Examples/Demos/glslshaders/SkyboxShader/fSkyboxShaderD.pas

@@ -17,7 +17,7 @@ interface
   GLS.Objects,
   GLS.GeomObjects,
   GLS.Texture,
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLS.CompositeImage,
   GLS.Material,
   GLScene.Coordinates,

Examples/Demos/materials/TransparAdv/fTransparAdvD.pas

@@ -13,7 +13,7 @@ interface
   Vcl.Dialogs,
   Vcl.Imaging.Jpeg,
 
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLScene.VectorGeometry,
   GLScene.VectorTypes,
   GLS.Context,

Examples/Demos/materials/fdMaterials.dfm

@@ -7,7 +7,7 @@ object FormMaterials: TFormMaterials
   Margins.Bottom = 5
   Caption = 'Materials'
   ClientHeight = 776
-  ClientWidth = 1096
+  ClientWidth = 1309
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText

Examples/Demos/materials/proceduralclouds/fProcCloudsD.pas

@@ -24,7 +24,7 @@ interface
   GLS.Cadencer,
   GLS.SceneViewer,
   GLS.ProcTextures,
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLScene.Coordinates,
   GLScene.BaseClasses,
 

Examples/Demos/materials/texformat/fTexFormatD.pas

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

Examples/Demos/meshes/tiles/fTilesD.pas

@@ -31,7 +31,7 @@ interface
   GLScene.Coordinates,
   GLScene.BaseClasses,
   GLS.RenderContextInfo,
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLS.Keyboard,
   GLScene.Utils,
   GLS.SimpleNavigation;

Examples/Demos/rendering/Grass/fGrassD.pas

@@ -32,7 +32,7 @@ interface
   GLS.Keyboard,
   GLScene.BaseClasses,
   GLS.RenderContextInfo,
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLScene.Utils
   ;
 

Examples/Demos/specialsFX/ShadowFBO/fShadowFBOD.pas

@@ -16,7 +16,7 @@ interface
   Vcl.ExtCtrls,
   Vcl.Imaging.Jpeg,
 
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLS.Scene,
   GLScene.VectorTypes,
   GLS.Context,

Examples/Demos/specialsFX/waterplane/fWaterPlaneD.pas

@@ -15,7 +15,7 @@ interface
   Vcl.Imaging.Jpeg,
 
 
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
 
   GLS.Scene,
   GLS.Objects,

Examples/Demos/utilities/GLInfos/fGLInfosD.pas

@@ -19,7 +19,7 @@ interface
   GLScene.BaseClasses,
   GLS.Scene,
   GLS.SceneViewer,
-  GLS.TextureFormat,
+  GLScene.TextureFormat,
   GLS.OpenGLAdapter,
   GLS.Context,
   GLS.Material,

Packages/GLScene_RT.dpk

@@ -254,19 +254,21 @@ contains
   GLScene.Spline in '..\Source\GLScene.Spline.pas',
   GLScene.Strings in '..\Source\GLScene.Strings.pas',
   GLScene.RandomLib in '..\Source\GLScene.RandomLib.pas',
-  GLS.TextureFormat in '..\Source\GLS.TextureFormat.pas',
+  GLScene.TextureFormat in '..\Source\GLScene.TextureFormat.pas',
   GLScene.VectorLists in '..\Source\GLScene.VectorLists.pas',
   GLScene.VectorGeometry in '..\Source\GLScene.VectorGeometry.pas',
   GLScene.VectorTypes in '..\Source\GLScene.VectorTypes.pas',
+  GLScene.VectorTypesExt in '..\Source\GLScene.VectorTypesExt.pas',
+  GLScene.Utils in '..\Source\GLScene.Utils.pas',
   GLS.VectorFileObjects in '..\Source\GLS.VectorFileObjects.pas',
   GLS.VerletTypes in '..\Source\GLS.VerletTypes.pas',
   GLS.VerletClothify in '..\Source\GLS.VerletClothify.pas',
-  GLScene.VectorTypesExt in '..\Source\GLScene.VectorTypesExt.pas',
   PasDblStrUtils in '..\Source\PasDblStrUtils.pas',
   PasGLTF in '..\Source\PasGLTF.pas',
   PasJSON in '..\Source\PasJSON.pas',
-  GLScene.Utils in '..\Source\GLScene.Utils.pas',
-  GLS.OpenGLAdapter in '..\Source\GLS.OpenGLAdapter.pas';
+  GLS.OpenGLAdapter in '..\Source\GLS.OpenGLAdapter.pas',
+  gnuGettext in '..\Source\gnuGettext.pas',
+  gnuGettextInit in '..\Source\gnuGettextInit.pas';
 
 end.
 

Packages/GLScene_RT.dproj

@@ -379,19 +379,21 @@
         <DCCReference Include="..\Source\GLScene.Spline.pas"/>
         <DCCReference Include="..\Source\GLScene.Strings.pas"/>
         <DCCReference Include="..\Source\GLScene.RandomLib.pas"/>
-        <DCCReference Include="..\Source\GLS.TextureFormat.pas"/>
+        <DCCReference Include="..\Source\GLScene.TextureFormat.pas"/>
         <DCCReference Include="..\Source\GLScene.VectorLists.pas"/>
         <DCCReference Include="..\Source\GLScene.VectorGeometry.pas"/>
         <DCCReference Include="..\Source\GLScene.VectorTypes.pas"/>
+        <DCCReference Include="..\Source\GLScene.VectorTypesExt.pas"/>
+        <DCCReference Include="..\Source\GLScene.Utils.pas"/>
         <DCCReference Include="..\Source\GLS.VectorFileObjects.pas"/>
         <DCCReference Include="..\Source\GLS.VerletTypes.pas"/>
         <DCCReference Include="..\Source\GLS.VerletClothify.pas"/>
-        <DCCReference Include="..\Source\GLScene.VectorTypesExt.pas"/>
         <DCCReference Include="..\Source\PasDblStrUtils.pas"/>
         <DCCReference Include="..\Source\PasGLTF.pas"/>
         <DCCReference Include="..\Source\PasJSON.pas"/>
-        <DCCReference Include="..\Source\GLScene.Utils.pas"/>
         <DCCReference Include="..\Source\GLS.OpenGLAdapter.pas"/>
+        <DCCReference Include="..\Source\gnuGettext.pas"/>
+        <DCCReference Include="..\Source\gnuGettextInit.pas"/>
         <None Include="..\Source\GLScene.Defines.inc"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>

Packages/GXScene_RT.dpk

@@ -37,26 +37,9 @@ requires
   fmx;
 
 contains
-  Formatx.m3DS in '..\SourceX\Formatx.m3DS.pas',
-  Formatx.m3DSConst in '..\SourceX\Formatx.m3DSConst.pas',
-  Formatx.m3DSTypes in '..\SourceX\Formatx.m3DSTypes.pas',
-  Formatx.m3DSUtils in '..\SourceX\Formatx.m3DSUtils.pas',
-  Formatx.B3D in '..\SourceX\Formatx.B3D.pas',
-  Formatx.MD2 in '..\SourceX\Formatx.MD2.pas',
-  Formatx.MD3 in '..\SourceX\Formatx.MD3.pas',
-  Formatx.DXTC in '..\SourceX\Formatx.DXTC.pas',
-  Formatx.GL2 in '..\SourceX\Formatx.GL2.pas',
-  Formatx.LWO in '..\SourceX\Formatx.LWO.pas',
-  Formatx.VFW in '..\SourceX\Formatx.VFW.pas',
-  Formatx.Q3BSP in '..\SourceX\Formatx.Q3BSP.pas',
   Formatx.DDSImage in '..\SourceX\Formatx.DDSImage.pas',
   Formatx.HDRImage in '..\SourceX\Formatx.HDRImage.pas',
-  Formatx.Q3MD3 in '..\SourceX\Formatx.Q3MD3.pas',
-  Formatx.OCT in '..\SourceX\Formatx.OCT.pas',
-  Formatx.X in '..\SourceX\Formatx.X.pas',
   Formatx.TGA in '..\SourceX\Formatx.TGA.pas',
-  Formatx.VRML in '..\SourceX\Formatx.VRML.pas',
-  Formatx.VfsPAK in '..\SourceX\Formatx.VfsPAK.pas',
   GXS.AnimatedSprite in '..\SourceX\GXS.AnimatedSprite.pas',
   GXS.ApplicationFileIO in '..\SourceX\GXS.ApplicationFileIO.pas',
   GXS.ArchiveManager in '..\SourceX\GXS.ArchiveManager.pas',
@@ -254,7 +237,6 @@ contains
   GLScene.VectorTypesExt in '..\Source\GLScene.VectorTypesExt.pas',
   GLScene.VectorGeometry in '..\Source\GLScene.VectorGeometry.pas',
   GLScene.OpenGLTokens in '..\Source\GLScene.OpenGLTokens.pas',
-  GXS.TextureFormat in '..\Sourcex\GXS.TextureFormat.pas',
   GXS.OpenGLAdapter in '..\Sourcex\GXS.OpenGLAdapter.pas',
   GLScene.Logger in '..\Source\GLScene.Logger.pas',
   GLScene.Spline in '..\Source\GLScene.Spline.pas',
@@ -269,6 +251,25 @@ contains
   GLScene.CurvesAndSurfaces in '..\Source\GLScene.CurvesAndSurfaces.pas',
   GLScene.Coordinates in '..\Source\GLScene.Coordinates.pas',
   GLScene.BaseClasses in '..\Source\GLScene.BaseClasses.pas',
-  GLScene.AnimationUtils in '..\Source\GLScene.AnimationUtils.pas';
+  GLScene.AnimationUtils in '..\Source\GLScene.AnimationUtils.pas',
+  Formats.X in '..\Source\Formats.X.pas',
+  GLScene.TextureFormat in '..\Source\GLScene.TextureFormat.pas',
+  Formats.DXTC in '..\Source\Formats.DXTC.pas',
+  Formats.GL2 in '..\Source\Formats.GL2.pas',
+  Formats.m3DS in '..\Source\Formats.m3DS.pas',
+  Formats.m3DSConst in '..\Source\Formats.m3DSConst.pas',
+  Formats.m3DSTypes in '..\Source\Formats.m3DSTypes.pas',
+  Formats.m3DSUtils in '..\Source\Formats.m3DSUtils.pas',
+  Formats.MD2 in '..\Source\Formats.MD2.pas',
+  Formats.MD3 in '..\Source\Formats.MD3.pas',
+  Formats.OCT in '..\Source\Formats.OCT.pas',
+  Formats.Q3BSP in '..\Source\Formats.Q3BSP.pas',
+  Formats.VFW in '..\Source\Formats.VFW.pas',
+  Formats.VRML in '..\Source\Formats.VRML.pas',
+  Formatx.Q3MD3 in '..\Sourcex\Formatx.Q3MD3.pas',
+  Formats.B3D in '..\Source\Formats.B3D.pas',
+  Formats.LWO in '..\Source\Formats.LWO.pas',
+  gnuGettext in '..\Source\gnuGettext.pas',
+  gnuGettextInit in '..\Source\gnuGettextInit.pas';
 
 end.