Parcourir la source

typo, should be included .hpp for c++

GLScene il y a 2 ans
Parent
commit
86252f3938

+ 31 - 2
Examples/Demos/materials/objectmats/fObjectMatsD.dfm

@@ -36,14 +36,16 @@ object FormMO: TFormMO
       Left = 24
       Top = 120
       Width = 145
-      Height = 121
+      Height = 177
       ItemIndex = 0
       Items.Strings = (
         'Cube'
         'Hexahedra'
         'PlaneCube'
         'PointsCube'
-        'PolyCube')
+        'PolyCube'
+        'Disk'
+        'Polygon')
       TabOrder = 0
     end
     object chbRotate: TCheckBox
@@ -81,6 +83,33 @@ object FormMO: TFormMO
     object dcCubes: TGLDummyCube
       CubeSize = 100.000000000000000000
       VisibleAtRunTime = True
+      object polyTriangle: TGLPolygon
+        Material.MaterialLibrary = GLMaterialLibrary1
+        Material.LibMaterialName = 'txEarth'
+        Direction.Coordinates = {0000803F000000000000000000000000}
+        Position.Coordinates = {00000000000040C0000040C00000803F}
+        Up.Coordinates = {00000000000080BF0000000000000000}
+        Nodes = <
+          item
+            X = 1.000000000000000000
+            Z = 1.000000000000000000
+          end
+          item
+            X = 1.000000000000000000
+          end
+          item
+            Z = 1.000000000000000000
+          end>
+      end
+      object GLDisk1: TGLDisk
+        Material.MaterialLibrary = GLMaterialLibrary1
+        Material.LibMaterialName = 'txEarth'
+        Direction.Coordinates = {000000000000803F0000000000000000}
+        Position.Coordinates = {00000000000080C0000000000000803F}
+        Up.Coordinates = {0000000000000000000080BF00000000}
+        OuterRadius = 1.000000000000000000
+        SweepAngle = 360.000000000000000000
+      end
       object GLCube1: TGLCube
         Material.MaterialLibrary = GLMaterialLibrary1
         Material.LibMaterialName = 'txEarth'

+ 4 - 0
Examples/Demos/materials/objectmats/fObjectMatsD.pas

@@ -64,6 +64,8 @@ type
     PolyRight: TGLPolygon;
     PolyBack: TGLPolygon;
     GLPolygon4: TGLPolygon;
+    GLDisk1: TGLDisk;
+    polyTriangle: TGLPolygon;
     procedure FormCreate(Sender: TObject);
     procedure dcPlaneCubeProgress(Sender: TObject; const DeltaTime, NewTime: Double);
     procedure GLCadencer1Progress(Sender: TObject; const DeltaTime, NewTime: Double);
@@ -136,6 +138,8 @@ begin
       2: dcPlaneCube.RollAngle := -90 * NewTime;
       3: GLPoints1.TurnAngle := 90 * NewTime;
       4: dcPolyCube.PitchAngle := -90 * NewTime;
+      5: GLDisk1.RollAngle := -90 * NewTime;
+      6: PolyTriangle.TurnAngle := -90 * NewTime;
     end;
   end;
 end;

+ 2 - 2
Packages/GLScene_DT.dproj

@@ -92,7 +92,6 @@
         <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <VerInfo_MinorVer>5</VerInfo_MinorVer>
         <DCC_IOChecking>false</DCC_IOChecking>
         <DCC_DebugDCUs>true</DCC_DebugDCUs>
         <DCC_RangeChecking>true</DCC_RangeChecking>
@@ -100,11 +99,12 @@
         <DCC_HppOutput>..\include\$(Platform)</DCC_HppOutput>
         <DCC_ObjOutput>..\lib\$(Platform)</DCC_ObjOutput>
         <DCC_BpiOutput>..\lib\$(Platform)</DCC_BpiOutput>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.5.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.5.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileVersion=2023.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.5.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <DCC_Description>GLScene Engine</DCC_Description>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
+        <VerInfo_MajorVer>2023</VerInfo_MajorVer>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">

+ 2 - 7
Packages/GLScene_RT.dproj

@@ -122,8 +122,9 @@
         <DCC_BpiOutput>..\lib\$(Platform)</DCC_BpiOutput>
         <DCC_ObjOutput>..\lib\$(Platform)</DCC_ObjOutput>
         <DCC_CBuilderOutput>All</DCC_CBuilderOutput>
