Updated examples

Examples/AdvDemos/Archipelago/fArchipelagoC.h

@@ -42,7 +42,7 @@
 #include "GLS.RoamPatch.hpp"
 #include "GLS.RenderContextInfo.hpp"
 
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLS.Context.hpp"
 #include "GLS.State.hpp"
 #include "GLScene.TextureFormat.hpp"

Examples/AdvDemos/Archipelago/fArchipelagoD.pas

@@ -12,14 +12,24 @@ uses
   Vcl.Graphics, 
   Vcl.Controls, 
   Vcl.ExtCtrls,
-  Vcl.ComCtrls, 
-  Vcl.Forms, 
-  Vcl.Dialogs, 
+  Vcl.ComCtrls,
+  Vcl.Forms,
+  Vcl.Dialogs,
   Vcl.Imaging.Jpeg,
 
+  GLScene.Coordinates,
+  GLScene.BaseClasses,
+  GLScene.VectorLists,
+  GLScene.VectorTypes,
+  GLScene.VectorGeometry,
+  GLScene.XCollection,
+  GLScene.TextureFormat,
+  GLScene.Keyboard,
+  GLScene.Utils,
+
   GLS.Scene,
-  GLS.Cadencer, 
-  GLS.Objects, 
+  GLS.Cadencer,
+  GLS.Objects,
   GLS.TerrainRenderer,
   GLS.HeightData,
   GLS.HeightTileFileHDS,
@@ -30,20 +40,12 @@ uses
   GLS.SceneViewer,
   GLS.WindowsFont,
   GLS.BitmapFont,
-  GLScene.Coordinates,
   GLS.RenderContextInfo,
-  GLS.Color,
+  GLScene.Color,
   GLS.VectorFileObjects,
-  GLScene.BaseClasses,
-  GLScene.VectorLists,
-  GLScene.VectorTypes,
-  GLScene.VectorGeometry,
-  GLScene.XCollection,
   GLS.Context,
   GLS.State,
-  GLScene.TextureFormat,
   GLS.File3DS,
-  GLScene.Utils,
   GLS.Navigator;
 
 type

Examples/AdvDemos/Christmas/fChrismasD.pas

@@ -38,7 +38,7 @@ uses
   GLS.GeomObjects,
   GLS.Material,
   GLScene.Coordinates,
-  GLS.Color,
+  GLScene.Color,
   GLS.SoundManager,
   GLS.Sounds.BASS,
   BASS.Import,

Examples/AdvDemos/Earth/fEarthD.pas

@@ -32,7 +32,7 @@ uses
   GLS.SceneViewer,
   GLS.Texture,
   GLS.RenderContextInfo,
-  GLS.Color,
+  GLScene.Color,
   GLS.State,
   GLScene.Utils,
   GLS.Context,
@@ -136,8 +136,8 @@ type
   private
     FileName, Path: TFileName;
     procedure LoadConstellationLines;
-    function AtmosphereColor(const rayStart, rayEnd: TGLVector): TGLColorVector;
-    function ComputeColor(var rayDest: TGLVector; mayHitGround: Boolean): TGLColorVector;
+    function AtmosphereColor(const rayStart, rayEnd: TGLVector): TGColorVector;
+    function ComputeColor(var rayDest: TGLVector; mayHitGround: Boolean): TGColorVector;
   end;
 
 var
@@ -149,8 +149,8 @@ const
   cAtmosphereRadius: Single = 0.55;
   // use value slightly lower than actual radius, for antialiasing effect
   cEarthRadius: Single = 0.495;
-  cLowAtmColor: TGLColorVector = (X: 1; Y: 1; Z: 1; W: 1);
-  cHighAtmColor: TGLColorVector = (X: 0; Y: 0; Z: 1; W: 1);
+  cLowAtmColor: TGColorVector = (X: 1; Y: 1; Z: 1; W: 1);
+  cHighAtmColor: TGColorVector = (X: 0; Y: 0; Z: 1; W: 1);
   cIntDivTable: array [2 .. 20] of Single = (1 / 2, 1 / 3, 1 / 4, 1 / 5, 1 / 6, 1 / 7, 1 / 8, 1 / 9,
     1 / 10, 1 / 11, 1 / 12, 1 / 13, 1 / 14, 1 / 15, 1 / 16, 1 / 17, 1 / 18, 1 / 19, 1 / 20);
 
@@ -191,11 +191,11 @@ end;
 
 //--------------------------------------------------------------------------------
 
-function TFormEarth.AtmosphereColor(const rayStart, rayEnd: TGLVector): TGLColorVector;
+function TFormEarth.AtmosphereColor(const rayStart, rayEnd: TGLVector): TGColorVector;
 var
   i, n: Integer;
   atmPoint, normal: TGLVector;
-  altColor: TGLColorVector;
+  altColor: TGColorVector;
   alt, rayLength, contrib, decay, intensity, invN: Single;
 
 begin
@@ -238,7 +238,7 @@ end;
 
 //-----------------------------------------------------------------------
 
-function TFormEarth.ComputeColor(var rayDest: TGLVector; mayHitGround: Boolean): TGLColorVector;
+function TFormEarth.ComputeColor(var rayDest: TGLVector; mayHitGround: Boolean): TGColorVector;
 var
   ai1, ai2, pi1, pi2: TGLVector;
   rayVector: TGLVector;

Examples/AdvDemos/Forest/fForestD.pas

@@ -17,16 +17,21 @@ uses
   Vcl.Imaging.Jpeg,
   Vcl.ExtCtrls,
 
+  GLScene.VectorTypes,
+  GLScene.VectorGeometry,
+  GLScene.XCollection,
+  GLScene.VectorLists,
+  GLScene.PersistentClasses,
+  GLScene.BaseClasses,
+  GLScene.TextureFormat,
+  GLScene.Keyboard,
+
   GLS.SceneViewer,
   GLS.Cadencer,
   GLS.Texture,
-  GLScene.VectorTypes,
-  GLScene.VectorGeometry,
   GLS.Scene,
   GLS.Objects,
   GLS.Tree,
-  GLScene.XCollection,
-  GLScene.VectorLists,
   GLS.BitmapFont,
   GLS.Context,
   GLS.WindowsFont,
@@ -35,12 +40,9 @@ uses
   GLS.Imposter,
   GLS.ParticleFX,
   GLS.Graphics,
-  GLScene.PersistentClasses,
-  GLS.PipelineTransformation,
   GLS.XOpenGL,
-  GLScene.BaseClasses,
+  GLS.PipelineTransformation,
   GLS.TextureCombiners,
-  GLScene.TextureFormat,
   GLS.Material,
   GLScene.Coordinates,
   GLS.TerrainRenderer,

Examples/AdvDemos/GLSViewer/Source/fGLSViewer.pas

@@ -36,27 +36,29 @@ uses
   Vcl.BaseImageCollection,
   Vcl.ImageCollection,
 
+  GLScene.VectorTypes,
+  GLScene.VectorLists,
+  GLScene.Keyboard,
+  GLScene.VectorGeometry,
+  GLScene.Coordinates,
+  GLScene.BaseClasses,
+  GLScene.PersistentClasses,
+  GLScene.TextureFormat,
+  GLScene.XCollection,
+
   GLS.Material,
   GLS.Scene,
   GLS.SceneViewer,
   GLS.VectorFileObjects,
   GLS.Objects,
-  GLScene.VectorGeometry,
   GLS.Texture,
   GLS.Context,
-  GLScene.VectorLists,
   GLS.Cadencer,
-  GLScene.Coordinates,
-  GLScene.BaseClasses,
   GLS.State,
   GLS.RenderContextInfo,
-  GLScene.TextureFormat,
-  GLS.Color,
-  GLScene.XCollection,
+  GLScene.Color,
   GLS.Graphics,
-  GLScene.PersistentClasses,
   GLS.MeshUtils,
-  GLScene.VectorTypes,
   GLS.AsyncTimer,
   GLS.Graph,
   GLS.MeshBuilder,
@@ -311,8 +313,8 @@ type
   // Hidden line shader (specific implem for the viewer, *not* generic)
   THiddenLineShader = class(TGLShader)
   private
-    LinesColor: TGLColorVector;
-    BackgroundColor: TGLColorVector;
+    LinesColor: TGColorVector;
+    BackgroundColor: TGColorVector;
     PassCount: Integer;
   public
     procedure DoApply(var rci: TGLRenderContextInfo; Sender: TObject); override;

Examples/AdvDemos/PanoramViewer/fPanoViewerC.cpp

@@ -16,7 +16,7 @@
 #pragma link "GLScene.Coordinates"
 
 #pragma link "GLS.Material"
-#pragma link "GLS.Keyboard"
+#pragma link "GLScene.Keyboard"
 #pragma resource "*.dfm"
 TForm1* Form1;
 //---------------------------------------------------------------------------

Examples/AdvDemos/PanoramViewer/fPanoViewerC.h

@@ -22,7 +22,7 @@
 #include "GLScene.Coordinates.hpp"
 #include "GLS.Material.hpp"
 
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLS.FileJPEG.hpp"
 #include "GLScene.Utils.hpp"
 

Examples/AdvDemos/PanoramViewer/fPanoViewerD.dfm

@@ -1,30 +1,39 @@
 object Form1: TForm1
   Left = 201
   Top = 129
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'Simple Spherical Pano Viewer'
-  ClientHeight = 345
-  ClientWidth = 530
+  ClientHeight = 604
+  ClientWidth = 942
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   KeyPreview = True
   OnCreate = FormCreate
   OnKeyDown = FormKeyDown
   OnMouseWheel = FormMouseWheel
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 24
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
-    Top = 46
-    Width = 530
-    Height = 299
+    Top = 81
+    Width = 942
+    Height = 523
     Cursor = crHandPoint
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.FaceCulling = False
     Buffer.Lighting = False
-    FieldOfView = 150.041778564453100000
+    FieldOfView = 162.606475830078100000
     PenAsTouch = False
     Align = alClient
     OnMouseDown = GLSceneViewer1MouseDown
@@ -34,66 +43,94 @@ object Form1: TForm1
   object Panel1: TPanel
     Left = 0
     Top = 0
-    Width = 530
-    Height = 46
+    Width = 942
+    Height = 81
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
-    Font.Height = -11
+    Font.Height = -19
     Font.Name = 'Arial'
     Font.Style = []
     ParentFont = False
     TabOrder = 1
     object LabelYaw: TLabel
-      Left = 249
-      Top = 8
-      Width = 35
-      Height = 14
+      Left = 436
+      Top = 14
+      Width = 55
+      Height = 22
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Yaw: 0'
     end
     object LabelPitch: TLabel
-      Left = 249
-      Top = 24
-      Width = 35
-      Height = 14
+      Left = 436
+      Top = 42
+      Width = 63
+      Height = 22
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Pitch: 0'
     end
     object Label1: TLabel
-      Left = 113
-      Top = 8
-      Width = 62
-      Height = 14
+      Left = 198
+      Top = 14
+      Width = 110
+      Height = 22
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Focal Length'
     end
     object Label2: TLabel
-      Left = 329
-      Top = 8
-      Width = 166
-      Height = 28
+      Left = 576
+      Top = 14
+      Width = 285
+      Height = 44
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Hold left mouse button to pan'#13#10'Zoom in/out with the mouse wheel'
     end
     object BtnLoad: TButton
-      Left = 8
-      Top = 8
-      Width = 89
-      Height = 30
+      Left = 14
+      Top = 14
+      Width = 156
+      Height = 53
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Load Image...'
       TabOrder = 0
       OnClick = BtnLoadClick
     end
     object TrackBar1: TTrackBar
-      Left = 108
-      Top = 23
-      Width = 126
-      Height = 16
+      Left = 189
+      Top = 40
+      Width = 221
+      Height = 28
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Max = 100
       Min = 10
       Frequency = 10
       Position = 40
       TabOrder = 1
-      ThumbLength = 10
+      ThumbLength = 18
       TickMarks = tmBoth
       TickStyle = tsNone
       OnChange = TrackBar1Change

Examples/AdvDemos/PanoramViewer/fPanoViewerD.pas

@@ -18,17 +18,18 @@ uses
   Vcl.ExtDlgs,
   Vcl.Imaging.Jpeg,
 
+  GLScene.Coordinates,
+  GLScene.BaseClasses,
+  GLScene.VectorGeometry,
+  GLScene.Keyboard,
+  GLScene.XCollection,
 
   GLS.Scene,
   GLS.Objects,
   GLS.Texture,
-  GLScene.XCollection,
   GLS.Cadencer,
   GLS.SceneViewer,
   GLS.Material,
-  GLScene.Coordinates,
-  GLScene.BaseClasses,
-  GLScene.VectorGeometry,
   GLScene.Utils;
 
 type
@@ -71,7 +72,7 @@ type
 var
   Form1: TForm1;
 
-implementation
+implementation  //------------------------------------------------------------
 
 {$R *.DFM}
 

Examples/Demos/behaviours/DCEDemo/fDceDemoC.h

@@ -33,7 +33,7 @@
 #include "GLS.FileMD2.hpp"
 #include "GLScene.BaseClasses.hpp"
 #include "GLS.RenderContextInfo.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLS.State.hpp"
 #include "GLScene.VectorGeometry.hpp"
 #include "GLS.Context.hpp"

Examples/Demos/behaviours/FPSMovement/fFPSMovementC.h

@@ -22,7 +22,7 @@
 #include "GLS.SimpleNavigation.hpp"
 #include "GLS.VectorFileObjects.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLS.GeomObjects.hpp"
 #include "GLScene.VectorGeometry.hpp"
 #include "GLS.Octree.hpp"

Examples/Demos/behaviours/Torque/fTorqueD.pas

@@ -23,7 +23,7 @@ uses
   GLScene.BaseClasses,
   GLS.Behaviours,
   GLS.HUDObjects,
-  GLS.Color,
+  GLScene.Color,
   GLS.BitmapFont,
   GLS.GeomObjects,
   GLS.RenderContextInfo,
@@ -107,7 +107,7 @@ procedure TFormTorque.GLSceneViewer1MouseDown(Sender: TObject; Button: TMouseBut
   Shift: TShiftState; X, Y: Integer);
 var
   pickedObject: TGLCustomSceneObject;
