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

opengl.model: Use 'default_Shine' for all lit models.

Browse Source
This commit is contained in:
Rod Kay
2024-02-23 18:35:07 +11:00
parent 4717490e43
commit d1f702aab5
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
3-mid/opengl/source/lean/model/opengl-model-capsule-lit_textured.adb
View File

@@ -115,7 +115,7 @@ is
ny := tmp; ny := tmp;
the_Vertices (i).Site := the_Edges (Each).Fore; the_Vertices (i).Site := the_Edges (Each).Fore;
the_Vertices (i).Shine := 0.5; the_Vertices (i).Shine := default_Shine;
the_Vertices (i).Normal := Normalised ([the_Vertices (i).Site (1), the_Vertices (i).Normal := Normalised ([the_Vertices (i).Site (1),
the_Vertices (i).Site (2), the_Vertices (i).Site (2),
0.0]); 0.0]);
@@ -124,7 +124,7 @@ is
i := i + 1; i := i + 1;
the_Vertices (i).Site := the_Edges (Each).Aft; the_Vertices (i).Site := the_Edges (Each).Aft;
the_Vertices (i).Shine := 0.5; the_Vertices (i).Shine := default_Shine;
the_Vertices (i).Normal := the_Vertices (i - 1).Normal; the_Vertices (i).Normal := the_Vertices (i - 1).Normal;
the_Vertices (i).Coords := (s => S, the_Vertices (i).Coords := (s => S,
t => 0.0); t => 0.0);
@@ -134,7 +134,7 @@ is
end loop; end loop;
the_Vertices (i).Site := the_Edges (1).Fore; the_Vertices (i).Site := the_Edges (1).Fore;
the_Vertices (i).Shine := 0.5; the_Vertices (i).Shine := default_Shine;
the_Vertices (i).Normal := Normalised ([the_Vertices (i).Site (1), the_Vertices (i).Normal := Normalised ([the_Vertices (i).Site (1),
the_Vertices (i).Site (2), the_Vertices (i).Site (2),
0.0]); 0.0]);
@@ -143,7 +143,7 @@ is
i := i + 1; i := i + 1;
the_Vertices (i).Site := the_Edges (1).Aft; the_Vertices (i).Site := the_Edges (1).Aft;
the_Vertices (i).Shine := 0.5; the_Vertices (i).Shine := default_Shine;
the_Vertices (i).Normal := the_Vertices (i - 1).Normal; the_Vertices (i).Normal := the_Vertices (i - 1).Normal;
the_Vertices (i).Coords := (s => S, the_Vertices (i).Coords := (s => S,
t => 0.0); t => 0.0);
@@ -259,7 +259,7 @@ is
ny := tmp; ny := tmp;
the_Vertices (i).Site := the_arch_Edges (each_Hoop) (Each); the_Vertices (i).Site := the_arch_Edges (each_Hoop) (Each);
the_Vertices (i).Shine := 0.5; the_Vertices (i).Shine := default_Shine;
the_Vertices (i).Normal := Normalised ([the_Vertices (i).Site (1), the_Vertices (i).Normal := Normalised ([the_Vertices (i).Site (1),
the_Vertices (i).Site (2), the_Vertices (i).Site (2),
(if is_Fore then the_Vertices (i).Site (3) - L (if is_Fore then the_Vertices (i).Site (3) - L
@@ -292,7 +292,7 @@ is
-- Add pole vertex. -- Add pole vertex.
-- --
the_Vertices (i).Site := pole_Site; the_Vertices (i).Site := pole_Site;
the_Vertices (i).Shine := 0.5; the_Vertices (i).Shine := default_Shine;
the_Vertices (i).Normal := Normalised (pole_Site); the_Vertices (i).Normal := Normalised (pole_Site);
the_Vertices (i).Coords := (s => 0.5, the_Vertices (i).Coords := (s => 0.5,
t => 1.0); t => 1.0);

8
3-mid/opengl/source/lean/model/opengl-model-sphere-lit_textured.adb
View File

@@ -83,14 +83,14 @@ is
the_Vertices (the_Vertices'First).Site := north_Pole; the_Vertices (the_Vertices'First).Site := north_Pole;
the_Vertices (the_Vertices'First).Normal := Normalised (north_Pole); the_Vertices (the_Vertices'First).Normal := Normalised (north_Pole);
the_Vertices (the_Vertices'First).Coords := (S => 0.5, T => 1.0); the_Vertices (the_Vertices'First).Coords := (S => 0.5, T => 1.0);
the_Vertices (the_Vertices'First).Shine := 0.5; the_Vertices (the_Vertices'First).Shine := default_Shine;
the_Sites (the_Vertices'Last) := south_Pole; the_Sites (the_Vertices'Last) := south_Pole;
the_Vertices (the_Vertices'Last).Site := south_Pole; the_Vertices (the_Vertices'Last).Site := south_Pole;
the_Vertices (the_Vertices'Last).Normal := Normalised (south_Pole); the_Vertices (the_Vertices'Last).Normal := Normalised (south_Pole);
the_Vertices (the_Vertices'Last).Coords := (S => 0.5, T => 0.0); the_Vertices (the_Vertices'Last).Coords := (S => 0.5, T => 0.0);
the_Vertices (the_Vertices'Last).Shine := 0.5; the_Vertices (the_Vertices'Last).Shine := default_Shine;
for lat_Id in 2 .. lat_Count - 1 for lat_Id in 2 .. lat_Count - 1
loop loop
@@ -107,7 +107,7 @@ is
the_Vertices (vert_Id).Normal := Normalised (the_Site); the_Vertices (vert_Id).Normal := Normalised (the_Site);
the_Vertices (vert_Id).Coords := (S => a / Degrees_360, the_Vertices (vert_Id).Coords := (S => a / Degrees_360,
T => 1.0 - b / Degrees_180); T => 1.0 - b / Degrees_180);
the_Vertices (vert_Id).Shine := 0.5; the_Vertices (vert_Id).Shine := default_Shine;
for long_Id in 1 .. long_Count for long_Id in 1 .. long_Count
loop loop
@@ -125,7 +125,7 @@ is
the_Vertices (vert_Id).Normal := Normalised (the_Site); the_Vertices (vert_Id).Normal := Normalised (the_Site);
the_Vertices (vert_Id).Coords := (S => a / Degrees_360, the_Vertices (vert_Id).Coords := (S => a / Degrees_360,
T => 1.0 - b / Degrees_180); T => 1.0 - b / Degrees_180);
the_Vertices (vert_Id).Shine := 0.5; the_Vertices (vert_Id).Shine := default_Shine;
end loop; end loop;
end loop; end loop;

2
3-mid/opengl/source/lean/model/opengl-model-terrain.adb
View File

@@ -172,7 +172,7 @@ is
for i in the_Vertices'Range for i in the_Vertices'Range
loop loop
the_Vertices (i).Normal := the_Normals (i); the_Vertices (i).Normal := the_Normals (i);
the_Vertices (i).Shine := 0.005; the_Vertices (i).Shine := default_Shine;
end loop; end loop;
deallocate (the_Normals); deallocate (the_Normals);