Upgraded to v.2.5

Examples/AdvDemos/ActorMS3D/fActorMS3dC.cpp

@@ -18,10 +18,10 @@
 #pragma link "GLS.Utils"
 #pragma link "GLS.GeomObjects"
 #pragma link "GLS.Graphics"
-#pragma link "GLS.VectorTypes"
+#pragma link "GLScene.VectorTypes"
 #pragma link "GLS.RenderContextInfo"
 #pragma link "GLS.ShadowPlane"
-#pragma link "GLS.VectorGeometry"
+#pragma link "GLScene.VectorGeometry"
 #pragma link "GLS.Mesh"
 #pragma link "GLS.Windows"
 #pragma link "GLS.State"

Examples/AdvDemos/ActorMS3D/fActorMS3dC.dfm

@@ -1,31 +1,40 @@
 object Form1: TForm1
   Left = 332
   Top = 110
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'Actor MS3D Animation'
-  ClientHeight = 682
-  ClientWidth = 952
+  ClientHeight = 1194
+  ClientWidth = 1666
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'Tahoma'
   Font.Style = []
   Position = poScreenCenter
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnShow = FormShow
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 23
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
-    Top = 65
-    Width = 952
-    Height = 617
+    Top = 114
+    Width = 1666
+    Height = 1080
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.BackgroundColor = 3618615
     Buffer.AmbientColor.Color = {0000803F0000803F0000803F0000803F}
     Buffer.AntiAliasing = aa4xHQ
     Buffer.ShadeModel = smSmooth
-    FieldOfView = 137.490020751953100000
+    FieldOfView = 154.942382812500000000
     PenAsTouch = False
     Align = alClient
     TabOrder = 0
@@ -33,59 +42,62 @@ object Form1: TForm1
   object Panel1: TPanel
     Left = 0
     Top = 0
-    Width = 952
-    Height = 65
+    Width = 1666
+    Height = 114
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Align = alTop
     TabOrder = 1
-    ExplicitWidth = 944
     object Button2: TButton
-      Left = 374
-      Top = 13
-      Width = 94
-      Height = 31
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Left = 655
+      Top = 23
+      Width = 164
+      Height = 54
+      Margins.Left = 7
+      Margins.Top = 7
+      Margins.Right = 7
+      Margins.Bottom = 7
       Caption = 'Next Frame'
       TabOrder = 0
       OnClick = Button2Click
     end
     object btnStartStop: TButton
-      Left = 16
-      Top = 13
-      Width = 94
-      Height = 31
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Left = 28
+      Top = 23
+      Width = 165
+      Height = 54
+      Margins.Left = 7
+      Margins.Top = 7
+      Margins.Right = 7
+      Margins.Bottom = 7
       Caption = 'Start'
       TabOrder = 1
       OnClick = btnStartStopClick
     end
     object Button4: TButton
-      Left = 1084
-      Top = 13
-      Width = 94
-      Height = 31
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Left = 1897
+      Top = 23
+      Width = 165
+      Height = 54
+      Margins.Left = 7
+      Margins.Top = 7
+      Margins.Right = 7
+      Margins.Bottom = 7
       Caption = 'Previous'
       TabOrder = 2
       OnClick = Button4Click
     end
     object aniBox: TComboBox
-      Left = 130
-      Top = 15
-      Width = 221
+      Left = 228
+      Top = 26
+      Width = 386
       Height = 21
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Margins.Left = 7
+      Margins.Top = 7
+      Margins.Right = 7
+      Margins.Bottom = 7
       Style = csDropDownList
       TabOrder = 3
       OnSelect = aniBoxSelect
@@ -99,17 +111,17 @@ object Form1: TForm1
         'Sit')
     end
     object aniPos: TTrackBar
-      Left = 485
-      Top = 15
-      Width = 591
-      Height = 36
-      Margins.Left = 4
-      Margins.Top = 4
-      Margins.Right = 4
-      Margins.Bottom = 4
+      Left = 849
+      Top = 26
+      Width = 1034
+      Height = 63
+      Margins.Left = 7
+      Margins.Top = 7
+      Margins.Right = 7
+      Margins.Bottom = 7
       Enabled = False
       TabOrder = 4
-      ThumbLength = 25
+      ThumbLength = 44
       OnChange = aniPosChange
     end
   end

Examples/AdvDemos/ActorMS3D/fActorMS3dC.h

@@ -24,7 +24,7 @@
 
 #include "GLS.Scene.hpp"
 
-#include "GLS.VectorGeometry.hpp"
+#include "GLScene.VectorGeometry.hpp"
 
 #include "GLS.SimpleNavigation.hpp"
 #include "GLS.VectorFileObjects.hpp"

Examples/AdvDemos/ActorMS3D/fActorms3dD.pas

@@ -31,10 +31,10 @@ uses
   GLS.Material,
   GLS.CameraController,
   GLS.Graphics,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.RenderContextInfo,
   GLS.ShadowPlane,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.SimpleNavigation,
   GLS.Mesh,
   GLS.Gui,

Examples/AdvDemos/Archipelago/fArchipelagoC.h

@@ -32,8 +32,8 @@
 #include "GLS.TerrainRenderer.hpp"
 
 #include "GLS.VectorLists.hpp"
-#include "GLS.VectorTypes.hpp"
-#include "GLS.VectorGeometry.hpp"
+#include "GLScene.VectorTypes.hpp"
+#include "GLScene.VectorGeometry.hpp"
 #include "GLS.VectorFileObjects.hpp"
 #include "GLS.WindowsFont.hpp"
 

Examples/AdvDemos/Archipelago/fArchipelagoD.pas