-  oldColor: TGLColorVector;
+  oldColor: TGColorVector;
   rci: TGLRenderContextInfo;
 begin
   // if an object is picked...

Examples/Demos/bench/megacube/fMegaCubeD.pas

@@ -18,7 +18,7 @@ uses
   GLS.Cadencer,
   GLScene.VectorTypes,
   GLS.SceneViewer,
-  GLS.Color,
+  GLScene.Color,
   GLScene.Coordinates,
   GLScene.BaseClasses,
   GLS.SimpleNavigation;

Examples/Demos/bench/megaglasscube/fMegaglassD.pas

@@ -18,7 +18,7 @@ uses
   GLS.Cadencer,
   GLScene.VectorTypes,
   GLS.SceneViewer,
-  GLS.Color,
+  GLScene.Color,
 
   GLScene.Coordinates,
   GLS.Material,

Examples/Demos/collisions/Raycast/fRayCastD.pas

@@ -24,7 +24,7 @@ uses
   GLS.Cadencer,
   GLS.SceneViewer,
   GLS.GeomObjects,
-  GLS.Color,
+  GLScene.Color,
   GLScene.Coordinates,
   GLScene.Utils;
 

Examples/Demos/collisions/TriangleBox/fTriangleBoxD.pas

@@ -22,7 +22,7 @@ uses
   GLS.Cadencer,
   GLS.VectorFileObjects,
   GLS.Material,
-  GLS.Color,
+  GLScene.Color,
   GLS.State,
   GLS.SceneViewer,
   GLScene.VectorGeometry,

Examples/Demos/collisions/boxedin/fBoxC.cpp

@@ -4,7 +4,7 @@
 #include <tchar.h>
 
 #include <stdlib.h>
-#include <GLS.Keyboard.hpp>
+#include <GLScene.Keyboard.hpp>
 #pragma hdrstop
 
 #include "fBoxC.h"
@@ -20,7 +20,7 @@
 #pragma link "GLS.Scene"
 #pragma link "GLS.File3DS"
 #pragma link "GLScene.VectorGeometry"
-#pragma link "GLS.Keyboard"
+#pragma link "GLScene.Keyboard"
 #pragma link "GLScene.Coordinates"
 
 #pragma link "GLScene.BaseClasses"

Examples/Demos/extrusion/tentacles/fTentaclesD.pas

@@ -20,7 +20,7 @@ uses
   GLScene.VectorTypes,
   GLS.Texture,
   GLS.SceneViewer,
-  GLS.Color,
+  GLScene.Color,
 
   GLScene.Coordinates,
   GLScene.BaseClasses;

Examples/Demos/glslshaders/Ocean/fOceanD.pas

@@ -36,7 +36,7 @@ uses
   GLS.RenderContextInfo,
   GLS.SimpleNavigation,
   GLScene.TextureFormat,
-  GLS.Color;
+  GLScene.Color;
 
 type
   TForm1 = class(TForm)

Examples/Demos/glslshaders/ShadersLab/fShaderLabD.pas

@@ -42,7 +42,7 @@ uses
   GLS.State,
   GLS.RenderContextInfo,
   GLScene.TextureFormat,
-  GLS.Color,
+  GLScene.Color,
   GLS.Graphics,
   GLS.MeshUtils,
   GLScene.Utils,

Examples/Demos/glslshaders/SimpleGLSL/fSimpleShaderC.cpp

@@ -7,7 +7,7 @@
 
 #include "fSimpleShaderC.h"
 
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLS.Context.hpp"
 #include "GLS.File3DS.hpp"
 
@@ -26,7 +26,7 @@
 #pragma link "GLS.VectorFileObjects"
 #pragma link "GLS.SceneViewer"
 #pragma link "GLS.WindowsFont"
-#pragma link "GLS.Keyboard"
+#pragma link "GLScene.Keyboard"
 #pragma link "GLS.Context"
 #pragma link "GLS.File3DS"
 
@@ -177,7 +177,7 @@ void __fastcall TForm1::Timer1Timer(TObject* Sender)
     Caption = Format("Simple GLSL Shader [%.2f FPS]",
         ARRAYOFCONST((GLSceneViewer1->FramesPerSecond())));
     GLHUDText1->Text =
-        "GLS.Keyboard [1,2,3,4,5,6,7,8,9,0 ] Current Shader: " + CurrShaderName;
+        "GLScene.Keyboard [1,2,3,4,5,6,7,8,9,0 ] Current Shader: " + CurrShaderName;
     GLSceneViewer1->ResetPerformanceMonitor();
 }
 //---------------------------------------------------------------------------

Examples/Demos/graph/heightfield/fHeightFieldD.pas

@@ -23,7 +23,7 @@ uses
   GLScene.VectorGeometry,
   GLScene.VectorTypes,
   GLS.SceneViewer,
-  GLS.Color,
+  GLScene.Color,
   GLScene.Coordinates,
   GLScene.BaseClasses;
 
@@ -71,11 +71,11 @@ type
   private
 
     procedure Formula1(const X, Y: Single; var z: Single;
-      var Color: TGLColorVector; var texPoint: TTexPoint);
+      var Color: TGColorVector; var texPoint: TTexPoint);
     procedure Formula2(const X, Y: Single; var z: Single;
-      var Color: TGLColorVector; var texPoint: TTexPoint);
+      var Color: TGColorVector; var texPoint: TTexPoint);
     procedure Formula3(const X, Y: Single; var z: Single;
-      var Color: TGLColorVector; var texPoint: TTexPoint);
+      var Color: TGColorVector; var texPoint: TTexPoint);
   public
     mx, my: Integer;
   end;
@@ -97,7 +97,7 @@ begin
 end;
 
 procedure TFormHeightField.Formula1(const X, Y: Single; var z: Single;
-  var Color: TGLColorVector; var texPoint: TTexPoint);
+  var Color: TGColorVector; var texPoint: TTexPoint);
 begin
   // first formula
   z := VectorNorm(X, Y);
@@ -106,7 +106,7 @@ begin
 end;
 
 procedure TFormHeightField.Formula2(const X, Y: Single; var z: Single;
-  var Color: TGLColorVector; var texPoint: TTexPoint);
+  var Color: TGColorVector; var texPoint: TTexPoint);
 begin
   // 2nd formula
   z := 0.5 * cos(X * 6.28) * sin(Sqrt(abs(Y)) * 6.28);
@@ -114,7 +114,7 @@ begin
 end;
 
 procedure TFormHeightField.Formula3(const X, Y: Single; var z: Single;
-  var Color: TGLColorVector; var texPoint: TTexPoint);
+  var Color: TGColorVector; var texPoint: TTexPoint);
 begin
   // 3rd formula, dynamic
   z := 1 / (1 + VectorNorm(Sphere1.position.X - X, Sphere1.position.Y - Y));

Examples/Demos/graph/points/fPointsD.pas

@@ -22,7 +22,7 @@ uses
   GLScene.VectorLists,
   GLS.Cadencer,
   GLS.Texture,
-  GLS.Color,
+  GLScene.Color,
 
   GLScene.Coordinates,
   GLScene.BaseClasses;

Examples/Demos/interface/GameMenu/fGameMenuC.h

@@ -24,7 +24,7 @@
 #include "GLS.GameMenu.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Texture.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 
 #include "GLS.Material.hpp"
 #include "GLScene.Coordinates.hpp"

Examples/Demos/interface/GizmoEx/fGizmoExC.h

@@ -24,7 +24,7 @@
 #include "GLS.Scene.hpp"
 #include "GLS.SceneViewer.hpp"
 #include "GLS.WindowsFont.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLS.GizmoEx.hpp"
 
 //---------------------------------------------------------------------------

Examples/Demos/interface/HFPick/fHFPickD.pas

@@ -20,7 +20,7 @@ uses
   GLScene.VectorTypes,
   GLS.Texture,
   GLS.Objects,
-  GLS.Color,
+  GLScene.Color,
   GLScene.Coordinates,
   GLScene.BaseClasses;
 

Examples/Demos/interface/Pick/fPickD.pas

@@ -15,7 +15,7 @@ uses
   GLS.Texture,
   GLS.SceneViewer,
   GLS.GeomObjects,
-  GLS.Color,
+  GLScene.Color,
 
   GLScene.Coordinates,
   GLScene.BaseClasses,

Examples/Demos/interface/camera/fCameraC.h

@@ -17,7 +17,7 @@
 #include "GLS.Scene.hpp"
 #include "GLS.GeomObjects.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 
 //---------------------------------------------------------------------------
 class TForm1 : public TForm

Examples/Demos/materials/TransparAdv/fTransparAdvD.pas

@@ -18,7 +18,7 @@ uses
   GLScene.VectorTypes,
   GLS.Context,
   GLS.State,
-  GLS.Color,
+  GLScene.Color,
   GLS.Scene,
   GLS.Objects,
   GLScene.Coordinates,
@@ -39,6 +39,7 @@ uses
   GLS.BitmapFont,
   GLS.WindowsFont,
   GLScene.XCollection,
+  GLScene.Keyboard,
   GLS.CompositeImage,
 
   GLScene.Utils;
@@ -131,11 +132,11 @@ end;
 //---------------------------------------------------------------------------
 procedure TFormTransparAdv.CreateShapes;
 const
-  vLtBlue: TGLColorVector = (X: 0.00; Y: 0.00; Z: 1.00; W:0.90);
-  vLtPink: TGLColorVector = (X: 0.40; Y:0.00; Z:0.20; W:0.50);
-  vLtYellow: TGLColorVector = (X: 0.98; Y:0.96; Z:0.14; W:0.30);
-  vLtMagenta: TGLColorVector = (X: 0.83; Y:0.04; Z:0.83; W:0.70);
-  vLtGreen: TGLColorVector = (X: 0.05; Y:0.98; Z:0.14; W:0.30);
+  vLtBlue: TGColorVector = (X: 0.00; Y: 0.00; Z: 1.00; W:0.90);
+  vLtPink: TGColorVector = (X: 0.40; Y:0.00; Z:0.20; W:0.50);
+  vLtYellow: TGColorVector = (X: 0.98; Y:0.96; Z:0.14; W:0.30);
+  vLtMagenta: TGColorVector = (X: 0.83; Y:0.04; Z:0.83; W:0.70);
+  vLtGreen: TGColorVector = (X: 0.05; Y:0.98; Z:0.14; W:0.30);
 var
   vd: array [0 .. 3] of TGLVertexData;
 

Examples/Demos/materials/customquad/fCustomQuadD.pas

@@ -19,7 +19,7 @@ uses
   GLS.Behaviours,
   GLS.SceneViewer,
   GLS.GeomObjects,
-  GLS.Color,
+  GLScene.Color,
 
   GLS.Material,
   GLScene.Coordinates,

Examples/Demos/materials/multipass/fMultiPassD.pas

@@ -19,7 +19,7 @@ uses
   GLS.Context,
   GLS.GeomObjects,
   GLS.State,
-  GLS.Color,
+  GLScene.Color,
   GLS.Material,
   GLScene.Coordinates,
  
@@ -63,7 +63,7 @@ type
 
   THiddenLineShader = class(TGLShader)
   private
-    BackgroundColor, LineColor: TGLColorVector;
+    BackgroundColor, LineColor: TGColorVector;
     PassCount: Integer;
   public
     procedure DoApply(var rci: TGLRenderContextInfo; Sender: TObject); override;
@@ -72,7 +72,7 @@ type
 
   TOutLineShader = class(TGLShader)
   private
-    BackgroundColor, LineColor: TGLColorVector;
+    BackgroundColor, LineColor: TGColorVector;
     OutlineSmooth, Lighting: Boolean;
     OutlineWidth, Oldlinewidth: Single;
     PassCount: Integer;

Examples/Demos/materials/multipass/fMultipassC.h

@@ -50,7 +50,7 @@ class THiddenLineShader : public TGLShader
     __fastcall virtual THiddenLineShader(TComponent* AOwner);
     __fastcall virtual ~THiddenLineShader(void);
 
-    TGLColorVector BackgroundColor, LineColor;
+    TGColorVector BackgroundColor, LineColor;
     int PassCount;
 
     void __fastcall DoApply(TGLRenderContextInfo &rci, System::TObject* Sender);
@@ -64,7 +64,7 @@ class TOutLineShader : public TGLShader
     __fastcall virtual TOutLineShader(TComponent* AOwner);
     __fastcall virtual ~TOutLineShader(void);
 
-    TGLColorVector BackgroundColor, LineColor;
+    TGColorVector BackgroundColor, LineColor;
     bool OutlineSmooth, Lighting;
     float OutlineWidth, OldlineWidth;
     int PassCount;

Examples/Demos/meshes/actortwocam/fActorTwocamC.h

@@ -25,7 +25,7 @@
 #include "GLS.Navigator.hpp"
 #include "GLS.SkyDome.hpp"
 #include "GLS.VectorFileObjects.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLScene.VectorGeometry.hpp"
 
 //---------------------------------------------------------------------------

Examples/Demos/meshes/actortwocam/fActorTwocamD.pas

@@ -14,27 +14,29 @@ uses
   Vcl.ExtCtrls,
   Vcl.ComCtrls,
   Vcl.Forms,
+  Vcl.StdCtrls,
+  Vcl.Graphics,
 
-  GLS.Scene,
+  GLScene.Keyboard,
   GLScene.VectorTypes,
+  GLScene.Coordinates,
+  GLScene.BaseClasses,
+  GLScene.Utils,
+  GLScene.VectorGeometry,
+  GLScene.XCollection,
+  GLScene.PersistentClasses,
+
+  GLS.Scene,
   GLS.Objects,
   GLS.Cadencer,
   GLS.VectorFileObjects,
-  StdCtrls,
-  Graphics,
   GLS.SkyDome,
   GLS.SceneViewer,
   GLS.Navigator,
   GLS.FileMD2,
   GLS.File3DS,
   GLS.GeomObjects,
-
-  GLScene.Coordinates,
-  GLScene.BaseClasses,
-  GLScene.Utils,
-  GLScene.VectorGeometry,
-  GLScene.XCollection,
-  GLScene.PersistentClasses, GLS.DCE;
+  GLS.DCE;
 
 type
   TFormActorTwocam = class(TForm)

