Renamed GLVectorGeometry to Scene.VectorGeometry for the compatibility with GXScene

Demos/CPP/behaviours/DCEDemo/Unit1.cpp

@@ -125,7 +125,7 @@ void TForm1::AddMushrooms()
 {
   int i;
   TGLFreeFormProxy *Proxy;
-  Glvectorgeometry::TVector s;
+  Scene.VectorGeometry::TVector s;
   float f;
 
   // spawn some more mushrooms using proxy objects

Demos/CPP/behaviours/DCEDemo/Unit1.h

@@ -35,7 +35,7 @@
 #include "GLRenderContextInfo.hpp"
 #include "GLKeyBoard.hpp"
 #include "GLState.hpp"
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLContext.hpp"
 #include "GLEllipseCollision.hpp"
 #include "GLS.Utils.hpp"

Demos/CPP/behaviours/FPSMovement/Unit1.h

@@ -24,9 +24,9 @@
 #include "GLSceneViewer.hpp"
 #include "GLKeyboard.hpp"
 #include "GLGeomObjects.hpp"
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLOctree.hpp"
-#include "GLVectorLists.hpp"
+#include "Scene.VectorLists.hpp"
 #include "GLNavigator.hpp"
 #include "GLCollision.hpp"
 #include "GLTexture.hpp"

Demos/CPP/cgshaders/simple/Unit1.cpp

@@ -60,7 +60,7 @@ void __fastcall TForm1::FormCreate(TObject *Sender)
 
 void __fastcall TForm1::CgShader1ApplyVP(TCgProgram *CgProgram, TObject *Sender)
 {
-  Glvectorgeometry::TVector v;
+  Scene.VectorGeometry::TVector v;
   TCgParameter *Param;
   // rotate light vector for the "simple lighting" vertex program
   v = ZHmgVector;

Demos/CPP/cgshaders/texturing/Unit1.cpp

@@ -72,7 +72,7 @@ void __fastcall TForm1::CgShader1Initialize(TCustomCgShader *CgShader)
 
 void __fastcall TForm1::CgShader1ApplyVP(TCgProgram *CgProgram, TObject *Sender)
 {
-  Glvectorgeometry::TVector v;
+  Scene.VectorGeometry::TVector v;
   CgProgram->ParamByName("ModelViewProj")->SetAsStateMatrix(CG_GL_MODELVIEW_PROJECTION_MATRIX, CG_GL_MATRIX_IDENTITY);
 // Alternatively, you can set it using:
 // CgProgram->SetStateMatrix("ModelViewProj", CG_GL_MODELVIEW_PROJECTION_MATRIX, CG_GL_MATRIX_IDENTITY);
@@ -91,7 +91,7 @@ void __fastcall TForm1::CgShader1ApplyVP(TCgProgram *CgProgram, TObject *Sender)
 
 void __fastcall TForm1::CgShader1ApplyFP(TCgProgram *CgProgram, TObject *Sender)
 {
-  Glvectorgeometry::TVector v;
+  Scene.VectorGeometry::TVector v;
   CgProgram->ParamByName("Map0")->EnableTexture();
   CgProgram->ParamByName("Map1")->EnableTexture();
   CgProgram->ParamByName("Map2")->EnableTexture();

Demos/CPP/collisions/BoxSphere/Unit1.cpp

@@ -44,10 +44,10 @@ void __fastcall TForm1::CheckBox04Click(TObject *Sender)
 //---------------------------------------------------------------------------
 
 // Generates random rotation for matrix. It remains a scale.
-Glvectorgeometry::TMatrix RandomRotation(Glvectorgeometry::TMatrix const &aMatrix)
+Scene.VectorGeometry::TMatrix RandomRotation(Scene.VectorGeometry::TMatrix const &aMatrix)
 {
   TAffineVector aScale;
-  Glvectorgeometry::TMatrix mat;
+  Scene.VectorGeometry::TMatrix mat;
   int I;
 
   // Save scale.

Demos/CPP/collisions/BoxSphere/Unit1.h

@@ -83,7 +83,7 @@ __published:	// IDE-managed Components
 private:	// User declarations
 	int mdx, mdy;
 	TAffineVector intersPoint, ResNormal, BoxScale, SpherePos;
-	Glvectorgeometry::TMatrix BoxMatrix;
+	Scene.VectorGeometry::TMatrix BoxMatrix;
 	float SphereRadius;
 public:		// User declarations
 	__fastcall TForm1(TComponent* Owner);

Demos/CPP/collisions/Raycast/Unit1.cpp

@@ -26,8 +26,8 @@ __fastcall TForm1::TForm1(TComponent* Owner)
 //---------------------------------------------------------------------------
 void __fastcall TForm1::BUCastClick(TObject *Sender)
 {
-   Glvectorgeometry::TVector o, v, vLight, light, iPoint, iNormal;
-   Glvectorgeometry::TVector up, right, dir;
+   Scene.VectorGeometry::TVector o, v, vLight, light, iPoint, iNormal;
+   Scene.VectorGeometry::TVector up, right, dir;
    int x, y, dx, dy;
    float f, d;
    TColor color;

Demos/CPP/collisions/Raycast/Unit1.h

@@ -16,7 +16,7 @@
 #include "GLObjects.hpp"
 #include "GLScene.hpp"
 #include "GLSceneViewer.hpp"
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLPolynomials.hpp"
 
 //---------------------------------------------------------------------------

Demos/CPP/collisions/boxedin/Unit1.cpp

@@ -19,7 +19,7 @@
 #pragma link "GLVectorFileObjects"
 #pragma link "GLScene"
 #pragma link "GLFile3DS"
-#pragma link "GLVectorGeometry"
+#pragma link "Scene.VectorGeometry"
 #pragma link "GLKeyboard"
 #pragma link "GLCoordinates"
 #pragma link "GLCrossPlatform"
@@ -57,10 +57,10 @@ void __fastcall TForm1::GLCadencer1Progress(TObject * Sender,
 											const double deltaTime,
 											const double newTime)
 {
-  Glvectorgeometry::TVector rayStart, rayVector;
+  Scene.VectorGeometry::TVector rayStart, rayVector;
   float velocity;
-  Glvectorgeometry::TVector pPoint;
-  Glvectorgeometry::TVector pNormal;
+  Scene.VectorGeometry::TVector pPoint;
+  Scene.VectorGeometry::TVector pNormal;
   __int64 t;
 
   if(IsKeyDown(VK_ESCAPE))
@@ -109,7 +109,7 @@ void __fastcall TForm1::GLCadencer1Progress(TObject * Sender,
 
 //---------------------------------------------------------------------------
 
-void TForm1::AddToTrail(const Glvectorgeometry::TVector & p)
+void TForm1::AddToTrail(const Scene.VectorGeometry::TVector & p)
 {
   int i, k;
   Lines1->Nodes->Last()->AsVector = p;

Demos/CPP/collisions/boxedin/Unit1.h

@@ -9,7 +9,7 @@
 #include <Forms.hpp>
 #include <ComCtrls.hpp>
 #include <ExtCtrls.hpp>
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLScene.hpp"
 #include "GLBaseClasses.hpp"
 #include <GLGeomObjects.hpp>
@@ -55,7 +55,7 @@ __published:                   // IDE-managed Components
 private:                       // User declarations
   float colTotalTime;           // for timing collision detection
   int colCount;
-  void AddToTrail(const Glvectorgeometry::TVector & p);
+  void AddToTrail(const Scene.VectorGeometry::TVector & p);
 public:                        // User declarations
     __fastcall TForm1(TComponent * Owner);
   int mousex, mousey;

Demos/CPP/collisions/facevsface/Unit1.cpp

@@ -161,7 +161,7 @@ void __fastcall TForm1::GLSceneViewer1MouseMove(TObject *Sender, TShiftState Shi
           int X, int Y)
 {
    int dx, dy;
-   Glvectorgeometry::TVector VX, VY;
+   Scene.VectorGeometry::TVector VX, VY;
    TGLCamera *Camera;
 
    Camera = GLSceneViewer1->Camera;

Demos/CPP/collisions/meshhit/Unit1.cpp

@@ -36,7 +36,7 @@ void __fastcall TForm1::FormCreate(TObject *Sender)
 void __fastcall TForm1::GLSceneViewer1MouseDown(TObject *Sender, TMouseButton Button,
 		  TShiftState Shift, int X, int Y)
 {
-   Glvectorgeometry::TVector rayStart, rayVector, iPoint, iNormal;
+   Scene.VectorGeometry::TVector rayStart, rayVector, iPoint, iNormal;
    // retrieve raycasting data:
    //    rayStart is obtained for camera and screen position
    //    rayVector is the camera direction (i.e direction to target since our camera is targeted)
@@ -71,7 +71,7 @@ void __fastcall TForm1::GLSceneViewer1MouseMove(TObject *Sender, TShiftState Shi
 void __fastcall TForm1::GLSceneViewer2MouseDown(TObject *Sender, TMouseButton Button,
 		  TShiftState Shift, int X, int Y)
 {
-   Glvectorgeometry::TVector rayStart, rayVector, iPoint, iNormal;
+   Scene.VectorGeometry::TVector rayStart, rayVector, iPoint, iNormal;
    // retrieve raycasting data:
    //    rayStart is the eye (camera) position
    //    rayVector is computed from screen position

Demos/CPP/collisions/octree/Unit1.cpp

@@ -49,7 +49,7 @@ void __fastcall TForm1::GLSceneViewer2MouseDown(TObject * Sender,
 												TMouseButton Button,
 												TShiftState Shift, int X, int Y)
 {
-  Glvectorgeometry::TVector rayStart, rayVector, iPoint, iNormal;
+  Scene.VectorGeometry::TVector rayStart, rayVector, iPoint, iNormal;
   __int64 t;
 
   SetVector(rayStart, GLCamera2->AbsolutePosition);

Demos/CPP/extrusion/bendingcyl/Unit1.h

@@ -16,7 +16,7 @@
 #include "GLExtrusion.hpp"
 #include "GLObjects.hpp"
 #include "GLScene.hpp"
-#include "GLVectorgeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLSceneViewer.hpp"
 #include "GLSpline.hpp"
 

Demos/CPP/extrusion/cutoutstar/Unit1.cpp

@@ -33,7 +33,7 @@ void __fastcall TForm1::FormCreate(TObject *Sender)
    const int
 	  cSteps = 16;
    const int
-	  c2 = Glvectorgeometry::c2PI;
+	  c2 = Scene.VectorGeometry::c2PI;
       new TGLExtrusionSolid(ExtrusionSolid);
    // a small star contour
 	  for (i=0; i<cSteps; i++)

Demos/CPP/extrusion/tentacles/Unit1.cpp

@@ -69,7 +69,7 @@ void __fastcall TForm1::GLCadencer1Progress(TObject *Sender, const double deltaT
 		 pipe->Nodes->BeginUpdate();
 		 for (i=0; i<pipe->Nodes->Count-1; i++)
 		 {
-			t1 =  -t+i*0.1+k*(2*M_PI)/5;   // Glvectorgeometry::c2PI
+			t1 =  -t+i*0.1+k*(2*M_PI)/5;   // Scene.VectorGeometry::c2PI
 			r =  (Sin(3*t+k)+2)*0.5*((2*i+pipe->Nodes->Count)/pipe->Nodes->Count);
 			pipe->Nodes->Items[i]->X = Cos(t1)*r;
 			pipe->Nodes->Items[i]->Z = Sin(t1)*r;

Demos/CPP/extrusion/tentacles/Unit1.h

@@ -13,7 +13,7 @@
 #include "GLObjects.hpp"
 #include "GLExtrusion.hpp"
 #include "GLCadencer.hpp"
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLTexture.hpp"
 #include "GLSceneViewer.hpp"
 #include "GLColor.hpp"

Demos/CPP/glslshaders/Ocean/Unit1.cpp

@@ -93,7 +93,7 @@ void __fastcall TForm1::DOInitializeRender(TObject *Sender, TGLRenderContextInfo
 void __fastcall TForm1::GLUserShader1DoApply(TObject *Sender, TGLRenderContextInfo &rci)
 
 {
-  Glvectorgeometry::TVector camPos;
+  Scene.VectorGeometry::TVector camPos;
 
   programObject = new TGLProgramHandle();
   programObject->UseProgramObject();

Demos/CPP/graph/projection/Unit1.cpp

@@ -39,9 +39,9 @@ void __fastcall TForm1::DirectOpenGLRender(TObject *Sender, TGLRenderContextInfo
 
 {
    int i;
-   Glvectorgeometry::TMatrix mat;
-   Glvectorgeometry::TVector p, pProj;
-   Glvectorgeometry::TVector planePoint, planeNormal;
+   Scene.VectorGeometry::TMatrix mat;
+   Scene.VectorGeometry::TVector p, pProj;
+   Scene.VectorGeometry::TVector planePoint, planeNormal;
    THmgPlane plane;
 
    // Here we recover our plane point and normal...

Demos/CPP/interface/CameraController/Unit1.cpp

@@ -63,7 +63,7 @@ void __fastcall TForm1::GetInput(TButton *Sender)
   }
 }
 //---------------------------------------------------------------------------
-Glvectorgeometry::TVector __fastcall TForm1::OnGetCameraPosition(
+Scene.VectorGeometry::TVector __fastcall TForm1::OnGetCameraPosition(
 					   TGLNavigatorSmoothChangeVector* const ASender)
 {
   if (ASender == FCameraSmoothAnimator_AbsPos)
@@ -73,7 +73,7 @@ Glvectorgeometry::TVector __fastcall TForm1::OnGetCameraPosition(
 }
 //---------------------------------------------------------------------------
 void __fastcall TForm1::OnSetCameraPosition(TGLNavigatorSmoothChangeVector* const ASender,
-					   const Glvectortypes::TVector4f &AValue)
+					   const Scene.VectorTypes::TVector4f &AValue)
 {
   if (ASender == FCameraSmoothAnimator_AbsPos)
 	GLCamera->AbsolutePosition = AValue;
@@ -119,7 +119,7 @@ void __fastcall TForm1::btnZoomToDistanceClick(TObject *Sender)
 //---------------------------------------------------------------------------
 void __fastcall TForm1::btnOrbitToPosClick(TObject *Sender)
 {
-  Glvectorgeometry::TVector lTargetPosition;
+  Scene.VectorGeometry::TVector lTargetPosition;
 
   GetInput(btnOrbitToPos);
   lTargetPosition = dcSphere->LocalToAbsolute(PointMake(DextX, DextY, DextZ));
@@ -147,7 +147,7 @@ void __fastcall TForm1::btSmoothOrbitClick(TObject *Sender)
   float lAngle; // In radians.
   float lTime;
   bool lNeedToRecalculateZoom;
-  Glvectorgeometry::TVector lTargetPosition;
+  Scene.VectorGeometry::TVector lTargetPosition;
 
   GetInput(btSmoothOrbit);
   lTargetPosition = dcSphere->LocalToAbsolute(PointMake(DextX, DextY, DextZ));
@@ -178,7 +178,7 @@ void __fastcall TForm1::btSmoothOrbitToPosAdvClick(TObject *Sender)
 {
   float lAngle; // In radians.
   float lTime;
-  Glvectorgeometry::TVector lTargetPosition;
+  Scene.VectorGeometry::TVector lTargetPosition;
 
   GetInput(btSmoothOrbitToPosAdv);
 
@@ -199,7 +199,7 @@ void __fastcall TForm1::btSmoothOrbitToPosAdvClick(TObject *Sender)
 
 void __fastcall TForm1::btnOrbitToPosAdvClick(TObject *Sender)
 {
-  Glvectorgeometry::TVector lTargetPosition;
+  Scene.VectorGeometry::TVector lTargetPosition;
 
   GetInput(btnOrbitToPosAdv);
   lTargetPosition = dcSphere->LocalToAbsolute(PointMake(DextX, DextY, DextZ));

Demos/CPP/interface/CameraController/Unit1.h

@@ -133,12 +133,12 @@ private:	// User declarations
 	TGLNavigatorSmoothChangeVector *FCameraSmoothAnimator_AbsPos;
 	TGLNavigatorSmoothChangeVector *FCameraSmoothAnimator_RelPos;
 	void __fastcall GetInput(TButton *Sender);
-	Glvectortypes::TVector4f __fastcall (__closure *TGLNavigatorSmoothChangeVectorGetEvent)
+	Scene.VectorTypes::TVector4f __fastcall (__closure *TGLNavigatorSmoothChangeVectorGetEvent)
 		(TGLNavigatorSmoothChangeVector* const ASender);
-	Glvectorgeometry::TVector __fastcall OnGetCameraPosition(
+	Scene.VectorGeometry::TVector __fastcall OnGetCameraPosition(
 					   TGLNavigatorSmoothChangeVector* const ASender);
 	void __fastcall OnSetCameraPosition(TGLNavigatorSmoothChangeVector* const ASender,
-					   const Glvectortypes::TVector4f &AValue);
+					   const Scene.VectorTypes::TVector4f &AValue);
 public:		// User declarations
 	__fastcall TForm1(TComponent* Owner);
 };

Demos/CPP/interface/GizmoEx/Unit1.h

@@ -143,9 +143,9 @@ __published:	// IDE-managed Components
 
 private:	// User declarations
 	int mx, my;
-	Glvectorgeometry::TVector MousePos,LostMousePos;
+	Scene.VectorGeometry::TVector MousePos,LostMousePos;
 	bool MouseMoving;
-	Glvectorgeometry::TVector pos;
+	Scene.VectorGeometry::TVector pos;
 	TGLBaseSceneObject *FObj;
 	TGLGizmoEx *Gizmo;
 	float FVectorLength;

Demos/CPP/interface/camera/Unit1.cpp

@@ -57,7 +57,7 @@ void __fastcall TForm1::RadioGroup2Click(TObject *Sender)
 void __fastcall TForm1::GLCamera1CustomPerspective(const TRectangle &viewport, int width,
           int height, int DPI, float &viewPortRadius)
 {
-  Glvectorgeometry::TMatrix Mat;
+  Scene.VectorGeometry::TMatrix Mat;
 
   Mat =  CreatePerspectiveMatrix(GLCamera1->GetFieldOfView(Width)/4,
 	Width / Height, GLCamera1->NearPlaneBias, GLCamera1->DepthOfView);
@@ -85,7 +85,7 @@ void __fastcall TForm1::GLSceneViewer1MouseMove(TObject *Sender, TShiftState Shi
           int X, int Y)
 {
 	int dx, dy;
-	Glvectorgeometry::TVector v;
+	Scene.VectorGeometry::TVector v;
 
 	// calculate delta since last move or last mousedown
 	dx = mdx-X; dy = mdy-Y;

Demos/CPP/interface/fadingintf/Unit1.h

@@ -15,7 +15,7 @@
 #include "GLGeomObjects.hpp"
 #include "GLObjects.hpp"
 #include "GLScene.hpp"
-#include "GLVectorgeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLSceneViewer.hpp"
 //---------------------------------------------------------------------------
 class TForm1 : public TForm

Demos/CPP/materials/multimaterial/Unit1.h

@@ -13,7 +13,7 @@
 #include "GLObjects.hpp"
 #include "GLSceneViewer.hpp"
 #include "GLTexture.hpp"
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLCadencer.hpp"
 #include "GLMultiMaterialShader.hpp"
 #include "GLTexCombineShader.hpp"

Demos/CPP/meshes/actorms3d/Unit1.cpp

@@ -20,10 +20,10 @@
 #pragma link "GLCameraController"
 #pragma link "GLGraphics"
 #pragma link "GLFileTGA"
-#pragma link "GLVectorTypes"
+#pragma link "Scene.VectorTypes"
 #pragma link "GLRenderContextInfo"
 #pragma link "GLShadowPlane"
-#pragma link "GLVectorGeometry"
+#pragma link "Scene.VectorGeometry"
 #pragma link "GLMesh"
 #pragma link "GLGui"
 #pragma link "GLWindows"

Demos/CPP/meshes/actorproxy/Unit1.cpp

@@ -69,7 +69,7 @@ void __fastcall TForm1::GLSceneViewer1MouseMove(TObject *Sender, TShiftState Shi
 
 void __fastcall TForm1::DoRaycastStuff()
 {
-   Glvectorgeometry::TVector rayStart, rayVector, iPoint, iNormal;
+   Scene.VectorGeometry::TVector rayStart, rayVector, iPoint, iNormal;
 
    SetVector(rayStart, GLCamera1->AbsolutePosition);
    SetVector(rayVector, GLSceneViewer1->Buffer->ScreenToVector(

Demos/CPP/meshes/actorproxy/Unit1.h

@@ -19,7 +19,7 @@
 #include "GLObjects.hpp"
 #include "GLGeomObjects.hpp"
 #include "GLProxyObjects.hpp"
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLCadencer.hpp"
 #include "GLTexture.hpp"
 #include "GLMaterial.hpp"

Demos/CPP/meshes/actortwocam/Unit1.cpp

@@ -47,7 +47,7 @@ void __fastcall TForm1::AddMushrooms()
 {
    int i;
    TGLProxyObject *proxy;
-   Glvectorgeometry::TVector s;
+   Scene.VectorGeometry::TVector s;
    float f;
 
    // spawn some more mushrooms using proxy objects

Demos/CPP/meshes/actortwocam/Unit1.h

@@ -26,7 +26,7 @@
 #include "GLSkydome.hpp"
 #include "GLVectorFileObjects.hpp"
 #include "GLKeyboard.hpp"
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 
 //---------------------------------------------------------------------------
 class TForm1 : public TForm

Demos/CPP/meshes/expolygon/Unit1.h

@@ -16,7 +16,7 @@
 #include "GLGeomObjects.hpp"
 #include "GLTexture.hpp"
 #include "GLMultiPolygon.hpp"
-#include "GlvectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLSceneViewer.hpp"
 #include "GLCrossPlatform.hpp"
 #include "GLMaterial.hpp"

Demos/CPP/meshes/formula/Unit1.h

@@ -14,7 +14,7 @@
 
 #include "GLScene.hpp"
 #include "GLObjects.hpp"
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLTexture.hpp"
 #include "GLCadencer.hpp"
 #include "GLMesh.hpp"

Demos/CPP/meshes/mushroom/Unit1.cpp

@@ -49,7 +49,7 @@ void __fastcall TForm1::AddMushRooms()
 {
    int i;
    TGLProxyObject *proxy;
-   Glvectorgeometry::TVector s;
+   Scene.VectorGeometry::TVector s;
    float f;
 
    // spawn some more mushrooms using proxy objects

Demos/CPP/meshes/shadedterrain/Unit1.cpp

@@ -56,7 +56,7 @@ void __fastcall TForm1::GLBumpmapHDS1NewTilePrepared(TGLBumpmapHDS * Sender,
 													 TGLLibMaterial *
 													 normalMapMaterial)
 {
-  Glvectorgeometry::TVector n;
+  Scene.VectorGeometry::TVector n;
 
   heightData->MaterialName = normalMapMaterial->Name;
   normalMapMaterial->Texture2Name = "contrast";

Demos/CPP/meshes/shadedterrain/Unit1.h

@@ -15,7 +15,7 @@
 #include "GLTexCombineShader.hpp"
 #include "GLBumpmapHDS.hpp"
 #include "GLLensFlare.hpp"
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLSceneViewer.hpp"
 #include "GLSkydome.hpp"
 #include "GLTexture.hpp"

Demos/CPP/meshes/subdivide/Unit1.h

@@ -24,7 +24,7 @@
 #include "GLSceneViewer.hpp"
 
 #include "GLMeshUtils.hpp"
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 
 #include "GLFileTGA.hpp"
 #include "GLFileObj.hpp"

Demos/CPP/meshes/terrain/Unit1.cpp

@@ -11,7 +11,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLLensFlare"
-#pragma link "GLVectorGeometry"
+#pragma link "Scene.VectorGeometry"
 #pragma link "GLSMBASS"
 #pragma link "GLSound"
 #pragma link "GLSceneViewer"
@@ -267,7 +267,7 @@ void __fastcall TForm1::FormKeyPress(TObject * Sender, char &Key)
 
 void __fastcall TForm1::TISoundTimer(TObject * Sender)
 {
-  Glvectorgeometry::TVector wolfPos;
+  Scene.VectorGeometry::TVector wolfPos;
   float c, s;
   TGLBSoundEmitter *be;
 
@@ -286,7 +286,7 @@ void __fastcall TForm1::TISoundTimer(TObject * Sender)
   {
     // wolf howl at some distance, at ground level
     wolfPos = GLCamera1->AbsolutePosition;
-    SinCosine(random() * Glvectorgeometry::c2PI, 100 + random(1000), s, c);
+    SinCosine(random() * Scene.VectorGeometry::c2PI, 100 + random(1000), s, c);
 	wolfPos.X = wolfPos.X + c;
 	wolfPos.Z = wolfPos.Z + s;
 	wolfPos.Y = TerrainRenderer1->InterpolatedHeight(wolfPos);

Demos/CPP/meshes/terrain/Unit1.h

@@ -12,7 +12,7 @@
 #include <GIFImg.hpp>
 
 #include <GLLensFlare.hpp>
-#include <GLVectorGeometry.hpp>
+#include <Scene.VectorGeometry.hpp>
 #include <GLSMBASS.hpp>
 #include <GLSound.hpp>
 #include <GLSceneViewer.hpp>

Demos/CPP/movements/objmove/Unit1.cpp

@@ -35,10 +35,10 @@ void __fastcall TForm1::FormCreate(TObject *Sender)
   UpdateHudText();
 }
 //---------------------------------------------------------------------------
-Glvectorgeometry::TVector __fastcall TForm1::MouseWorldPos(int X, int Y)
+Scene.VectorGeometry::TVector __fastcall TForm1::MouseWorldPos(int X, int Y)
 {
-  Glvectorgeometry::TVector v;
-  Glvectorgeometry::TVector Result;
+  Scene.VectorGeometry::TVector v;
+  Scene.VectorGeometry::TVector Result;
 
   Y = Scn->Height - Y;
   if (CurrentPick)
@@ -131,7 +131,7 @@ void __fastcall TForm1::ScnMouseDown(TObject *Sender, TMouseButton Button, TShif
 void __fastcall TForm1::ScnMouseMove(TObject *Sender, TShiftState Shift, int X, int Y)
 
 {
-  Glvectorgeometry::TVector newPos;
+  Scene.VectorGeometry::TVector newPos;
 
   ScnMouseMoveCnt++;
 ////not translated  Assert(ScnMouseMoveCnt < 2);

Demos/CPP/movements/objmove/Unit1.h

@@ -17,7 +17,7 @@
 #include "GLGraph.hpp"
 #include "GLCollision.hpp"
 #include "GLTexture.hpp"
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLVectorFileObjects.hpp"
 #include "GLSceneViewer.hpp"
 #include "GLSpaceText.hpp"
@@ -71,11 +71,11 @@ __published:	// IDE-managed Components
 	void __fastcall FormKeyUp(TObject *Sender, WORD &Key, TShiftState Shift);
 
 private:	// User declarations
-	Glvectorgeometry::TVector lastMouseWorldPos;
+	Scene.VectorGeometry::TVector lastMouseWorldPos;
 	bool movingOnZ;
 	TGLCustomSceneObject *CurrentPick;
 	int ScnMouseMoveCnt;
-	Glvectorgeometry::TVector __fastcall MouseWorldPos(int X, int Y);
+	Scene.VectorGeometry::TVector __fastcall MouseWorldPos(int X, int Y);
 	void __fastcall UpdateHudText();
 	void __fastcall ProcessPick(TGLBaseSceneObject* pick);
 public:		// User declarations

Demos/CPP/movements/pointto/Unit1.cpp

@@ -10,7 +10,7 @@
 #pragma link "GLGeomObjects"
 #pragma link "GLSceneViewer"
 #pragma link "GLCadencer"
-#pragma link "GLVectorGeometry"
+#pragma link "Scene.VectorGeometry"
 #pragma link "GLScene"
 #pragma link "GLObjects"
 #pragma link "GLBaseClasses"

Demos/CPP/movements/pointto/Unit1.h

@@ -10,7 +10,7 @@
 #include <GLGeomObjects.hpp>
 #include <GLSceneViewer.hpp>
 #include <GLCadencer.hpp>
-#include <GLVectorGeometry.hpp>
+#include <Scene.VectorGeometry.hpp>
 #include <GLScene.hpp>
 #include <GLObjects.hpp>
 #include "GLBaseClasses.hpp"

Demos/CPP/movements/pong/Unit1.cpp

@@ -67,7 +67,7 @@ const float
 void __fastcall TForm1::GLCadencer1Progress(TObject *Sender, const double deltaTime,
 		  const double newTime)
 {
-	Glvectorgeometry::TVector newBallPos;
+	Scene.VectorGeometry::TVector newBallPos;
 	// gameOver is True as soon as the ball is behind the pad, but we don't end
 	// the game immediately so the user can realize he has lost
 	if ((!gameOver) && (deltaTime>0))

Demos/CPP/physics/NewtonDensity/Unit1.cpp

@@ -30,8 +30,8 @@ TForm1 *Form1;
 int __cdecl BuoyancyPlaneCallback(const int collisionID, void *context,
   const PNGDFloat globalSpaceMatrix, PNGDFloat globalSpacePlane)
 {
-  Glvectorgeometry::TMatrix *BodyMatrix;
-  Glvectorgeometry::TVector PlaneEquation;
+  Scene.VectorGeometry::TMatrix *BodyMatrix;
+  Scene.VectorGeometry::TVector PlaneEquation;
   PVector pv;
   TForm1 *MyForm;
 
@@ -108,7 +108,7 @@ void __fastcall TForm1::GLSceneViewer1MouseDown(TObject *Sender, TMouseButton Bu
 void TForm1::MyForceAndTorqueDensity(const PNewtonBody cbody,
 	  NGDFloat timestep, int threadIndex)
 {
-  Glvectorgeometry::TVector worldGravity;
+  Scene.VectorGeometry::TVector worldGravity;
   TGLNGDDynamic  *NGDDyn;
   float fluidDensity, fluidLinearViscosity, fluidAngularViscosity;
 

Demos/CPP/physics/OdeConveyor/Unit1.h

@@ -61,8 +61,8 @@ __published:	// IDE-managed Components
 	void __fastcall FrictionChange(TObject *Sender);
 
 private:	// User declarations
-	Glvectorgeometry::TVector FUserDirection;
-	Glvectorgeometry::TVector FDirectionVector;
+	Scene.VectorGeometry::TVector FUserDirection;
+	Scene.VectorGeometry::TVector FDirectionVector;
 
 public:		// User declarations
 	__fastcall TForm1(TComponent* Owner);

Demos/CPP/physics/OdeFurball/Unit1.cpp

@@ -9,7 +9,7 @@
 
 #pragma link "GLNavigator"
 #pragma link "GLShadowPlane"
-#pragma link "GLVectorGeometry"
+#pragma link "Scene.VectorGeometry"
 #pragma link "GLExtrusion"
 #pragma link "GLTexture"
 #pragma link "GLCadencer"

Demos/CPP/rendering/OctreeDemo/Unit1.h

@@ -20,7 +20,7 @@
 
 #include "GLSpacePartition.hpp"
 #include "GLContext.hpp"
-#include "GLVectorgeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "OpenGLTokens.hpp"
 
 

Demos/CPP/rendering/multiproxy/Unit1.h

@@ -18,7 +18,7 @@
 #include "GLScene.hpp"
 #include "GLSceneViewer.hpp"
 #include "GLTexture.hpp"
-#include "GLVectorgeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 
 //---------------------------------------------------------------------------
 class TForm1 : public TForm

Demos/CPP/specialsFX/Atmosphere/Unit1.h

@@ -17,7 +17,7 @@
 #include "GLSceneViewer.hpp"
 #include "GLTexture.hpp"
 #include "GLSkydome.hpp"
-#include "GLVectorGeometry.hpp"
+#include "Scene.VectorGeometry.hpp"
 #include "GLCrossPlatform.hpp"
 #include "GLAtmosphere.hpp"
 #include "GLSimpleNavigation.hpp"

Demos/CPP/specialsFX/spiral/Unit1.cpp

@@ -8,7 +8,7 @@
 #pragma package(smart_init)
 #pragma link "GLSceneViewer"
 #pragma link "GLCrossPlatform"
-#pragma link "GLVectorGeometry"
+#pragma link "Scene.VectorGeometry"
 #pragma link "GLBehaviours"
 #pragma link "GLSceneViewer"
 #pragma link "GLObjects"

Demos/CPP/specialsFX/spiral/Unit1.h

@@ -11,7 +11,7 @@
 #include <ExtCtrls.hpp>
 
 #include <GLCrossPlatform.hpp>  // Pascal unit
-#include <GLVectorGeometry.hpp>   // Pascal unit
+#include <Scene.VectorGeometry.hpp>   // Pascal unit
 #include <GLBehaviours.hpp>     // Pascal unit
 #include <GLSceneViewer.hpp>    // Pascal unit
 #include <GLObjects.hpp>        // Pascal unit

Demos/CPP/specialsFX/waterplane/Unit1.cpp

@@ -14,7 +14,7 @@ TForm1 *Form1;
 
 void TForm1::ClickWater(int x, int y)
 {
-  Glvectorgeometry::TVector ip;
+  Scene.VectorGeometry::TVector ip;
   // create a ripple in the pond on a right-mousebutton click
   GLSceneViewer1->Buffer->
     ScreenVectorIntersectWithPlaneXZ(VectorMake

Demos/CPP/sprites/imposter/Unit1.cpp

@@ -96,8 +96,8 @@ void __fastcall TForm1::GLDirectOpenGL1Render(TObject *Sender, TGLRenderContextI
 
 {
    int x, y;
-   Glvectorgeometry::TVector camPos;
-   Glvectorgeometry::TVector pos;
+   Scene.VectorGeometry::TVector camPos;
+   Scene.VectorGeometry::TVector pos;
 
 /*   to do
    TImposter *imp;

Demos/CPP/sprites/particles/Unit1.cpp

@@ -8,7 +8,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLSceneViewer"
-#pragma link "GLVectorGeometry"
+#pragma link "Scene.VectorGeometry"
 #pragma link "GLBehaviours"
 #pragma link "GLCadencer"
 #pragma link "GLParticles"

Demos/CPP/sprites/particles/Unit1.h

@@ -8,7 +8,7 @@
 #include <StdCtrls.hpp>
 #include <Forms.hpp>
 #include <GLSceneViewer.hpp>    // Pascal unit
-#include <GLVectorGeometry.hpp>   // Pascal unit
+#include <Scene.VectorGeometry.hpp>   // Pascal unit
 #include <GLBehaviours.hpp>     // Pascal unit
 #include <GLCadencer.hpp>       // Pascal unit
 #include <GLParticles.hpp>      // Pascal unit

Demos/Delphi/behaviours/DCEDemo/Unit1.pas

@@ -16,7 +16,7 @@ uses
 
   GLScene,
   GLObjects,
-  GLPersistentClasses,
+  Scene.PersistentClasses,
   GLCadencer,
   GLSceneViewer,
   GLDCE,
@@ -30,7 +30,7 @@ uses
   GLHUDObjects,
   GLCrossPlatform,
   GLCoordinates,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLFileMD2,
   GLFile3DS,
   GLContext,
@@ -41,7 +41,7 @@ uses
   GLState,
   GLS.Utils,
   GLBaseClasses,
-  GLVectorTypes;
+  Scene.VectorTypes;
 
 type
   TForm1 = class(TForm)

Demos/Delphi/behaviours/FPSMovement/Unit1.pas

@@ -27,10 +27,10 @@ uses
   GLCollision,
   GLVectorFileObjects,
   GLNavigator,
-  GLVectorLists,
+  Scene.VectorLists,
   GLOctree,
   GLFile3DS,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLGeomObjects,
   GLCrossPlatform,
   GLMaterial,

Demos/Delphi/behaviours/pathcontrol/Unit1.pas

@@ -16,12 +16,12 @@ uses
   
   GLScene,
   GLObjects,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLCadencer,
   GLBehaviours,
   GLGraph,
   GLMovement,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLSceneViewer,
   GLCrossPlatform,
   GLCoordinates,

Demos/Delphi/behaviours/torque/Unit1.pas

@@ -15,7 +15,7 @@ uses
   
   GLObjects,
   GLScene,
-  GLPersistentClasses,
+  Scene.PersistentClasses,
   GLCadencer,
   GLSceneViewer,
   GLPolyhedron,

Demos/Delphi/bench/megacube/Unit1.pas

@@ -14,10 +14,10 @@ uses
   
   GLScene,
   GLObjects,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLTexture,
   GLCadencer,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLSceneViewer,
   GLCrossPlatform,
   GLColor,

Demos/Delphi/bench/megaglasscube/Unit1.pas

@@ -13,10 +13,10 @@ uses
   
   GLScene,
   GLObjects,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLTexture,
   GLCadencer,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLSceneViewer,
   GLColor,
   GLCrossPlatform,

Demos/Delphi/bench/whirlwind/Unit1.pas

@@ -20,8 +20,8 @@ uses
   GLCrossPlatform,
   GLBaseClasses,
   GLScene,
-  GLPersistentClasses,
-  GLVectorGeometry,
+  Scene.PersistentClasses,
+  Scene.VectorGeometry,
   GLSceneViewer,
   GLParticles,
   GLCadencer,

Demos/Delphi/cgshaders/CGBombShader/uMainForm.pas

@@ -26,7 +26,7 @@ uses
   GLGraph,
   GLS.cgBombShader,
   GLMaterial,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
 
   // Formats
   GLFileMD2,

Demos/Delphi/cgshaders/cellshading/Unit1.pas

@@ -16,8 +16,8 @@ uses
   GLS.cgShader,
 
   GLScene,
-  GLVectorTypes,
-  GLVectorGeometry,
+  Scene.VectorTypes,
+  Scene.VectorGeometry,
   GLObjects,
   GLCadencer,
   GLTexture,

Demos/Delphi/cgshaders/simple/Unit1.pas

@@ -19,12 +19,12 @@ uses
   GLS.cgShader,
 
   GLScene,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLObjects,
   GLSceneViewer,
   GLTexture,
 
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLCadencer,
   GLVectorFileObjects,
   GLFile3DS,

Demos/Delphi/cgshaders/texturing/Unit1.pas

@@ -21,11 +21,11 @@ uses
   GLS.cgShader,
 
   GLScene,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLObjects,
   GLSceneViewer,
   GLTexture,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLCadencer,
   GLGraph,
   GLCrossPlatform,

Demos/Delphi/collisions/BoxSphere/Unit1.pas

@@ -19,13 +19,13 @@ uses
 
   
   GLScene,
-  GLPersistentClasses,
-  GLVectorTypes,
+  Scene.PersistentClasses,
+  Scene.VectorTypes,
   GLObjects,
   GLCadencer,
   GLVectorFileObjects,
   GLSceneViewer,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLGraph,
   GLGeomObjects,
   GLCrossPlatform,

Demos/Delphi/collisions/OcclusionQuery/Unit1.pas

@@ -17,7 +17,7 @@ uses
 
   
   GLScene,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLGeomObjects,
   GLObjects,
   GLCadencer,

Demos/Delphi/collisions/RayBox/Unit1.pas

@@ -17,13 +17,13 @@ uses
   Vcl.StdCtrls,
   
   GLScene,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLObjects,
   GLCadencer,
   GLVectorFileObjects,
   GLSceneViewer,
   GLTexture,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLCrossPlatform,
   GLMaterial,
   GLCoordinates,

Demos/Delphi/collisions/TriangleBox/Unit1.pas

@@ -16,8 +16,8 @@ uses
   Vcl.StdCtrls,
 
 
-  GLVectorTypes,
-  GLVectorLists,
+  Scene.VectorTypes,
+  Scene.VectorLists,
   GLScene,
   GLObjects,
   GLCadencer,
@@ -26,7 +26,7 @@ uses
   GLColor,
   GLState,
   GLSceneViewer,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLGraph,
   GLGeomObjects,
   GLCrossPlatform,

Demos/Delphi/collisions/boxedin/Unit1.pas

@@ -15,10 +15,10 @@ uses
 
   
   GLKeyboard,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLScene,
   GLVectorFileObjects,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLObjects,
   GLSceneViewer,
   GLCadencer,

Demos/Delphi/collisions/facevsface/Unit1.pas

@@ -17,16 +17,16 @@ uses
   Vcl.Grids,
 
 
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLScene,
   GLObjects,
   GLSceneViewer,
-  GLVectorGeometry,
-  GLSpaceText,
+  Scene.VectorGeometry,
+  GLS.SpaceText,
   GLCollision,
   GLVectorFileObjects,
   GLCrossPlatform,
-  GLVectorLists,
+  Scene.VectorLists,
   GLFile3DS,
   GLCoordinates,
   GLS.Utils,

Demos/Delphi/collisions/meshhit/Unit1.pas

@@ -11,8 +11,8 @@ uses
   Vcl.StdCtrls,
 
   
-  GLScene, GLVectorFileObjects, GLObjects, GLSceneViewer, GLVectorTypes,
-  GLVectorGeometry, GLGeomObjects, GLCrossPlatform, GLCoordinates,
+  GLScene, GLVectorFileObjects, GLObjects, GLSceneViewer, Scene.VectorTypes,
+  Scene.VectorGeometry, GLGeomObjects, GLCrossPlatform, GLCoordinates,
   GLBaseClasses, GLFile3DS, GLS.Utils;
 
 type

Demos/Delphi/collisions/octree/Unit1.pas

@@ -16,15 +16,15 @@ uses
   GLVectorFileObjects,
   GLObjects,
   GLSceneViewer,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLCadencer,
   GLGeomObjects,
   GLCrossPlatform,
   GLCoordinates,
   GLS.Utils,
   GLBaseClasses,
-  GLVectorGeometry,
-  GLVectorLists,
+  Scene.VectorGeometry,
+  Scene.VectorLists,
   GLFile3DS;
 
 type

Demos/Delphi/collisions/raycast/Unit1.pas

@@ -14,9 +14,9 @@ uses
   Vcl.ExtCtrls,
   Vcl.ComCtrls,
   
-  GLScene, GLObjects, GLVectorGeometry, GLTexture, GLCadencer, GLVectorTypes,
+  GLScene, GLObjects, Scene.VectorGeometry, GLTexture, GLCadencer, Scene.VectorTypes,
   GLSceneViewer, GLGeomObjects, GLColor, GLCrossPlatform,
-  GLCoordinates, GLBaseClasses, GLPolynomials;
+  GLCoordinates, GLBaseClasses, Scene.Polynomials;
 
 type
   TForm1 = class(TForm)

Demos/Delphi/collisions/sphere/Unit1.pas

@@ -15,7 +15,7 @@ uses
 
   
   GLScene,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLObjects,
   GLCollision,
   GLSceneViewer,

Demos/Delphi/computing/FastFourierTransformation/UnitMain.pas

@@ -22,7 +22,7 @@ uses
   GLGraphics,
   GLS.CUDAUtility,
   GLS.CUDADataAccess,
-  GLVectorTypes,
+  Scene.VectorTypes,
   CPUFFT,
   GLS.CUDAFFTPlan,
   GLS.CUDA,

Demos/Delphi/computing/StableFluids/uDemo.pas

@@ -11,8 +11,8 @@ uses
   Vcl.Graphics,
 
   GLScene,
-  GLVectorGeometry,
-  GLVectorTypes,
+  Scene.VectorGeometry,
+  Scene.VectorTypes,
   GLCadencer,
   GLSceneViewer,
   GLBaseClasses,

Demos/Delphi/computing/VertexDataGeneration/uDemo.pas

@@ -12,8 +12,8 @@ uses
   Vcl.Dialogs,
 
   GLScene,
-  GLVectorTypes,
-  GLVectorGeometry,
+  Scene.VectorTypes,
+  Scene.VectorGeometry,
   GLPipelineTransformation,
   GLCadencer,
   GLSceneViewer,

Demos/Delphi/extrusion/bendingcyl/Unit1.pas

@@ -17,7 +17,7 @@ uses
   GLObjects,
   GLExtrusion,
   GLCadencer,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLSceneViewer,
   GLCrossPlatform,
   GLCoordinates,

Demos/Delphi/extrusion/cutoutstar/Unit1.pas

@@ -17,7 +17,7 @@ uses
   GLCadencer,
   GLScene,
   GLExtrusion,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLMultiPolygon,
   GLSceneViewer,
   GLCrossPlatform,

Demos/Delphi/extrusion/nutsnbolts/Unit1.pas

@@ -19,7 +19,7 @@ uses
   GLObjects,
   GLExtrusion,
   GLSceneViewer,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLGeomObjects,
   GLCrossPlatform,
   GLCoordinates,

Demos/Delphi/extrusion/tentacles/Unit1.pas

@@ -13,12 +13,12 @@ uses
 
   
   GLScene,
-  GLPersistentClasses,
+  Scene.PersistentClasses,
   GLObjects,
   GLExtrusion,
   GLCadencer,
-  GLVectorGeometry,
-  GLVectorTypes,
+  Scene.VectorGeometry,
+  Scene.VectorTypes,
   GLTexture,
   GLSceneViewer,
   GLColor,

Demos/Delphi/glslshaders/BumpShader/uMainForm.pas

@@ -23,7 +23,7 @@ uses
   GLVectorFileObjects,
   GLGraph,
   GLGeomObjects,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLSL.ShaderBump,
   GLS.ShaderCustom,
   GLSL.Shader,

Demos/Delphi/glslshaders/DiffuseSpecularShader/uMainForm.pas

@@ -18,9 +18,9 @@ uses
   GLScene, 
   GLObjects, 
   GLGraph,
-  GLVectorTypes, 
+  Scene.VectorTypes, 
   GLContext,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLGeomObjects,
   GLVectorFileObjects,
 

Demos/Delphi/glslshaders/GLSLShaderComponent/uMainForm.pas

@@ -16,9 +16,9 @@ uses
   GLScene,
   GLObjects,
   GLGraph,
-  GLVectorLists,
-  GLVectorTypes,
-  GLVectorGeometry,
+  Scene.VectorLists,
+  Scene.VectorTypes,
+  Scene.VectorGeometry,
   GLSL.Shader,
   GLGeomObjects,
   GLVectorFileObjects,

Demos/Delphi/glslshaders/PostShaders/UMainForm.pas

@@ -22,7 +22,7 @@ uses
   GLGraph,
   GLS.Utils,
   GLContext,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLGeomObjects,
   GLCoordinates,
   GLObjects,

Demos/Delphi/glslshaders/ShadersLab/UMainForm.pas

@@ -27,10 +27,10 @@ uses
   GLSceneViewer, 
   GLVectorFileObjects, 
   GLObjects,
-  GLVectorGeometry, 
+  Scene.VectorGeometry, 
   GLTexture,
   GLContext,
-  GLVectorLists,
+  Scene.VectorLists,
   GLCadencer,
   GLCoordinates, 
   GLCrossPlatform, 
@@ -42,9 +42,9 @@ uses
   GLColor, 
   GLKeyBoard, 
   GLGraphics,
-  GLPersistentClasses, 
+  Scene.PersistentClasses, 
   GLMeshUtils, 
-  GLVectorTypes, 
+  Scene.VectorTypes, 
   GLS.Utils, 
   GLGeomObjects,
   GLSimpleNavigation, 

Demos/Delphi/glslshaders/ocean/Unit1.pas

@@ -20,15 +20,15 @@ uses
   GLTexture,
   GLObjects,
   GLContext,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLGeomObjects,
   GLCadencer,
   GLS.ShaderUser,
   GLS.Utils,
   GLGraph,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLSkydome,
-  GLVectorLists,
+  Scene.VectorLists,
   GLCrossPlatform,
   GLMaterial,
   GLCoordinates,

Demos/Delphi/graph/fxy/Unit1.pas

@@ -18,8 +18,8 @@ uses
   GLObjects,
   GLGraph,
   GLScene,
-  GLVectorGeometry,
-  GLVectorTypes,
+  Scene.VectorGeometry,
+  Scene.VectorTypes,
   GLSceneViewer,
   GLCrossPlatform,
   GLCoordinates,

Demos/Delphi/graph/heightfield/Unit1.pas

@@ -16,7 +16,7 @@ uses
   Vcl.ExtCtrls,
   
   GLScene, GLGraph, GLObjects, GLTexture, GLCadencer,
-  GLVectorGeometry, GLVectorTypes, GLSceneViewer, GLColor,
+  Scene.VectorGeometry, Scene.VectorTypes, GLSceneViewer, GLColor,
   GLCrossPlatform, GLCoordinates, GLBaseClasses;
 
 type

Demos/Delphi/graph/points/Unit1.pas

@@ -15,11 +15,11 @@ uses
   Vcl.ExtCtrls,
 
   GLScene,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLObjects,
   GLSceneViewer,
-  GLVectorGeometry,
-  GLVectorLists,
+  Scene.VectorGeometry,
+  Scene.VectorLists,
   GLCadencer,
   GLTexture,
   GLColor,

Demos/Delphi/graph/projection/Unit1.pas

@@ -16,11 +16,11 @@ uses
   GLObjects,
   GLSceneViewer,
   GLTexture,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLGeomObjects,
   GLRenderContextInfo,
   GLState,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLGraph,
   GLCoordinates,
   GLCrossPlatform,

Demos/Delphi/graph/splines/Unit1.pas

@@ -17,7 +17,7 @@ uses
   GLCrossPlatform,
   GLCoordinates,
   GLBaseClasses,
-  GLVectorGeometry;
+  Scene.VectorGeometry;
 
 type
   TForm1 = class(TForm)

Demos/Delphi/interface/CameraController/Main.pas

@@ -30,9 +30,9 @@ uses
   GLMaterial,
   GLCoordinates,
   GLCrossPlatform,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLBaseClasses,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLNavigator,
   GLSmoothNavigator,
   GLGraph;

Demos/Delphi/interface/GameMenu/UnitM.pas

@@ -18,7 +18,7 @@ uses
   
   GLScene,
   GLObjects,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLSceneViewer,
   GLGeomObjects,
   GLBitmapFont,

Demos/Delphi/interface/Gizmo/DemoGizmoForm.pas

@@ -16,9 +16,9 @@ uses
   
   GLScene,
   GLCadencer,
-  GLPersistentClasses,
+  Scene.PersistentClasses,
   GLObjects,
-  GLSpaceText,
+  GLS.SpaceText,
   GLPolyhedron,
   GLSceneViewer,
   GLBitmapFont,

Demos/Delphi/interface/GizmoEx/DemoGizmoForm.pas

@@ -17,17 +17,17 @@ uses
 
   
   GLScene,
-  GLPersistentClasses,
+  Scene.PersistentClasses,
   GLCadencer,
   GLObjects,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLSceneViewer,
   GLKeyboard,
   GLGizmoEx,
   GLCrossPlatform,
   GLCoordinates,
   GLBaseClasses,
-  GLVectorGeometry,
+  Scene.VectorGeometry,
   GLGeomObjects,
   GLBitmapFont,
   GLWindowsFont,

Demos/Delphi/interface/GuiPaint/Unit1.pas

@@ -14,7 +14,7 @@ uses
   Vcl.Menus,
   
   GLScene,
-  GLVectorTypes,
+  Scene.VectorTypes,
   GLHUDObjects,
   GLObjects,
   GLCadencer,