@@ -36,10 +36,9 @@ uses
   GLS.VectorFileObjects,
   GLS.BaseClasses,
   GLS.VectorLists,
-  GLS.VectorTypes,
-  GLS.VectorGeometry,
+  GLScene.VectorTypes,
+  GLScene.VectorGeometry,
   GLS.Keyboard,
-  GLS.OpenGLTokens,
   GLS.Context,
   GLS.State,
   GLS.TextureFormat,

Examples/AdvDemos/Christmas/fChrismasD.pas

@@ -25,12 +25,12 @@ uses
   GLS.Cadencer,
   GLS.SkyDome,
   GLS.ParticleFX,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.LensFlare,
   GLS.BitmapFont,
   GLS.WindowsFont,
   GLS.HUDObjects,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.ScreenSaver,
   GLS.ShadowPlane,
   GLS.File3DS,

Examples/AdvDemos/Earth/fEarthD.pas

@@ -20,8 +20,8 @@ uses
   Vcl.Menus,
   Vcl.ComCtrls,
 
-  GLS.VectorTypes,
-  GLS.VectorGeometry,
+  GLScene.VectorTypes,
+  GLScene.VectorGeometry,
   GLS.Material,
   GLS.Cadencer,
   GLS.LensFlare,

Examples/AdvDemos/Forest/fForestD.pas

@@ -17,12 +17,11 @@ uses
   Vcl.Imaging.Jpeg,
   Vcl.ExtCtrls,
 
-  GLS.OpenGLTokens,
   GLS.SceneViewer,
   GLS.Cadencer,
   GLS.Texture,
-  GLS.VectorTypes,
-  GLS.VectorGeometry,
+  GLScene.VectorTypes,
+  GLScene.VectorGeometry,
   GLS.Scene,
   GLS.Objects,
   GLS.Tree,

Examples/AdvDemos/GLSViewer/Source/fGLSViewer.pas

@@ -41,7 +41,7 @@ uses
   GLS.SceneViewer,
   GLS.VectorFileObjects,
   GLS.Objects,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Texture,
   GLS.Context,
   GLS.VectorLists,
@@ -56,7 +56,7 @@ uses
   GLS.Graphics,
   GLS.PersistentClasses,
   GLS.MeshUtils,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.AsyncTimer,
   GLS.Graph,
   GLS.MeshBuilder,

Examples/AdvDemos/IntensityMesh/fIntensityMeshD.pas

@@ -16,7 +16,7 @@ uses
   Vcl.ExtCtrls,
 
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.VectorFileObjects,
   GLS.VectorLists,
   GLS.SceneViewer,
@@ -24,7 +24,7 @@ uses
   GLS.Texture,
   GLSL.UserShader,
   GLS.HUDObjects,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Context,
   GLS.Objects,
   GLS.BitmapFont,

Examples/AdvDemos/PanoramViewer/fPanoViewerD.pas

@@ -28,7 +28,7 @@ uses
   GLS.Material,
   GLS.Coordinates,
   GLS.BaseClasses,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Utils;
 
 type

Examples/AdvDemos/Quake3Actor/fQuakeActorC.h

@@ -20,7 +20,7 @@
 #include "GLS.Cadencer.hpp"
 #include "GLS.VectorFileObjects.hpp"
 #include "GLS.ShadowPlane.hpp"
-#include "GLS.VectorGeometry.hpp"
+#include "GLScene.VectorGeometry.hpp"
 #include "GLS.Texture.hpp"
 #include "GLS.ParticleFX.hpp"
 #include "GLS.Material.hpp"

Examples/AdvDemos/Quake3Actor/fQuakeActorD.pas

@@ -18,12 +18,12 @@ uses
   GLS.Cadencer,
   GLS.Scene,
   GLS.Objects,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.SceneViewer,
   GLS.VectorFileObjects,
   GLS.PersistentClasses,
   GLS.ShadowPlane,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Texture,
   GLS.ParticleFX,
   GLS.Material,

Examples/AdvDemos/TexCombine/fTexCombineD.pas

@@ -32,7 +32,7 @@ uses
   GLS.BaseClasses,
   GLS.Texture,
   GLS.Graphics,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.State,
   GLS.Utils;
 

Examples/Demos/behaviours/DCEDemo/fDceDemoC.h

@@ -35,7 +35,7 @@
 #include "GLS.RenderContextInfo.hpp"
 #include "GLS.Keyboard.hpp"
 #include "GLS.State.hpp"
-#include "GLS.VectorGeometry.hpp"
+#include "GLScene.VectorGeometry.hpp"
 #include "GLS.Context.hpp"
 #include "GLS.EllipseCollision.hpp"
 #include "GLS.Utils.hpp"

Examples/Demos/behaviours/DCEDemo/fDceDemoD.pas

@@ -29,7 +29,7 @@ uses
   GLS.WindowsFont,
   GLS.HUDObjects,
   GLS.Coordinates,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.FileMD2,
   GLS.File3DS,
   GLS.Context,
@@ -40,7 +40,7 @@ uses
   GLS.State,
   GLS.Utils,
   GLS.BaseClasses,
-  GLS.VectorTypes;
+  GLScene.VectorTypes;
 
 type
   TFormDCE = class(TForm)

Examples/Demos/behaviours/FPSMovement/fFPSMovementC.h

@@ -24,7 +24,7 @@
 #include "GLS.SceneViewer.hpp"
 #include "GLS.Keyboard.hpp"
 #include "GLS.GeomObjects.hpp"
-#include "GLS.VectorGeometry.hpp"
+#include "GLScene.VectorGeometry.hpp"
 #include "GLS.Octree.hpp"
 #include "GLS.VectorLists.hpp"
 #include "GLS.Collision.hpp"