Examples/Demos/meshes/formula/fFormulaC.cpp

@@ -35,7 +35,7 @@ TAffineVector __fastcall TForm1::MakeVect(const float aX, const float aY)
 //---------------------------------------------------------------------------
 
 void __fastcall TForm1::AddTriangle(const TAffineVector p1,
-	const TAffineVector p2, const TAffineVector p3, const TGLColorVector color)
+	const TAffineVector p2, const TAffineVector p3, const TGColorVector color)
 {
 	Mesh1->Vertices->AddVertex(p1, NullVector, color);
 	Mesh1->Vertices->AddVertex(p2, NullVector, color);

Examples/Demos/meshes/formula/fFormulaC.h

@@ -63,7 +63,7 @@ private:	// User declarations
 	void __fastcall AddTriangle(const TAffineVector p1,
 						  const TAffineVector p2,
 						  const TAffineVector p3,
-						  const TGLColorVector color);
+						  const TGColorVector color);
 public:		// User declarations
 	__fastcall TForm1(TComponent* Owner);
 };

Examples/Demos/meshes/formula/fFormulaD.pas

@@ -23,7 +23,7 @@ uses
   GLS.Mesh,
   GLS.SceneViewer,
   GLS.State,
-  GLS.Color,
+  GLScene.Color,
  
   GLScene.Coordinates,
   GLScene.BaseClasses;
@@ -58,7 +58,7 @@ type
     invRes1, invRes2 : Single;
     function MakeVect(const aX, aY : Single) : TAffineVector;
     procedure AddTriangle(const p1, p2, p3 : TAffineVector;
-                          const color : TGLColorVector);
+                          const color : TGColorVector);
   public
      
   end;
@@ -80,7 +80,7 @@ begin
 end;
 
 procedure TFormFormula.AddTriangle(const p1, p2, p3 : TAffineVector;
-                         const color : TGLColorVector);
+                         const color : TGColorVector);
 begin
   with Mesh1.Vertices do begin
      AddVertex(p1, NullVector, color);

Examples/Demos/meshes/portal/fPortalC.h

@@ -20,7 +20,7 @@
 #include "GLS.Portal.hpp"
 #include "GLS.VectorFileObjects.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "JPeg.hpp"
 
 //---------------------------------------------------------------------------

Examples/Demos/meshes/portal/fPortalD.dfm

@@ -1,126 +1,165 @@
 object FormPortal: TFormPortal
   Left = 74
   Top = 84
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'Portal'
-  ClientHeight = 528
-  ClientWidth = 810
+  ClientHeight = 924
+  ClientWidth = 1432
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   Position = poScreenCenter
   WindowState = wsMaximized
   OnCreate = FormCreate
+  PixelsPerInch = 168
   DesignSize = (
-    810
-    528)
-  TextHeight = 13
+    1432
+    924)
+  TextHeight = 24
   object Label1: TLabel
-    Left = 8
-    Top = 8
-    Width = 75
-    Height = 18
+    Left = 14
+    Top = 14
+    Width = 135
+    Height = 32
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 'Maze Map'
     Font.Charset = ANSI_CHARSET
     Font.Color = clWindowText
-    Font.Height = -16
+    Font.Height = -28
     Font.Name = 'Arial'
     Font.Style = [fsBold, fsItalic]
     ParentFont = False
   end
   object Label2: TLabel
-    Left = 304
-    Top = 8
-    Width = 61
-    Height = 18
+    Left = 532
+    Top = 14
+    Width = 108
+    Height = 32
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = '3D View'
     Font.Charset = ANSI_CHARSET
     Font.Color = clWindowText
-    Font.Height = -16
+    Font.Height = -28
     Font.Name = 'Arial'
     Font.Style = [fsBold, fsItalic]
     ParentFont = False
   end
   object Label3: TLabel
-    Left = 24
-    Top = 312
-    Width = 241
-    Height = 42
+    Left = 42
+    Top = 546
+    Width = 421
+    Height = 66
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 
       'To modify map, edit cells with keyboard :'#13#10'- any non-empty cell ' +
       'is a wall'#13#10'- click '#39'process'#39' to commit changes or check '#39'auto'#39
     Font.Charset = ANSI_CHARSET
     Font.Color = clWindowText
-    Font.Height = -11
+    Font.Height = -19
     Font.Name = 'Arial'
     Font.Style = []
     ParentFont = False
   end
   object GLSceneViewer1: TGLSceneViewer
-    Left = 296
-    Top = 32
-    Width = 522
-    Height = 521
+    Left = 518
+    Top = 56
+    Width = 914
+    Height = 912
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.FogEnvironment.FogColor.Color = {00000000000000008180003F0000803F}
     Buffer.FogEnvironment.FogStart = 1.000000000000000000
     Buffer.FogEnvironment.FogEnd = 10.000000000000000000
     Buffer.BackgroundColor = clNavy
-    FieldOfView = 158.269744873046900000
+    FieldOfView = 167.485137939453100000
     PenAsTouch = False
     Anchors = [akLeft, akTop, akRight, akBottom]
     OnMouseDown = GLSceneViewer1MouseDown
     TabOrder = 0
-    ExplicitWidth = 476
-    ExplicitHeight = 453
   end
   object BUForward: TButton
-    Left = 96
-    Top = 360
-    Width = 89
-    Height = 25
+    Left = 168
+    Top = 630
+    Width = 156
+    Height = 44
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 'Forward (Z/W)'
     TabOrder = 1
     OnClick = BUForwardClick
   end
   object BUTurnLeft: TButton
-    Left = 8
-    Top = 376
-    Width = 81
-    Height = 25
+    Left = 14
+    Top = 658
+    Width = 142
+    Height = 44
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 'Turn Left (Q/A)'
     TabOrder = 2
     OnClick = BUTurnLeftClick
   end
   object BUTurnRight: TButton
-    Left = 192
-    Top = 376
-    Width = 89
-    Height = 25
+    Left = 336
+    Top = 658
+    Width = 156
+    Height = 44
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 'TurnRight (D)'
     TabOrder = 3
     OnClick = BUTurnRightClick
   end
   object BUBackward: TButton
-    Left = 96
-    Top = 392
-    Width = 89
-    Height = 25
+    Left = 168
+    Top = 686
+    Width = 156
+    Height = 44
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 'Backward (S)'
     TabOrder = 4
     OnClick = BUBackwardClick
   end
   object SGMap: TStringGrid
-    Left = 8
-    Top = 32
-    Width = 272
-    Height = 272
+    Left = 14
+    Top = 56
+    Width = 476
+    Height = 476
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     BorderStyle = bsNone
     ColCount = 16
-    DefaultColWidth = 16
-    DefaultRowHeight = 16
+    DefaultColWidth = 28
+    DefaultRowHeight = 28
     FixedCols = 0
     RowCount = 16
     FixedRows = 0
@@ -129,62 +168,74 @@ object FormPortal: TFormPortal
     TabOrder = 5
     OnSetEditText = SGMapSetEditText
     ColWidths = (
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16)
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28)
     RowHeights = (
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16
-      16)
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28
+      28)
   end
   object BBProcess: TButton
-    Left = 200
-    Top = 8
-    Width = 75
-    Height = 17
+    Left = 350
+    Top = 14
+    Width = 131
+    Height = 30
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 'Process'
     TabOrder = 6
     OnClick = BBProcessClick
   end
   object CBAuto: TCheckBox
-    Left = 152
-    Top = 8
-    Width = 41
-    Height = 17
+    Left = 266
+    Top = 14
+    Width = 72
+    Height = 30
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 'Auto'
     TabOrder = 7
   end
   object CBFog: TCheckBox
-    Left = 640
-    Top = 8
-    Width = 49
-    Height = 17
+    Left = 1120
+    Top = 14
+    Width = 86
+    Height = 30
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Caption = 'Fog'
     TabOrder = 8
     OnClick = CBFogClick

Examples/Demos/meshes/portal/fPortalD.pas

@@ -18,20 +18,24 @@ uses
   Vcl.Imaging.Jpeg,
 
   GLS.Scene,
+
   GLScene.VectorTypes,
+  GLScene.PersistentClasses,
+  GLScene.Keyboard,
+  GLScene.Coordinates,
+  GLScene.BaseClasses,
+  GLScene.XCollection,
+  GLScene.Utils,
+
   GLS.Texture,
   GLS.VectorFileObjects,
-  GLScene.PersistentClasses,
   GLS.Objects,
   GLS.Cadencer,
   GLS.Portal,
   GLS.SceneViewer,
- 
+
   GLS.Material,
-  GLScene.Coordinates,
-  GLScene.BaseClasses,
-  GLScene.XCollection,
-  GLScene.Utils, GLS.SimpleNavigation;
+  GLS.SimpleNavigation;
 
 type
   TFormPortal = class(TForm)

Examples/Demos/meshes/shadedterrain/fShadedTerrainC.h

@@ -27,7 +27,7 @@
 
 #include "GLS.Material.hpp"
 
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include <jpeg.hpp>
 #include "GLSL.TextureShaders.hpp"             // Pascal unit
 

Examples/Demos/meshes/shadedterrain/fShadedTerrainD.dfm

@@ -1,13 +1,17 @@
 object FormShadedTerrain: TFormShadedTerrain
   Left = 165
   Top = 146
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'Shaded Terrain'
-  ClientHeight = 508
-  ClientWidth = 782
+  ClientHeight = 889
+  ClientWidth = 1383
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   Position = poScreenCenter
@@ -15,12 +19,17 @@ object FormShadedTerrain: TFormShadedTerrain
   OnKeyPress = FormKeyPress
   OnMouseWheel = FormMouseWheel
   OnShow = FormShow
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 24
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
-    Top = 65
-    Width = 782
-    Height = 443
+    Top = 114
+    Width = 1383
+    Height = 775
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     BeforeRender = GLSceneViewer1BeforeRender
     Buffer.FogEnvironment.FogColor.Color = {0000803F0000803F0000803F0000803F}
@@ -30,7 +39,7 @@ object FormShadedTerrain: TFormShadedTerrain
     Buffer.BackgroundColor = clGray
     Buffer.FogEnable = True
     Buffer.Lighting = False
-    FieldOfView = 154.559234619140600000
+    FieldOfView = 165.295242309570300000
     PenAsTouch = False
     Align = alClient
     OnMouseDown = GLSceneViewer1MouseDown
@@ -40,94 +49,138 @@ object FormShadedTerrain: TFormShadedTerrain
   object Panel1: TPanel
     Left = 0
     Top = 0
-    Width = 782
-    Height = 65
+    Width = 1383
+    Height = 114
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Align = alTop
     BevelOuter = bvLowered
     TabOrder = 1
     object Label1: TLabel
-      Left = 8
-      Top = 8
-      Width = 113
-      Height = 13
+      Left = 14
+      Top = 14
+      Width = 208
+      Height = 24
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Bumpmap Sub-sampling'
     end
     object LASubFactor: TLabel
-      Left = 306
-      Top = 8
-      Width = 62
-      Height = 13
+      Left = 536
+      Top = 14
+      Width = 110
+      Height = 24
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'LASubFactor'
     end
     object Label2: TLabel
-      Left = 8
-      Top = 40
-      Width = 89
-      Height = 13
+      Left = 14
+      Top = 70
+      Width = 159
+      Height = 24
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Bumpmap Intensity'
     end
     object LABumpIntensity: TLabel
-      Left = 308
-      Top = 38
-      Width = 59
-      Height = 13
+      Left = 539
+      Top = 67
+      Width = 102
+      Height = 24
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'LABIntensity'
     end
     object LaScaleZ: TLabel
-      Left = 474
-      Top = 8
-      Width = 37
-      Height = 13
+      Left = 830
+      Top = 14
+      Width = 64
+      Height = 24
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Scale Z'
     end
     object LabelZ: TLabel
-      Left = 703
-      Top = 8
-      Width = 47
-      Height = 13
+      Left = 1230
+      Top = 14
+      Width = 82
+      Height = 24
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'LAScaleZ'
     end
     object LabelContInterval: TLabel
-      Left = 703
-      Top = 35
-      Width = 70
-      Height = 13
+      Left = 1230
+      Top = 61
+      Width = 121
+      Height = 24
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'LAContInterval'
     end
     object TBSubSampling: TTrackBar
-      Left = 127
-      Top = 3
-      Width = 177
-      Height = 29
+      Left = 222
+      Top = 5
+      Width = 310
+      Height = 51
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Max = 3
       PageSize = 1
       Position = 1
       TabOrder = 0
       TabStop = False
-      ThumbLength = 10
+      ThumbLength = 18
       TickMarks = tmBoth
       OnChange = TBSubSamplingChange
     end
     object TBIntensity: TTrackBar
-      Left = 125
-      Top = 30
-      Width = 177
-      Height = 29
+      Left = 219
+      Top = 53
+      Width = 310
+      Height = 50
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Max = 100
       PageSize = 1
       Frequency = 10
       Position = 40
       TabOrder = 1
       TabStop = False
-      ThumbLength = 10
+      ThumbLength = 18
       TickMarks = tmBoth
       OnChange = TBIntensityChange
     end
     object TBContourInterval: TTrackBar
-      Left = 520
-      Top = 30
-      Width = 177
-      Height = 29
+      Left = 910
+      Top = 53
+      Width = 310
+      Height = 50
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Max = 4000
       Min = 1000
       PageSize = 1
@@ -135,29 +188,37 @@ object FormShadedTerrain: TFormShadedTerrain
       Position = 2000
       TabOrder = 2
       TabStop = False
-      ThumbLength = 10
+      ThumbLength = 18
       TickMarks = tmBoth
     end
     object TBScaleZ: TTrackBar
-      Left = 520
-      Top = 1
-      Width = 177
-      Height = 29
+      Left = 910
+      Top = 2
+      Width = 310
+      Height = 51
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Max = 50
       PageSize = 1
       Frequency = 10
       Position = 10
       TabOrder = 3
       TabStop = False
-      ThumbLength = 10
+      ThumbLength = 18
       TickMarks = tmBoth
       OnChange = TBScaleZChange
     end
     object CBContourIntervals: TCheckBox