-        <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_Keys>CompanyName=;FileVersion=2023.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
         <DCC_Description>GLScene Engine</DCC_Description>
+        <VerInfo_MajorVer>2023</VerInfo_MajorVer>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -394,12 +395,6 @@
                     <Source Name="MainSource">GLScene_RT.dpk</Source>
                 </Source>
                 <Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GLScene_Physics_DT.bpl">GLScene Physics Managers</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GBComps.bpl">Geoblock - Components</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GEdgeIO.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GEdgeIO.bpl not found</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GEdgeIODB.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GEdgeIODB.bpl not found</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\VirtualTreesD22.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\VirtualTreesD22.bpl not found</Excluded_Packages>
-                    <Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GLScene_Newton_DT.bpl">File C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\GLScene_Newton_DT.bpl not found</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcboffice2k280.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\bcbofficexp280.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
                     <Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>

+ 0 - 1
Source/GLS.ThorFX.pas

@@ -1,7 +1,6 @@
 //
 // The graphics platform GLScene https://github.com/glscene
 //
-
 unit GLS.ThorFX;
 
 (* ThorFX  for GLScene *)

+ 7 - 11
Source/GLS.TilePlane.pas

@@ -68,9 +68,8 @@ type
     destructor Destroy; override;
     procedure WriteToFiler(writer: TGLVirtualWriter); override;
     procedure ReadFromFiler(reader: TGLVirtualReader); override;
-    property Tile[col, row: Integer]: Integer read GetTile
-      write SetTile; default;
-    property Row[index: Integer]: TGLTiledAreaRow read GetRow;
+    property Tile[col, row: Integer]: Integer read GetTile write SetTile; default;
+    property row[index: Integer]: TGLTiledAreaRow read GetRow;
     property RowMin: Integer read FRowMin write SetRowMin;
     property RowMax: Integer read FRowMax write SetRowMax;
     procedure Pack;
@@ -94,8 +93,7 @@ type
     procedure SetTiles(const val: TGLTiledArea);
     procedure SetMaterialLibrary(const val: TGLMaterialLibrary);
     procedure SetSortByMaterials(const val: Boolean);
-    procedure Notification(AComponent: TComponent;
-      Operation: TOperation); override;
+    procedure Notification(AComponent: TComponent; Operation: TOperation); override;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -108,8 +106,7 @@ type
       This property should ideally be left always at its default, True,
       except for debugging and performance measurement, which is why
       it's only public and not published. *)
-    property SortByMaterials: Boolean read FSortByMaterials
-      write SetSortByMaterials;
+    property SortByMaterials: Boolean read FSortByMaterials write SetSortByMaterials;
   published
     // If True the tiles are rendered without writing to the ZBuffer.
     property NoZWrite: Boolean read FNoZWrite write SetNoZWrite;
@@ -117,8 +114,7 @@ type
       The lower 16 bits of the tile integer value is understood as being
       the index of the tile's material in the library (material of
       index zero is thus unused). *)
-    property MaterialLibrary: TGLMaterialLibrary read FMaterialLibrary
-      write SetMaterialLibrary;
+    property MaterialLibrary: TGLMaterialLibrary read FMaterialLibrary write SetMaterialLibrary;
   end;
 
 // -------------------------------------------------------------
@@ -520,8 +516,7 @@ begin
   StructureChanged;
 end;
 
-procedure TGLTilePlane.Notification(AComponent: TComponent;
-  Operation: TOperation);
+procedure TGLTilePlane.Notification(AComponent: TComponent; Operation: TOperation);
 begin
   if Operation = opRemove then
   begin
@@ -649,6 +644,7 @@ end;
 
 // -------------------------------------------------------------
 initialization
+
 // -------------------------------------------------------------
 
 RegisterClasses([TGLTilePlane, TGLTiledAreaRow, TGLTiledArea]);

BIN
lib/Win64/GLScene_Cg_RT.a


BIN
lib/Win64/GLScene_Cg_RT.bpi


BIN
lib/Win64/GLScene_GPU_RT.a


BIN
lib/Win64/GLScene_GPU_RT.bpi


BIN
lib/Win64/GLScene_Physics_RT.a


BIN
lib/Win64/GLScene_Physics_RT.bpi


BIN
lib/Win64/GLScene_RT.a


BIN
lib/Win64/GLScene_RT.bpi


BIN
lib/Win64/GLScene_Sounds_RT.a


BIN
lib/Win64/GLScene_Sounds_RT.bpi