Examples/Demos/behaviours/FPSMovement/fFPSMovementD.pas

@@ -30,7 +30,7 @@ uses
   GLS.VectorLists,
   GLS.Octree,
   GLS.File3DS,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.GeomObjects,
   GLS.Material,
   GLS.Coordinates,

Examples/Demos/behaviours/PathControl/fPathControlD.pas

@@ -16,12 +16,12 @@ uses
   
   GLS.Scene,
   GLS.Objects,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Cadencer,
   GLS.Behaviours,
   GLS.Graph,
   GLS.Movement,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.SceneViewer,
  
   GLS.Coordinates,

Examples/Demos/bench/megacube/fMegaCubeD.pas

@@ -13,10 +13,10 @@ uses
 
   GLS.Scene,
   GLS.Objects,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Texture,
   GLS.Cadencer,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.SceneViewer,
   GLS.Color,
   GLS.Coordinates,

Examples/Demos/bench/megaglasscube/fMegaglassD.pas

@@ -13,10 +13,10 @@ uses
 
   GLS.Scene,
   GLS.Objects,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Texture,
   GLS.Cadencer,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.SceneViewer,
   GLS.Color,
 

Examples/Demos/bench/whirlwind/fWhirlD.pas

@@ -19,7 +19,7 @@ uses
   GLS.BaseClasses,
   GLS.Scene,
   GLS.PersistentClasses,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.SceneViewer,
   GLS.Particles,
   GLS.Cadencer,

Examples/Demos/cgshaders/BlinnSheen/fdBlinnSheen.pas

@@ -18,12 +18,12 @@ uses
   GLS.Scene,
   GLS.Objects,
   GLS.Cadencer,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Texture,
   GLS.SceneViewer,
   GLS.VectorFileObjects,
   GLS.AsyncTimer,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Material,
   GLS.Coordinates,
 

Examples/Demos/cgshaders/BombShader/CGBombShaderC.cbproj

@@ -9,7 +9,7 @@
         <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>1</TargetedPlatforms>
-        <ProjectName Condition="'$(ProjectName)'==''">CgBombShaderC</ProjectName>
+        <ProjectName Condition="'$(ProjectName)'==''">CGBombShaderC</ProjectName>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>

Examples/Demos/cgshaders/BombShader/fCgBombShaderD.pas

@@ -24,7 +24,7 @@ uses
   GLS.File3DS,
   GLS.Graph,
   GLS.Material,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Coordinates,
   GLS.BaseClasses,
   GLS.Utils,

Examples/Demos/cgshaders/BumpMap/fBumpMapD.pas

@@ -18,7 +18,7 @@ uses
 
   Cg.GL,
   GLS.CgShader,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.SceneViewer,
   GLS.Cadencer,
   GLS.Scene,

Examples/Demos/cgshaders/CellShader/fCgCellShaderD.pas

@@ -14,8 +14,8 @@ uses
   Cg.GL,
 
   GLS.Scene,
-  GLS.VectorTypes,
-  GLS.VectorGeometry,
+  GLScene.VectorTypes,
+  GLScene.VectorGeometry,
   GLS.Objects,
   GLS.Cadencer,
   GLS.Texture,

Examples/Demos/cgshaders/CloudSky/fCloudSkyD.pas

@@ -21,7 +21,7 @@ uses
   GLS.SceneViewer,
   GLS.AsyncTimer,
   GLS.Cadencer,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.SkyDome,
   GLS.Texture,
   GLS.FileTGA,

Examples/Demos/cgshaders/DistTex/fDisttexD.pas

@@ -13,7 +13,7 @@ uses
   Vcl.ExtCtrls,
   Vcl.StdCtrls,
 
-  GLS.OpenGLTokens,
+  GLS.TextureFormat,
   GLS.Cadencer,
   GLS.Texture,
   GLS.SceneViewer,

Examples/Demos/cgshaders/Reflect/fReflectD.pas

@@ -26,12 +26,12 @@ uses
   GLS.SceneViewer,
   GLS.Texture,
   GLS.CgShader,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Cadencer,
   GLS.VectorFileObjects, 
   GLS.File3DS,
   GLS.Graph, 
-  GLS.VectorTypes, 
+  GLScene.VectorTypes, 
   GLS.GeomObjects, 
   GLS.Material, 
   GLS.Coordinates,

Examples/Demos/cgshaders/SimpleCG/fCgSimpleD.pas

@@ -19,12 +19,12 @@ uses
   Cg.Shader,
 
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Objects,
   GLS.SceneViewer,
   GLS.Texture,
 
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Cadencer,
   GLS.VectorFileObjects,
   GLS.File3DS,

Examples/Demos/cgshaders/Texturing/fCgTextureD.pas

@@ -20,11 +20,11 @@ uses
   GLS.CgShader,
 
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Objects,
   GLS.SceneViewer,
   GLS.Texture,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Cadencer,
   GLS.Graph,
  

Examples/Demos/collisions/BoxSphere/fBoxSphereD.pas

@@ -20,12 +20,12 @@ uses
   
   GLS.Scene,
   GLS.PersistentClasses,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Objects,
   GLS.Cadencer,
   GLS.VectorFileObjects,
   GLS.SceneViewer,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Graph,
   GLS.GeomObjects,
  

Examples/Demos/collisions/OcclusionQuery/fOcclusionQueryD.pas

@@ -17,7 +17,7 @@ uses
 
   
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.GeomObjects,
   GLS.Objects,
   GLS.Cadencer,

Examples/Demos/collisions/RayBox/fRayBoxD.pas