-      Left = 422
-      Top = 35
-      Width = 97
-      Height = 17
+      Left = 739
+      Top = 61
+      Width = 169
+      Height = 30
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Contour Interval'
       Checked = True
       State = cbChecked

Examples/Demos/meshes/shadedterrain/fShadedTerrainD.pas

@@ -20,8 +20,13 @@ uses
 
   GLS.Scene,
   GLScene.BaseClasses,
-  GLS.Objects,
+  GLScene.VectorTypes,
+  GLScene.VectorGeometry,
+  GLScene.Keyboard,
   GLScene.XCollection,
+  GLScene.Coordinates,
+
+  GLS.Objects,
   GLS.TerrainRenderer,
   GLS.ROAMPatch,
   GLS.HeightData,
@@ -29,13 +34,10 @@ uses
   GLS.Texture,
   GLS.SkyDome,
   GLS.SceneViewer,
-  GLScene.VectorTypes,
-  GLScene.VectorGeometry,
   GLS.LensFlare,
   GLS.BumpMapHDS,
   GLSL.TextureShaders,
   GLS.Material,
-  GLScene.Coordinates,
 
   GLS.State,
   GLScene.Utils;

Examples/Demos/meshes/synthterr/fSynthTerrainC.h

@@ -24,7 +24,7 @@
 #include "GLS.HeightData.hpp"
 #include "GLS.SceneViewer.hpp"
 #include "Jpeg.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 
 
 

Examples/Demos/meshes/synthterr/fSynthTerrainD.pas

@@ -24,12 +24,15 @@ uses
   GLScene.VectorTypes,
   GLS.Texture,
   GLS.SceneViewer,
-  GLScene.VectorGeometry,
-
   GLS.Material,
+
+  GLScene.Keyboard,
+  GLScene.VectorGeometry,
   GLScene.Coordinates,
   GLScene.BaseClasses,
-  GLScene.XCollection, GLS.ShadowHDS;
+  GLScene.XCollection,
+
+  GLS.ShadowHDS;
 
 type
   TFormSynthTerrain = class(TForm)

Examples/Demos/meshes/terrain/fTerrainC.cpp

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 
 #include <vcl.h>
-#include <GLS.Keyboard.hpp>
+#include <GLScene.Keyboard.hpp>
 #include <stdlib.h>
 
 #pragma hdrstop
@@ -24,7 +24,7 @@
 #pragma link "GLS.Objects"
 #pragma link "GLS.TerrainRenderer"
 #pragma link "GLS.Scene"
-#pragma link "GLS.Keyboard"
+#pragma link "GLScene.Keyboard"
 #pragma link "GLScene.BaseClasses"
 #pragma link "GLScene.Coordinates"
 

Examples/Demos/meshes/terrain/fTerrainD.pas

@@ -17,30 +17,31 @@ uses
   Vcl.Imaging.GIFImg,
   Vcl.Imaging.Jpeg,
 
-  
   GLS.Scene,
   GLScene.VectorTypes,
+  GLScene.Keyboard,
+  GLScene.XCollection,
+  GLScene.VectorGeometry,
+  GLScene.Coordinates,
+  GLScene.BaseClasses,
+
   GLS.Objects,
   GLS.TerrainRenderer,
   GLS.HeightData,
-  GLS.Color,
+  GLScene.Color,
   GLS.Cadencer,
   GLS.Texture,
   GLS.BitmapFont,
-  GLScene.XCollection,
   GLS.SkyDome,
   GLS.SceneViewer,
   GLS.SoundManager,
   GLS.Sounds.BASS,
-  GLScene.VectorGeometry,
   GLS.LensFlare,
   GLS.Material,
-  GLScene.Coordinates,
-  GLScene.BaseClasses,
   GLS.State,
   GLS.FileMP3,
   GLScene.Utils,
- 
+
   GLS.HUDObjects;
 
 type

Examples/Demos/meshes/tiles/fTilesD.pas

@@ -17,23 +17,24 @@ uses
   Vcl.StdCtrls,
 
   GLScene.VectorTypes,
+  GLScene.Coordinates,
+  GLScene.BaseClasses,
+  GLScene.Keyboard,
+  GLScene.VectorGeometry,
+  GLScene.TextureFormat,
+  GLScene.XCollection,
+  GLScene.Utils,
+
   GLS.Objects,
   GLS.Graph,
   GLS.Scene,
   GLS.SceneViewer,
-  GLScene.VectorGeometry,
   GLS.TilePlane,
   GLS.Texture,
   GLS.Cadencer,
   GLS.Context,
- 
   GLS.Material,
-  GLScene.Coordinates,
-  GLScene.BaseClasses,
   GLS.RenderContextInfo,
-  GLScene.TextureFormat,
-  GLScene.XCollection,
-  GLScene.Utils,
   GLS.SimpleNavigation;
 
 type

Examples/Demos/movements/column/fColumnD.pas

@@ -17,7 +17,7 @@ uses
   GLScene.VectorTypes,
   GLS.Cadencer,
   GLS.SceneViewer,
-  GLS.Color,
+  GLScene.Color,
 
   GLScene.Coordinates,
   GLScene.BaseClasses,

Examples/Demos/movements/objmove/fObjmoveC.cpp

@@ -22,7 +22,7 @@
 #pragma resource "*.dfm"
 TFormObjmove *FormObjmove;
 
-const TGLColorVector
+const TGColorVector
   SelectionColor[]  = {0.243, 0.243, 0.243, 1.000};
 
 

Examples/Demos/movements/objmove/fObjmoveD.pas

@@ -26,7 +26,7 @@ uses
   GLS.SceneViewer,
   GLS.SpaceText,
   GLS.GeomObjects,
-  GLS.Color,
+  GLScene.Color,
 
   GLScene.Coordinates,
   GLScene.BaseClasses,
@@ -80,7 +80,7 @@ type
   end;
 
 const
-  SelectionColor: TGLColorVector = (X : 0.243; Y : 0.243; Z: 0.243; W : 1.000);
+  SelectionColor: TGColorVector = (X : 0.243; Y : 0.243; Z: 0.243; W : 1.000);
 
 var
   FormObjmove: TFormObjmove;

Examples/Demos/movements/smoothnavi/fSmoothNaviC.h

@@ -22,7 +22,7 @@
 #include "GLS.Scene.hpp"
 #include "GLS.SceneViewer.hpp"
 #include "GLS.SmoothNavigator.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLScene.Utils.hpp"
 
 

Examples/Demos/movements/smoothnavi/fSmoothNaviD.pas

@@ -12,18 +12,20 @@ uses
   Vcl.ExtCtrls, 
   Vcl.StdCtrls,
 
-  GLS.Cadencer, 
-  GLS.SceneViewer, 
-  GLScene.XCollection, 
-  GLScene.VectorGeometry, 
+  GLScene.Keyboard,
+  GLScene.Coordinates,
+  GLScene.BaseClasses,
+  GLScene.XCollection,
+  GLScene.VectorGeometry,
+
+  GLS.Cadencer,
+  GLS.SceneViewer,
   GLS.GeomObjects,
-  GLS.Scene, 
-  GLS.Objects, 
-  GLS.Graph, 
-  
+  GLS.Scene,
+  GLS.Objects,
+  GLS.Graph,
+
   GLS.SmoothNavigator,
-  GLScene.Coordinates, 
-  GLScene.BaseClasses, 
   GLS.Screen;
 
 type

Examples/Demos/physics/NewtonSimple/fNewtonSimpleD.pas

@@ -18,7 +18,7 @@ uses
   GLS.SimpleNavigation,
   GLS.Cadencer,
   GLS.SceneViewer,
-  GLS.Color,
+  GLScene.Color,
  
   GLScene.BaseClasses,
   GLS.NGDManager,

Examples/Demos/physics/NewtonWalkCarry/fNewtonWalkCarryD.pas

@@ -35,7 +35,7 @@ uses
   GLS.Navigator,
   GLScene.XCollection,
   GLScene.VectorTypes,
-  GLS.Color,
+  GLScene.Color,
   GLS.HUDObjects,
   GLS.Texture,
   GLScene.Utils,
@@ -138,7 +138,7 @@ var
   cp: TPoint;
   visible_cursor: boolean;
   ScObj, FScObj: TGLBaseSceneObject;
-  targetColor: TGLColorVector;
+  targetColor: TGColorVector;
   picked: TGLCustomSceneObject;
   mm: TMatrix4f;
 

Examples/Demos/physics/OdeFurball/fOdeFurballC.cpp

@@ -17,7 +17,7 @@
 #pragma link "GLS.Objects"
 #pragma link "GLS.Scene"
 #pragma link "GLS.SceneViewer"
-#pragma link "GLS.Keyboard"
+#pragma link "GLScene.Keyboard"
 #pragma link "GLS.VerletTypes"
 
 //---------------------------------------------------------------------------

Examples/Demos/physics/OdeFurball/fOdeFurballC.h

@@ -23,7 +23,7 @@
 #include "GLS.Texture.hpp"
 #include "GLS.Objects.hpp"
 #include "GLScene.BaseClasses.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLScene.Coordinates.hpp"
 
 #include "GLS.VerletTypes.hpp"

Examples/Demos/physics/OdeFurball/fOdeFurballD.pas

@@ -30,7 +30,7 @@ uses
   GLS.Navigator,
   GLS.VerletTypes,
   GLScene.XCollection,
-  GLS.Color,
+  GLScene.Color,
  
   GLScene.Coordinates,
   GLScene.BaseClasses;

Examples/Demos/physics/OdeTerrain/fOdeTerrainC.h

@@ -27,7 +27,7 @@
 #include "GLS.SceneViewer.hpp"
 #include "GLScene.Utils.hpp"
 #include "JPeg.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLS.ODEManager.hpp"
 
 //---------------------------------------------------------------------------

Examples/Demos/physics/OdeTerrain/fOdeTerrainD.pas

@@ -33,7 +33,7 @@ uses
   GLS.ODEManager,
   GLS.Navigator,
   GLS.GeomObjects,
-  GLS.Color,
+  GLScene.Color,
  
   GLS.Material,
   GLScene.Coordinates,

Examples/Demos/physics/PhysXScatter/PhysXScatterFm.pas

@@ -20,7 +20,7 @@ uses
   GLS.Cadencer,
   GLScene.VectorTypes,
   GLS.SceneViewer,
-  GLS.Color,
+  GLScene.Color,
   GLScene.XCollection,
   GLScene.BaseClasses,
   GLScene.VectorGeometry,

Examples/Demos/rendering/BasicSDL/fBasicSDL_D.pas

@@ -13,7 +13,7 @@ uses
   GLS.GeomObjects,
   GLScene.Coordinates,
   GLScene.BaseClasses,
-  GLS.Color,
+  GLScene.Color,
   GLS.Context,
   GLS.Texture,
   GLScene.Utils,

Examples/Demos/rendering/MultiTexture/fMultiTexturesC.h

@@ -26,7 +26,7 @@
 #include "GLS.WindowsFont.hpp"
 #include "GLS.State.hpp"
 #include "GLS.Context.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 
 //---------------------------------------------------------------------------
 class TForm1 : public TForm

Examples/Demos/rendering/SkyBox/fSkyBoxC.h

@@ -19,7 +19,7 @@
 #include "GLS.SimpleNavigation.hpp"
 #include "GLS.SkyDome.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "JPeg.hpp"
 #include "GLS.FileJPEG.hpp"
 #include "GLScene.Utils.hpp"

Examples/Demos/rendering/celshading/fCelShadingC.h

@@ -21,7 +21,7 @@
 #include "GLScene.Coordinates.hpp"
 
 #include "GLS.Material.hpp"          // Pascal unit
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLS.FileMD2.hpp"
 #include "GLScene.Utils.hpp"
 

Examples/Demos/rendering/multiproxy/fMultiProxyD.pas

@@ -20,7 +20,7 @@ uses
   GLS.Objects,
   GLS.Particles,
   GLS.SceneViewer,
-  GLS.Color,
+  GLScene.Color,
   GLS.MultiProxy,
   GLS.Texture,
 

Examples/Demos/specialsFX/Atmosphere/fAtmosphereD.pas

@@ -25,7 +25,7 @@ uses
   GLS.SimpleNavigation,
   GLS.Behaviours,
   GLScene.Coordinates,
-  GLS.Color;
+  GLScene.Color;
 
 type
   TFormAtmosphere = class(TForm)

Examples/Demos/specialsFX/PFXCursor/fPfxCursorD.dfm

@@ -1,44 +1,61 @@
 object Form1: TForm1
   Left = 403
   Top = 221
-  ClientHeight = 516
-  ClientWidth = 761
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
+  ClientHeight = 903
+  ClientWidth = 1346
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   Position = poScreenCenter
   OnCreate = FormCreate
   OnShow = FormShow
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 24
   object vp: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 600
-    Height = 516
+    Width = 1064
+    Height = 903
     Cursor = -1
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.BackgroundColor = clNavy
     Buffer.ContextOptions = [roDoubleBuffer, roRenderToWindow]
-    FieldOfView = 158.064254760742200000
+    FieldOfView = 167.361404418945300000
     PenAsTouch = False
     Align = alClient
     TabOrder = 0
   end
   object Panel1: TPanel
-    Left = 600
+    Left = 1064
     Top = 0
-    Width = 161
-    Height = 516
+    Width = 282
+    Height = 903
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Align = alRight
     TabOrder = 1
     object RadioGroup1: TRadioGroup
