opengl.geometry: Add multi-texture support to more geometries.

3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.adb

@@ -8,13 +8,14 @@ with
      openGL.Tasks,
      openGL.Errors,
 
-     GL.Binding,
      GL.lean,
      GL.Pointers,
 
      Interfaces.C.Strings,
      System.storage_Elements;
 
+--  with ada.Text_IO; use ada.Text_IO;
+
 
 package body openGL.Geometry.lit_textured
 is
@@ -82,8 +83,10 @@ is
             white_Texture := openGL.Texture.Forge.to_Texture (white_Image);
 
             vertex_Shader  .define (Shader.Vertex,   "assets/opengl/shader/lit_textured.vert");
-            fragment_Shader.define (Shader.Fragment, "assets/opengl/shader/lit_textured.frag");
 
+            fragment_Shader.define (Shader.Fragment, (asset_Names' (1 => to_Asset ("assets/opengl/shader/version.header"),
+                                                                    2 => to_Asset ("assets/opengl/shader/texturing.frag"),
+                                                                    3 => to_Asset ("assets/opengl/shader/lit_textured.frag"))));
             the_Program := new openGL.Program.lit.item;
             the_Program.define (  vertex_Shader'Access,
                                 fragment_Shader'Access);
@@ -152,6 +155,7 @@ is
       end if;
 
       Self.Program_is (the_Program.all'Access);
+
       return Self;
    end new_Geometry;
 
@@ -245,25 +249,73 @@ is
    end Indices_are;
 
 
+
+
+
+   --- Texturing
+   --
+
+   procedure Fade_is (Self : in out Item;   Which : texture_ID;   Now : in Geometry.texturing.fade_Level)
+   is
+   begin
+      Self.Textures.Textures (Which).Fade := Now;
+   end Fade_is;
+
+
+   function Fade (Self : in Item;   Which : texture_ID) return Geometry.texturing.fade_Level
+   is
+   begin
+      return Self.Textures.Textures (Which).Fade;
+   end Fade;
+
+
+
+   procedure Texture_is (Self : in out Item;   Which : texture_ID;   Now : in openGL.Texture.Object)
+   is
+      use openGL.Geometry.texturing;
+   begin
+      Texture_is (in_Set => Self.Textures,
+                  Which  => Which,
+                  Now    => Now);
+   end Texture_is;
+
+
+
+   function Texture (Self : in Item;   Which : texture_ID) return openGL.Texture.Object
+   is
+   begin
+      return openGL.Geometry.texturing.Texture (in_Set => Self.Textures,
+                                                Which  => Which);
+   end Texture;
+
+
+
+   overriding
+   procedure Texture_is (Self : in out Item;   Now : in openGL.Texture.Object)
+   is
+      use openGL.Geometry.texturing;
+   begin
+      Texture_is (in_Set => Self.Textures,
+                  Now    => Now);
+   end Texture_is;
+
+
+   overriding
+   function Texture (Self : in Item) return openGL.Texture.Object
+   is
+   begin
+      return openGL.Geometry.texturing.Texture (in_Set => Self.Textures,
+                                                Which  => 1);
+   end Texture;
+
+
+
    overriding
    procedure enable_Texture (Self : in out Item)
    is
-      use GL,
-          GL.Binding,
-          openGL.Texture;
-
-      check_is_OK : constant Boolean := openGL.Tasks.Check;     pragma Unreferenced (check_is_OK);
-
+      use openGL.Geometry.texturing;
    begin
-      Tasks.check;
-
-      glActiveTexture (gl.GL_TEXTURE0);
-      Errors.log;
-
-      if Self.Texture = openGL.Texture.null_Object
-      then   enable (white_Texture);
-      else   enable (Self.Texture);
-      end if;
+      enable (Self.Textures, Self.Program);
    end enable_Texture;