Browse Source

Updated to v.2.5

glscene 1 year ago
parent
commit
a83cb3f949
100 changed files with 178 additions and 160 deletions
  1. 1 1
      Examples/AdvDemos/ActorMS3D/fActorMS3dC.cpp
  2. 1 1
      Examples/AdvDemos/ActorMS3D/fActorMS3dC.h
  3. 2 2
      Examples/AdvDemos/ActorMS3D/fActorms3dD.pas
  4. 1 1
      Examples/AdvDemos/Archipelago/Splitter/fSplitterD.pas
  5. 4 4
      Examples/AdvDemos/Archipelago/fArchipelagoC.cpp
  6. 40 22
      Examples/AdvDemos/Archipelago/fArchipelagoC.dfm
  7. 5 5
      Examples/AdvDemos/Archipelago/fArchipelagoC.h
  8. 8 8
      Examples/AdvDemos/Archipelago/fArchipelagoD.pas
  9. 1 1
      Examples/AdvDemos/Christmas/fChrismasC.h
  10. 1 1
      Examples/AdvDemos/Christmas/fChrismasD.pas
  11. 1 1
      Examples/AdvDemos/Earth/fEarthC.cpp
  12. 1 1
      Examples/AdvDemos/Earth/fEarthC.h
  13. 2 2
      Examples/AdvDemos/Earth/fEarthD.pas
  14. 7 7
      Examples/AdvDemos/Forest/fForestD.pas
  15. 1 1
      Examples/AdvDemos/GLSViewer/Source/dImages.pas
  16. 7 7
      Examples/AdvDemos/GLSViewer/Source/fGLSViewer.pas
  17. 1 1
      Examples/AdvDemos/GLSViewer/Source/fcGLSViewer.cpp
  18. 1 1
      Examples/AdvDemos/GLSViewer/Source/fcGLSViewer.h
  19. 1 1
      Examples/AdvDemos/IntensityMesh/fIntensityMeshC.h
  20. 2 2
      Examples/AdvDemos/IntensityMesh/fIntensityMeshD.pas
  21. 1 1
      Examples/AdvDemos/PanoramViewer/fPanoViewerC.cpp
  22. 1 1
      Examples/AdvDemos/PanoramViewer/fPanoViewerC.h
  23. 1 1
      Examples/AdvDemos/PanoramViewer/fPanoViewerD.pas
  24. 1 1
      Examples/AdvDemos/Quake3Actor/fQuakeActorC.cpp
  25. 1 1
      Examples/AdvDemos/Quake3Actor/fQuakeActorC.h
  26. 2 2
      Examples/AdvDemos/Quake3Actor/fQuakeActorD.pas
  27. 1 1
      Examples/AdvDemos/TexCombine/fTexCombineC.cpp
  28. 1 1
      Examples/AdvDemos/TexCombine/fTexCombineC.h
  29. 1 1
      Examples/AdvDemos/TexCombine/fTexCombineD.pas
  30. 1 1
      Examples/Demos/behaviours/DCEDemo/fDceDemoC.cpp
  31. 1 1
      Examples/Demos/behaviours/DCEDemo/fDceDemoC.h
  32. 2 2
      Examples/Demos/behaviours/DCEDemo/fDceDemoD.pas
  33. 1 1
      Examples/Demos/behaviours/FPSMovement/fFPSMovementC.cpp
  34. 2 2
      Examples/Demos/behaviours/FPSMovement/fFPSMovementC.h
  35. 2 2
      Examples/Demos/behaviours/FPSMovement/fFPSMovementD.pas
  36. 1 1
      Examples/Demos/behaviours/PathControl/fPathControlC.cpp
  37. 1 1
      Examples/Demos/behaviours/PathControl/fPathControlC.h
  38. 1 1
      Examples/Demos/behaviours/PathControl/fPathControlD.pas
  39. 1 1
      Examples/Demos/behaviours/Torque/fTorqueC.cpp
  40. 1 1
      Examples/Demos/behaviours/Torque/fTorqueC.h
  41. 2 2
      Examples/Demos/behaviours/Torque/fTorqueD.pas
  42. 1 1
      Examples/Demos/bench/canvas/fCanvasC.h
  43. 1 1
      Examples/Demos/bench/canvas/fCanvasD.pas
  44. 1 1
      Examples/Demos/bench/megacube/fMegaCubeC.h
  45. 1 1
      Examples/Demos/bench/megacube/fMegaCubeD.pas
  46. 1 1
      Examples/Demos/bench/megaglasscube/fMegaglassC.cpp
  47. 1 1
      Examples/Demos/bench/megaglasscube/fMegaglassC.h
  48. 1 1
      Examples/Demos/bench/megaglasscube/fMegaglassD.pas
  49. 1 1
      Examples/Demos/bench/smoking/fSmokingC.cpp
  50. 1 1
      Examples/Demos/bench/smoking/fSmokingC.h
  51. 1 1
      Examples/Demos/bench/smoking/fSmokingD.pas
  52. 1 1
      Examples/Demos/bench/volcano/fVolcanoC.cpp
  53. 1 1
      Examples/Demos/bench/volcano/fVolcanoC.h
  54. 1 1
      Examples/Demos/bench/volcano/fVolcanoD.pas
  55. 1 1
      Examples/Demos/bench/whirlwind/fWhirlC.cpp
  56. 1 1
      Examples/Demos/bench/whirlwind/fWhirlC.h
  57. 2 2
      Examples/Demos/bench/whirlwind/fWhirlD.pas
  58. 2 2
      Examples/Demos/cgshaders/BlinnSheen/fdBlinnSheen.pas
  59. 1 1
      Examples/Demos/cgshaders/BombShader/fCgBombShaderC.cpp
  60. 1 1
      Examples/Demos/cgshaders/BombShader/fCgBombShaderC.h
  61. 1 1
      Examples/Demos/cgshaders/BombShader/fCgBombShaderD.pas
  62. 1 1
      Examples/Demos/cgshaders/BumpMap/fBumpMapD.pas
  63. 1 1
      Examples/Demos/cgshaders/CellShader/fCelShadingC.cpp
  64. 1 1
      Examples/Demos/cgshaders/CellShader/fCelShadingC.h
  65. 1 1
      Examples/Demos/cgshaders/CellShader/fCgCellShaderD.pas
  66. 1 1
      Examples/Demos/cgshaders/CloudSky/fCloudSkyD.pas
  67. 1 1
      Examples/Demos/cgshaders/DistTex/fDisttexD.pas
  68. 1 1
      Examples/Demos/cgshaders/Reflect/fReflectC.cpp
  69. 1 1
      Examples/Demos/cgshaders/Reflect/fReflectC.h
  70. 1 1
      Examples/Demos/cgshaders/Reflect/fReflectD.pas
  71. 1 1
      Examples/Demos/cgshaders/SimpleCG/fCgSimpleC.cpp
  72. 1 1
      Examples/Demos/cgshaders/SimpleCG/fCgSimpleC.h
  73. 1 1
      Examples/Demos/cgshaders/SimpleCG/fCgSimpleD.pas
  74. 1 1
      Examples/Demos/cgshaders/Texturing/fCgTextureC.cpp
  75. 1 1
      Examples/Demos/cgshaders/Texturing/fCgTextureC.h
  76. 1 1
      Examples/Demos/cgshaders/Texturing/fCgTextureD.pas
  77. 1 1
      Examples/Demos/collisions/BoxSphere/fBoxSphereC.cpp
  78. 1 1
      Examples/Demos/collisions/BoxSphere/fBoxSphereC.h
  79. 2 2
      Examples/Demos/collisions/BoxSphere/fBoxSphereD.pas
  80. 1 1
      Examples/Demos/collisions/OcclusionQuery/fOcclusionQueryC.cpp
  81. 1 1
      Examples/Demos/collisions/OcclusionQuery/fOcclusionQueryC.h
  82. 1 1
      Examples/Demos/collisions/OcclusionQuery/fOcclusionQueryD.pas
  83. 1 1
      Examples/Demos/collisions/RayBox/fRayBoxC.cpp
  84. 1 1
      Examples/Demos/collisions/RayBox/fRayBoxC.h
  85. 1 1
      Examples/Demos/collisions/RayBox/fRayBoxD.pas
  86. 1 1
      Examples/Demos/collisions/Raycast/fRayCastD.pas
  87. 1 1
      Examples/Demos/collisions/Raycast/fRaycastC.cpp
  88. 1 1
      Examples/Demos/collisions/Raycast/fRaycastC.h
  89. 1 1
      Examples/Demos/collisions/TriangleBox/fMainC.cpp
  90. 1 1
      Examples/Demos/collisions/TriangleBox/fMainC.h
  91. 2 2
      Examples/Demos/collisions/TriangleBox/fTriangleBoxD.pas
  92. 1 1
      Examples/Demos/collisions/boxedin/fBoxC.cpp
  93. 1 1
      Examples/Demos/collisions/boxedin/fBoxC.h
  94. 1 1
      Examples/Demos/collisions/boxedin/fBoxedinD.pas
  95. 1 1
      Examples/Demos/collisions/facevsface/fFaceC.cpp
  96. 1 1
      Examples/Demos/collisions/facevsface/fFaceC.h
  97. 2 2
      Examples/Demos/collisions/facevsface/fFacevsFaceD.pas
  98. 1 1
      Examples/Demos/collisions/meshhit/fMainC.cpp
  99. 1 1
      Examples/Demos/collisions/meshhit/fMainC.h
  100. 1 1
      Examples/Demos/collisions/meshhit/fMeshHitD.pas

