Adde FMaterialEditor

Demos/Delphi/bench/canvas/canvas.dproj

@@ -137,8 +137,8 @@
                     <Source Name="MainSource">canvas.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\GLScene_Sounds_DT.bpl">GLScene Sound Managers</Excluded_Packages>
                     <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\GLScene_Physics_DT.bpl">GLScene Physics Managers</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\GLScene_Sounds_DT.bpl">GLScene Sound Managers</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>

Demos/Delphi/bench/megacube/Megacube.dproj

@@ -147,8 +147,8 @@
                     <Source Name="MainSource">Megacube.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\GLScene_Sounds_DT.bpl">GLScene Sound Managers</Excluded_Packages>
                     <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\GLScene_Physics_DT.bpl">GLScene Physics Managers</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\GLScene_Sounds_DT.bpl">GLScene Sound Managers</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>

Demos/Delphi/bench/whirlwind/Whirlwind.dproj

@@ -147,8 +147,8 @@
                     <Source Name="MainSource">Whirlwind.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\GLScene_Sounds_DT.bpl">GLScene Sound Managers</Excluded_Packages>
                     <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\GLScene_Physics_DT.bpl">GLScene Physics Managers</Excluded_Packages>
+                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\21.0\Bpl\GLScene_Sounds_DT.bpl">GLScene Sound Managers</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>

Demos/Delphi/specialsFX/Atmosphere/Atmosphere.dproj

@@ -114,9 +114,10 @@
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <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.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -146,10 +147,10 @@
                     <Source Name="MainSource">Atmosphere.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/GLSLProjectedTexture/GLSLProjectedTexture.dproj

@@ -8,7 +8,7 @@
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>19.0</ProjectVersion>
-        <Platform Condition="'$(Platform)'==''">Win64</Platform>
+        <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>

Demos/Delphi/specialsFX/PFXGallery/PFXGallery.dproj

@@ -117,8 +117,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -148,10 +149,10 @@
                     <Source Name="MainSource">PFXGallery.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/ParticleMasking/ParticleMasking.dproj

@@ -114,9 +114,10 @@
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <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.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -146,10 +147,10 @@
                     <Source Name="MainSource">ParticleMasking.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/ShadowmappingFBO/ShadowmappingFBO.dproj

@@ -119,8 +119,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,10 +151,10 @@
                     <Source Name="MainSource">ShadowmappingFBO.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/Trail/TrailDemo.dproj

@@ -119,8 +119,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,10 +151,10 @@
                     <Source Name="MainSource">TrailDemo.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/beer/beer.dproj

@@ -127,8 +127,9 @@
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <BT_BuildType>Debug</BT_BuildType>
@@ -173,10 +174,10 @@
                     <Source Name="MainSource">beer.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/boom/boom.dproj

@@ -105,9 +105,10 @@
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <BT_BuildType>Debug</BT_BuildType>
@@ -149,10 +150,10 @@
                     <Source Name="MainSource">boom.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/candles/candles.dproj

@@ -118,9 +118,10 @@
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <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.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,10 +151,10 @@
                     <Source Name="MainSource">candles.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/fire/fire.dproj

@@ -105,9 +105,10 @@
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <BT_BuildType>Debug</BT_BuildType>
@@ -148,10 +149,10 @@
                     <Source Name="MainSource">fire.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/meshexplosion/meshexplosion.dproj

@@ -118,9 +118,10 @@
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <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.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,10 +151,10 @@
                     <Source Name="MainSource">meshexplosion.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/motionblur/motionblur.dproj

@@ -120,8 +120,9 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -151,10 +152,10 @@
                     <Source Name="MainSource">motionblur.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/motionblur2/motionblur2.dproj

@@ -117,8 +117,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -148,10 +149,10 @@
                     <Source Name="MainSource">motionblur2.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/posteffect/posteffect.dproj

@@ -119,8 +119,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,10 +151,10 @@
                     <Source Name="MainSource">posteffect.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/projtextures/ProjTextures.dproj

@@ -119,8 +119,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,10 +151,10 @@
                     <Source Name="MainSource">ProjTextures.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/shadowplane/shadowplane.dproj

@@ -119,8 +119,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,10 +151,10 @@
                     <Source Name="MainSource">shadowplane.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/shadows/Shadows.dproj

@@ -119,8 +119,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,10 +151,10 @@
                     <Source Name="MainSource">Shadows.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/shadowvolumes/shadowvolumes.dproj

@@ -120,8 +120,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -151,10 +152,10 @@
                     <Source Name="MainSource">shadowvolumes.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/spiral/spiral.dproj

@@ -119,8 +119,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,10 +151,10 @@
                     <Source Name="MainSource">spiral.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/thor/Thor.dproj

@@ -119,8 +119,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,10 +151,10 @@
                     <Source Name="MainSource">Thor.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/warping/warping.dproj

@@ -119,8 +119,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,10 +151,10 @@
                     <Source Name="MainSource">warping.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/specialsFX/waterplane/waterplane.dproj

@@ -119,8 +119,9 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -150,10 +151,10 @@
                     <Source Name="MainSource">waterplane.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/sprites/caterpillar/Caterpillar.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.5</ProjectVersion>
+        <ProjectVersion>19.0</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -99,13 +99,14 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <BT_BuildType>Debug</BT_BuildType>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <BT_BuildType>Debug</BT_BuildType>
@@ -146,10 +147,10 @@
                     <Source Name="MainSource">Caterpillar.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/sprites/imposter/Imposter.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.3</ProjectVersion>
+        <ProjectVersion>19.0</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win64</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -90,7 +90,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <AppEnableHighDPI>true</AppEnableHighDPI>
+        <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
@@ -108,8 +108,7 @@
         <BT_BuildType>Debug</BT_BuildType>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-        <AppEnableHighDPI>true</AppEnableHighDPI>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -117,6 +116,8 @@
         <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
         <BT_BuildType>Debug</BT_BuildType>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -146,10 +147,10 @@
                     <Source Name="MainSource">Imposter.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Demos/Delphi/sprites/particles/Particles.dproj

