Updated v2.5

glscene · Jan 3, 2025 · c87ac51 · c87ac51
1 parent 1e666ce
commit c87ac51
Show file tree

Hide file tree

Showing 471 changed files with 36,429 additions and 2,983 deletions.
diff --git a/Assets/Texture/GLX.png b/Assets/Texture/GLX.png
diff --git a/Examples/AdvDemoc.groupproj b/Examples/AdvDemoc.groupproj
@@ -27,9 +27,6 @@
         <Projects Include="AdvDemos\TexCombine\TexCombineC.cbproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="AdvDemos\Archipelago\Splitter\SplitterC.cbproj">
-            <Dependencies/>
-        </Projects>
     </ItemGroup>
     <ProjectExtensions>
         <Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -110,23 +107,14 @@
     <Target Name="TexCombineC:Make">
         <MSBuild Projects="AdvDemos\TexCombine\TexCombineC.cbproj" Targets="Make"/>
     </Target>
-    <Target Name="SplitterC">
-        <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterC.cbproj"/>
-    </Target>
-    <Target Name="SplitterC:Clean">
-        <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterC.cbproj" Targets="Clean"/>
-    </Target>
-    <Target Name="SplitterC:Make">
-        <MSBuild Projects="AdvDemos\Archipelago\Splitter\SplitterC.cbproj" Targets="Make"/>
-    </Target>
     <Target Name="Build">
-        <CallTarget Targets="ActorMS3dC;ArchipelagoC;ChristmasC;GLSViewerC;IntensityMeshC;PanoViewerC;QuakeActorC;TexCombineC;SplitterC"/>
+        <CallTarget Targets="ActorMS3dC;ArchipelagoC;ChristmasC;GLSViewerC;IntensityMeshC;PanoViewerC;QuakeActorC;TexCombineC"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="ActorMS3dC:Clean;ArchipelagoC:Clean;ChristmasC:Clean;GLSViewerC:Clean;IntensityMeshC:Clean;PanoViewerC:Clean;QuakeActorC:Clean;TexCombineC:Clean;SplitterC:Clean"/>
+        <CallTarget Targets="ActorMS3dC:Clean;ArchipelagoC:Clean;ChristmasC:Clean;GLSViewerC:Clean;IntensityMeshC:Clean;PanoViewerC:Clean;QuakeActorC:Clean;TexCombineC:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="ActorMS3dC:Make;ArchipelagoC:Make;ChristmasC:Make;GLSViewerC:Make;IntensityMeshC:Make;PanoViewerC:Make;QuakeActorC:Make;TexCombineC:Make;SplitterC:Make"/>
+        <CallTarget Targets="ActorMS3dC:Make;ArchipelagoC:Make;ChristmasC:Make;GLSViewerC:Make;IntensityMeshC:Make;PanoViewerC:Make;QuakeActorC:Make;TexCombineC:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>
diff --git a/Examples/AdvDemos/ActorMS3D/fActorMS3dC.cpp b/Examples/AdvDemos/ActorMS3D/fActorMS3dC.cpp
@@ -15,13 +15,13 @@
 #pragma link "GLS.Material"
 #pragma link "GLS.Objects"
 
+#pragma link "Stage.VectorTypes"
+#pragma link "Stage.VectorGeometry"
 #pragma link "Stage.Utils"
 #pragma link "GLS.GeomObjects"
 #pragma link "GLS.Graphics"
-#pragma link "Stage.VectorTypes"
 #pragma link "GLS.RenderContextInfo"
 #pragma link "GLS.ShadowPlane"
-#pragma link "Stage.VectorGeometry"
 #pragma link "GLS.Mesh"
 #pragma link "GLS.Windows"
 #pragma link "GLS.State"

diff --git a/Examples/AdvDemos/ActorMS3D/fActorMS3dC.h b/Examples/AdvDemos/ActorMS3D/fActorMS3dC.h
@@ -11,6 +11,9 @@
 #include <Vcl.StdCtrls.hpp>
 #include <Vcl.Forms.hpp>
 
+#include "Stage.VectorGeometry.hpp"
+#include "Stage.Utils.hpp"
+
 #include "GLS.BaseClasses.hpp"
 #include "GLS.Cadencer.hpp"
 #include "GLS.Coordinates.hpp"
@@ -24,8 +27,6 @@
 
 #include "GLS.Scene.hpp"
 
-#include "Stage.VectorGeometry.hpp"
-
 #include "GLS.SimpleNavigation.hpp"
 #include "GLS.VectorFileObjects.hpp"
 #include "GLS.SceneViewer.hpp"

diff --git a/Examples/AdvDemos/Christmas/fChrismasD.dfm b/Examples/AdvDemos/Christmas/fChrismasD.dfm
@@ -1,19 +1,15 @@
 object Main: TMain
   Left = 129
   Top = 63
-  Margins.Left = 5
-  Margins.Top = 5
-  Margins.Right = 5
-  Margins.Bottom = 5
   Align = alCustom
   BorderStyle = bsNone
   Caption = 'Christmas'
-  ClientHeight = 966
-  ClientWidth = 1230
+  ClientHeight = 552
+  ClientWidth = 703
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -19
+  Font.Height = -11
   Font.Name = 'MS Sans Serif'
   Font.Style = []
   Visible = True
@@ -22,23 +18,18 @@ object Main: TMain
   OnKeyPress = FormKeyPress
   OnMouseWheel = FormMouseWheel
   OnResize = FormResize