@@ -17,13 +17,13 @@ uses
   Vcl.StdCtrls,
 
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Objects,
   GLS.Cadencer,
   GLS.VectorFileObjects,
   GLS.SceneViewer,
   GLS.Texture,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
 
   GLS.Material,
   GLS.Coordinates,

Examples/Demos/collisions/Raycast/fRayCastD.pas

@@ -16,8 +16,8 @@ uses
 
   GLS.Scene,
   GLS.Objects,
-  GLS.VectorTypes,
-  GLS.VectorGeometry,
+  GLScene.VectorTypes,
+  GLScene.VectorGeometry,
   GLS.BaseClasses,
   GLS.Polynomials,
   GLS.Texture,

Examples/Demos/collisions/Raycast/fRaycastC.h

@@ -16,7 +16,7 @@
 #include "GLS.Objects.hpp"
 #include "GLS.Scene.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "GLS.VectorGeometry.hpp"
+#include "GLScene.VectorGeometry.hpp"
 #include "GLS.Polynomials.hpp"
 
 //---------------------------------------------------------------------------

Examples/Demos/collisions/TriangleBox/fTriangleBoxD.pas

@@ -15,7 +15,7 @@ uses
   Vcl.ExtCtrls,
   Vcl.StdCtrls,
 
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.VectorLists,
   GLS.Scene,
   GLS.Objects,
@@ -25,7 +25,7 @@ uses
   GLS.Color,
   GLS.State,
   GLS.SceneViewer,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Graph,
   GLS.GeomObjects,
  

Examples/Demos/collisions/boxedin/fBoxC.cpp

@@ -19,7 +19,7 @@
 #pragma link "GLS.VectorFileObjects"
 #pragma link "GLS.Scene"
 #pragma link "GLS.File3DS"
-#pragma link "GLS.VectorGeometry"
+#pragma link "GLScene.VectorGeometry"
 #pragma link "GLS.Keyboard"
 #pragma link "GLS.Coordinates"
 

Examples/Demos/collisions/boxedin/fBoxC.h

@@ -9,7 +9,7 @@
 #include <Forms.hpp>
 #include <ComCtrls.hpp>
 #include <ExtCtrls.hpp>
-#include "GLS.VectorGeometry.hpp"
+#include "GLScene.VectorGeometry.hpp"
 #include "GLS.Scene.hpp"
 #include "GLS.BaseClasses.hpp"
 #include <GLS.GeomObjects.hpp>

Examples/Demos/collisions/boxedin/fBoxedinD.pas

@@ -14,10 +14,10 @@ uses
   Vcl.ComCtrls,
 
   GLS.Keyboard,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Scene,
   GLS.VectorFileObjects,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Objects,
   GLS.SceneViewer,
   GLS.Cadencer,

Examples/Demos/collisions/facevsface/fFacevsFaceD.pas

@@ -16,11 +16,11 @@ uses
   Vcl.ComCtrls,
   Vcl.Grids,
 
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Scene,
   GLS.Objects,
   GLS.SceneViewer,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.SpaceText,
   GLS.Collision,
   GLS.VectorFileObjects,

Examples/Demos/collisions/meshhit/fMeshHitD.pas

@@ -14,8 +14,8 @@ uses
   GLS.VectorFileObjects,
   GLS.Objects,
   GLS.SceneViewer,
-  GLS.VectorTypes,
-  GLS.VectorGeometry,
+  GLScene.VectorTypes,
+  GLScene.VectorGeometry,
   GLS.GeomObjects,
   GLS.Coordinates,
   GLS.BaseClasses,

Examples/Demos/collisions/octree/fOctreeD.pas

@@ -16,14 +16,14 @@ uses
   GLS.VectorFileObjects,
   GLS.Objects,
   GLS.SceneViewer,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Cadencer,
   GLS.GeomObjects,
  
   GLS.Coordinates,
   GLS.Utils,
   GLS.BaseClasses,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.VectorLists,
   GLS.File3DS;
 

Examples/Demos/collisions/sphere/fSphereD.pas

@@ -14,7 +14,7 @@ uses
   Vcl.StdCtrls,
 
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Objects,
   GLS.Collision,
   GLS.SceneViewer,

Examples/Demos/computing/PostProcessing/fPostProcessingD.pas

@@ -14,7 +14,7 @@ uses
   Vcl.Dialogs,
   Vcl.ComCtrls,
 
-  GLS.OpenGLTokens,
+  GLS.TextureFormat
   GLS.Scene,
   GLS.Coordinates,
   GLS.Objects,

Examples/Demos/computing/StableFluids/fFluidsD.pas

@@ -11,8 +11,8 @@ uses
   Vcl.Graphics,
 
   GLS.Scene,
-  GLS.VectorGeometry,
-  GLS.VectorTypes,
+  GLScene.VectorGeometry,
+  GLScene.VectorTypes,
   GLS.Cadencer,
   GLS.SceneViewer,
   GLS.BaseClasses,

Examples/Demos/computing/VertexGeneration/fVertexGenD.pas

@@ -12,8 +12,8 @@ uses
   Vcl.Dialogs,
 
   GLS.Scene,
-  GLS.VectorTypes,
-  GLS.VectorGeometry,
+  GLScene.VectorTypes,
+  GLScene.VectorGeometry,
   GLS.PipelineTransformation,
   GLS.Cadencer,
   GLS.SceneViewer,

Examples/Demos/extrusion/bendingcyl/fBendingC.cpp

@@ -18,6 +18,8 @@
 #pragma link "GLS.Objects"
 #pragma link "GLS.Scene"
 #pragma link "GLS.SceneViewer"
+#pragma link "GLScene.Spline"
+
 #pragma resource "*.dfm"
 TFormBending *FormBending;
 