-      Left = 18
-      Top = 232
-      Width = 137
-      Height = 105
+      Left = 32
+      Top = 406
+      Width = 239
+      Height = 184
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Fire'
       ItemIndex = 0
       Items.Strings = (
@@ -48,10 +65,14 @@ object Form1: TForm1
       OnClick = RadioGroup1Click
     end
     object RadioGroup2: TRadioGroup
-      Left = 18
-      Top = 64
-      Width = 137
-      Height = 105
+      Left = 32
+      Top = 112
+      Width = 239
+      Height = 184
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Perlin'
       ItemIndex = 0
       Items.Strings = (
@@ -61,19 +82,27 @@ object Form1: TForm1
       OnClick = RadioGroup2Click
     end
     object stPerlin: TStaticText
-      Left = 16
-      Top = 32
-      Width = 132
-      Height = 17
+      Left = 28
+      Top = 56
+      Width = 231
+      Height = 28
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Left mouse button for perlin'
       TabOrder = 2
       OnClick = stPerlinClick
     end
     object stFire: TStaticText
-      Left = 16
-      Top = 200
-      Width = 128
-      Height = 17
+      Left = 28
+      Top = 350
+      Width = 223
+      Height = 28
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Right mouse button for fire'
       TabOrder = 3
     end
@@ -268,7 +297,6 @@ object Form1: TForm1
     Cadencer = GLCadencer1
     Renderer = rend
     Friction = 1.000000000000000000
-    OnPrepareTextureImage = pfx2PrepareTextureImage
     ColorMode = scmFade
     ParticleSize = 0.750000000000000000
     ColorInner.Color = {0000803F1283C03E000000000000803F}

Examples/Demos/specialsFX/PFXCursor/fPfxCursorD.pas

@@ -15,23 +15,24 @@ uses
   Vcl.StdCtrls,
   Vcl.ExtCtrls,
 
+  GLScene.Keyboard,
   GLScene.VectorTypes,
+  GLScene.VectorGeometry,
+  GLScene.XCollection,
+  GLScene.Coordinates,
+  GLScene.BaseClasses,
+
   GLS.Cadencer,
   GLS.Texture,
   GLS.SceneViewer,
   GLS.Scene,
-  GLScene.VectorGeometry,
   GLS.Graphics,
-  GLScene.XCollection,
   GLS.ParticleFX,
   GLS.Objects,
   GLS.HUDObjects,
   GLS.AsyncTimer,
   GLS.PerlinPFX,
   GLS.Material,
-  GLScene.Coordinates,
-
-  GLScene.BaseClasses,
   GLS.FireFX,
   GLS.GeomObjects,
   GLScene.Utils;

Examples/Demos/specialsFX/PFXGallery/fPFXGallaryC.cpp

@@ -23,7 +23,7 @@
 #pragma link "GLS.Scene"
 #pragma link "GLS.SpaceText"
 #pragma link "GLS.SceneViewer"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 
 #pragma resource "*.dfm"
 TForm1 *Form1;

Examples/Demos/specialsFX/PFXGallery/fPFXGalleryD.dfm

@@ -1,29 +1,38 @@
 object FormPFXGallery: TFormPFXGallery
   Left = 199
   Top = 114
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Caption = 'PFXGallery'
-  ClientHeight = 508
-  ClientWidth = 680
+  ClientHeight = 889
+  ClientWidth = 1204
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   OnCreate = FormCreate
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 24
   object GLSceneViewer1: TGLSceneViewer
     Left = 0
-    Top = 25
-    Width = 680
-    Height = 483
+    Top = 44
+    Width = 1204
+    Height = 845
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera1
     Buffer.FogEnvironment.FogColor.Color = {D7A3703ED7A3703ED7A3703E0000803F}
     Buffer.FogEnvironment.FogStart = 30.000000000000000000
     Buffer.FogEnvironment.FogEnd = 200.000000000000000000
     Buffer.BackgroundColor = clBlack
     Buffer.AmbientColor.Color = {0000803F0000803F0000803F0000803F}
-    FieldOfView = 147.671005249023400000
+    FieldOfView = 161.185333251953100000
     PenAsTouch = False
     Align = alClient
     TabOrder = 0
@@ -31,32 +40,48 @@ object FormPFXGallery: TFormPFXGallery
   object Panel1: TPanel
     Left = 0
     Top = 0
-    Width = 680
-    Height = 25
+    Width = 1204
+    Height = 44
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Align = alTop
     Caption = ' '
     TabOrder = 1
     object Label1: TLabel
-      Left = 376
-      Top = 6
-      Width = 91
-      Height = 13
+      Left = 658
+      Top = 11
+      Width = 157
+      Height = 24
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'WASD - navigation'
     end
     object chkMouseLook: TCheckBox
-      Left = 244
-      Top = 4
-      Width = 97
-      Height = 17
+      Left = 427
+      Top = 7
+      Width = 170
+      Height = 30
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'MouseLook'
       TabOrder = 0
       OnClick = chkMouseLookClick
     end
     object chkFloor: TCheckBox
-      Left = 8
-      Top = 4
-      Width = 97
-      Height = 17
+      Left = 14
+      Top = 7
+      Width = 170
+      Height = 30
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Show floor'
       Checked = True
       State = cbChecked
@@ -64,10 +89,14 @@ object FormPFXGallery: TFormPFXGallery
       OnClick = chkFloorClick
     end
     object chkBlur: TCheckBox
-      Left = 116
-      Top = 4
-      Width = 97
-      Height = 17
+      Left = 203
+      Top = 7
+      Width = 170
+      Height = 30
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Caption = 'Blur effects'
       TabOrder = 2
       OnClick = chkBlurClick

Examples/Demos/specialsFX/PFXGallery/fPFXGalleryD.pas

@@ -14,27 +14,29 @@ uses
   Vcl.StdCtrls,
   Vcl.Imaging.Jpeg,
 
+  GLScene.VectorTypes,
+  GLScene.Keyboard,
   GLScene.VectorGeometry,
+  GLScene.Coordinates,
+  GLScene.BaseClasses,
+  GLScene.XCollection,
+  GLScene.Utils,
+
   GLS.SceneViewer,
   GLS.Scene,
   GLS.HUDObjects,
   GLS.ParticleFX,
   GLS.VectorFileObjects,
-  GLScene.VectorTypes,
   GLS.Objects,
   GLS.BitmapFont,
-  GLScene.Utils,
   GLS.Cadencer,
   GLS.Texture,
   GLS.Navigator,
   GLS.GeomObjects,
-  GLScene.XCollection,
   GLS.SpaceText,
   GLS.Behaviours,
   GLS.PerlinPFX,
-  GLS.Blur,
-  GLScene.Coordinates,
-  GLScene.BaseClasses;
+  GLS.Blur;
 
 const
   cRunBoost = 10;

Examples/Demos/specialsFX/motionblur/fMotionBlurC.h

@@ -18,7 +18,7 @@
 #include "GLS.Objects.hpp"
 #include "GLS.Scene.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLS.VectorFileObjects.hpp"
 //---------------------------------------------------------------------------
 class TForm1 : public TForm

Examples/Demos/specialsFX/spiral/fSpiralC.h

@@ -21,7 +21,7 @@
 #include "GLScene.Coordinates.hpp"
 #include "GLS.FullScreenViewer.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 #include "GLS.FullScreenViewer.hpp"
 
 //---------------------------------------------------------------------------

Examples/Demos/specialsFX/waterplane/fWaterPlaneD.pas

@@ -33,7 +33,7 @@ uses
   GLScene.Coordinates,
   GLS.RenderContextInfo,
   GLS.SimpleNavigation,
-  GLS.Color,
+  GLScene.Color,
   GLScene.Utils,
   GLScene.BaseClasses;
 

Examples/Demos/utilities/recorder/Unit1.cpp

@@ -13,7 +13,7 @@
 #pragma link "GLS.Objects"
 #pragma link "GLS.Scene"
 #pragma link "GLAVIRecorder"
-#pragma link "GLS.Keyboard"
+#pragma link "GLScene.Keyboard"
 #pragma link "GLScene.BaseClasses"
 #pragma link "GLScene.Coordinates"
 

Examples/Demos/utilities/recorder/Unit1.h

@@ -14,7 +14,7 @@
 #include "GLS.Objects.hpp"
 #include "GLS.Scene.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "GLS.Keyboard.hpp"
+#include "GLScene.Keyboard.hpp"
 
 #ifndef Unit1H
 #define Unit1H

GXScene.groupproj

@@ -18,6 +18,9 @@
         <Projects Include="Packages\GXScene_GPU_RT.dproj">
             <Dependencies/>
         </Projects>
+        <Projects Include="Packages\GXScene_GBE.dproj">
+            <Dependencies/>
+        </Projects>
         <Projects Include="Packages\GXScene_Sounds_DT.dproj">
             <Dependencies/>
         </Projects>
@@ -86,6 +89,15 @@
     <Target Name="GXScene_GPU_RT:Make">
         <MSBuild Projects="Packages\GXScene_GPU_RT.dproj" Targets="Make"/>
     </Target>
+    <Target Name="GXScene_GBE">
+        <MSBuild Projects="Packages\GXScene_GBE.dproj"/>
+    </Target>
+    <Target Name="GXScene_GBE:Clean">
+        <MSBuild Projects="Packages\GXScene_GBE.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="GXScene_GBE:Make">
+        <MSBuild Projects="Packages\GXScene_GBE.dproj" Targets="Make"/>
+    </Target>
     <Target Name="GXScene_Sounds_DT">
         <MSBuild Projects="Packages\GXScene_Sounds_DT.dproj"/>
     </Target>
@@ -132,13 +144,13 @@
         <MSBuild Projects="Packages\GXScene_GPU_DT.dproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="GXScene_RT;GXScene_Sounds_RT;GXScene_Cg_RT;GXScene_Physics_RT;GXScene_GPU_RT;GXScene_Sounds_DT;GXScene_DT;GXScene_Physics_DT;GXScene_Cg_DT;GXScene_GPU_DT"/>
+        <CallTarget Targets="GXScene_RT;GXScene_Sounds_RT;GXScene_Cg_RT;GXScene_Physics_RT;GXScene_GPU_RT;GXScene_GBE;GXScene_Sounds_DT;GXScene_DT;GXScene_Physics_DT;GXScene_Cg_DT;GXScene_GPU_DT"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="GXScene_RT:Clean;GXScene_Sounds_RT:Clean;GXScene_Cg_RT:Clean;GXScene_Physics_RT:Clean;GXScene_GPU_RT:Clean;GXScene_Sounds_DT:Clean;GXScene_DT:Clean;GXScene_Physics_DT:Clean;GXScene_Cg_DT:Clean;GXScene_GPU_DT:Clean"/>
+        <CallTarget Targets="GXScene_RT:Clean;GXScene_Sounds_RT:Clean;GXScene_Cg_RT:Clean;GXScene_Physics_RT:Clean;GXScene_GPU_RT:Clean;GXScene_GBE:Clean;GXScene_Sounds_DT:Clean;GXScene_DT:Clean;GXScene_Physics_DT:Clean;GXScene_Cg_DT:Clean;GXScene_GPU_DT:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="GXScene_RT:Make;GXScene_Sounds_RT:Make;GXScene_Cg_RT:Make;GXScene_Physics_RT:Make;GXScene_GPU_RT:Make;GXScene_Sounds_DT:Make;GXScene_DT:Make;GXScene_Physics_DT:Make;GXScene_Cg_DT:Make;GXScene_GPU_DT:Make"/>
+        <CallTarget Targets="GXScene_RT:Make;GXScene_Sounds_RT:Make;GXScene_Cg_RT:Make;GXScene_Physics_RT:Make;GXScene_GPU_RT:Make;GXScene_GBE:Make;GXScene_Sounds_DT:Make;GXScene_DT:Make;GXScene_Physics_DT:Make;GXScene_Cg_DT:Make;GXScene_GPU_DT:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Packages/GLScene_RT.dpk

@@ -72,7 +72,7 @@ contains
   GLS.CameraController in '..\Source\GLS.CameraController.pas',
   GLS.Canvas in '..\Source\GLS.Canvas.pas',
   GLS.Collision in '..\Source\GLS.Collision.pas',
-  GLS.Color in '..\Source\GLS.Color.pas',
+  GLScene.Color in '..\Source\GLScene.Color.pas',
   GLS.CompositeImage in '..\Source\GLS.CompositeImage.pas',
   GLS.Console in '..\Source\GLS.Console.pas',
   GLS.Context in '..\Source\GLS.Context.pas',

Packages/GLScene_RT.dproj

@@ -197,7 +197,7 @@
         <DCCReference Include="..\Source\GLS.CameraController.pas"/>
         <DCCReference Include="..\Source\GLS.Canvas.pas"/>
         <DCCReference Include="..\Source\GLS.Collision.pas"/>
-        <DCCReference Include="..\Source\GLS.Color.pas"/>
+        <DCCReference Include="..\Source\GLScene.Color.pas"/>
         <DCCReference Include="..\Source\GLS.CompositeImage.pas"/>
         <DCCReference Include="..\Source\GLS.Console.pas"/>
         <DCCReference Include="..\Source\GLS.Context.pas"/>

Packages/GXScene_GBE.dproj

@@ -6,7 +6,7 @@
         <FrameworkType>FMX</FrameworkType>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <Platform Condition="'$(Platform)'==''">Win64x</Platform>
+        <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>1048577</TargetedPlatforms>
         <AppType>Package</AppType>
         <ProjectName Condition="'$(ProjectName)'==''">GXScene_GBE</ProjectName>

Packages/GXScene_RT.dpk

@@ -59,7 +59,6 @@ contains
   GXS.Canvas in '..\SourceX\GXS.Canvas.pas',
   GXS.CelShader in '..\SourceX\GXS.CelShader.pas',
   GXS.Collision in '..\SourceX\GXS.Collision.pas',
-  GXS.Color in '..\SourceX\GXS.Color.pas',
   GXS.CompositeImage in '..\SourceX\GXS.CompositeImage.pas',
   GXS.Console in '..\SourceX\GXS.Console.pas',
   GXS.Context in '..\SourceX\GXS.Context.pas',
@@ -270,6 +269,7 @@ contains
   gnuGettextInit in '..\Source\gnuGettextInit.pas',
   GLScene.XCollection in '..\Source\GLScene.XCollection.pas',
   GLScene.Keyboard in '..\Source\GLScene.Keyboard.pas',
-  GLScene.Polynomials in '..\Source\GLScene.Polynomials.pas';
+  GLScene.Polynomials in '..\Source\GLScene.Polynomials.pas',
+  GLScene.Color in '..\Source\GLScene.Color.pas';
 
 end.

Packages/GXScene_RT.dproj

@@ -208,7 +208,6 @@
         <DCCReference Include="..\SourceX\GXS.Canvas.pas"/>
         <DCCReference Include="..\SourceX\GXS.CelShader.pas"/>
         <DCCReference Include="..\SourceX\GXS.Collision.pas"/>
-        <DCCReference Include="..\SourceX\GXS.Color.pas"/>
         <DCCReference Include="..\SourceX\GXS.CompositeImage.pas"/>
         <DCCReference Include="..\SourceX\GXS.Console.pas"/>
         <DCCReference Include="..\SourceX\GXS.Context.pas"/>
@@ -420,6 +419,7 @@
         <DCCReference Include="..\Source\GLScene.XCollection.pas"/>
         <DCCReference Include="..\Source\GLScene.Keyboard.pas"/>
         <DCCReference Include="..\Source\GLScene.Polynomials.pas"/>
+        <DCCReference Include="..\Source\GLScene.Color.pas"/>
         <None Include="..\Sourcex\GXS.Scene.inc"/>
         <None Include="..\Source\GLScene.Defines.inc"/>
         <BuildConfiguration Include="Base">

Source/FRColorEditor.pas

@@ -23,7 +23,7 @@ uses
   VCL.Graphics,
    
   GLScene.VectorGeometry, 
-  GLS.Color, 
+  GLScene.Color, 
   GLS.Texture, 
   GLScene.VectorTypes;
 

Source/FRMaterialPreview.pas

@@ -25,7 +25,7 @@ uses
   GLS.HUDObjects,
   GLS.SceneViewer,
   GLS.GeomObjects,
-  GLS.Color,
+  GLScene.Color,
   GLScene.Coordinates,
   GLScene.BaseClasses,
   GLS.Material;

Source/FmLibMaterialPicker.pas

@@ -22,7 +22,7 @@ uses
   GLS.Objects,
   GLS.SceneViewer,
   GLS.Material,
-  GLS.Color,
+  GLScene.Color,
   GLScene.Coordinates,
   GLScene.BaseClasses,
   GLS.HUDObjects,

Source/GLS.Atmosphere.pas

@@ -26,7 +26,7 @@ uses
   GLScene.VectorGeometry,
   GLS.Context,
   GLScene.Strings,
-  GLS.Color,
+  GLScene.Color,
   GLS.RenderContextInfo,
   GLS.State;
 
@@ -53,8 +53,8 @@ type
     FPlanetRadius: Single;
     FAtmosphereRadius: Single;
     FOpacity: Single;
-    FLowAtmColor: TGLColor;
-    FHighAtmColor: TGLColor;
+    FLowAtmColor: TGColor;
+    FHighAtmColor: TGColor;
     FSun: TGLBaseSceneObject;
     procedure SetSun(const Value: TGLBaseSceneObject);
     procedure SetAtmosphereRadius(const Value: Single);
@@ -64,8 +64,8 @@ type
     function StoreOpacity: Boolean;
     function StorePlanetRadius: Boolean;
     procedure SetSlices(const Value: Integer);
-    procedure SetLowAtmColor(const AValue: TGLColor);
-    procedure SetHighAtmColor(const AValue: TGLColor);
+    procedure SetLowAtmColor(const AValue: TGColor);
+    procedure SetHighAtmColor(const AValue: TGColor);
     function StoreLowAtmColor: Boolean;
     function StoreHighAtmColor: Boolean;
   protected
@@ -81,9 +81,9 @@ type
     property PlanetRadius: Single read FPlanetRadius write SetPlanetRadius
       stored StorePlanetRadius;
     // Use value slightly lower than actual radius, for antialiasing effect
-    property LowAtmColor: TGLColor read FLowAtmColor write SetLowAtmColor
+    property LowAtmColor: TGColor read FLowAtmColor write SetLowAtmColor
       stored StoreLowAtmColor;
-    property HighAtmColor: TGLColor read FHighAtmColor write SetHighAtmColor
+    property HighAtmColor: TGColor read FHighAtmColor write SetHighAtmColor
       stored StoreHighAtmColor;
     property BlendingMode: TGLAtmosphereBlendingMode read FBlendingMode
       write FBlendingMode default abmOneMinusSrcAlpha;
@@ -145,8 +145,8 @@ end;
 constructor TGLCustomAtmosphere.Create(AOwner: TComponent);
 begin
   inherited;
-  FLowAtmColor := TGLColor.Create(Self);
-  FHighAtmColor := TGLColor.Create(Self);
+  FLowAtmColor := TGColor.Create(Self);
+  FHighAtmColor := TGColor.Create(Self);
   FOpacity := 2.1;
   SetSlices(60);
   FAtmosphereRadius := 3.55;
@@ -172,11 +172,11 @@ var
   sunPos, eyePos, lightingVector: TGLVector;
   diskNormal, diskRight, diskUp: TGLVector;
 
-  function AtmosphereColor(const rayStart, rayEnd: TGLVector): TGLColorVector;
+  function AtmosphereColor(const rayStart, rayEnd: TGLVector): TGColorVector;
   var
     I, n: Integer;
     atmPoint, normal: TGLVector;
-    altColor: TGLColorVector;
+    altColor: TGColorVector;
     alt, rayLength, contrib, decay, intensity, invN: Single;
   begin
     Result := clrTransparent;
@@ -217,7 +217,7 @@ var
   end;
 
   function ComputeColor(var rayDest: TGLVector; mayHitGround: Boolean)
-    : TGLColorVector;
+    : TGColorVector;
   var
     ai1, ai2, pi1, pi2: TGLVector;
     rayVector: TGLVector;
@@ -442,12 +442,12 @@ begin
     raise EGLAtmosphereException.Create('Slices must be more than0!');
 end;
 
-procedure TGLCustomAtmosphere.SetHighAtmColor(const AValue: TGLColor);
+procedure TGLCustomAtmosphere.SetHighAtmColor(const AValue: TGColor);
 begin
   FHighAtmColor.Assign(AValue);
 end;
 
-procedure TGLCustomAtmosphere.SetLowAtmColor(const AValue: TGLColor);
+procedure TGLCustomAtmosphere.SetLowAtmColor(const AValue: TGColor);
 begin
   FLowAtmColor.Assign(AValue);
 end;

Source/GLS.BitmapFont.pas

@@ -28,7 +28,7 @@ uses
   GLS.State,
   GLScene.Utils,
   GLS.Graphics,
-  GLS.Color,
+  GLScene.Color,
   GLScene.BaseClasses,
   GLS.RenderContextInfo,
   GLScene.PersistentClasses;
@@ -189,13 +189,13 @@ type
        Enable states are also possibly altered. *)
     procedure RenderString(var ARci: TGLRenderContextInfo;
       const aText: UnicodeString; aAlignment: TAlignment;
-      aLayout: TTextLayout; const aColor: TGLColorVector;
+      aLayout: TTextLayout; const aColor: TGColorVector;
       aPosition: PGLVector = 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 TGLCanvas *)
     procedure TextOut(var rci: TGLRenderContextInfo; X, Y: Single;
-      const Text: UnicodeString; const Color: TGLColorVector); overload;
+      const Text: UnicodeString; const Color: TGColorVector); overload;
     procedure TextOut(var rci: TGLRenderContextInfo; X, Y: Single;
       const Text: UnicodeString; const Color: TColor); overload;
     function TextWidth(const Text: UnicodeString): Integer;