-  PixelsPerInch = 168
-  TextHeight = 24
+  TextHeight = 13
   object Viewer: TGLSceneViewer
     Left = 0
     Top = 0
-    Width = 1230
-    Height = 966
-    Margins.Left = 5
-    Margins.Top = 5
-    Margins.Right = 5
-    Margins.Bottom = 5
+    Width = 703
+    Height = 552
     Camera = Camera
     Buffer.BackgroundColor = clBlack
     Buffer.AmbientColor.Color = {0000803F0000803F0000803F0000803F}
     Buffer.ContextOptions = [roDoubleBuffer, roRenderToWindow]
     Buffer.AntiAliasing = aa2x
-    FieldOfView = 168.492782592773400000
+    FieldOfView = 160.000000000000000000
     PenAsTouch = False
     Align = alClient
     OnDblClick = ViewerDblClick

diff --git a/Examples/AdvDemos/GLSViewer/GLSViewerD.dproj b/Examples/AdvDemos/GLSViewer/GLSViewerD.dproj
@@ -115,9 +115,11 @@
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=2.5.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <Icon_MainIcon>..\..\..\Assets\Icon\Pyramid.ico</Icon_MainIcon>
         <DCC_UnitSearchPath>..\..\..\Unipas;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <VerInfo_MajorVer>2</VerInfo_MajorVer>
+        <VerInfo_MinorVer>5</VerInfo_MinorVer>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
@@ -174,6 +176,9 @@
                     <Source Name="MainSource">GLSViewerD.dpr</Source>
                 </Source>
                 <Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLXEngine_DTRT.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GLXEngine_DTRT.bpl not found</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GXScene_GBE.bpl">GXScene GBE</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\23.0\Bpl\GBComps.bpl">Geoblock - Components</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
@@ -185,7 +190,6 @@
                 <Platform value="Win64">True</Platform>
             </Platforms>
             <Deployment Version="5">
-                <DeployFile LocalName="GLSViewerD.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployFile LocalName="GLSViewerD.exe" Configuration="Debug" Class="ProjectOutput"/>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="iOSSimulator">

diff --git a/Examples/AdvDemos/GLSViewer/Source/fGLForm.dfm b/Examples/AdvDemos/GLSViewer/Source/fGLForm.dfm
@@ -8,10 +8,10 @@ object GLForm: TGLForm
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -16
-  Font.Name = 'MS Sans Serif'
+  Font.Name = 'Segoe UI'
   Font.Style = []
   Position = poMainFormCenter
   Scaled = False
   OnCreate = FormCreate
-  TextHeight = 20
+  TextHeight = 21
 end
diff --git a/Examples/AdvDemos/GLSViewer/Source/fGLSViewer.dfm b/Examples/AdvDemos/GLSViewer/Source/fGLSViewer.dfm
@@ -157,16 +157,16 @@ object FormGLSViewer: TFormGLSViewer
   end
   object snViewer: TGLSceneViewer
     Left = 273
-    Top = 56
+    Top = 54
     Width = 807
-    Height = 627
+    Height = 629
     Camera = Camera
     BeforeRender = snViewerBeforeRender
     AfterRender = snViewerAfterRender
     Buffer.BackgroundColor = clBlack
     Buffer.ContextOptions = [roDoubleBuffer, roRenderToWindow, roTwoSideLighting]
     Buffer.FaceCulling = False
-    FieldOfView = 161.876480102539100000
+    FieldOfView = 161.933151245117200000
     PenAsTouch = False
     OnMouseLeave = snViewerMouseLeave
     Align = alClient
@@ -176,11 +176,12 @@ object FormGLSViewer: TFormGLSViewer
   end
   object ControlBar: TControlBar
     Left = 0
-    Top = 27
+    Top = 25
     Width = 1080
     Height = 29
     Align = alTop
     TabOrder = 2
+    ExplicitWidth = 1072
     object atbTools: TActionToolBar
       Left = 357
       Top = 2
@@ -248,7 +249,7 @@ object FormGLSViewer: TFormGLSViewer
     Left = 0
     Top = 0
     Width = 1080
-    Height = 27
+    Height = 25
     UseSystemFont = False
     ActionManager = ActionManager
     Caption = 'ActionMainMenuBar'
@@ -263,20 +264,21 @@ object FormGLSViewer: TFormGLSViewer
     Font.Name = 'MS Sans Serif'
     Font.Style = []
     Spacing = 0
+    ExplicitWidth = 1072
   end
   object PanelLeft: TPanel
     Left = 0
-    Top = 56
+    Top = 54
     Width = 273
-    Height = 627
+    Height = 629
     Align = alLeft
     TabOrder = 4
-    ExplicitHeight = 602
+    ExplicitHeight = 604
     object tvScene: TTreeView
       Left = 1
       Top = 1
       Width = 271
-      Height = 625
+      Height = 627
       Align = alClient
       CheckStyles = [csDimmed]
       Images = dmImages.ImageListGLS
@@ -480,6 +482,7 @@ object FormGLSViewer: TFormGLSViewer
         6D0070007500740069006E0067000000410000005E0000005E000000FFFFFFFF
         FFFFFFFF0000000000000000000000000001114300550044004100470065006E
         006500720061007400650064004D00650073006800}
+      ExplicitHeight = 602
     end
   end
   object Scene: TGLScene