Examples/Demos/extrusion/bendingcyl/fBendingC.dfm

@@ -1,25 +1,34 @@
 object FormBending: TFormBending
   Left = 0
   Top = 0
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'Bending Cylinder'
-  ClientHeight = 397
-  ClientWidth = 586
+  ClientHeight = 695
+  ClientWidth = 1040
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'Tahoma'
   Font.Style = []
   Position = poScreenCenter
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 23
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 586
-    Height = 397
+    Width = 1040
+    Height = 695
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.BackgroundColor = clBackground
-    FieldOfView = 151.723861694335900000
+    FieldOfView = 163.624389648437500000
     PenAsTouch = False
     Align = alClient
     OnMouseDown = GLSceneViewer1MouseDown
@@ -27,27 +36,39 @@ object FormBending: TFormBending
     TabOrder = 0
   end
   object CBSpline: TCheckBox
-    Left = 120
-    Top = 8
-    Width = 57
-    Height = 17
+    Left = 210
+    Top = 14
+    Width = 100
+    Height = 30
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 'Splines'
     TabOrder = 1
     OnClick = CBSplineClick
   end
   object CBFat: TCheckBox
-    Left = 376
-    Top = 8
-    Width = 57
-    Height = 17
+    Left = 658
+    Top = 14
+    Width = 100
+    Height = 30
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 'Fat/Slim'
     TabOrder = 2
   end
   object PanelFPS: TPanel
-    Left = 208
-    Top = 8
-    Width = 129
-    Height = 17
+    Left = 364
+    Top = 14
+    Width = 226
+    Height = 30
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 'FPS'
     TabOrder = 3
   end

Examples/Demos/extrusion/bendingcyl/fBendingC.h

@@ -16,9 +16,9 @@
 #include "GLS.Extrusion.hpp"
 #include "GLS.Objects.hpp"
 #include "GLS.Scene.hpp"
-#include "GLS.VectorGeometry.hpp"
+#include "GLScene.VectorGeometry.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "GLS.Spline.hpp"
+#include "GLScene.Spline.hpp"
 
 //---------------------------------------------------------------------------
 class TFormBending : public TForm

Examples/Demos/extrusion/bendingcyl/fBendingD.pas

@@ -17,7 +17,7 @@ uses
   GLS.Objects,
   GLS.Extrusion,
   GLS.Cadencer,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.SceneViewer,
 
   GLS.Coordinates,

Examples/Demos/extrusion/cutoutstar/fCutoutStarD.pas

@@ -17,7 +17,7 @@ uses
   GLS.Cadencer,
   GLS.Scene,
   GLS.Extrusion,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.MultiPolygon,
   GLS.SceneViewer,
  

Examples/Demos/extrusion/cutoutstar/fCutoutstarC.cpp

@@ -33,7 +33,7 @@ void __fastcall TFormCutoutstar::FormCreate(TObject *Sender)
    const int
 	  cSteps = 16;
    const int
-      c2 = Gls::Vectorgeometry::c2PI;
+      c2 = Glscene::Vectorgeometry::c2PI;
    new TGLExtrusionSolid(ExtrusionSolid);
    // a small star contour
    for (i=0; i<cSteps; i++)

Examples/Demos/extrusion/cutoutstar/fCutoutstarC.dfm

@@ -1,35 +1,48 @@
 object FormCutoutstar: TFormCutoutstar
   Left = 0
   Top = 0
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'Cutout Star'
-  ClientHeight = 443
-  ClientWidth = 646
+  ClientHeight = 775
+  ClientWidth = 1145
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'Tahoma'
   Font.Style = []
   Position = poScreenCenter
   OnCreate = FormCreate
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 23
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 646
-    Height = 443
+    Width = 1145
+    Height = 775
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.BackgroundColor = clBackground
-    FieldOfView = 142.587753295898400000
+    FieldOfView = 158.091873168945300000
     PenAsTouch = False
     Align = alClient
     TabOrder = 0
   end
   object PanelFPS: TPanel
-    Left = 248
-    Top = 8
-    Width = 89
-    Height = 25
+    Left = 434
+    Top = 14
+    Width = 156
+    Height = 44
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 'FPS'
     TabOrder = 1
   end

Examples/Demos/extrusion/nutsnbolts/fNutsnBoltsD.pas

@@ -19,7 +19,7 @@ uses
   GLS.Objects,
   GLS.Extrusion,
   GLS.SceneViewer,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.GeomObjects,
  
   GLS.Coordinates,

Examples/Demos/extrusion/tentacles/fTentaclesC.h

@@ -13,7 +13,7 @@
 #include "GLS.Objects.hpp"
 #include "GLS.Extrusion.hpp"
 #include "GLS.Cadencer.hpp"
-#include "GLS.VectorGeometry.hpp"
+#include "GLScene.VectorGeometry.hpp"
 #include "GLS.Texture.hpp"
 #include "GLS.SceneViewer.hpp"
 #include "GLS.Color.hpp"

Examples/Demos/extrusion/tentacles/fTentaclesD.pas

@@ -16,8 +16,8 @@ uses
   GLS.Objects,
   GLS.Extrusion,
   GLS.Cadencer,
-  GLS.VectorGeometry,
-  GLS.VectorTypes,
+  GLScene.VectorGeometry,
+  GLScene.VectorTypes,
   GLS.Texture,
   GLS.SceneViewer,
   GLS.Color,

Examples/Demos/glslshaders/BumpShader/fBumpShaderD.pas

@@ -22,7 +22,7 @@ uses
   GLS.VectorFileObjects,
   GLS.Graph,
   GLS.GeomObjects,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Material,
   GLS.Coordinates,
   GLS.BaseClasses,