@@ -7,8 +7,8 @@
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>18.5</ProjectVersion>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <ProjectVersion>19.0</ProjectVersion>
+        <Platform Condition="'$(Platform)'==''">Win64</Platform>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
@@ -108,7 +108,7 @@
         <BT_BuildType>Debug</BT_BuildType>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
+        <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>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -117,6 +117,7 @@
         <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
         <BT_BuildType>Debug</BT_BuildType>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <DCC_UnitSearchPath>..\..\..\..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -146,10 +147,10 @@
                     <Source Name="MainSource">Particles.dpr</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k270.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp270.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
                 </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>

Packages/Win32/GLScene_DT.dpk

@@ -45,8 +45,8 @@ contains
   FRColorEditor in '..\..\Source\FRColorEditor.pas' {RColorEditor: TFrame},
   FRTextureEdit in '..\..\Source\FRTextureEdit.pas' {RTextureEdit: TFrame},
   FRTrackBarEdit in '..\..\Source\FRTrackBarEdit.pas' {RTrackBarEdit: TFrame},
-  FLibMaterialPicker in '..\..\Source\FLibMaterialPicker.pas' {GLLibMaterialPicker},
-  FMaterialEditorForm in '..\..\Source\FMaterialEditorForm.pas' {GLMaterialEditorForm},
+  FLibMaterialPicker in '..\..\Source\FLibMaterialPicker.pas' {GLLibMaterialPickerForm},
+  FMaterialEditor in '..\..\Source\FMaterialEditor.pas' {GLMaterialEditorForm},
   FGUILayoutEditor in '..\..\Source\FGUILayoutEditor.pas' {GLLayoutEditorForm},
   FGuiSkinEditor in '..\..\Source\FGuiSkinEditor.pas' {GLSkinEditorForm},
   FShaderMemo in '..\..\Source\FShaderMemo.pas' {ShaderMemoForm},

Packages/Win32/GLScene_DT.dproj

@@ -141,9 +141,9 @@
             <DesignClass>TFrame</DesignClass>
         </DCCReference>
         <DCCReference Include="..\..\Source\FLibMaterialPicker.pas">
-            <Form>GLLibMaterialPicker</Form>
+            <Form>GLLibMaterialPickerForm</Form>
         </DCCReference>
-        <DCCReference Include="..\..\Source\FMaterialEditorForm.pas">
+        <DCCReference Include="..\..\Source\FMaterialEditor.pas">
             <Form>GLMaterialEditorForm</Form>
         </DCCReference>
         <DCCReference Include="..\..\Source\FGUILayoutEditor.pas">

Source/FGUILayoutEditor.pas

@@ -26,7 +26,8 @@ uses
   
   GLCrossPlatform,
   GLBaseClasses,
-  GLGui;
+  GLGui,
+  GLS.Strings;
 
 type
   TGLLayoutEditorForm = class(TForm)
@@ -99,7 +100,7 @@ type
   end;
 
 function GUILayoutEditorForm: TGLLayoutEditorForm;
-procedure ReleaseGUILayoutEditor;
+procedure ReleaseGUILayoutEditorForm;
 
 //-------------------------------------------------
 implementation
@@ -110,24 +111,24 @@ implementation
 uses GLUtils;
 
 var
-  vGUILayoutEditor: TGLLayoutEditorForm;
+  vGUILayoutEditorForm: TGLLayoutEditorForm;
   rect_point1, rect_point2: TPoint;
   zoom: integer = 1;
   sorted_elements: array[0..9] of TGLGuiElement;
 
 function GUILayoutEditorForm: TGLLayoutEditorForm;
 begin
-  if not Assigned(vGUILayoutEditor) then
-    vGUILayoutEditor := TGLLayoutEditorForm.Create(nil);
-  Result := vGUILayoutEditor;
+  if not Assigned(vGUILayoutEditorForm) then
+    vGUILayoutEditorForm := TGLLayoutEditorForm.Create(nil);
+  Result := vGUILayoutEditorForm;
 end;
 
-procedure ReleaseGUILayoutEditor;
+procedure ReleaseGUILayoutEditorForm;
 begin
-  if Assigned(vGUILayoutEditor) then
+  if Assigned(vGUILayoutEditorForm) then
   begin
-    vGUILayoutEditor.Free;
-    vGUILayoutEditor := nil;
+    vGUILayoutEditorForm.Free;
+    vGUILayoutEditorForm := nil;
   end;
 end;
 
@@ -531,11 +532,13 @@ begin
     AGUILayout.Assign(GLGuiLayout1);
 end;
 
+//-------------------------------------
 initialization
+//-------------------------------------
 
 finalization
 
-  ReleaseGUILayoutEditor;
+  ReleaseGUILayoutEditorForm;
 
 end.
 

Source/FLibMaterialPicker.dfm

@@ -1,4 +1,4 @@
-object GLLibMaterialPicker: TGLLibMaterialPicker
+object GLLibMaterialPickerForm: TGLLibMaterialPickerForm
   Left = 326
   Top = 157
   BorderStyle = bsDialog

Source/FLibMaterialPicker.pas

@@ -1,17 +1,17 @@
 //
 // This unit is part of the GLScene Engine, http://glscene.org
 //
-{
- Allows choosing a material in a material library 
-}
+
 unit FLibMaterialPicker;
 
+(* Allows choosing a material in a material library *)
+
 interface
 
 {$I GLScene.inc}
 
 uses
-  System.Classes, 
+  System.Classes,
   VCL.Forms,
   VCL.StdCtrls,
   VCL.Buttons,
@@ -21,7 +21,7 @@ uses
   FRMaterialPreview;
 
 type
