Upgraded to v2.1

glscene · Sep 22, 2021 · 751c0dd · 751c0dd
1 parent df0478b
commit 751c0dd
Show file tree

Hide file tree

Showing 77 changed files with 15,103 additions and 3,661 deletions.
diff --git a/Demos/bench/megacube/MegaCubeC.cbproj b/Demos/bench/megacube/MegaCubeC.cbproj
@@ -124,8 +124,7 @@
         <ILINK_LibraryPath>$(BDSCOMMONDIR)\Dcp;$(ILINK_LibraryPath)</ILINK_LibraryPath>
         <Defines>_DEBUG;$(Defines)</Defines>
         <LinkPackageImports>rtl.bpi;vcl.bpi;fmx.bpi;xmlrtl.bpi;vclimg.bpi;GLScene_RT.bpi</LinkPackageImports>
-        <BT_BuildType>Debug</BT_BuildType>
-        <LinkPackageStatics>GR32_RT.lib</LinkPackageStatics>
+        <BT_BuildType>Debug</BT_BuildType>        
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <Defines>_DEBUG;$(Defines)</Defines>

diff --git a/Demos/bench/megaglasscube/MegaGlassCubeC.cbproj b/Demos/bench/megaglasscube/MegaGlassCubeC.cbproj
@@ -124,8 +124,7 @@
         <Defines>_DEBUG;$(Defines)</Defines>
         <LinkPackageImports>rtl.bpi;vcl.bpi;fmx.bpi;xmlrtl.bpi;vclimg.bpi;GLScene_RT.bpi</LinkPackageImports>
         <BT_BuildType>Debug</BT_BuildType>
-        <LinkPackageStatics>GR32_RT.lib</LinkPackageStatics>
-    </PropertyGroup>
+        </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <Defines>_DEBUG;$(Defines)</Defines>
     </PropertyGroup>

diff --git a/Demos/cgshaders/cellshading/CgCellShaderC.cbproj b/Demos/cgshaders/cellshading/CgCellShaderC.cbproj
@@ -127,8 +127,7 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <LinkPackageStatics>GR32_RT.lib</LinkPackageStatics>
-    </PropertyGroup>
+        </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <Defines>_DEBUG;$(Defines)</Defines>
     </PropertyGroup>

diff --git a/Demos/collisions/BoxSphere/BoxSphere.dproj b/Demos/collisions/BoxSphere/BoxSphere.dproj
diff --git a/Demos/collisions/BoxSphere/BoxSphereC.cbproj b/Demos/collisions/BoxSphere/BoxSphereC.cbproj
diff --git a/Demos/collisions/OcclusionQuery/OcclusionQuery.dproj b/Demos/collisions/OcclusionQuery/OcclusionQuery.dproj
diff --git a/Demos/collisions/OcclusionQuery/OcclusionQueryC.cbproj b/Demos/collisions/OcclusionQuery/OcclusionQueryC.cbproj
diff --git a/Demos/collisions/RayBox/RayBox.dproj b/Demos/collisions/RayBox/RayBox.dproj
diff --git a/Demos/collisions/RayBox/RayBoxC.cbproj b/Demos/collisions/RayBox/RayBoxC.cbproj
diff --git a/Demos/collisions/Raycast/RayCast.dproj b/Demos/collisions/Raycast/RayCast.dproj
diff --git a/Demos/collisions/Raycast/RaycastC.cbproj b/Demos/collisions/Raycast/RaycastC.cbproj
diff --git a/Demos/collisions/TriangleBox/TriangleBox.dproj b/Demos/collisions/TriangleBox/TriangleBox.dproj
diff --git a/Demos/collisions/TriangleBox/TriangleBoxC.cbproj b/Demos/collisions/TriangleBox/TriangleBoxC.cbproj
diff --git a/Demos/collisions/boxedin/Boxedin.dproj b/Demos/collisions/boxedin/Boxedin.dproj
diff --git a/Demos/collisions/boxedin/boxedinC.cbproj b/Demos/collisions/boxedin/boxedinC.cbproj
diff --git a/Demos/collisions/facevsface/FacevsFace.dproj b/Demos/collisions/facevsface/FacevsFace.dproj
diff --git a/Demos/collisions/facevsface/FacevsfaceC.cbproj b/Demos/collisions/facevsface/FacevsfaceC.cbproj
diff --git a/Demos/collisions/meshhit/MeshHit.dproj b/Demos/collisions/meshhit/MeshHit.dproj
diff --git a/Demos/collisions/meshhit/MeshhitC.cbproj b/Demos/collisions/meshhit/MeshhitC.cbproj
diff --git a/Demos/collisions/octree/Octree.dproj b/Demos/collisions/octree/Octree.dproj
diff --git a/Demos/collisions/octree/OctreeC.cbproj b/Demos/collisions/octree/OctreeC.cbproj
diff --git a/Demos/collisions/sphere/Sphere.dproj b/Demos/collisions/sphere/Sphere.dproj
diff --git a/Demos/collisions/sphere/SphereC.cbproj b/Demos/collisions/sphere/SphereC.cbproj
diff --git a/Demos/graph/fxy/Fxy.dproj b/Demos/graph/fxy/Fxy.dproj
diff --git a/Demos/graph/fxy/FxyC.cbproj b/Demos/graph/fxy/FxyC.cbproj
diff --git a/Demos/graph/fxy/fFxyC.dfm b/Demos/graph/fxy/fFxyC.dfm
@@ -10,7 +10,6 @@ object Form1: TForm1
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
-  OldCreateOrder = False
   WindowState = wsMaximized
   OnCreate = FormCreate
   OnMouseWheel = FormMouseWheel