Examples/Demos/glslshaders/BunnyBump/fBunnyBumpD.pas

@@ -16,7 +16,7 @@ uses
   Vcl.Imaging.Jpeg,
   
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Objects,
   GLS.Texture,
   GLS.VectorFileObjects,
@@ -27,7 +27,7 @@ uses
   GLS.Material,
   GLS.Coordinates,
   GLS.BaseClasses,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Context,
   GLS.FileOBJ,
   GLS.Utils,

Examples/Demos/glslshaders/DiffuseShader/fDiffuseShaderD.pas

@@ -18,9 +18,9 @@ uses
   GLS.Scene,
   GLS.Objects,
   GLS.Graph,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Context,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.GeomObjects,
   GLS.VectorFileObjects,
 

Examples/Demos/glslshaders/FurShader/fFurShaderD.pas

@@ -25,8 +25,8 @@ uses
   GLS.Utils,
   GLS.Context,
   GLS.FileOBJ,
-  GLS.VectorGeometry,
-  GLS.OpenGLTokens,
+  GLScene.VectorGeometry,
+  GLS.TextureFormat
   GLS.XOpenGL,
   GLS.Graphics,
   GLS.BaseClasses,

Examples/Demos/glslshaders/Ocean/fOceanC.h

@@ -22,7 +22,7 @@
 #include "GLS.SceneViewer.hpp"
 #include "GLS.TextureFormat.hpp"
 #include "GLS.Color.hpp"
-#include "GLS.OpenGLTokens.hpp"
+#include "GLScene.OpenGLTokens.hpp"
 #include "GLS.OpenGLAdapter.hpp"
 #include "GLS.Context.hpp"
 #include "GLS.RenderContextInfo.hpp"

Examples/Demos/glslshaders/Ocean/fOceanD.pas

@@ -14,19 +14,18 @@ uses
   Vcl.ExtCtrls,
   Vcl.ComCtrls,
 
-  GLS.OpenGLTokens,
   GLS.SceneViewer,
   GLS.Scene,
   GLS.Texture,
   GLS.Objects,
   GLS.Context,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.GeomObjects,
   GLS.Cadencer,
   GLSL.UserShader,
   GLS.Utils,
   GLS.Graph,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.SkyDome,
   GLS.VectorLists,
   GLS.FileDDS,

Examples/Demos/glslshaders/PostShader/fPostShaderD.pas

@@ -21,7 +21,7 @@ uses
   GLS.Graph,
   GLS.Utils,
   GLS.Context,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.GeomObjects,
   GLS.Coordinates,
   GLS.Objects,

Examples/Demos/glslshaders/ProjectedTexture/fProjectTextureD.pas

@@ -14,7 +14,7 @@ uses
   Vcl.ExtCtrls,
 
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Objects,
   GLS.Texture,
   GLS.SceneViewer,
@@ -25,7 +25,7 @@ uses
   GLS.Utils,
   GLS.FileLMTS,
   GLS.Context,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.PipelineTransformation,
   GLSL.ProjectedTextures,
 

Examples/Demos/glslshaders/ShaderComponent/fShaderCompD.pas

@@ -17,8 +17,8 @@ uses
   GLS.Objects,
   GLS.Graph,
   GLS.VectorLists,
-  GLS.VectorTypes,
-  GLS.VectorGeometry,
+  GLScene.VectorTypes,
+  GLScene.VectorGeometry,
   GLSL.Shader,
   GLS.GeomObjects,
   GLS.VectorFileObjects,

Examples/Demos/glslshaders/ShadersLab/fShaderLabD.pas

@@ -22,9 +22,9 @@ uses
   Vcl.Imaging.Jpeg,
   Vcl.Imaging.PngImage,
 
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.VectorLists,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.BaseClasses,
   GLS.PersistentClasses,
   GLS.Keyboard,

Examples/Demos/glslshaders/Shadertoy/fShadertoyD.pas

@@ -12,7 +12,7 @@ uses
   Vcl.Forms,
 
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.BaseClasses,
   GLS.Objects,
   GLS.Cadencer,
@@ -20,8 +20,8 @@ uses
   GLS.Keyboard,
   GLS.RenderContextInfo,
   GLS.OpenGLAdapter,
-  GLS.OpenGLTokens,
-  GLS.VectorGeometry,
+  GLS.TextureFormat
+  GLScene.VectorGeometry,
 
   GLS.AsyncTimer,
   GLS.Context,

Examples/Demos/glslshaders/SkyboxShader/fSkyboxShaderD.pas

@@ -9,11 +9,11 @@ uses
   Vcl.Forms,
   Vcl.Controls,
 
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Cadencer,
   GLS.SceneViewer,
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Objects,
   GLS.GeomObjects,
   GLS.Texture,

Examples/Demos/graph/fxy/fFxyD.dfm

@@ -1,112 +1,156 @@
 object FormFxy: TFormFxy
   Left = 179
   Top = 106
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   BorderWidth = 4
   Caption = 'Fxy'
-  ClientHeight = 409
-  ClientWidth = 525
+  ClientHeight = 716
+  ClientWidth = 933
   Color = clBtnFace
   DockSite = True
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   Position = poScreenCenter
   OnMouseWheel = FormMouseWheel
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 24
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 356
-    Height = 409
+    Width = 637
+    Height = 716
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.BackgroundColor = clTeal
-    FieldOfView = 109.843315124511700000
+    FieldOfView = 137.143493652343800000
     PenAsTouch = False
     Align = alClient
     OnMouseDown = GLSceneViewer1MouseDown
     OnMouseMove = GLSceneViewer1MouseMove
     TabOrder = 0
