From d1f702aab507499679822b139954504accf4525b Mon Sep 17 00:00:00 2001 From: Rod Kay Date: Fri, 23 Feb 2024 18:35:07 +1100 Subject: [PATCH] opengl.model: Use 'default_Shine' for all lit models. --- .../lean/model/opengl-model-capsule-lit_textured.adb | 12 ++++++------ .../lean/model/opengl-model-sphere-lit_textured.adb | 8 ++++---- .../source/lean/model/opengl-model-terrain.adb | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/3-mid/opengl/source/lean/model/opengl-model-capsule-lit_textured.adb b/3-mid/opengl/source/lean/model/opengl-model-capsule-lit_textured.adb index 4ab8514..53e0844 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-capsule-lit_textured.adb +++ b/3-mid/opengl/source/lean/model/opengl-model-capsule-lit_textured.adb @@ -115,7 +115,7 @@ is ny := tmp; 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).Site (2), 0.0]); @@ -124,7 +124,7 @@ is i := i + 1; 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).Coords := (s => S, t => 0.0); @@ -134,7 +134,7 @@ is end loop; 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).Site (2), 0.0]); @@ -143,7 +143,7 @@ is i := i + 1; 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).Coords := (s => S, t => 0.0); @@ -259,7 +259,7 @@ is ny := tmp; 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).Site (2), (if is_Fore then the_Vertices (i).Site (3) - L @@ -292,7 +292,7 @@ is -- Add pole vertex. -- 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).Coords := (s => 0.5, t => 1.0); diff --git a/3-mid/opengl/source/lean/model/opengl-model-sphere-lit_textured.adb b/3-mid/opengl/source/lean/model/opengl-model-sphere-lit_textured.adb index 7f45ff5..4ef3e21 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-sphere-lit_textured.adb +++ b/3-mid/opengl/source/lean/model/opengl-model-sphere-lit_textured.adb @@ -83,14 +83,14 @@ is the_Vertices (the_Vertices'First).Site := 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).Shine := 0.5; + the_Vertices (the_Vertices'First).Shine := default_Shine; the_Sites (the_Vertices'Last) := south_Pole; the_Vertices (the_Vertices'Last).Site := 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).Shine := 0.5; + the_Vertices (the_Vertices'Last).Shine := default_Shine; for lat_Id in 2 .. lat_Count - 1 loop @@ -107,7 +107,7 @@ is the_Vertices (vert_Id).Normal := Normalised (the_Site); the_Vertices (vert_Id).Coords := (S => a / Degrees_360, 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 loop @@ -125,7 +125,7 @@ is the_Vertices (vert_Id).Normal := Normalised (the_Site); the_Vertices (vert_Id).Coords := (S => a / Degrees_360, T => 1.0 - b / Degrees_180); - the_Vertices (vert_Id).Shine := 0.5; + the_Vertices (vert_Id).Shine := default_Shine; end loop; end loop; diff --git a/3-mid/opengl/source/lean/model/opengl-model-terrain.adb b/3-mid/opengl/source/lean/model/opengl-model-terrain.adb index 83700b0..4797f68 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-terrain.adb +++ b/3-mid/opengl/source/lean/model/opengl-model-terrain.adb @@ -172,7 +172,7 @@ is for i in the_Vertices'Range loop the_Vertices (i).Normal := the_Normals (i); - the_Vertices (i).Shine := 0.005; + the_Vertices (i).Shine := default_Shine; end loop; deallocate (the_Normals);