-  TGLLibMaterialPicker = class(TForm)
+  TGLLibMaterialPickerForm = class(TForm)
     LBMaterials: TListBox;
     Label1: TLabel;
     Label2: TLabel;
@@ -37,8 +37,8 @@ type
       materialLibrary: TGLAbstractMaterialLibrary): Boolean;
   end;
 
-function GLLibMaterialPicker: TGLLibMaterialPicker;
-procedure ReleaseLibMaterialPicker;
+function GLLibMaterialPickerForm: TGLLibMaterialPickerForm;
+procedure ReleaseLibMaterialPickerForm;
 
 //-------------------------------------------------
 implementation
@@ -47,26 +47,26 @@ implementation
 {$R *.dfm}
 
 var
-  vGLLibMaterialPicker: TGLLibMaterialPicker;
+  vGLLibMaterialPickerForm: TGLLibMaterialPickerForm;
 
-function GLLibMaterialPicker: TGLLibMaterialPicker;
+function GLLibMaterialPickerForm: TGLLibMaterialPickerForm;
 begin
-  if not Assigned(vGLLibMaterialPicker) then
-    vGLLibMaterialPicker := TGLLibMaterialPicker.Create(nil);
-  Result := vGLLibMaterialPicker;
+  if not Assigned(vGLLibMaterialPickerForm) then
+    vGLLibMaterialPickerForm := TGLLibMaterialPickerForm.Create(nil);
+  Result := vGLLibMaterialPickerForm;
 end;
 
-procedure ReleaseLibMaterialPicker;
+procedure ReleaseLibMaterialPickerForm;
 begin
-  if Assigned(vGLLibMaterialPicker) then
+  if Assigned(vGLLibMaterialPickerForm) then
   begin
-    vGLLibMaterialPicker.Free;
-    vGLLibMaterialPicker := nil;
+    vGLLibMaterialPickerForm.Free;
+    vGLLibMaterialPickerForm := nil;
   end;
 end;
 
 