-    ExplicitWidth = 420
-    ExplicitHeight = 442
   end
   object Panel1: TPanel
-    Left = 356
+    Left = 637
     Top = 0
-    Width = 169
-    Height = 409
+    Width = 296
+    Height = 716
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Align = alRight
     TabOrder = 1
-    ExplicitLeft = 424
-    ExplicitHeight = 461
     object Label1: TLabel
-      Left = 46
-      Top = 343
-      Width = 82
-      Height = 13
+      Left = 81
+      Top = 600
+      Width = 148
+      Height = 24
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'XYZ Grid position'
     end
     object Label2: TLabel
-      Left = 22
-      Top = 69
-      Width = 7
-      Height = 13
+      Left = 39
+      Top = 121
+      Width = 14
+      Height = 24
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'X'
     end
     object Label3: TLabel
-      Left = 77
-      Top = 69
-      Width = 7
-      Height = 13
+      Left = 135
+      Top = 121
+      Width = 12
+      Height = 24
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Y'
     end
     object Label4: TLabel
-      Left = 126
-      Top = 69
-      Width = 7
-      Height = 13
+      Left = 221
+      Top = 121
+      Width = 12
+      Height = 24
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Z'
     end
     object CBCentered: TCheckBox
-      Left = 48
-      Top = 25
-      Width = 97
-      Height = 17
+      Left = 84
+      Top = 44
+      Width = 170
+      Height = 30
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Centered grids'
       TabOrder = 0
       OnClick = CBCenteredClick
     end
     object TBXYPosition: TTrackBar
-      Left = 114
-      Top = 88
-      Width = 45
-      Height = 249
+      Left = 200
+      Top = 154
+      Width = 78
+      Height = 436
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Min = -10
       Orientation = trVertical
       TabOrder = 1
+      ThumbLength = 35
       TickMarks = tmBoth
       OnChange = TBXYPositionChange
     end
     object TBYZPosition: TTrackBar
-      Left = 12
-      Top = 88
-      Width = 45
-      Height = 249
+      Left = 21
+      Top = 154
+      Width = 79
+      Height = 436
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Min = -10
       Orientation = trVertical
       TabOrder = 2
+      ThumbLength = 35
       TickMarks = tmBoth
       OnChange = TBYZPositionChange
     end
     object TBXZPosition: TTrackBar
-      Left = 63
-      Top = 88
-      Width = 45
-      Height = 249
+      Left = 110
+      Top = 154
+      Width = 79
+      Height = 436
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Min = -10
       Orientation = trVertical
       TabOrder = 3
+      ThumbLength = 35
       TickMarks = tmBoth
       OnChange = TBXZPositionChange
     end

Examples/Demos/graph/fxy/fFxyD.pas

@@ -17,8 +17,8 @@ uses
   GLS.Objects,
   GLS.Graph,
   GLS.Scene,
-  GLS.VectorGeometry,
-  GLS.VectorTypes,
+  GLScene.VectorGeometry,
+  GLScene.VectorTypes,
   GLS.SceneViewer,
 
   GLS.Coordinates,

Examples/Demos/graph/heightfield/fHeightFieldD.pas

@@ -20,8 +20,8 @@ uses
   GLS.Objects,
   GLS.Texture,
   GLS.Cadencer,
-  GLS.VectorGeometry,
-  GLS.VectorTypes,
+  GLScene.VectorGeometry,
+  GLScene.VectorTypes,
   GLS.SceneViewer,
   GLS.Color,
   GLS.Coordinates,

Examples/Demos/graph/points/fPointsD.pas

@@ -15,10 +15,10 @@ uses
   Vcl.ExtCtrls,
 
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Objects,
   GLS.SceneViewer,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.VectorLists,
   GLS.Cadencer,
   GLS.Texture,

Examples/Demos/graph/projection/fProjectionD.pas

@@ -14,11 +14,11 @@ uses
   GLS.Objects,
   GLS.SceneViewer,
   GLS.Texture,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.VectorLists,
   GLS.RenderContextInfo,
   GLS.State,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Coordinates,
   GLS.BaseClasses,
   GLS.GeomObjects,

Examples/Demos/graph/splines/fSplinesD.pas

@@ -17,7 +17,7 @@ uses
  
   GLS.Coordinates,
   GLS.BaseClasses,
-  GLS.VectorGeometry;
+  GLScene.VectorGeometry;
 
 type
   TFormSplines = class(TForm)

Examples/Demos/interface/CameraController/fCameraControllerD.pas

@@ -29,9 +29,9 @@ uses
   GLS.Material,
   GLS.Coordinates,
 
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.BaseClasses,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Navigator,
   GLS.SmoothNavigator,
   GLS.Graph;

Examples/Demos/interface/Console/fConsoleC.cpp

@@ -33,7 +33,7 @@ __fastcall TForm1::TForm1(TComponent* Owner)
 void __fastcall TForm1::OnHelloCommand(const TGLConsoleCommand *ConsoleCommand,
 		  const TGLCustomConsole *Console, TGLUserInputCommand &Command)
 {
-  Console->AddLine();
+  /// Console->AddLine();
 }
 
 //---------------------------------------------------------------------------