@@ -245,14 +245,14 @@ type
     FText: UnicodeString;
     FAlignment: TAlignment;
     FLayout: TTextLayout;
-    FModulateColor: TGLColor;
+    FModulateColor: TGColor;
     FOptions: TGLFlatTextOptions;
   protected
     procedure SetBitmapFont(const val: TGLCustomBitmapFont);
     procedure SetText(const val: UnicodeString);
     procedure SetAlignment(const val: TAlignment);
     procedure SetLayout(const val: TTextLayout);
-    procedure SetModulateColor(const val: TGLColor);
+    procedure SetModulateColor(const val: TGColor);
     procedure SetOptions(const val: TGLFlatTextOptions);
     procedure Notification(AComponent: TComponent;
       Operation: TOperation); override;
@@ -279,7 +279,7 @@ type
       Possible values : tlTop, tlCenter, tlBottom *)
     property Layout: TTextLayout read FLayout write SetLayout;
     // Color modulation, can be used for fade in/out too.
-    property ModulateColor: TGLColor read FModulateColor write SetModulateColor;
+    property ModulateColor: TGColor read FModulateColor write SetModulateColor;
     (* Flat text options.
        ftoTwoSided : when set the text will be visible from its two
        sides even if faceculling is on (at the scene-level). *)
@@ -832,7 +832,7 @@ end;
 
 procedure TGLCustomBitmapFont.RenderString(var ARci: TGLRenderContextInfo;
   const aText: UnicodeString; aAlignment: TAlignment; aLayout: TTextLayout;
-  const aColor: TGLColorVector; aPosition: PGLVector = nil;
+  const aColor: TGColorVector; aPosition: PGLVector = nil;
   aReverseY: boolean = False);
 
   function AlignmentAdjustement(p: Integer): Single;
@@ -964,7 +964,7 @@ begin
 end;
 
 procedure TGLCustomBitmapFont.TextOut(var rci: TGLRenderContextInfo; X, Y: Single;
-  const Text: UnicodeString; const Color: TGLColorVector);
+  const Text: UnicodeString; const Color: TGColorVector);
 var
   V: TGLVector;
 begin
@@ -1148,7 +1148,7 @@ constructor TGLFlatText.Create(AOwner: TComponent);
 begin
   inherited;
   ObjectStyle := ObjectStyle + [osDirectDraw, osNoVisibilityCulling];
-  FModulateColor := TGLColor.CreateInitialized(Self, clrWhite);
+  FModulateColor := TGColor.CreateInitialized(Self, clrWhite);
 end;
 
 destructor TGLFlatText.Destroy;
@@ -1200,7 +1200,7 @@ begin
   StructureChanged;
 end;
 
-procedure TGLFlatText.SetModulateColor(const val: TGLColor);
+procedure TGLFlatText.SetModulateColor(const val: TGColor);
 begin
   FModulateColor.Assign(val);
 end;

Source/GLS.Blur.pas

@@ -28,7 +28,7 @@ uses
   GLS.Texture,
   GLS.Material,
   GLS.HudObjects,
-  GLS.Color,
+  GLScene.Color,
   GLS.Graphics,
   GLS.Context,
   GLS.XOpenGL,

Source/GLS.BumpmapHDS.pas

@@ -27,7 +27,7 @@ uses
   GLScene.Coordinates,
   GLS.HeightData,
   GLS.Graphics,
-  GLS.Color,
+  GLScene.Color,
   GLScene.VectorLists,
   GLS.Texture,
   GLS.Material,

Source/GLS.Canvas.pas

@@ -21,7 +21,7 @@ uses
   GLScene.OpenGLTokens,
   GLScene.VectorTypes,
   GLScene.VectorGeometry,
-  GLS.Color,
+  GLScene.Color,
   GLS.Context,
   GLS.State;
 
@@ -121,9 +121,9 @@ type
     procedure FillRect(const x1, y1, x2, y2: Single); overload;
     // Draw the (x1,y1)-(x2, y2) rectangle (filled with given gradient's color). 
     procedure FillRectGradient(const x1, y1, x2, y2: Single;
-      const x1y1Color, x2y1Color, x2y2Color, x1y2Color: TGLColorVector); overload;
+      const x1y1Color, x2y1Color, x2y2Color, x1y2Color: TGColorVector); overload;
     procedure FillRectGradient(const x1, y1, x2, y2: Integer;
-      const x1y1Color, x2y1Color, x2y2Color, x1y2Color: TGLColorVector); overload;
+      const x1y1Color, x2y1Color, x2y2Color, x1y2Color: TGColorVector); overload;
     // Draws an ellipse with (x1,y1)-(x2, y2) bounding rectangle. 
     procedure EllipseBB(const x1, y1, x2, y2: Integer); overload;
     procedure EllipseBB(const x1, y1, x2, y2: Single); overload;
@@ -139,11 +139,11 @@ type
     OpenGL will use the last PenColor and PenAlpha as the center color and do gradient 
   	to edge of ellipse using the edgeColor parameter. *)
     procedure FillEllipseGradient(const x, y, xRadius, yRadius: Single;
-      const edgeColor: TGLColorVector); overload;
+      const edgeColor: TGColorVector); overload;
     procedure FillEllipseGradient(const x, y: Integer;
-      const xRadius, yRadius: Integer; const edgeColor: TGLColorVector); overload;
+      const xRadius, yRadius: Integer; const edgeColor: TGColorVector); overload;
     procedure FillEllipseGradient(const x, y, Radius: Single;
-      const edgeColor: TGLColorVector); overload;
+      const edgeColor: TGColorVector); overload;
     (* Draw an elliptical arc.
        The points (x1, y1) and (x2, y2) specify the bounding rectangle.
        An ellipse formed by the specified bounding rectangle defines the curve of the arc.
@@ -523,7 +523,7 @@ begin
 end;
 
 procedure TGLCanvas.FillRectGradient(const x1, y1, x2, y2: Single;
-  const x1y1Color, x2y1Color, x2y2Color, x1y2Color: TGLColorVector);
+  const x1y1Color, x2y1Color, x2y2Color, x1y2Color: TGColorVector);
 begin
   StartPrimitive(GL_QUADS);
   gl.Color4f(x1y1Color.X, x1y1Color.Y, x1y1Color.Z, x1y1Color.W);
@@ -541,7 +541,7 @@ begin
 end;
 
 procedure TGLCanvas.FillRectGradient(const x1, y1, x2, y2: Integer;
-  const x1y1Color, x2y1Color, x2y2Color, x1y2Color: TGLColorVector);
+  const x1y1Color, x2y1Color, x2y2Color, x1y2Color: TGColorVector);
 begin
   StartPrimitive(GL_QUADS);
   gl.Color4f(x1y1Color.X, x1y1Color.Y, x1y1Color.Z, x1y1Color.W);
@@ -558,7 +558,7 @@ begin
   gl.Color4fv(@FCurrentPenColorVector);
 end;
 
-procedure TGLCanvas.FillEllipseGradient(const x, y: Integer; const xRadius, yRadius: Integer; const edgeColor: TGLColorVector);
+procedure TGLCanvas.FillEllipseGradient(const x, y: Integer; const xRadius, yRadius: Integer; const edgeColor: TGColorVector);
 begin
   StartPrimitive(GL_TRIANGLE_FAN);
 
