nichkara/lace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opengl.glyphimpl.texture: Revert to using '()' instead of '[]' for record aggregates.

Browse Source
This commit is contained in:
Rod Kay
2023-05-05 03:50:47 +10:00
parent ba8a471557
commit 6bd8001f2e
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
3-mid/opengl/source/lean/model/opengl-model-hex_grid.adb
View File

@@ -185,8 +185,8 @@ is
declare declare
use hexagon_Geometry; use hexagon_Geometry;
Site : constant Geometry_2d.Site := vertex_Site (the_Grid, Site : constant Geometry_2d.Site := vertex_Site (the_Grid,
hex_Id => [Positive (Row), hex_Id => (Positive (Row),
Positive (Col)], Positive (Col)),
Which => Which); Which => Which);
vertex_Id : constant Index_t := fetch_Id (S => Site); vertex_Id : constant Index_t := fetch_Id (S => Site);
@@ -194,8 +194,8 @@ is
C : constant Index_t := the_Vertex.shared_Count + 1; C : constant Index_t := the_Vertex.shared_Count + 1;
begin begin
the_Vertex.shared_Count := C; the_Vertex.shared_Count := C;
the_Vertex.shared_Hexes (C) := [Positive (Row), the_Vertex.shared_Hexes (C) := (Positive (Row),
Positive (Col)]; Positive (Col));
the_Vertex.Site := [Site (1), the_Vertex.Site := [Site (1),
0.0, 0.0,
Site (2)]; Site (2)];
@@ -221,8 +221,8 @@ is
declare declare
use hexagon_Geometry; use hexagon_Geometry;
Site : constant Geometry_2d.Site := vertex_Site (the_Grid, Site : constant Geometry_2d.Site := vertex_Site (the_Grid,
hex_Id => [Positive (Row), hex_Id => (Positive (Row),
Positive (Col)], Positive (Col)),
Which => Which); Which => Which);
Height : Real := 0.0; Height : Real := 0.0;
vertex_Id : constant Index_t := fetch_Id (S => Site); vertex_Id : constant Index_t := fetch_Id (S => Site);
@@ -281,8 +281,8 @@ is
use hexagon_Geometry; use hexagon_Geometry;
Site : Geometry_2d.Site := vertex_Site (the_Grid, Site : Geometry_2d.Site := vertex_Site (the_Grid,
hex_Id => [Row => Positive (row_Count), hex_Id => (Row => Positive (row_Count),
Col => Positive (i)], Col => Positive (i)),
Which => 3); Which => 3);
hex_vertex_Id : Index_t := fetch_Id (Site); hex_vertex_Id : Index_t := fetch_Id (Site);
begin begin
@@ -292,8 +292,8 @@ is
Alpha => 0)); Alpha => 0));
Site := vertex_Site (the_Grid, Site := vertex_Site (the_Grid,
hex_Id => [Row => 1, hex_Id => (Row => 1,
Col => Positive (i)], Col => Positive (i)),
Which => 6); Which => 6);
hex_vertex_Id := fetch_Id (Site); hex_vertex_Id := fetch_Id (Site);
@@ -318,7 +318,7 @@ is
use hexagon_Geometry; use hexagon_Geometry;
Site : constant Geometry_2d.Site := vertex_Site (the_Grid, Site : constant Geometry_2d.Site := vertex_Site (the_Grid,
hex_Id => [Row, Col], hex_Id => (Row, Col),
Which => hex_Vertex); Which => hex_Vertex);
begin begin
Cursor := Cursor + 1; Cursor := Cursor + 1;
@@ -426,16 +426,16 @@ is
declare declare
use hexagon_Geometry; use hexagon_Geometry;
Site : Geometry_2d.Site := vertex_Site (the_Grid, Site : Geometry_2d.Site := vertex_Site (the_Grid,
hex_Id => [Positive (Row), hex_Id => (Positive (Row),
Positive (Col)], Positive (Col)),
Which => 5); Which => 5);
begin begin
Cursor := Cursor + 1; Cursor := Cursor + 1;
tops_Indices (Cursor) := fetch_Id (Site); tops_Indices (Cursor) := fetch_Id (Site);
Site := vertex_Site (the_Grid, Site := vertex_Site (the_Grid,
hex_Id => [Positive (Row), hex_Id => (Positive (Row),
Positive (Col)], Positive (Col)),
Which => 6); Which => 6);
Cursor := Cursor + 1; Cursor := Cursor + 1;
@@ -444,16 +444,16 @@ is
if Row = row_Count -- Last row, so do bottoms. if Row = row_Count -- Last row, so do bottoms.
then then
Site := vertex_Site (the_Grid, Site := vertex_Site (the_Grid,
hex_Id => [Positive (Row), hex_Id => (Positive (Row),
Positive (Col)], Positive (Col)),
Which => 3); Which => 3);
Cursor := Cursor + 1; Cursor := Cursor + 1;
tops_Indices (Cursor) := fetch_Id (Site); tops_Indices (Cursor) := fetch_Id (Site);
Site := vertex_Site (the_Grid, Site := vertex_Site (the_Grid,
hex_Id => [Positive (Row), hex_Id => (Positive (Row),
Positive (Col)], Positive (Col)),
Which => 2); Which => 2);
Cursor := Cursor + 1; Cursor := Cursor + 1;