@@ -50,7 +50,7 @@ void __fastcall TForm1::OnCommand(const TGLConsoleCommand *ConsoleCommand,
   {
 	for (i = 1; i< (Command.CommandCount - 1); i++)
 	  Str = Str + Command.Strings[i];
-	Console->AddLine("You just typed: " + Str);
+///	Console->AddLine("You just typed: " + Str);  // todo
 	Command.UnknownCommand = false;
   }
   else
@@ -85,13 +85,13 @@ void __fastcall TForm1::FormCreate(TObject *Sender)
 
   //two ways of processing commands:
 	 //1) manual
-   GLConsole1->OnCommandIssued = OnCommand;
+ ///  GLConsole1->OnCommandIssued = OnCommand;    // todo
 	 //2)using built-in objects (prefered)
    GLConsole1->Commands->Add()->CommandName = "hello";
    GLConsole1->Commands->Add()->ShortHelp = "Says hi to you too";
    GLConsole1->Commands->Add()->LongHelp->Add("Well, the console really does say - Hi, dude - to you, because");
    GLConsole1->Commands->Add()->LongHelp->Add("it is roude not to greet someone, when he says - hello - to you ;)");
-   GLConsole1->Commands->Add()->OnCommand = OnHelloCommand;
+///   GLConsole1->Commands->Add()->OnCommand = OnHelloCommand; // todo
 
   //register additional commands to enable auto-completion function
   GLConsole1->AdditionalCommands->Add("echo");

Examples/Demos/interface/GameMenu/fGameMenuD.pas

@@ -18,7 +18,7 @@ uses
   
   GLS.Scene,
   GLS.Objects,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.SceneViewer,
   GLS.GeomObjects,
   GLS.BitmapFont,

Examples/Demos/interface/GizmoEx/fGizmoExD.pas

@@ -20,7 +20,7 @@ uses
   GLS.PersistentClasses,
   GLS.Cadencer,
   GLS.Objects,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.SceneViewer,
   GLS.Keyboard,
 
@@ -29,7 +29,7 @@ uses
 
   GLS.Coordinates,
   GLS.BaseClasses,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.GeomObjects,
   GLS.BitmapFont,
   GLS.WindowsFont,

Examples/Demos/interface/GuiPaint/fGuiPaintD.pas

@@ -14,7 +14,7 @@ uses
   Vcl.Menus,
 
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.HUDObjects,
   GLS.Objects,
   GLS.Cadencer,

Examples/Demos/interface/HFPick/fHFPickD.pas

@@ -16,8 +16,8 @@ uses
   GLS.Scene,
   GLS.Graph,
   GLS.SceneViewer,
-  GLS.VectorGeometry,
-  GLS.VectorTypes,
+  GLScene.VectorGeometry,
+  GLScene.VectorTypes,
   GLS.Texture,
   GLS.Objects,
   GLS.Color,

Examples/Demos/interface/Pick/fPickD.pas

@@ -9,7 +9,7 @@ uses
   Vcl.Dialogs,
   Vcl.Forms,
 
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Scene,
   GLS.Objects,
   GLS.Texture,

Examples/Demos/interface/WinFont/fWinFontD.pas

@@ -14,7 +14,7 @@ uses
   Vcl.Menus,
 
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.HUDObjects,
   GLS.Objects,
   GLS.Cadencer,

Examples/Demos/interface/bmpfont/fBmpfontD.pas

@@ -11,9 +11,9 @@ uses
   Vcl.Forms,
   Vcl.Dialogs,
   Vcl.ExtCtrls,
-  
+
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.HUDObjects,
   GLS.Objects,
   GLS.Cadencer,

Examples/Demos/interface/camera/fCameraD.pas

@@ -12,14 +12,14 @@ uses
   Vcl.ExtCtrls,
 
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.Objects,
   GLS.PersistentClasses,
   GLS.PipelineTransformation,
   GLS.GeomObjects,
   GLS.Coordinates,
   GLS.BaseClasses,
-  GLS.VectorGeometry,
+  GLScene.VectorGeometry,
   GLS.Cadencer,
   GLS.Context,
   GLS.SceneViewer;

Examples/Demos/interface/cursor/fCursorD.pas

@@ -19,7 +19,7 @@ uses
 
   GLS.Scene,
   GLS.Objects,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.PersistentClasses,
   GLS.Particles,
   GLS.Texture,

Examples/Demos/interface/cursorcross/fCrossCursor.pas

@@ -18,8 +18,8 @@ uses
   GLS.Objects,
   GLS.GeomObjects,
   GLS.SceneViewer,
-  GLS.VectorGeometry,
-  GLS.VectorTypes,
+  GLScene.VectorGeometry,
+  GLScene.VectorTypes,
   GLS.FileTGA,
   GLS.Coordinates,
   GLS.BaseClasses;

Examples/Demos/interface/fontcolor/fFontColorD.pas

@@ -15,8 +15,8 @@ uses
   GLS.Scene,
   GLS.Objects,
   GLS.HUDObjects,
-  GLS.VectorGeometry,
-  GLS.VectorTypes,
+  GLScene.VectorGeometry,
+  GLScene.VectorTypes,
   GLS.BitmapFont,
   GLS.Cadencer,
   GLS.TimeEventsMgr,

Examples/Demos/materials/TransparAdv/fTransparAdvD.pas

@@ -13,9 +13,9 @@ uses
   Vcl.Dialogs,
   Vcl.Imaging.Jpeg,
 
-  GLS.OpenGLTokens,
-  GLS.VectorGeometry,
-  GLS.VectorTypes,
+  GLS.TextureFormat,
+  GLScene.VectorGeometry,
+  GLScene.VectorTypes,
   GLS.Context,
   GLS.State,
   GLS.Color,

Examples/Demos/materials/dyncubemap/fDynCubemapD.pas

@@ -15,7 +15,7 @@ uses
 
   GLS.Objects,
   GLS.Scene,
-  GLS.VectorTypes,
+  GLScene.VectorTypes,
   GLS.SceneViewer,
   GLS.SkyDome,
   GLS.Cadencer,