@@ -574,7 +574,7 @@ begin
   gl.Color4fv(@FCurrentPenColorVector);
 end;
 
-procedure TGLCanvas.FillEllipseGradient(const x, y, xRadius, yRadius: Single; const edgeColor: TGLColorVector);
+procedure TGLCanvas.FillEllipseGradient(const x, y, xRadius, yRadius: Single; const edgeColor: TGColorVector);
 begin
   StartPrimitive(GL_TRIANGLE_FAN);
   gl.Vertex2f(x, y); // really necessary now :)
@@ -586,7 +586,7 @@ begin
   gl.Color4fv(@FCurrentPenColorVector);
 end;
 
-procedure TGLCanvas.FillEllipseGradient(const x, y, Radius: Single; const edgeColor: TGLColorVector);
+procedure TGLCanvas.FillEllipseGradient(const x, y, Radius: Single; const edgeColor: TGColorVector);
 begin
   FillEllipseGradient(x, y, Radius, Radius, edgeColor);
 end;

Source/GLS.Extrusion.pas

@@ -25,7 +25,7 @@ uses
   GLS.Objects,
   GLS.Scene,
   GLS.MultiPolygon,
-  GLS.Color,
+  GLScene.Color,
   GLScene.VectorGeometry,
   GLS.RenderContextInfo,
   GLS.Nodes,
@@ -149,13 +149,13 @@ type
   TGLPipeNode = class(TGLNode)
   private
     FRadiusFactor: Single;
-    FColor: TGLColor;
+    FColor: TGColor;
     FTexCoordT: Single;
   protected
     function GetDisplayName: string; override;
     procedure SetRadiusFactor(const val: Single);
     function StoreRadiusFactor: Boolean;
-    procedure SetColor(const val: TGLColor);
+    procedure SetColor(const val: TGColor);
     procedure ColorChanged(sender: TObject);
     function StoreTexCoordT: Boolean;
   public
@@ -165,7 +165,7 @@ type
   published
     property RadiusFactor: Single read FRadiusFactor write SetRadiusFactor stored
       StoreRadiusFactor;
-    property Color: TGLColor read FColor write SetColor;
+    property Color: TGColor read FColor write SetColor;
     property TexCoordT: Single read FTexCoordT write FTexCoordT stored
       StoreTexCoordT;
   end;
@@ -687,7 +687,7 @@ constructor TGLPipeNode.Create(Collection: TCollection);
 begin
   inherited Create(Collection);
   FRadiusFactor := 1.0;
-  FColor := TGLColor.CreateInitialized(Self, clrBlack, ColorChanged);
+  FColor := TGColor.CreateInitialized(Self, clrBlack, ColorChanged);
   FTexCoordT := 1.0;
 end;
 
@@ -735,7 +735,7 @@ begin
   Result := (FTexCoordT <> 1.0);
 end;
 
-procedure TGLPipeNode.SetColor(const val: TGLColor);
+procedure TGLPipeNode.SetColor(const val: TGColor);
 begin
   FColor.Assign(val);
 end;
@@ -928,7 +928,7 @@ type
   end;
   TRowData = record
     node: array of TNodeData;
-    color: TGLColorVector;
+    color: TGColorVector;
     center: TVector3f;
     textcoordT: Single;
   end;

Source/GLS.FBORenderer.pas

@@ -25,7 +25,7 @@ uses
   GLS.Scene,
   GLS.Texture,
   GLS.Context,
-  GLS.Color,
+  GLScene.Color,
   GLS.Material,
   GLS.RenderContextInfo,
   GLS.State,
@@ -188,7 +188,7 @@ type
     FPostInitialize: TNotifyEvent;
     FAfterRender: TGLDirectRenderEvent;
     FPreInitialize: TNotifyEvent;
-    FBackgroundColor: TGLColor;
+    FBackgroundColor: TGColor;
     FClearOptions: TGLFBOClearOptions;
     FAspect: Single;
     FSceneScaleFactor: Single;
@@ -216,7 +216,7 @@ type
     procedure SetCamera(const Value: TGLCamera);
     procedure SetEnabledRenderBuffers(const Value: TGLEnabledRenderBuffers);
     procedure SetTargetVisibility(const Value: TGLFBOTargetVisibility);
-    procedure SetBackgroundColor(const Value: TGLColor);
+    procedure SetBackgroundColor(const Value: TGColor);
     function StoreSceneScaleFactor: Boolean;
     function StoreAspect: Boolean;
     procedure SetUseLibraryAsMultiTarget(Value: Boolean);
@@ -264,7 +264,7 @@ type
       write SetDepthTextureName;
     property MaterialLibrary: TGLAbstractMaterialLibrary read GetMaterialLibrary
       write SetMaterialLibrary;