+ 1 - 1
Examples/AdvDemos/ActorMS3D/fActorMS3dC.cpp

@@ -6,7 +6,7 @@
 #include "fActorMS3dC.h"
 // ---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/AdvDemos/ActorMS3D/fActorMS3dC.h

@@ -11,7 +11,7 @@
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
 
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 2 - 2
Examples/AdvDemos/ActorMS3D/fActorms3dD.pas

@@ -20,10 +20,10 @@ uses
   GLScene.Utils,
 
   GLS.PipelineTransformation,
-  GLS.VectorLists,
+  GLScene.VectorLists,
   GLS.Cadencer,
   GLS.SceneViewer,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.Scene,
   GLS.VectorFileObjects,
   GLS.Objects,

+ 1 - 1
Examples/AdvDemos/Archipelago/Splitter/fSplitterD.pas

@@ -45,7 +45,7 @@ implementation
 {$R *.dfm}
 
 uses
-  GLS.VectorLists;
+  GLScene.VectorLists;
 
 procedure TForm1.Button1Click(Sender: TObject);
 var

+ 4 - 4
Examples/AdvDemos/Archipelago/fArchipelagoC.cpp

@@ -9,7 +9,7 @@
 // ---------------------------------------------------------------------------
 #pragma package(smart_init)
 
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.BitmapFont"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
@@ -470,9 +470,9 @@ void __fastcall TForm1::DOWakeProgress(TObject *Sender, const double deltaTime,
 	TGLVector sbp, sbr;
 
 	if (WakeVertices == NULL) {
-		WakeVertices = new TGLAffineVectorList();
-		WakeStretch = new TGLAffineVectorList();
-		WakeTime = new TGLSingleList();
+		WakeVertices = new TGAffineVectorList();
+		WakeStretch = new TGAffineVectorList();
+		WakeTime = new TGSingleList();
 	}
 
 	// enlarge current vertices

+ 40 - 22
Examples/AdvDemos/Archipelago/fArchipelagoC.dfm

@@ -1,25 +1,34 @@
 object Form1: TForm1
   Left = 0
   Top = 0
+  Margins.Left = 5
+  Margins.Top = 5
+  Margins.Right = 5
+  Margins.Bottom = 5
   Align = alClient
   BorderStyle = bsNone
   Caption = 'GLScene Archipelago'
-  ClientHeight = 421
-  ClientWidth = 560
+  ClientHeight = 737
+  ClientWidth = 980
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
+  Font.Height = -19
   Font.Name = 'Tahoma'
   Font.Style = []
   OnCreate = FormCreate
   OnKeyPress = FormKeyPress
-  TextHeight = 13
+  PixelsPerInch = 168
+  TextHeight = 23
   object GLSceneViewer: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 560
-    Height = 421
+    Width = 980
+    Height = 737
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     Camera = GLCamera
     BeforeRender = GLSceneViewerBeforeRender
     Buffer.FogEnvironment.FogColor.Color = {0000803F0000803F0000803F0000803F}
@@ -29,37 +38,46 @@ object Form1: TForm1
     Buffer.BackgroundColor = clGray
     Buffer.ContextOptions = [roDoubleBuffer, roStencilBuffer, roRenderToWindow]
     Buffer.FogEnable = True
-    FieldOfView = 140.778594970703100000
+    FieldOfView = 156.991683959960900000
     PenAsTouch = False
     Align = alClient
     TabOrder = 0
   end
   object PAProgress: TPanel
-    Left = 200
-    Top = 168
-    Width = 185
-    Height = 49
+    Left = 350
+    Top = 294
+    Width = 324
+    Height = 86
+    Margins.Left = 5
+    Margins.Top = 5
+    Margins.Right = 5
+    Margins.Bottom = 5
     BorderWidth = 6
     TabOrder = 1
     Visible = False
     object Label1: TLabel
-      Left = 7
-      Top = 7
-      Width = 171
-      Height = 20
+      Left = 12
+      Top = 12
+      Width = 300
+      Height = 35
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Align = alTop
       Alignment = taCenter
       AutoSize = False
       Caption = 'Loading && compressing textures'
-      ExplicitLeft = 6
-      ExplicitTop = 6
-      ExplicitWidth = 173
     end
     object ProgressBar: TProgressBar
-      Left = 7
-      Top = 27
-      Width = 171
-      Height = 15
+      Left = 12
+      Top = 47
+      Width = 300
+      Height = 27
+      Margins.Left = 5
+      Margins.Top = 5
+      Margins.Right = 5
+      Margins.Bottom = 5
       Align = alClient
       Max = 16
       TabOrder = 0

+ 5 - 5
Examples/AdvDemos/Archipelago/fArchipelagoC.h

@@ -16,7 +16,7 @@
 #include <Vcl.Forms.hpp>
 #include <Vcl.Imaging.jpeg.hpp>
 
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.BitmapFont.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
@@ -31,7 +31,7 @@
 #include "GLS.SkyDome.hpp"
 #include "GLS.TerrainRenderer.hpp"
 
-#include "GLS.VectorLists.hpp"
+#include "GLScene.VectorLists.hpp"
 #include "GLScene.VectorTypes.hpp"
 #include "GLScene.VectorGeometry.hpp"
 #include "GLS.VectorFileObjects.hpp"
@@ -95,9 +95,9 @@ public:		// User declarations
 	bool WasAboveWater;
 	float HelpOpacity;
 
-	TGLAffineVectorList *WakeVertices;
-	TGLAffineVectorList *WakeStretch;
-	TGLSingleList *WakeTime;
+	TGAffineVectorList *WakeVertices;
+	TGAffineVectorList *WakeStretch;
+	TGSingleList *WakeTime;
 	void ResetMousePos(void);
 	float WaterPhase(const float px, const float py);
 	float WaterHeight(const float px, const float py);

+ 8 - 8
Examples/AdvDemos/Archipelago/fArchipelagoD.pas

@@ -34,8 +34,8 @@ uses
   GLS.RenderContextInfo,
   GLS.Color,
   GLS.VectorFileObjects,
-  GLS.BaseClasses,
-  GLS.VectorLists,
+  GLScene.BaseClasses,
+  GLScene.VectorLists,
   GLScene.VectorTypes,
   GLScene.VectorGeometry,
   GLS.Keyboard,
@@ -93,9 +93,9 @@ type
     WaterPlane: Boolean;
     WasAboveWater: Boolean;
     HelpOpacity: Single;
-    WakeVertices: TGLAffineVectorList;
-    WakeStretch: TGLAffineVectorList;
-    WakeTime: TGLSingleList;
+    WakeVertices: TGAffineVectorList;
+    WakeStretch: TGAffineVectorList;
+    WakeTime: TGSingleList;
     procedure ResetMousePos;
     function WaterPhase(const px, py: Single): Single;
     function WaterHeight(const px, py: Single): Single;
@@ -545,9 +545,9 @@ var
 begin
   if WakeVertices = nil then
   begin
-    WakeVertices := TGLAffineVectorList.Create;
-    WakeStretch := TGLAffineVectorList.Create;
-    WakeTime := TGLSingleList.Create;
+    WakeVertices := TGAffineVectorList.Create;
+    WakeStretch := TGAffineVectorList.Create;
+    WakeTime := TGSingleList.Create;
   end;
 
   // enlarge current vertices

+ 1 - 1
Examples/AdvDemos/Christmas/fChrismasC.h

@@ -34,7 +34,7 @@
 #include "GLS.FileMP3.hpp"
 #include "GLS.ThorFX.hpp"
 #include "GLS.FireFX.hpp"
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLScene.Utils.hpp"
 #include "GLS.SoundManager.hpp"
 #include "GLS.Sounds.BASS.hpp"

+ 1 - 1
Examples/AdvDemos/Christmas/fChrismasD.pas

@@ -17,7 +17,7 @@ uses
   Vcl.Menus,
 
   GLS.Scene,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.VectorFileObjects,
   GLS.Objects,
   GLS.SceneViewer,

+ 1 - 1
Examples/AdvDemos/Earth/fEarthC.cpp

@@ -6,7 +6,7 @@
 #include "fEarthC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 #pragma link "GLS.LensFlare"

+ 1 - 1
Examples/AdvDemos/Earth/fEarthC.h

@@ -7,7 +7,7 @@
 #include <Vcl.Controls.hpp>
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 #include "GLS.LensFlare.hpp"

+ 2 - 2
Examples/AdvDemos/Earth/fEarthD.pas

@@ -38,8 +38,8 @@ uses
   GLS.Context,
   GLS.TextureFormat,
   GLSL.TextureShaders,
-  GLS.BaseClasses,
-  GLS.PersistentClasses,
+  GLScene.BaseClasses,
+  GLScene.PersistentClasses,
 
   Vcl.BaseImageCollection,
   Vcl.ImageCollection,

+ 7 - 7
Examples/AdvDemos/Forest/fForestD.pas

@@ -26,7 +26,7 @@ uses
   GLS.Objects,
   GLS.Tree,
   GLS.Keyboard,
-  GLS.VectorLists,
+  GLScene.VectorLists,
   GLS.BitmapFont,
   GLS.Context,
   GLS.WindowsFont,
@@ -35,10 +35,10 @@ uses
   GLS.Imposter,
   GLS.ParticleFX,
   GLS.Graphics,
-  GLS.PersistentClasses,
+  GLScene.PersistentClasses,
   GLS.PipelineTransformation,
   GLS.XOpenGL,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.TextureCombiners,
   GLS.TextureFormat,
   GLS.Material,
@@ -92,7 +92,7 @@ type
     function SIBTreeLoadingImposter(Sender: TObject; impostoredObject: TGLBaseSceneObject;
       destImposter: TImposter): TGLBitmap32;
     procedure Timer1Timer(Sender: TObject);
-    procedure PFXTreesProgress(Sender: TObject; const progressTime: TGLProgressTimes;
+    procedure PFXTreesProgress(Sender: TObject; const progressTime: TGProgressTimes;
       var defaultProgress: Boolean);
     function PFXTreesGetParticleCountEvent(Sender: TObject): Integer;
     procedure FormResize(Sender: TObject);
@@ -110,7 +110,7 @@ type
     Path: TFileName;
     TestTree: TGLTree;
     TreesShown: Integer;
-    nearTrees: TGLPersistentObjectList;
+    nearTrees: TGPersistentObjectList;
     Imposter: TImposter;
     densityBitmap: TBitmap;
     mirrorTexture: TGLTextureHandle;
@@ -216,7 +216,7 @@ begin
   SetCursorPos(lmp.X, lmp.Y);
   ShowCursor(False);
 
-  nearTrees := TGLPersistentObjectList.Create;
+  nearTrees := TGPersistentObjectList.Create;
 
   camTurn := -60;
   enableRectReflection := False;
@@ -489,7 +489,7 @@ begin
   Result := TreesShown;
 end;
 
-procedure TForm1.PFXTreesProgress(Sender: TObject; const progressTime: TGLProgressTimes;
+procedure TForm1.PFXTreesProgress(Sender: TObject; const progressTime: TGProgressTimes;
   var defaultProgress: Boolean);
 begin
   defaultProgress := False;

+ 1 - 1
Examples/AdvDemos/GLSViewer/Source/dImages.pas

@@ -17,7 +17,7 @@ uses
   Vcl.VirtualImageList,
   Vcl.Controls,
 
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.Material;
 
 type

+ 7 - 7
Examples/AdvDemos/GLSViewer/Source/fGLSViewer.pas

@@ -44,17 +44,17 @@ uses
   GLScene.VectorGeometry,
   GLS.Texture,
   GLS.Context,
-  GLS.VectorLists,
+  GLScene.VectorLists,
   GLS.Cadencer,
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.State,
   GLS.RenderContextInfo,
   GLS.TextureFormat,
   GLS.Color,
   GLS.Keyboard,
   GLS.Graphics,
-  GLS.PersistentClasses,
+  GLScene.PersistentClasses,
   GLS.MeshUtils,
   GLScene.VectorTypes,
   GLS.AsyncTimer,
@@ -872,8 +872,8 @@ end;
 
 procedure TFormGLSViewer.acConvertToIndexedTrianglesExecute(Sender: TObject);
 var
-  v: TGLAffineVectorList;
-  I: TGLIntegerList;
+  v: TGAffineVectorList;
+  I: TGIntegerList;
   m: TGLMeshObject;
   fg: TFGVertexIndexList;
 begin
@@ -908,7 +908,7 @@ var
   I: Integer;
   mo: TGLMeshObject;
   fg: TFGVertexIndexList;
-  strips: TGLPersistentObjectList;
+  strips: TGPersistentObjectList;
 begin
   acConvertToTriangles.Execute;
   mo := ffObject.MeshObjects[0];
@@ -919,7 +919,7 @@ begin
     for I := 0 to strips.Count - 1 do
     begin
       fg := TFGVertexIndexList.CreateOwned(mo.FaceGroups);
-      fg.VertexIndices := (strips[I] as TGLIntegerList);
+      fg.VertexIndices := (strips[I] as TGIntegerList);
       if I = 0 then
         fg.Mode := fgmmTriangles
       else

+ 1 - 1
Examples/AdvDemos/GLSViewer/Source/fcGLSViewer.cpp

@@ -7,7 +7,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLS.AsyncTimer"
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 #pragma link "GLS.Graph"

+ 1 - 1
Examples/AdvDemos/GLSViewer/Source/fcGLSViewer.h

@@ -8,7 +8,7 @@
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
 #include "GLS.AsyncTimer.hpp"
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 #include "GLS.Graph.hpp"

+ 1 - 1
Examples/AdvDemos/IntensityMesh/fIntensityMeshC.h

@@ -18,7 +18,7 @@
 #include "GLS.VectorFileObjects.hpp"
 #include "GLS.SceneViewer.hpp"
 #include "GLS.Objects.hpp"
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.BitmapFont.hpp"
 #include "GLS.Coordinates.hpp"
  

+ 2 - 2
Examples/AdvDemos/IntensityMesh/fIntensityMeshD.pas

@@ -18,7 +18,7 @@ uses
   GLS.Scene,
   GLScene.VectorTypes,
   GLS.VectorFileObjects,
-  GLS.VectorLists,
+  GLScene.VectorLists,
   GLS.SceneViewer,
   GLS.Mesh,
   GLS.Texture,
@@ -32,7 +32,7 @@ uses
   GLScene.Utils,
   GLS.Material,
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.RenderContextInfo,
   GLS.Graphics,
   GLS.State,

+ 1 - 1
Examples/AdvDemos/PanoramViewer/fPanoViewerC.cpp

@@ -12,7 +12,7 @@
 #pragma link "GLS.Scene"
 #pragma link "GLS.Texture"
 #pragma link "GLS.SceneViewer"
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Coordinates"
 
 #pragma link "GLS.Material"

+ 1 - 1
Examples/AdvDemos/PanoramViewer/fPanoViewerC.h

@@ -18,7 +18,7 @@
 #include "GLS.Scene.hpp"
 #include "GLS.Texture.hpp"
 #include "GLS.SceneViewer.hpp"
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Coordinates.hpp"
 #include "GLS.Material.hpp"
 

+ 1 - 1
Examples/AdvDemos/PanoramViewer/fPanoViewerD.pas

@@ -27,7 +27,7 @@ uses
   GLS.SceneViewer,
   GLS.Material,
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLScene.VectorGeometry,
   GLScene.Utils;
 

+ 1 - 1
Examples/AdvDemos/Quake3Actor/fQuakeActorC.cpp

@@ -6,7 +6,7 @@
 #include "fQuakeActorC.h"
 // ---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/AdvDemos/Quake3Actor/fQuakeActorC.h

@@ -26,7 +26,7 @@
 #include "GLS.Material.hpp"
 #include "GLS.Coordinates.hpp"
 
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.FileQ3MD3.hpp"
 
 

+ 2 - 2
Examples/AdvDemos/Quake3Actor/fQuakeActorD.pas

@@ -21,14 +21,14 @@ uses
   GLScene.VectorTypes,
   GLS.SceneViewer,
   GLS.VectorFileObjects,
-  GLS.PersistentClasses,
+  GLScene.PersistentClasses,
   GLS.ShadowPlane,
   GLScene.VectorGeometry,
   GLS.Texture,
   GLS.ParticleFX,
   GLS.Material,
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
 
   GLS.FileMD3, // MD3 loading into GLScene
   GLS.FileQ3MD3; // Quake3 helper structures and functions

+ 1 - 1
Examples/AdvDemos/TexCombine/fTexCombineC.cpp

@@ -6,7 +6,7 @@
 #include "fTexCombineC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Coordinates"
 #pragma link "GLS.HUDObjects"
 #pragma link "GLS.Objects"

+ 1 - 1
Examples/AdvDemos/TexCombine/fTexCombineC.h

@@ -7,7 +7,7 @@
 #include <Vcl.Controls.hpp>
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Coordinates.hpp"
 #include "GLS.HUDObjects.hpp"
 #include "GLS.Objects.hpp"

+ 1 - 1
Examples/AdvDemos/TexCombine/fTexCombineD.pas

@@ -29,7 +29,7 @@ uses
   GLS.SceneViewer,
   GLS.FileTGA,
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.Texture,
   GLS.Graphics,
   GLScene.VectorGeometry,

+ 1 - 1
Examples/Demos/behaviours/DCEDemo/fDceDemoC.cpp

@@ -12,7 +12,7 @@
 #pragma link "GLS.FileMD2"
 #pragma link "GLS.ProxyObjects"
 
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.BitmapFont"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"

+ 1 - 1
Examples/Demos/behaviours/DCEDemo/fDceDemoC.h

@@ -31,7 +31,7 @@
 #include "GLS.HUDObjects.hpp"
 #include "GLS.Coordinates.hpp"
 #include "GLS.FileMD2.hpp"
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.RenderContextInfo.hpp"
 #include "GLS.Keyboard.hpp"
 #include "GLS.State.hpp"

+ 2 - 2
Examples/Demos/behaviours/DCEDemo/fDceDemoD.pas

@@ -16,7 +16,7 @@ uses
 
   GLS.Scene,
   GLS.Objects,
-  GLS.PersistentClasses,
+  GLScene.PersistentClasses,
   GLS.Cadencer,
   GLS.SceneViewer,
   GLS.DCE,
@@ -39,7 +39,7 @@ uses
   GLS.ProxyObjects,
   GLS.State,
   GLScene.Utils,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLScene.VectorTypes;
 
 type

+ 1 - 1
Examples/Demos/behaviours/FPSMovement/fFPSMovementC.cpp

@@ -13,7 +13,7 @@
 #pragma link "GLS.Coordinates"
 
 #pragma link "GLS.FPSMovement"
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 
 #pragma link "GLS.FPSMovement"

+ 2 - 2
Examples/Demos/behaviours/FPSMovement/fFPSMovementC.h

@@ -9,7 +9,7 @@
 #include <Vcl.ExtCtrls.hpp>
 #include <Vcl.Forms.hpp>
 
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 #include "GLS.FileJPEG.hpp"
@@ -26,7 +26,7 @@
 #include "GLS.GeomObjects.hpp"
 #include "GLScene.VectorGeometry.hpp"
 #include "GLS.Octree.hpp"
-#include "GLS.VectorLists.hpp"
+#include "GLScene.VectorLists.hpp"
 #include "GLS.Collision.hpp"
 #include "GLS.Texture.hpp"
 #include <System.Classes.hpp>

+ 2 - 2
Examples/Demos/behaviours/FPSMovement/fFPSMovementD.pas

@@ -27,7 +27,7 @@ uses
   GLS.Collision,
   GLS.VectorFileObjects,
   GLS.Navigator,
-  GLS.VectorLists,
+  GLScene.VectorLists,
   GLS.Octree,
   GLS.File3DS,
   GLScene.VectorGeometry,
@@ -35,7 +35,7 @@ uses
   GLS.Material,
   GLS.Coordinates,
   GLS.SimpleNavigation,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLScene.Utils;
 
 type

+ 1 - 1
Examples/Demos/behaviours/PathControl/fPathControlC.cpp

@@ -6,7 +6,7 @@
 #include "fPathControlC.h"
 // ---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/Demos/behaviours/PathControl/fPathControlC.h

@@ -9,7 +9,7 @@
 #include <Vcl.Forms.hpp>
 #include <Vcl.Buttons.hpp>
 
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 1 - 1
Examples/Demos/behaviours/PathControl/fPathControlD.pas

@@ -26,7 +26,7 @@ uses
   GLS.ImageUtils,
  
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLScene.Utils,
   GLS.SimpleNavigation;
 

+ 1 - 1
Examples/Demos/behaviours/Torque/fTorqueC.cpp

@@ -6,7 +6,7 @@
 #include "fTorqueC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/Demos/behaviours/Torque/fTorqueC.h

@@ -10,7 +10,7 @@
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
 #include <Vcl.ExtCtrls.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 2 - 2
Examples/Demos/behaviours/Torque/fTorqueD.pas

@@ -15,12 +15,12 @@ uses
 
   GLS.Objects,
   GLS.Scene,
-  GLS.PersistentClasses,
+  GLScene.PersistentClasses,
   GLS.Cadencer,
   GLS.SceneViewer,
 
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.Behaviours,
   GLS.HUDObjects,
   GLS.Color,

+ 1 - 1
Examples/Demos/bench/canvas/fCanvasC.h

@@ -18,7 +18,7 @@
 #include "GLS.RenderContextInfo.hpp"
 #include "GLS.BitmapFont.hpp"
 #include "GLS.WindowsFont.hpp"
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 
 //---------------------------------------------------------------------------
 class TFormCanvas : public TForm

+ 1 - 1
Examples/Demos/bench/canvas/fCanvasD.pas

@@ -22,7 +22,7 @@ uses
   GLS.WindowsFont,
   GLS.Coordinates,
 
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.Canvas,
   GLS.Texture,
   GLS.RenderContextInfo,

+ 1 - 1
Examples/Demos/bench/megacube/fMegaCubeC.h

@@ -10,7 +10,7 @@
 #include <Vcl.Controls.hpp>
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 1 - 1
Examples/Demos/bench/megacube/fMegaCubeD.pas

@@ -20,7 +20,7 @@ uses
   GLS.SceneViewer,
   GLS.Color,
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.SimpleNavigation;
 
 type

+ 1 - 1
Examples/Demos/bench/megaglasscube/fMegaglassC.cpp

@@ -7,7 +7,7 @@
 #include "fMegaglassC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/Demos/bench/megaglasscube/fMegaglassC.h

@@ -7,7 +7,7 @@
 #include <Vcl.Controls.hpp>
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 1 - 1
Examples/Demos/bench/megaglasscube/fMegaglassD.pas

@@ -23,7 +23,7 @@ uses
   GLS.Coordinates,
   GLS.Material,
   GLS.SimpleNavigation,
-  GLS.BaseClasses;
+  GLScene.BaseClasses;
 
 type
   TFormMegaglasscube = class(TForm)

+ 1 - 1
Examples/Demos/bench/smoking/fSmokingC.cpp

@@ -7,7 +7,7 @@
 #include "fSmokingC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/Demos/bench/smoking/fSmokingC.h

@@ -7,7 +7,7 @@
 #include <Vcl.Controls.hpp>
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 1 - 1
Examples/Demos/bench/smoking/fSmokingD.pas

@@ -21,7 +21,7 @@ uses
   GLS.SceneViewer, 
   GLS.Coordinates, 
   GLS.SimpleNavigation, 
-  GLS.BaseClasses;
+  GLScene.BaseClasses;
 
 type
   TFormSmoking = class(TForm)

+ 1 - 1
Examples/Demos/bench/volcano/fVolcanoC.cpp

@@ -7,7 +7,7 @@
 #include "fVolcanoC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Behaviours"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"

+ 1 - 1
Examples/Demos/bench/volcano/fVolcanoC.h

@@ -7,7 +7,7 @@
 #include <Vcl.Controls.hpp>
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Behaviours.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"

+ 1 - 1
Examples/Demos/bench/volcano/fVolcanoD.pas

@@ -22,7 +22,7 @@ uses
   GLS.SceneViewer,
  
   GLS.Coordinates,
-  GLS.BaseClasses;
+  GLScene.BaseClasses;
 
 type
   TFormVolcano = class(TForm)

+ 1 - 1
Examples/Demos/bench/whirlwind/fWhirlC.cpp

@@ -11,7 +11,7 @@
 #include "fWhirlC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Behaviours"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"

+ 1 - 1
Examples/Demos/bench/whirlwind/fWhirlC.h

@@ -7,7 +7,7 @@
 #include <Vcl.Controls.hpp>
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Behaviours.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"

+ 2 - 2
Examples/Demos/bench/whirlwind/fWhirlD.pas

@@ -16,9 +16,9 @@ uses
   Vcl.Dialogs,
   Vcl.ExtCtrls,
 
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.Scene,
-  GLS.PersistentClasses,
+  GLScene.PersistentClasses,
   GLScene.VectorGeometry,
   GLS.SceneViewer,
   GLS.Particles,

+ 2 - 2
Examples/Demos/cgshaders/BlinnSheen/fdBlinnSheen.pas

@@ -27,12 +27,12 @@ uses
   GLS.Material,
   GLS.Coordinates,
 
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.Behaviours,
   GLS.FileMD2,
   GLS.FileTGA,
   GLS.File3DS,
-  GLS.PersistentClasses,
+  GLScene.PersistentClasses,
   GLScene.Utils,
 
   Cg.GL,

+ 1 - 1
Examples/Demos/cgshaders/BombShader/fCgBombShaderC.cpp

@@ -6,7 +6,7 @@
 #include "fCgBombShaderC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/Demos/cgshaders/BombShader/fCgBombShaderC.h

@@ -11,7 +11,7 @@
 #include <Vcl.ComCtrls.hpp>
 #include <Vcl.ExtCtrls.hpp>
 
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 1 - 1
Examples/Demos/cgshaders/BombShader/fCgBombShaderD.pas

@@ -26,7 +26,7 @@ uses
   GLS.Material,
   GLScene.VectorGeometry,
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLScene.Utils,
 
   GLS.FileMD2,

+ 1 - 1
Examples/Demos/cgshaders/BumpMap/fBumpMapD.pas

@@ -27,7 +27,7 @@ uses
   GLS.AsyncTimer,
   GLS.Material,
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.TextureFormat,
   GLScene.Utils,
   GLS.SimpleNavigation;

+ 1 - 1
Examples/Demos/cgshaders/CellShader/fCelShadingC.cpp

@@ -8,7 +8,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLS.AsyncTimer"
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.CgShader"
 #pragma link "GLS.Coordinates"

+ 1 - 1
Examples/Demos/cgshaders/CellShader/fCelShadingC.h

@@ -9,7 +9,7 @@
 #include <Vcl.Forms.hpp>
 #include <Vcl.Imaging.jpeg.hpp>
 #include "GLS.AsyncTimer.hpp"
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 1 - 1
Examples/Demos/cgshaders/CellShader/fCgCellShaderD.pas

@@ -25,7 +25,7 @@ uses
 
   GLS.Material,
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLScene.Utils,
   GLS.FileMD2,
 

+ 1 - 1
Examples/Demos/cgshaders/CloudSky/fCloudSkyD.pas

@@ -28,7 +28,7 @@ uses
   GLS.Keyboard,
   GLS.Material,
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLScene.Utils,
   GLS.SimpleNavigation,
 

+ 1 - 1
Examples/Demos/cgshaders/DistTex/fDisttexD.pas

@@ -25,7 +25,7 @@ uses
   GLS.Material,
   GLS.Coordinates,
 
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.RenderContextInfo,
   GLScene.Utils,
 

+ 1 - 1
Examples/Demos/cgshaders/Reflect/fReflectC.cpp

@@ -7,7 +7,7 @@
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
 #pragma link "GLS.CgShader"
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 #pragma link "GLS.GeomObjects"

+ 1 - 1
Examples/Demos/cgshaders/Reflect/fReflectC.h

@@ -8,7 +8,7 @@
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
 #include "GLS.CgShader.hpp"
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 #include "GLS.GeomObjects.hpp"

+ 1 - 1
Examples/Demos/cgshaders/Reflect/fReflectD.pas

@@ -37,7 +37,7 @@ uses
   GLS.Coordinates,
   GLScene.Utils,
    
-  GLS.BaseClasses;
+  GLScene.BaseClasses;
 
 type
   TForm1 = class(TForm)

+ 1 - 1
Examples/Demos/cgshaders/SimpleCG/fCgSimpleC.cpp

@@ -7,7 +7,7 @@
 #include "fCgSimpleC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "Cg.Shader"
 
 #pragma link "GLS.Material"

+ 1 - 1
Examples/Demos/cgshaders/SimpleCG/fCgSimpleC.h

@@ -10,7 +10,7 @@
 #include <Vcl.ComCtrls.hpp>
 #include <Vcl.ExtCtrls.hpp>
 
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 
 #include "GLS.Material.hpp"
 #include "GLS.Scene.hpp"

+ 1 - 1
Examples/Demos/cgshaders/SimpleCG/fCgSimpleD.pas

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

+ 1 - 1
Examples/Demos/cgshaders/Texturing/fCgTextureC.cpp

@@ -7,7 +7,7 @@
 #include "fCgTextureC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/Demos/cgshaders/Texturing/fCgTextureC.h

@@ -9,7 +9,7 @@
 #include <Vcl.Forms.hpp>
 #include <Vcl.ComCtrls.hpp>
 #include <Vcl.ExtCtrls.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 1 - 1
Examples/Demos/cgshaders/Texturing/fCgTextureD.pas

@@ -31,7 +31,7 @@ uses
   GLS.Material,
   GLS.Coordinates,
   GLScene.Utils,
-  GLS.BaseClasses;
+  GLScene.BaseClasses;
 
 type
   TFormCgTexture = class(TForm)

+ 1 - 1
Examples/Demos/collisions/BoxSphere/fBoxSphereC.cpp

@@ -8,7 +8,7 @@
 #include "fBoxSphereC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/Demos/collisions/BoxSphere/fBoxSphereC.h

@@ -7,7 +7,7 @@
 #include <Vcl.Controls.hpp>
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 2 - 2
Examples/Demos/collisions/BoxSphere/fBoxSphereD.pas

@@ -19,7 +19,7 @@ uses
 
   
   GLS.Scene,
-  GLS.PersistentClasses,
+  GLScene.PersistentClasses,
   GLScene.VectorTypes,
   GLS.Objects,
   GLS.Cadencer,
@@ -30,7 +30,7 @@ uses
   GLS.GeomObjects,
  
   GLS.Coordinates,
-  GLS.BaseClasses;
+  GLScene.BaseClasses;
 
 type
   TFormBoxSphere = class(TForm)

+ 1 - 1
Examples/Demos/collisions/OcclusionQuery/fOcclusionQueryC.cpp

@@ -8,7 +8,7 @@
 #include "fOcclusionQueryC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 #pragma link "GLS.Context"

+ 1 - 1
Examples/Demos/collisions/OcclusionQuery/fOcclusionQueryC.h

@@ -8,7 +8,7 @@
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
 #include <Vcl.ExtCtrls.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 1 - 1
Examples/Demos/collisions/OcclusionQuery/fOcclusionQueryD.pas

@@ -24,7 +24,7 @@ uses
   GLS.SceneViewer,
  
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.RenderContextInfo,
   GLS.Context;
 

+ 1 - 1
Examples/Demos/collisions/RayBox/fRayBoxC.cpp

@@ -8,7 +8,7 @@
 #include "fRayBoxC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/Demos/collisions/RayBox/fRayBoxC.h

@@ -7,7 +7,7 @@
 #include <Vcl.Controls.hpp>
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 1 - 1
Examples/Demos/collisions/RayBox/fRayBoxD.pas

@@ -27,7 +27,7 @@ uses
 
   GLS.Material,
   GLS.Coordinates,
-  GLS.BaseClasses;
+  GLScene.BaseClasses;
 
 type
   TFormRayBox = class(TForm)

+ 1 - 1
Examples/Demos/collisions/Raycast/fRayCastD.pas

@@ -18,7 +18,7 @@ uses
   GLS.Objects,
   GLScene.VectorTypes,
   GLScene.VectorGeometry,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.Polynomials,
   GLS.Texture,
   GLS.Cadencer,

+ 1 - 1
Examples/Demos/collisions/Raycast/fRaycastC.cpp

@@ -8,7 +8,7 @@
 #include "fRaycastC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/Demos/collisions/Raycast/fRaycastC.h

@@ -8,7 +8,7 @@
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
 #include <Vcl.ExtCtrls.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 1 - 1
Examples/Demos/collisions/TriangleBox/fMainC.cpp

@@ -8,7 +8,7 @@
 #include "fMainC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/Demos/collisions/TriangleBox/fMainC.h

@@ -7,7 +7,7 @@
 #include <Vcl.Controls.hpp>
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 2 - 2
Examples/Demos/collisions/TriangleBox/fTriangleBoxD.pas

@@ -16,7 +16,7 @@ uses
   Vcl.StdCtrls,
 
   GLScene.VectorTypes,
-  GLS.VectorLists,
+  GLScene.VectorLists,
   GLS.Scene,
   GLS.Objects,
   GLS.Cadencer,
@@ -30,7 +30,7 @@ uses
   GLS.GeomObjects,
  
   GLS.Coordinates,
-  GLS.BaseClasses;
+  GLScene.BaseClasses;
 
 type
   TFormTriangleBox = class(TForm)

+ 1 - 1
Examples/Demos/collisions/boxedin/fBoxC.cpp

@@ -23,7 +23,7 @@
 #pragma link "GLS.Keyboard"
 #pragma link "GLS.Coordinates"
 
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Coordinates"
 #pragma link "GLS.Cadencer"
 #pragma link "GLS.SceneViewer"

+ 1 - 1
Examples/Demos/collisions/boxedin/fBoxC.h

@@ -11,7 +11,7 @@
 #include <ExtCtrls.hpp>
 #include "GLScene.VectorGeometry.hpp"
 #include "GLS.Scene.hpp"
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include <GLS.GeomObjects.hpp>
 #include <GLS.Navigator.hpp>
 #include <GLS.Cadencer.hpp>

+ 1 - 1
Examples/Demos/collisions/boxedin/fBoxedinD.pas

@@ -26,7 +26,7 @@ uses
 
   GLS.Coordinates,
   GLScene.Utils,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.File3DS;
 
 type

+ 1 - 1
Examples/Demos/collisions/facevsface/fFaceC.cpp

@@ -8,7 +8,7 @@
 #include "fFaceC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Collision"
 #pragma link "GLS.Coordinates"
 

+ 1 - 1
Examples/Demos/collisions/facevsface/fFaceC.h

@@ -9,7 +9,7 @@
 #include <Vcl.Forms.hpp>
 #include <Vcl.ExtCtrls.hpp>
 #include <Vcl.Grids.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Collision.hpp"
 #include "GLS.Coordinates.hpp"
 

+ 2 - 2
Examples/Demos/collisions/facevsface/fFacevsFaceD.pas

@@ -25,11 +25,11 @@ uses
   GLS.Collision,
   GLS.VectorFileObjects,
 
-  GLS.VectorLists,
+  GLScene.VectorLists,
   GLS.File3DS,
   GLS.Coordinates,
   GLScene.Utils,
-  GLS.BaseClasses;
+  GLScene.BaseClasses;
 
 type
   TFormFacevsFace = class(TForm)

+ 1 - 1
Examples/Demos/collisions/meshhit/fMainC.cpp

@@ -8,7 +8,7 @@
 #include "fMainC.h"
 //---------------------------------------------------------------------------
 #pragma package(smart_init)
-#pragma link "GLS.BaseClasses"
+#pragma link "GLScene.BaseClasses"
 #pragma link "GLS.Coordinates"
 
 #pragma link "GLS.GeomObjects"

+ 1 - 1
Examples/Demos/collisions/meshhit/fMainC.h

@@ -7,7 +7,7 @@
 #include <Vcl.Controls.hpp>
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
-#include "GLS.BaseClasses.hpp"
+#include "GLScene.BaseClasses.hpp"
 #include "GLS.Coordinates.hpp"
 
 #include "GLS.GeomObjects.hpp"

+ 1 - 1
Examples/Demos/collisions/meshhit/fMeshHitD.pas

@@ -18,7 +18,7 @@ uses
   GLScene.VectorGeometry,
   GLS.GeomObjects,
   GLS.Coordinates,
-  GLS.BaseClasses,
+  GLScene.BaseClasses,
   GLS.File3DS,
   GLScene.Utils;
 

Some files were not shown because too many files changed in this diff