-function TGLLibMaterialPicker.Execute(var materialName: TGLLibMaterialName;
+function TGLLibMaterialPickerForm.Execute(var materialName: TGLLibMaterialName;
   materialLibrary: TGLAbstractMaterialLibrary): Boolean;
 begin
   with LBMaterials do
@@ -89,20 +89,20 @@ begin
   end;
 end;
 
-procedure TGLLibMaterialPicker.LBMaterialsClick(Sender: TObject);
+procedure TGLLibMaterialPickerForm.LBMaterialsClick(Sender: TObject);
 begin
   with LBMaterials do
     if ItemIndex >= 0 then
       MPPreview.LibMaterial := TGLAbstractLibMaterial(Items.Objects[ItemIndex]);
 end;
 
-procedure TGLLibMaterialPicker.LBMaterialsKeyPress(Sender: TObject;
+procedure TGLLibMaterialPickerForm.LBMaterialsKeyPress(Sender: TObject;
   var Key: Char);
 begin
   LBMaterialsClick(Sender);
 end;
 
-procedure TGLLibMaterialPicker.LBMaterialsDblClick(Sender: TObject);
+procedure TGLLibMaterialPickerForm.LBMaterialsDblClick(Sender: TObject);
 begin
   BBOk.Click;
 end;
@@ -112,7 +112,8 @@ initialization
 //-----------------------------------------------------------------
 
 finalization
-  ReleaseLibMaterialPicker;
+
+ ReleaseLibMaterialPickerForm;
 
 end.
 

Source/FMaterialEditorForm.dfm → Source/FMaterialEditor.dfm

@@ -1,275 +1,275 @@
-object GLMaterialEditorForm: TGLMaterialEditorForm
-  Left = 143
-  Top = 100
-  BorderStyle = bsDialog
-  Caption = 'Material Editor'
-  ClientHeight = 289
-  ClientWidth = 560
-  Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  OldCreateOrder = False
-  ShowHint = True
-  PixelsPerInch = 96
-  TextHeight = 13
-  object Label1: TLabel
-    Left = 8
-    Top = 261
-    Width = 71
-    Height = 13
-    Caption = 'Blending Mode'
-  end
-  object Label2: TLabel
-    Left = 8
-    Top = 231
-    Width = 68
-    Height = 13
-    Caption = 'Polygon Mode'
-  end
-  object PageControl1: TPageControl
-    Left = 0
-    Top = 8
-    Width = 313
-    Height = 217
-    ActivePage = TSFront
-    Style = tsButtons
-    TabOrder = 0
-    object TSFront: TTabSheet
-      Caption = 'Front'
-      inline FEFront: TRFaceEditor
-        Left = 0
-        Top = 0
-        Width = 305
-        Height = 186
-        AutoSize = True
-        TabOrder = 0
-        inherited Label1: TLabel
-          Width = 45
-          ExplicitWidth = 45
-        end
-        inherited PageControl: TPageControl
-          inherited TSAmbient: TTabSheet
-            ExplicitTop = 24
-            ExplicitHeight = 102
-          end
-          inherited TSDiffuse: TTabSheet
-            ExplicitTop = 24
-            ExplicitHeight = 102
-          end
-          inherited TSSpecular: TTabSheet
-            ExplicitTop = 24
-            ExplicitHeight = 102
-          end
-        end
-        inherited ImageList: TImageList
-          Top = 0
-        end
-      end
-    end
-    object TSBack: TTabSheet
-      Caption = 'Back'
-      ImageIndex = 1
-      inline FEBack: TRFaceEditor
-        Left = 0
-        Top = 0
-        Width = 305
-        Height = 186
-        AutoSize = True
-        TabOrder = 0
-        inherited Label1: TLabel
-          Width = 45
-          ExplicitWidth = 45
-        end
-        inherited PageControl: TPageControl
-          inherited TSAmbient: TTabSheet
-            ExplicitTop = 24
-            ExplicitHeight = 102
-          end
-          inherited TSDiffuse: TTabSheet
-            ExplicitTop = 24
-            ExplicitHeight = 102
-          end
-          inherited TSSpecular: TTabSheet
-            ExplicitTop = 24
-            ExplicitHeight = 102
-          end
-        end
-      end
-    end
-    object TSTexture: TTabSheet
-      Caption = 'Texture'
-      ImageIndex = 2
-      inline RTextureEdit: TRTextureEdit
-        Left = 0
-        Top = 0
-        Width = 305
-        Height = 186
-        Align = alClient
-        ParentShowHint = False
-        ShowHint = True
-        TabOrder = 0
-        ExplicitWidth = 305
-        ExplicitHeight = 186
-        DesignSize = (
-          305
-          186)
-        inherited Label2: TLabel
-          Width = 29
-          ExplicitWidth = 29
-        end
-        inherited SBEditImage: TSpeedButton
-          Left = 287
-          ExplicitLeft = 287
-        end
-        inherited Label3: TLabel
-          Width = 43
-          ExplicitWidth = 43
-        end
-        inherited Label4: TLabel
-          Width = 39
-          ExplicitWidth = 39
-        end
-        inherited Label1: TLabel
-          Width = 66
-          ExplicitWidth = 66
-        end
-        inherited Label5: TLabel
-          Width = 65
-          ExplicitWidth = 65
-        end
-        inherited Label6: TLabel
-          Width = 56
-          ExplicitWidth = 56
-        end
-        inherited Label7: TLabel
-          Width = 71
-          ExplicitWidth = 71
-        end
-        inherited CBImageClass: TComboBox
-          Width = 213
-          ExplicitWidth = 213
-        end
-      end
-    end
-  end
-  object GroupBox1: TGroupBox
-    Left = 320
-    Top = 8
-    Width = 233
-    Height = 241
-    Caption = 'Material Preview'
-    TabOrder = 1
-    inline MPPreview: TRMaterialPreview
-      Left = 16
-      Top = 22
-      Width = 202
-      Height = 229
-      AutoSize = True
-      TabOrder = 0
-      ExplicitLeft = 16
-      ExplicitTop = 22
-      inherited GLScene: TGLScene
-        inherited World: TGLDummyCube
-          inherited Cube: TGLCube
-            Material.MaterialLibrary = nil
-            Material.LibMaterialName = ''
-            Direction.Coordinates = {FCFAF0B1D8B35D3FFEFFFF3E00000000}
-            Up.Coordinates = {D7B35DBFFFFF7F3ED7B3DDBE00000000}
-          end
-          inherited Sphere: TGLSphere
-            Material.MaterialLibrary = nil
-            Material.LibMaterialName = ''
-          end
-          inherited Cone: TGLCone
-            Material.MaterialLibrary = nil
-            Material.LibMaterialName = ''
-          end
-          inherited Teapot: TGLTeapot
-            Material.MaterialLibrary = nil
-            Material.LibMaterialName = ''
-            Scale.Coordinates = {00000040000000400000004000000000}
-          end
-        end
-        inherited Light: TGLDummyCube
-          Position.Coordinates = {0000000000004040000020410000803F}
-          inherited LightSource: TGLLightSource
-            Position.Coordinates = {0000000000004040000020410000803F}
-            Specular.Color = {0000803F0000803F0000803F0000803F}
-          end
-          inherited FireSphere: TGLSphere
-            Material.FrontProperties.Ambient.Color = {A3A2223FCDCC4C3ECDCC4C3E0000803F}
-            Material.FrontProperties.Emission.Color = {D3D2523FA1A0203F000000000000803F}
-          end
-        end
-        inherited Camera: TGLCamera
-          Position.Coordinates = {0000000000000000000020410000803F}
-        end
-      end
-      inherited GLMaterialLibrary: TGLMaterialLibrary
-        Materials = <
-          item
-            Name = 'LibMaterial1'
-            Tag = 0
-          end>
-      end
-    end
-  end
-  object BBOk: TBitBtn
-    Left = 376
-    Top = 256
-    Width = 83
-    Height = 25
-    Caption = 'OK'
-    Default = True
-    Glyph.Data = {
-      DE010000424DDE01000000000000760000002800000024000000120000000100
-      0400000000006801000000000000000000001000000000000000000000000000
-      80000080000000808000800000008000800080800000C0C0C000808080000000
-      FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF00333333333333
-      3333333333333333333333330000333333333333333333333333F33333333333
-      00003333344333333333333333388F3333333333000033334224333333333333
-      338338F3333333330000333422224333333333333833338F3333333300003342
-      222224333333333383333338F3333333000034222A22224333333338F338F333
-      8F33333300003222A3A2224333333338F3838F338F33333300003A2A333A2224
-      33333338F83338F338F33333000033A33333A222433333338333338F338F3333
-      0000333333333A222433333333333338F338F33300003333333333A222433333
-      333333338F338F33000033333333333A222433333333333338F338F300003333
-      33333333A222433333333333338F338F00003333333333333A22433333333333
-      3338F38F000033333333333333A223333333333333338F830000333333333333
-      333A333333333333333338330000333333333333333333333333333333333333
-      0000}
-    ModalResult = 1
-    NumGlyphs = 2
-    TabOrder = 2
-  end
-  object BBCancel: TBitBtn
-    Left = 472
-    Top = 256
-    Width = 83
-    Height = 25
-    Kind = bkCancel
-    NumGlyphs = 2
-    TabOrder = 3
-  end
-  object CBBlending: TComboBox
-    Left = 88
-    Top = 258
-    Width = 145
-    Height = 21
-    Style = csDropDownList
-    TabOrder = 4
-    OnChange = OnMaterialChanged
-  end
-  object CBPolygonMode: TComboBox
-    Left = 82
-    Top = 227
-    Width = 145
-    Height = 21
-    Style = csDropDownList
-    TabOrder = 5
-    OnChange = OnMaterialChanged
-  end
-end
+object GLMaterialEditorForm: TGLMaterialEditorForm
+  Left = 143
+  Top = 100
+  BorderStyle = bsDialog
+  Caption = 'Material Editor'
+  ClientHeight = 289
+  ClientWidth = 560
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  ShowHint = True
+  PixelsPerInch = 96
+  TextHeight = 13
+  object Label1: TLabel
+    Left = 8
+    Top = 261
+    Width = 71
+    Height = 13
+    Caption = 'Blending Mode'
+  end
+  object Label2: TLabel
+    Left = 8
+    Top = 231
+    Width = 68
+    Height = 13
+    Caption = 'Polygon Mode'
+  end
+  object PageControl1: TPageControl
+    Left = 0
+    Top = 8
+    Width = 313
+    Height = 217
+    ActivePage = TSFront
+    Style = tsButtons
+    TabOrder = 0
+    object TSFront: TTabSheet
+      Caption = 'Front'
+      inline FEFront: TRFaceEditor
+        Left = 0
+        Top = 0
+        Width = 305
+        Height = 186
+        AutoSize = True
+        TabOrder = 0
+        inherited Label1: TLabel
+          Width = 45
+          ExplicitWidth = 45
+        end
+        inherited PageControl: TPageControl
+          inherited TSAmbient: TTabSheet
+            ExplicitTop = 24
+            ExplicitHeight = 102
+          end
+          inherited TSDiffuse: TTabSheet
+            ExplicitTop = 24
+            ExplicitHeight = 102
+          end
+          inherited TSSpecular: TTabSheet
+            ExplicitTop = 24
+            ExplicitHeight = 102
+          end
+        end
+        inherited ImageList: TImageList
+          Top = 0
+        end
+      end
+    end
+    object TSBack: TTabSheet
+      Caption = 'Back'
+      ImageIndex = 1
+      inline FEBack: TRFaceEditor
+        Left = 0
+        Top = 0
+        Width = 305
+        Height = 186
+        AutoSize = True
+        TabOrder = 0
+        inherited Label1: TLabel
+          Width = 45
+          ExplicitWidth = 45
+        end
+        inherited PageControl: TPageControl
+          inherited TSAmbient: TTabSheet
+            ExplicitTop = 24
+            ExplicitHeight = 102
+          end
+          inherited TSDiffuse: TTabSheet
+            ExplicitTop = 24
+            ExplicitHeight = 102
+          end
+          inherited TSSpecular: TTabSheet
+            ExplicitTop = 24
+            ExplicitHeight = 102
+          end
+        end
+      end
+    end
+    object TSTexture: TTabSheet
+      Caption = 'Texture'
+      ImageIndex = 2
+      inline RTextureEdit: TRTextureEdit
+        Left = 0
+        Top = 0
+        Width = 305
+        Height = 186
+        Align = alClient
+        ParentShowHint = False
+        ShowHint = True
+        TabOrder = 0
+        ExplicitWidth = 305
+        ExplicitHeight = 186
+        DesignSize = (
+          305
+          186)
+        inherited Label2: TLabel
+          Width = 29
+          ExplicitWidth = 29
+        end
+        inherited SBEditImage: TSpeedButton
+          Left = 287
+          ExplicitLeft = 287
+        end
+        inherited Label3: TLabel
+          Width = 43
+          ExplicitWidth = 43
+        end
+        inherited Label4: TLabel
+          Width = 39
+          ExplicitWidth = 39
+        end
+        inherited Label1: TLabel
+          Width = 66
+          ExplicitWidth = 66
+        end
+        inherited Label5: TLabel
+          Width = 65
+          ExplicitWidth = 65
+        end
+        inherited Label6: TLabel
+          Width = 56
+          ExplicitWidth = 56
+        end
+        inherited Label7: TLabel
+          Width = 71
+          ExplicitWidth = 71
+        end
+        inherited CBImageClass: TComboBox
+          Width = 213
+          ExplicitWidth = 213
+        end
+      end
+    end
+  end
+  object GroupBox1: TGroupBox
+    Left = 320
+    Top = 8
+    Width = 233
+    Height = 241
+    Caption = 'Material Preview'
+    TabOrder = 1
+    inline MPPreview: TRMaterialPreview
+      Left = 16
+      Top = 22
+      Width = 202
+      Height = 229
+      AutoSize = True
+      TabOrder = 0
+      ExplicitLeft = 16
+      ExplicitTop = 22
+      inherited GLScene: TGLScene
+        inherited World: TGLDummyCube
+          inherited Cube: TGLCube
+            Material.MaterialLibrary = nil
+            Material.LibMaterialName = ''
+            Direction.Coordinates = {FCFAF0B1D8B35D3FFEFFFF3E00000000}
+            Up.Coordinates = {D7B35DBFFFFF7F3ED7B3DDBE00000000}
+          end
+          inherited Sphere: TGLSphere
+            Material.MaterialLibrary = nil
+            Material.LibMaterialName = ''
+          end
+          inherited Cone: TGLCone
+            Material.MaterialLibrary = nil
+            Material.LibMaterialName = ''
+          end
+          inherited Teapot: TGLTeapot
+            Material.MaterialLibrary = nil
+            Material.LibMaterialName = ''
+            Scale.Coordinates = {00000040000000400000004000000000}
+          end
+        end
+        inherited Light: TGLDummyCube
+          Position.Coordinates = {0000000000004040000020410000803F}
+          inherited LightSource: TGLLightSource
+            Position.Coordinates = {0000000000004040000020410000803F}
+            Specular.Color = {0000803F0000803F0000803F0000803F}
+          end
+          inherited FireSphere: TGLSphere
+            Material.FrontProperties.Ambient.Color = {A3A2223FCDCC4C3ECDCC4C3E0000803F}
+            Material.FrontProperties.Emission.Color = {D3D2523FA1A0203F000000000000803F}
+          end
+        end
+        inherited Camera: TGLCamera
+          Position.Coordinates = {0000000000000000000020410000803F}
+        end
+      end
+      inherited GLMaterialLibrary: TGLMaterialLibrary
+        Materials = <
+          item
+            Name = 'LibMaterial1'
+            Tag = 0
+          end>
+      end
+    end
+  end
+  object BBOk: TBitBtn
+    Left = 376
+    Top = 256
+    Width = 83
+    Height = 25
+    Caption = 'OK'
+    Default = True
+    Glyph.Data = {
+      DE010000424DDE01000000000000760000002800000024000000120000000100
+      0400000000006801000000000000000000001000000000000000000000000000
+      80000080000000808000800000008000800080800000C0C0C000808080000000
+      FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF00333333333333
+      3333333333333333333333330000333333333333333333333333F33333333333
+      00003333344333333333333333388F3333333333000033334224333333333333
+      338338F3333333330000333422224333333333333833338F3333333300003342
+      222224333333333383333338F3333333000034222A22224333333338F338F333
+      8F33333300003222A3A2224333333338F3838F338F33333300003A2A333A2224
+      33333338F83338F338F33333000033A33333A222433333338333338F338F3333
+      0000333333333A222433333333333338F338F33300003333333333A222433333
+      333333338F338F33000033333333333A222433333333333338F338F300003333
+      33333333A222433333333333338F338F00003333333333333A22433333333333
+      3338F38F000033333333333333A223333333333333338F830000333333333333
+      333A333333333333333338330000333333333333333333333333333333333333
+      0000}
+    ModalResult = 1
+    NumGlyphs = 2
+    TabOrder = 2
+  end
+  object BBCancel: TBitBtn
+    Left = 472
+    Top = 256
+    Width = 83
+    Height = 25
+    Kind = bkCancel
+    NumGlyphs = 2
+    TabOrder = 3
+  end
+  object CBBlending: TComboBox
+    Left = 88
+    Top = 258
+    Width = 145
+    Height = 21
+    Style = csDropDownList
+    TabOrder = 4
+    OnChange = OnMaterialChanged
+  end
+  object CBPolygonMode: TComboBox
+    Left = 82
+    Top = 227
+    Width = 145
+    Height = 21
+    Style = csDropDownList
+    TabOrder = 5
+    OnChange = OnMaterialChanged
+  end
+end

Source/FMaterialEditorForm.pas → Source/FMaterialEditor.pas

@@ -1,152 +1,143 @@
-//
-// This unit is part of the GLScene Engine, http://glscene.org
-//
-{
-   Editor window for a material (with preview).
-}
-unit FMaterialEditorForm;
-
-interface
-
-{$I GLScene.inc}
-
-uses
-  Winapi.Windows,
-  System.Classes,
-  System.TypInfo,
-  VCL.Forms,
-  VCL.ComCtrls,
-  VCL.StdCtrls,
-  VCL.Controls,
-  VCL.Buttons,
-  GLSceneViewer,
-  GLState,
-  GLMaterial,
-  GLTexture,
-  FRMaterialPreview,
-  FRColorEditor,
-  FRFaceEditor,
-  FRTextureEdit;
-
-type
-  TGLMaterialEditorForm = class(TForm)
-    PageControl1: TPageControl;
-    TSFront: TTabSheet;
-    TSBack: TTabSheet;
-    TSTexture: TTabSheet;
-    FEFront: TRFaceEditor;
-    FEBack: TRFaceEditor;
-    GroupBox1: TGroupBox;
-    MPPreview: TRMaterialPreview;
-    BBOk: TBitBtn;
-    BBCancel: TBitBtn;
-    RTextureEdit: TRTextureEdit;
-    CBBlending: TComboBox;
-    Label1: TLabel;
-    Label2: TLabel;
-    CBPolygonMode: TComboBox;
-    procedure OnMaterialChanged(Sender: TObject);
-  private
-     
-  public
-    
-    constructor Create(AOwner: TComponent); override;
-
-    function Execute(AMaterial: TGLMaterial): Boolean;
-  end;
-
-function GLMaterialEditorForm: TGLMaterialEditorForm;
-procedure ReleaseMaterialEditorForm;
-
-//----------------------------------------------
-implementation
-//----------------------------------------------
-
-{$R *.dfm}
-
-var
-  vGLMaterialEditorForm: TGLMaterialEditorForm;
-
-function GLMaterialEditorForm: TGLMaterialEditorForm;
-begin
-  if not Assigned(vGLMaterialEditorForm) then
-    vGLMaterialEditorForm := TGLMaterialEditorForm.Create(nil);
-  Result := vGLMaterialEditorForm;
-end;
-
-procedure ReleaseMaterialEditorForm;
-begin
-  if Assigned(vGLMaterialEditorForm) then
-  begin
-    vGLMaterialEditorForm.Free;
-    vGLMaterialEditorForm := nil;
-  end;
-end;
-
-
-constructor TGLMaterialEditorForm.Create(AOwner: TComponent);
-var
-  I: Integer;
-begin
-  inherited;
-  for i := 0 to Integer(High(TGLBlendingMode)) do
-    CBBlending.Items.Add(GetEnumName(TypeInfo(TGLBlendingMode), i));
-  for i := 0 to Integer(High(TGLPolygonMode)) do
-    CBPolygonMode.Items.Add(GetEnumName(TypeInfo(TGLPolygonMode), i));
-
-  FEFront.OnChange := OnMaterialChanged;
-  FEBack.OnChange := OnMaterialChanged;
-  RTextureEdit.OnChange := OnMaterialChanged;
-end;
-
-// Execute
-//
-function TGLMaterialEditorForm.Execute(AMaterial: TGLMaterial): Boolean;
-begin
-  with AMaterial.GetActualPrimaryMaterial do
-  begin
-    FEFront.FaceProperties := FrontProperties;
-    FEBack.FaceProperties := BackProperties;
-    RTextureEdit.Texture := Texture;
-    CBPolygonMode.ItemIndex:=Integer(PolygonMode);
-    CBBlending.ItemIndex := Integer(BlendingMode);
-  end;
-  MPPreview.Material := AMaterial;
-  Result := (ShowModal = mrOk);
-  if Result then
-    with AMaterial.GetActualPrimaryMaterial do
-    begin
-      FrontProperties := FEFront.FaceProperties;
-      BackProperties := FEBack.FaceProperties;
-      Texture := RTextureEdit.Texture;
-      BlendingMode := TGLBlendingMode(CBBlending.ItemIndex);
-      PolygonMode := TGLPolygonMode(CBPolygonMode.ItemIndex);
-    end;
-end;
-
-// OnMaterialChanged
-//
-
-procedure TGLMaterialEditorForm.OnMaterialChanged(Sender: TObject);
-begin
-  with MPPreview.Material do
-  begin
-    FrontProperties := FEFront.FaceProperties;
-    BackProperties := FEBack.FaceProperties;
-    Texture := RTextureEdit.Texture;
-    BlendingMode := TGLBlendingMode(CBBlending.ItemIndex);
-    PolygonMode := TGLPolygonMode(CBPolygonMode.ItemIndex);
-  end;
-  MPPreview.GLSceneViewer.Invalidate;
-end;
-
-// ------------------------------------------------------------------
-initialization
-// ------------------------------------------------------------------
-
-finalization
-
-  ReleaseMaterialEditorForm;
-
-end.
-
+//
+// This unit is part of the GLScene Engine, http://glscene.org
+//
+
+unit FMaterialEditor;
+
+(*  Editor window for a material (with preview) *)
+
+interface
+
+{$I GLScene.inc}
+
+uses
+  Winapi.Windows,
+  System.Classes,
+  System.TypInfo,
+  VCL.Forms,
+  VCL.ComCtrls,
+  VCL.StdCtrls,
+  VCL.Controls,
+  VCL.Buttons,
+  GLSceneViewer,
+  GLState,
+  GLMaterial,
+  GLTexture,
+  FRMaterialPreview,
+  FRColorEditor,
+  FRFaceEditor,
+  FRTextureEdit;
+
+type
+  TGLMaterialEditorForm = class(TForm)
+    PageControl1: TPageControl;
+    TSFront: TTabSheet;
+    TSBack: TTabSheet;
+    TSTexture: TTabSheet;
+    FEFront: TRFaceEditor;
+    FEBack: TRFaceEditor;
+    GroupBox1: TGroupBox;
+    MPPreview: TRMaterialPreview;
+    BBOk: TBitBtn;
+    BBCancel: TBitBtn;
+    RTextureEdit: TRTextureEdit;
+    CBBlending: TComboBox;
+    Label1: TLabel;
+    Label2: TLabel;
+    CBPolygonMode: TComboBox;
+    procedure OnMaterialChanged(Sender: TObject);
+  public
+    constructor Create(AOwner: TComponent); override;
+    function Execute(AMaterial: TGLMaterial): Boolean;
+  end;
+
+function GLMaterialEditorForm: TGLMaterialEditorForm;
+procedure ReleaseMaterialEditorForm;
+
+//----------------------------------------------
+implementation
+//----------------------------------------------
+
+{$R *.dfm}
+
+var
+  vGLMaterialEditorForm: TGLMaterialEditorForm;
+
+function GLMaterialEditorForm: TGLMaterialEditorForm;
+begin
+  if not Assigned(vGLMaterialEditorForm) then
+    vGLMaterialEditorForm := TGLMaterialEditorForm.Create(nil);
+  Result := vGLMaterialEditorForm;
+end;
+
+procedure ReleaseMaterialEditorForm;
+begin
+  if Assigned(vGLMaterialEditorForm) then
+  begin
+    vGLMaterialEditorForm.Free;
+    vGLMaterialEditorForm := nil;
+  end;
+end;
+
+
+constructor TGLMaterialEditorForm.Create(AOwner: TComponent);
+var
+  I: Integer;
+begin
+  inherited;
+  for i := 0 to Integer(High(TGLBlendingMode)) do
+    CBBlending.Items.Add(GetEnumName(TypeInfo(TGLBlendingMode), i));
+  for i := 0 to Integer(High(TGLPolygonMode)) do
+    CBPolygonMode.Items.Add(GetEnumName(TypeInfo(TGLPolygonMode), i));
+
+  FEFront.OnChange := OnMaterialChanged;
+  FEBack.OnChange := OnMaterialChanged;
+  RTextureEdit.OnChange := OnMaterialChanged;
+end;
+
+function TGLMaterialEditorForm.Execute(AMaterial: TGLMaterial): Boolean;
+begin
+  with AMaterial.GetActualPrimaryMaterial do
+  begin
+    FEFront.FaceProperties := FrontProperties;
+    FEBack.FaceProperties := BackProperties;
+    RTextureEdit.Texture := Texture;
+    CBPolygonMode.ItemIndex:=Integer(PolygonMode);
+    CBBlending.ItemIndex := Integer(BlendingMode);
+  end;
+  MPPreview.Material := AMaterial;
+  Result := (ShowModal = mrOk);
+  if Result then
+    with AMaterial.GetActualPrimaryMaterial do
+    begin
+      FrontProperties := FEFront.FaceProperties;
+      BackProperties := FEBack.FaceProperties;
+      Texture := RTextureEdit.Texture;
+      BlendingMode := TGLBlendingMode(CBBlending.ItemIndex);
+      PolygonMode := TGLPolygonMode(CBPolygonMode.ItemIndex);
+    end;
+end;
+
+procedure TGLMaterialEditorForm.OnMaterialChanged(Sender: TObject);
+begin
+  with MPPreview.Material do
+  begin
+    FrontProperties := FEFront.FaceProperties;
+    BackProperties := FEBack.FaceProperties;
+    Texture := RTextureEdit.Texture;
+    BlendingMode := TGLBlendingMode(CBBlending.ItemIndex);
+    PolygonMode := TGLPolygonMode(CBPolygonMode.ItemIndex);
+  end;
+  MPPreview.GLSceneViewer.Invalidate;
+end;
+
+// ------------------------------------------------------------------
+initialization
+// ------------------------------------------------------------------
+
+finalization
+
+  ReleaseMaterialEditorForm;
+
+end.
+

Source/FRColorEditor.pas

@@ -1,11 +1,11 @@
 //
 // This unit is part of the GLScene Engine, http://glscene.org
 //
-(*
-   RGB+Alpha color editor.
-*)
+
 unit FRColorEditor;
 
+(* RGB+Alpha color editor. *)
+
 interface
 
 {$I GLScene.inc}
@@ -111,7 +111,7 @@ const
 
 procedure TRColorEditor.TBEChange(Sender: TObject);
 begin
-   PAPreview.Color:=RGB(RedValue, GreenValue, BlueValue);
+   PAPreview.Color := RGB(RedValue, GreenValue, BlueValue);
    if (not updating) and Assigned(FOnChange) then FOnChange(Self);
 end;
 
@@ -133,7 +133,7 @@ end;
 
 procedure TRColorEditor.PAPreviewDblClick(Sender: TObject);
 begin
-   ColorDialog.Color:=PAPreview.Color;
+   ColorDialog.Color := PAPreview.Color;
    if ColorDialog.Execute then
       SetColor(ConvertWinColor(ColorDialog.Color));
 end;

Source/FSceneEditor.pas

@@ -1,11 +1,11 @@
 //
 // This unit is part of the GLScene Engine, http://glscene.org
 //
-(*
-   Scene Editor, for adding + removing scene objects within the Delphi IDE.
-*)
+
 unit FSceneEditor;
 
+(* Scene Editor, for adding + removing scene objects *)
+
 interface
 
 {$I GLScene.inc}

Source/FShaderUniformEditor.pas

@@ -1,12 +1,11 @@
 //
 // This unit is part of the GLScene Engine, http://glscene.org
 //
-{
-   Uniform editor for shaders
-}
 
 unit FShaderUniformEditor;
 
+(* Uniform editor for shaders *)
+
 interface
 
 {$I GLScene.inc}
@@ -90,7 +89,9 @@ begin
   end;
 end;
 
-{ TShaderUniformEditor }
+//-----------------------------
+// TShaderUniformEditor
+//-----------------------------
 
 procedure TGLShaderUniformEditor.AddUniform(AValue: IShaderParameter);
 begin
@@ -243,7 +244,9 @@ begin
   SamplerBox.Items.Add(S);
 end;
 
+//---------------------------------
 initialization
+//---------------------------------
 
 finalization
   ReleaseShaderUniformEditor;

Source/FVectorEditor.pas

@@ -1,29 +1,29 @@
 //
 // This unit is part of the GLScene Engine, http://glscene.org
 //
-{
-   Editor for a vector. 
-}
+
 unit FVectorEditor;
 
+(* Editor for a vector *)
+
 interface
 
 {$I GLScene.inc}
 
 uses
-  System.Classes, 
+  System.Classes,
   System.SysUtils,
-  VCL.Forms, 
-  VCL.ComCtrls, 
-  VCL.StdCtrls, 
+  VCL.Forms,
+  VCL.ComCtrls,
+  VCL.StdCtrls,
   VCL.ToolWin,
-  VCL.ExtCtrls, 
-  VCL.Buttons, 
-  VCL.Graphics, 
+  VCL.ExtCtrls,
+  VCL.Buttons,
+  VCL.Graphics,
   VCL.Controls,
-   
-  GLVectorGeometry, 
-  GLUtils, 
+
+  GLVectorGeometry,
+  GLUtils,
   GLVectorTypes;
 
 type
@@ -212,7 +212,7 @@ initialization
 
 finalization
 
-   ReleaseVectorEditorForm;
+ ReleaseVectorEditorForm;
 
 end.
 

Source/GLContext.pas

@@ -23,16 +23,16 @@ uses
 {$IFDEF USE_SERVICE_CONTEXT}
   GLSGenerics,
 {$ENDIF}
-  GLS.Logger,
   OpenGLTokens,
   OpenGLAdapter,
+  XOpenGL,
   GLVectorGeometry,
   GLS.Strings,
   GLVectorTypes,
   GLState,
-  XOpenGL,
   GLPipelineTransformation,
-  GLTextureFormat;
+  GLTextureFormat,
+  GLS.Logger;
 
 // Buffer ID's for Multiple-Render-Targets (using GL_ATI_draw_buffers)
 const

Source/GLS.SceneRegister.pas

@@ -282,7 +282,7 @@ implementation
 uses
   FLibMaterialPicker,
   FGUILayoutEditor,
-  FMaterialEditorForm,
+  FMaterialEditor,
   FShaderMemo,
   FShaderUniformEditor,
   FVectorEditor,
@@ -851,7 +851,7 @@ end;
 
 procedure TGLMaterialProperty.Edit;
 begin
-  if FMaterialEditorForm.GLMaterialEditorForm.Execute(TGLMaterial(GetOrdValue))
+  if FMaterialEditor.GLMaterialEditorForm.Execute(TGLMaterial(GetOrdValue))
   then
     Modified;
 end;
@@ -994,7 +994,7 @@ begin
   end;
   if not Assigned(ml) then
     ShowMessage('Select the material library first.')
-  else if GLLibMaterialPicker.Execute(buf, ml) then
+  else if GLLibMaterialPickerForm.Execute(buf, ml) then
     SetStrValue(buf);
 end;