-    property BackgroundColor: TGLColor read FBackgroundColor write SetBackgroundColor;
+    property BackgroundColor: TGColor read FBackgroundColor write SetBackgroundColor;
     property ClearOptions: TGLFBOClearOptions read FClearOptions
       write FClearOptions;
     (* Camera used for rendering to the FBO
@@ -808,7 +808,7 @@ end;
 procedure TGLFrameBuffer.Render(var rci: TGLRenderContextInfo; baseObject:
   TGLBaseSceneObject);
 var
-  backColor: TGLColorVector;
+  backColor: TGColorVector;
   buffer: TGLSceneBuffer;
 begin
   Bind;
@@ -979,7 +979,7 @@ begin
   inherited;
   ObjectStyle := [osDirectDraw, osNoVisibilityCulling];
   FFbo := TGLFrameBuffer.Create;
-  FBackgroundColor := TGLColor.Create(Self);
+  FBackgroundColor := TGColor.Create(Self);
   FUseLibraryAsMultiTarget := False;
   FForceTextureDimensions := True;
   FWidth := 256;
@@ -1278,7 +1278,7 @@ procedure TGLFBORenderer.RenderToFBO(var ARci: TGLRenderContextInfo);
 
 type
   TGLStoredStates = record
-    ColorClearValue: TGLColorVector;
+    ColorClearValue: TGColorVector;
     ColorWriteMask: TGLColorMask;
     Tests: TGLStates;
   end;
@@ -1306,7 +1306,7 @@ type
   end;
 
 var
-  backColor: TGLColorVector;
+  backColor: TGColorVector;
   buffer: TGLSceneBuffer;
   savedStates: TGLStoredStates;
   w, h: Integer;
@@ -1420,7 +1420,7 @@ begin
   end;
 end;
 
-procedure TGLFBORenderer.SetBackgroundColor(const Value: TGLColor);
+procedure TGLFBORenderer.SetBackgroundColor(const Value: TGColor);
 begin
   FBackgroundColor.Assign(Value);
 end;

Source/GLS.FileMS3D.pas

@@ -17,7 +17,7 @@ uses
   GLS.VectorFileObjects,
   GLScene.VectorTypes, 
   GLS.Material, 
-  GLS.Color, 
+  GLScene.Color, 
   GLS.Texture,
   GLScene.VectorGeometry, 
   GLScene.VectorLists, 
@@ -122,10 +122,10 @@ type
   // *) ms3d_material_t;
   TMS3DMaterial = record
     Name: array[0..31] of AnsiChar;
-    Ambient: TGLColorVector;
-    Diffuse: TGLColorVector;
-    Specular: TGLColorVector;
-    Emissive: TGLColorVector;
+    Ambient: TGColorVector;
+    Diffuse: TGColorVector;
+    Specular: TGColorVector;
+    Emissive: TGColorVector;
     Shininess: single;
     Transparency: single;
     Mode: AnsiChar;

Source/GLS.FileOBJ.pas

@@ -27,7 +27,7 @@ uses
   GLS.VectorFileObjects,
   GLScene.VectorLists,  
   GLS.Texture,  
-  GLS.Color,
+  GLScene.Color,
   GLS.RenderContextInfo, 
   GLS.Material,
   GLScene.Utils;

Source/GLS.FireFX.pas

@@ -24,7 +24,7 @@ uses
   GLScene.VectorLists,
   GLScene.VectorTypes,
   GLS.Cadencer,
-  GLS.Color,
+  GLScene.Color,
   GLScene.BaseClasses,
   GLScene.Coordinates,
   GLScene.Manager,
@@ -58,7 +58,7 @@ type
     FParticleSize, FFireDensity, FFireEvaporation: Single;
     FFireCrown, FParticleInterval, IntervalDelta: Single;
     NP: Integer;
-    FInnerColor, FOuterColor: TGLColor;
+    FInnerColor, FOuterColor: TGColor;
     FFireBurst, FFireRadius: Single;
     FDisabled, FPaused, FUseInterval: Boolean;
     FReference: TGLBaseSceneObject;
@@ -71,14 +71,14 @@ type
     procedure SetInitialDir(const val: TGCoordinates);
     procedure SetCadencer(const val: TGLCadencer);
     function StoreParticleSize: Boolean;
-    procedure SetInnerColor(const val: TGLcolor);
-    procedure SetOuterColor(const val: TGLcolor);
+    procedure SetInnerColor(const val: TGColor);
+    procedure SetOuterColor(const val: TGColor);
     procedure SetReference(const val: TGLBaseSceneObject);
     procedure SetMaxParticles(const val: Integer);
     procedure Notification(AComponent: TComponent; Operation: TOperation); override;
     procedure CalcFire(deltaTime: Double; ParticleInterval, ParticleLife: Single;
       FireAlpha: Single);
-    procedure AffParticle3d(Color2: TGLColorVector; const mat: TGLMatrix);
+    procedure AffParticle3d(Color2: TGColorVector; const mat: TGLMatrix);
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -110,9 +110,9 @@ type
     // Size of the particle, in absolute units.
     property ParticleSize: Single read FParticleSize write FParticleSize stored StoreParticleSize;
     // Inner color of a particle.
-    property InnerColor: TGLcolor read FInnerColor write SetInnerColor;
+    property InnerColor: TGColor read FInnerColor write SetInnerColor;
     // Outer color of a particle.
-    property OuterColor: TGLcolor read FOuterColor write SetOuterColor; // default clrWhite;
+    property OuterColor: TGColor read FOuterColor write SetOuterColor; // default clrWhite;
     property FireDensity: Single read FFireDensity write FFireDensity;
     property FireEvaporation: Single read FFireEvaporation write FFireEvaporation;
     (* Adjust a crown (circular) radius on which particles are spawned.
@@ -214,9 +214,9 @@ begin
   FInitialDir := TGCoordinates.CreateInitialized(Self, YHmgVector, csPoint);
   FMaxParticles := 256;
   FParticleSize := 1.0;
-  FInnerColor := TGLColor.Create(Self);
+  FInnerColor := TGColor.Create(Self);
   FInnerColor.Initialize(clrYellow);
-  FOuterColor := TGLColor.Create(Self);
+  FOuterColor := TGColor.Create(Self);
   FOuterColor.Initialize(clrOrange);
   FFireDensity := 1;
   FFireEvaporation := 0.86;
@@ -311,7 +311,7 @@ begin
 end;
 
 
-procedure TGLFireFXManager.SetInnerColor(const val: TGLcolor);
+procedure TGLFireFXManager.SetInnerColor(const val: TGColor);
 begin
   if FInnerColor <> val then
   begin
@@ -321,7 +321,7 @@ begin
 end;
 
 
-procedure TGLFireFXManager.SetOuterColor(const val: TGLcolor);
+procedure TGLFireFXManager.SetOuterColor(const val: TGColor);
 begin
   if FOuterColor <> val then
   begin
@@ -524,7 +524,7 @@ begin
   end;
 end;
 
-procedure TGLFireFXManager.AffParticle3d(Color2: TGLColorVector; const mat: TGLMatrix);
+procedure TGLFireFXManager.AffParticle3d(Color2: TGColorVector; const mat: TGLMatrix);
 var
   vx, vy: TGLVector;
   i: Integer;

Source/GLS.GameMenu.pas

@@ -21,7 +21,7 @@ uses
   GLS.Scene,
   GLS.Material,
   GLS.BitmapFont,
-  GLS.Color,
+  GLScene.Color,
   GLS.RenderContextInfo,
   GLS.Canvas,
   GLS.Context;
@@ -37,8 +37,8 @@ type
     FFont: TGLCustomBitmapFont;
     FMarginVert, FMarginHorz, FSpacing: Integer;
     FMenuScale: TGLGameMenuScale;
-    FBackColor: TGLColor;
-    FInactiveColor, FActiveColor, FDisabledColor: TGLColor;
+    FBackColor: TGColor;
+    FInactiveColor, FActiveColor, FDisabledColor: TGColor;
     FMaterialLibrary: TGLMaterialLibrary;
     FTitleMaterialName: TGLLibMaterialName;
     FTitleWidth, FTitleHeight: Integer;
@@ -53,10 +53,10 @@ type
     procedure SetMarginVert(AValue: Integer);
     procedure SetSpacing(AValue: Integer);
     procedure SetFont(AValue: TGLCustomBitmapFont);
-    procedure SetBackColor(AValue: TGLColor);
-    procedure SetInactiveColor(AValue: TGLColor);
-    procedure SetActiveColor(AValue: TGLColor);
-    procedure SetDisabledColor(AValue: TGLColor);
+    procedure SetBackColor(AValue: TGColor);
+    procedure SetInactiveColor(AValue: TGColor);
+    procedure SetActiveColor(AValue: TGColor);
+    procedure SetDisabledColor(AValue: TGColor);
     function GetEnabled(AIndex: Integer): Boolean;
     procedure SetEnabled(AIndex: Integer; AValue: Boolean);
     procedure SetItems(AValue: TStrings);
@@ -87,10 +87,10 @@ type
     property TitleMaterialName: string read FTitleMaterialName write SetTitleMaterialName;
     property TitleWidth: Integer read FTitleWidth write SetTitleWidth default 0;
     property TitleHeight: Integer read FTitleHeight write SetTitleHeight default 0;
-    property BackColor: TGLColor read FBackColor write SetBackColor;
-    property InactiveColor: TGLColor read FInactiveColor write SetInactiveColor;
-    property ActiveColor: TGLColor read FActiveColor write SetActiveColor;
-    property DisabledColor: TGLColor read FDisabledColor write SetDisabledColor;
+    property BackColor: TGColor read FBackColor write SetBackColor;
+    property InactiveColor: TGColor read FInactiveColor write SetInactiveColor;
+    property ActiveColor: TGColor read FActiveColor write SetActiveColor;
+    property DisabledColor: TGColor read FDisabledColor write SetDisabledColor;
     property Items: TStrings read FItems write SetItems;
     property Selected: Integer read FSelected write SetSelected default -1;
     property OnSelectedChanged: TNotifyEvent read FOnSelectedChanged write FOnSelectedChanged;
@@ -130,10 +130,10 @@ begin
   FMarginVert := 16;
   FSpacing := 16;
   FMenuScale := gmsNormal;
-  FBackColor := TGLColor.CreateInitialized(Self, clrTransparent, NotifyChange);
-  FInactiveColor := TGLColor.CreateInitialized(Self, clrGray75, NotifyChange);
-  FActiveColor := TGLColor.CreateInitialized(Self, clrWhite, NotifyChange);
-  FDisabledColor := TGLColor.CreateInitialized(Self, clrGray60, NotifyChange);
+  FBackColor := TGColor.CreateInitialized(Self, clrTransparent, NotifyChange);
+  FInactiveColor := TGColor.CreateInitialized(Self, clrGray75, NotifyChange);
+  FActiveColor := TGColor.CreateInitialized(Self, clrWhite, NotifyChange);
+  FDisabledColor := TGColor.CreateInitialized(Self, clrGray60, NotifyChange);
 end;
 
 destructor TGLGameMenu.Destroy;
@@ -164,7 +164,7 @@ var
   canvas: TGLCanvas;
   buffer: TGLSceneBuffer;
   i, w, h, tw, Y: Integer;
-  color: TGLColorVector;
+  color: TGColorVector;
   libMat: TGLLibMaterial;
 begin
   if Font = nil then
@@ -327,22 +327,22 @@ begin
     FFont.FreeNotification(Self);
 end;
 
-procedure TGLGameMenu.SetBackColor(AValue: TGLColor);
+procedure TGLGameMenu.SetBackColor(AValue: TGColor);
 begin
   FBackColor.Assign(AValue);
 end;
 
-procedure TGLGameMenu.SetInactiveColor(AValue: TGLColor);
+procedure TGLGameMenu.SetInactiveColor(AValue: TGColor);
 begin
   FInactiveColor.Assign(AValue);
 end;
 
-procedure TGLGameMenu.SetActiveColor(AValue: TGLColor);
+procedure TGLGameMenu.SetActiveColor(AValue: TGColor);
 begin
   FActiveColor.Assign(AValue);
 end;
 
-procedure TGLGameMenu.SetDisabledColor(AValue: TGLColor);
+procedure TGLGameMenu.SetDisabledColor(AValue: TGColor);
 begin
   FDisabledColor.Assign(AValue);
 end;

Source/GLS.Gizmo.pas

@@ -44,7 +44,7 @@ uses
 
   GLS.Scene,
   GLScene.PersistentClasses,
-  GLS.Color,
+  GLScene.Color,
   GLS.Objects,
   GLS.Material,
   GLS.GeomObjects,
@@ -158,9 +158,9 @@ type
     // FLastOperation,
     FOperation: TGLGizmoOperation;
     FSelAxis: TGLGizmoAxis;
-    FBoundingBoxColor: TGLColor;
-    FSelectedColor: TGLColor;
-    FVisibleInfoLabelsColor: TGLColor;
+    FBoundingBoxColor: TGColor;
+    FSelectedColor: TGColor;
+    FVisibleInfoLabelsColor: TGColor;
     FBoundingBoxColorChanged: Boolean;
     FVisibleInfoLabelsColorChanged: Boolean;
     FForceOperation: Boolean;
@@ -197,9 +197,9 @@ type
     procedure SetRootGizmo(const AValue: TGLBaseSceneObject);
     procedure SetGizmoElements(const AValue: TGLGizmoElements);
     procedure SeTGLGizmoVisibleInfoLabels(const AValue: TGLGizmoVisibleInfoLabels);
-    procedure SetBoundingBoxColor(const AValue: TGLColor);
-    procedure SetSelectedColor(const AValue: TGLColor);
-    procedure SetVisibleInfoLabelsColor(const AValue: TGLColor);
+    procedure SetBoundingBoxColor(const AValue: TGColor);
+    procedure SetSelectedColor(const AValue: TGColor);
+    procedure SetVisibleInfoLabelsColor(const AValue: TGColor);
     procedure SetExcludeObjectsList(const AValue: TStrings);
     procedure DirectGlDisable(Sender: TObject; var Rci: TGLRenderContextInfo);
     procedure DirectGlEnable(Sender: TObject; var Rci: TGLRenderContextInfo);
@@ -235,9 +235,9 @@ type
     property Viewer: TGLSceneViewer read FViewer write SetViewer;
     property GizmoElements: TGLGizmoElements read FGizmoElements
       write SetGizmoElements;
-    property BoundingBoxColor: TGLColor read FBoundingBoxColor
+    property BoundingBoxColor: TGColor read FBoundingBoxColor
       write SetBoundingBoxColor;
-    property SelectedColor: TGLColor read FSelectedColor write SetSelectedColor;
+    property SelectedColor: TGColor read FSelectedColor write SetSelectedColor;
     property SelAxis: TGLGizmoAxis read FSelAxis write FSelAxis;
     property ForceAxis: Boolean read FForceAxis write FForceAxis;
     property SelectedObj: TGLBaseSceneObject read FSelectedObj
@@ -251,7 +251,7 @@ type
       write SetExcludeObjectsList;
     property VisibleInfoLabels: TGLGizmoVisibleInfoLabels
       read FVisibleVisibleInfoLabels write SeTGLGizmoVisibleInfoLabels;
-    property VisibleInfoLabelsColor: TGLColor read FVisibleInfoLabelsColor
+    property VisibleInfoLabelsColor: TGColor read FVisibleInfoLabelsColor
       write SetVisibleInfoLabelsColor;
     property AutoZoom: Boolean read FAutoZoom write FAutoZoom;
     property AutoZoomFactor: Single read FAutoZoomFactor write FAutoZoomFactor;
@@ -335,12 +335,12 @@ begin
   FGizmoThickness := 1;
 
   FInternalRaycastHitData := TList.Create;
-  FBoundingBoxColor := TGLColor.Create(Self);
+  FBoundingBoxColor := TGColor.Create(Self);
   FBoundingBoxColor.Color := ClrWhite;
   FBoundingBoxColorChanged := False;
-  FSelectedColor := TGLColor.Create(Self);
+  FSelectedColor := TGColor.Create(Self);
   FSelectedColor.Color := ClrYellow;
-  FVisibleInfoLabelsColor := TGLColor.Create(Self);
+  FVisibleInfoLabelsColor := TGColor.Create(Self);
   FVisibleInfoLabelsColor.Color := ClrYellow;
   FVisibleInfoLabelsColorChanged := False;
 
@@ -743,7 +743,7 @@ begin
   end;
 end;
 
-procedure TGLGizmo.SetBoundingBoxColor(const AValue: TGLColor);
+procedure TGLGizmo.SetBoundingBoxColor(const AValue: TGColor);
 begin
   // Bug Here New Color is not Updated
   if AValue <> FBoundingBoxColor then
@@ -768,7 +768,7 @@ begin
   end;
 end;
 
-procedure TGLGizmo.SetSelectedColor(const AValue: TGLColor);
+procedure TGLGizmo.SetSelectedColor(const AValue: TGColor);
 begin
   if AValue <> FSelectedColor then
   begin
@@ -776,7 +776,7 @@ begin
   end;
 end;
 
-procedure TGLGizmo.SetVisibleInfoLabelsColor(const AValue: TGLColor);
+procedure TGLGizmo.SetVisibleInfoLabelsColor(const AValue: TGColor);
 begin
   // Bug Here New Color is not Updated
   if AValue <> FSelectedColor then

Source/GLS.GizmoEx.pas

@@ -22,7 +22,7 @@ uses
   Vcl.StdCtrls,
 
   GLS.Scene,
-  GLS.Color,
+  GLScene.Color,
   GLS.Objects,
   GLScene.VectorGeometry,
   GLS.Material,
@@ -263,10 +263,10 @@ type
     fInfoLabelCoordType: TInfoLabelCoordType;
     FReferenceCoordSystem: TGLGizmoExReferenceCoordinateSystem;
 
-    FBoundingBoxColor: TGLColor;
-    FSelectedColor: TGLColor;
-    FVisibleInfoLabelsColor: TGLColor;
-    FSelectionRegionColor: TGLColor;
+    FBoundingBoxColor: TGColor;
+    FSelectedColor: TGColor;
+    FVisibleInfoLabelsColor: TGColor;
+    FSelectionRegionColor: TGColor;
 
     FVisibleInfoLabelsColorChanged: Boolean;
 
@@ -326,10 +326,10 @@ type
     procedure SetRootObjects(const AValue: TGLBaseSceneObject);
     procedure SetGizmoTmpRoot(const AValue: TGLBaseSceneObject);
     procedure SeTGLGizmoExVisibleInfoLabels(const AValue: TGLGizmoExVisibleInfoLabels);
-    procedure SetBoundingBoxColor(const AValue: TGLColor);
-    procedure SetSelectedColor(const AValue: TGLColor);
-    procedure SetVisibleInfoLabelsColor(const AValue: TGLColor);
-    procedure SetSelectionRegionColor(const AValue: TGLColor);
+    procedure SetBoundingBoxColor(const AValue: TGColor);
+    procedure SetSelectedColor(const AValue: TGColor);
+    procedure SetVisibleInfoLabelsColor(const AValue: TGColor);
+    procedure SetSelectionRegionColor(const AValue: TGColor);
     procedure SetCanChangeWithChildren(AValue: Boolean);
     procedure SetAALines(aValue: Boolean);
     procedure SetInfoLabelCoordType(aValue: TInfoLabelCoordType);
@@ -401,9 +401,9 @@ type
     //--------------------------------------------------------------------
   published
     property Viewer: TGLSceneViewer read FViewer write SetViewer;
-    property BoundingBoxColor: TGLColor read FBoundingBoxColor write SetBoundingBoxColor;
-    property SelectedColor: TGLColor read FSelectedColor write SetSelectedColor;
-    property SelectionRegionColor: TGLColor read FSelectionRegionColor write SetSelectionRegionColor;
+    property BoundingBoxColor: TGColor read FBoundingBoxColor write SetBoundingBoxColor;
+    property SelectedColor: TGColor read FSelectedColor write SetSelectedColor;
+    property SelectionRegionColor: TGColor read FSelectionRegionColor write SetSelectionRegionColor;
     property SelectedObj: TGLBaseSceneObject read GetSelectedObj write SetSelectedObj;
     property SelectedObjects: TGLPickList read GetPickList write SetPickList;
     property OperationMode: TGLGizmoExOperationMode read FOperationMode write SetOperationMode default gomSelect;
@@ -412,7 +412,7 @@ type
     property ExcludeClassname: Boolean read FExcludeClassname write FExcludeClassname;
     property ExcludeClassnameList: TStrings read FExcludeClassnameList write SetExcludeClassnameList;
     property VisibleInfoLabels: TGLGizmoExVisibleInfoLabels read FVisibleVisibleInfoLabels write SeTGLGizmoExVisibleInfoLabels;
-    property VisibleInfoLabelsColor: TGLColor read FVisibleInfoLabelsColor write SetVisibleInfoLabelsColor;
+    property VisibleInfoLabelsColor: TGColor read FVisibleInfoLabelsColor write SetVisibleInfoLabelsColor;
     property AutoZoom: Boolean read FAutoZoom write FAutoZoom default True;
     property AutoZoomFactor: Single read FAutoZoomFactor write SetAutoZoomFactor;
     property ZoomFactor: Single read FZoomFactor write SetZoomFactor;
@@ -720,13 +720,13 @@ begin
   FMoveCoef := 0.1;
   FScaleCoef := 0.1;
 
-  FBoundingBoxColor := TGLColor.Create(Self);
+  FBoundingBoxColor := TGColor.Create(Self);
   FBoundingBoxColor.Color := clrWhite;
-  FSelectionRegionColor := TGLColor.Create(Self);
+  FSelectionRegionColor := TGColor.Create(Self);
   SelectionRegionColor.Color := clrBlack;
-  FSelectedColor := TGLColor.Create(Self);
+  FSelectedColor := TGColor.Create(Self);
   FSelectedColor.Color := clrYellow;
-  FVisibleInfoLabelsColor := TGLColor.Create(Self);
+  FVisibleInfoLabelsColor := TGColor.Create(Self);
   FVisibleInfoLabelsColor.Color := clrYellow;
   FVisibleInfoLabelsColorChanged := False;
 
@@ -2365,7 +2365,7 @@ begin
 
 end;
 
-procedure TGLGizmoEx.SetBoundingBoxColor(const AValue: TGLColor);
+procedure TGLGizmoEx.SetBoundingBoxColor(const AValue: TGColor);
 begin
   if AValue <> FBoundingBoxColor then
   begin
@@ -2374,7 +2374,7 @@ begin
   end;
 end;
 
-procedure TGLGizmoEx.SetSelectedColor(const AValue: TGLColor);
+procedure TGLGizmoEx.SetSelectedColor(const AValue: TGColor);
 begin
   if AValue <> FSelectedColor then
   begin
@@ -2734,7 +2734,7 @@ begin
 end;
 
 
-procedure TGLGizmoEx.SetVisibleInfoLabelsColor(const AValue: TGLColor);
+procedure TGLGizmoEx.SetVisibleInfoLabelsColor(const AValue: TGColor);
 begin
   if AValue <> FSelectedColor then
   begin
@@ -2745,7 +2745,7 @@ begin
   end;
 end;
 
-procedure TGLGizmoEx.SetSelectionRegionColor(const AValue: TGLColor);
+procedure TGLGizmoEx.SetSelectionRegionColor(const AValue: TGColor);
 begin
   if AValue <> FSelectionRegionColor then
   begin