diff --git a/Demos/graph/heightfield/HeightField.dproj b/Demos/graph/heightfield/HeightField.dproj
diff --git a/Demos/graph/heightfield/HeightfieldC.cbproj b/Demos/graph/heightfield/HeightfieldC.cbproj
diff --git a/Demos/graph/points/Points.dproj b/Demos/graph/points/Points.dproj
diff --git a/Demos/graph/points/PointsC.cbproj b/Demos/graph/points/PointsC.cbproj
diff --git a/Demos/graph/projection/Projection.dproj b/Demos/graph/projection/Projection.dproj
diff --git a/Demos/graph/projection/ProjectionC.cbproj b/Demos/graph/projection/ProjectionC.cbproj
diff --git a/Demos/graph/splines/Splines.dproj b/Demos/graph/splines/Splines.dproj
diff --git a/Demos/graph/splines/SplinesC.cbproj b/Demos/graph/splines/SplinesC.cbproj
diff --git a/Demos/materials/cubemap/CubemapC.cbproj b/Demos/materials/cubemap/CubemapC.cbproj
@@ -66,7 +66,7 @@
         <IncludePath>D:\GLScene\Samples\CPP\Demos\materials\cubemap\;$(IncludePath)</IncludePath>
         <_TCHARMapping>wchar_t</_TCHARMapping>
         <Icon_MainIcon>$(BDS)\bin\cbuilder_PROJECTICON.ico</Icon_MainIcon>
-        <AllPackageLibs>rtl.lib;vcl.lib;GLScene_RT.lib;fmx.lib;xmlrtl.lib;vclimg.lib;GR32_RT.lib</AllPackageLibs>
+        <AllPackageLibs>rtl.lib;vcl.lib;GLScene_RT.lib;fmx.lib;xmlrtl.lib;vclimg.lib</AllPackageLibs>
         <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
         <DynamicRTL>true</DynamicRTL>
         <UsePackages>true</UsePackages>
@@ -125,7 +125,6 @@
         <ILINK_LibraryPath>$(BDSCOMMONDIR)\Dcp;$(ILINK_LibraryPath)</ILINK_LibraryPath>
         <Defines>_DEBUG;$(Defines)</Defines>
         <LinkPackageImports>rtl.bpi;vcl.bpi;GLScene_RT.bpi;fmx.bpi;xmlrtl.bpi;vclimg.bpi</LinkPackageImports>
-        <LinkPackageStatics>GR32_RT.lib</LinkPackageStatics>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>

diff --git a/Demos/materials/cubemap/fCubemap.pas b/Demos/materials/cubemap/fCubemap.pas
@@ -62,7 +62,7 @@ procedure TFormCubeMap.ButtonApplyClick(Sender: TObject);
 begin
   // Cube map warning message
   // If you don't check and turn off cube maps yourself in your apps when
-  // cube maps aren't supported, GLScene will just turn off texturing
+  // cube maps aren't supported and will just turn off texturing
   // (ie. no error generated, just a different output)
   if not CubmapSupported then
   begin

diff --git a/Demos/meshes/terrain/TerrainC.cbproj b/Demos/meshes/terrain/TerrainC.cbproj
diff --git a/Demos/meshes/terrain/fTerrainC.dfm b/Demos/meshes/terrain/fTerrainC.dfm
@@ -12,7 +12,6 @@ object Form1: TForm1
   Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
-  OldCreateOrder = False
   OnKeyPress = FormKeyPress
   PixelsPerInch = 96
   TextHeight = 13