diff --git a/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.adb b/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.adb index b959ca5..24ea6bf 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.adb +++ b/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.adb @@ -10,20 +10,6 @@ is --- Forge -- - -- function new_polygon (vertex_Sites : in Vector_2_array; - -- Face : in Face_t) return View - -- is - -- Self : constant View := new Item; - -- begin - -- Self.vertex_Sites (1 .. vertex_Sites'Length) := vertex_Sites; - -- Self.vertex_Count := vertex_Sites'Length; - -- - -- Self.Face := Face; - -- - -- return Self; - -- end new_polygon; - - function new_polygon (vertex_Sites : in Vector_2_array; texture_Details : in texture_Set.Details) return View is @@ -39,97 +25,6 @@ is - - ------------------ - --- Attributes --- - ------------------ - - -- function texture_Details (Self : in Item) return texture_Set.Details - -- is - -- begin - -- return Self.texture_Details; - -- end texture_Details; - - - - ------------ - -- Texturing - -- - - -- overriding - -- procedure Fade_is (Self : in out Item; Which : in texture_Set.texture_Id; - -- Now : in texture_Set.fade_Level) - -- is - -- begin - -- Self.Face.texture_Details.Fades (which) := Now; - -- end Fade_is; - -- - -- - -- - -- overriding - -- function Fade (Self : in Item; Which : in texture_Set.texture_Id) return texture_Set.fade_Level - -- is - -- begin - -- return Self.Face.texture_Details.Fades (which); - -- end Fade; - -- - -- - -- - -- procedure Texture_is (Self : in out Item; Which : in texture_Set.texture_Id; - -- Now : in openGL.asset_Name) - -- is - -- begin - -- Self.Face.texture_Details.Textures (Positive (which)) := Now; - -- end Texture_is; - -- - -- - -- - -- - -- overriding - -- function texture_Count (Self : in Item) return Natural - -- is - -- begin - -- return Self.Face.texture_Details.texture_Count; - -- end texture_Count; - -- - -- - -- - -- overriding - -- function texture_Applied (Self : in Item; Which : in texture_Set.texture_Id) return Boolean - -- is - -- begin - -- return Self.Face.texture_Details.texture_Applies (Which); - -- end texture_Applied; - -- - -- - -- - -- overriding - -- procedure texture_Applied_is (Self : in out Item; Which : in texture_Set.texture_Id; - -- Now : in Boolean) - -- is - -- begin - -- Self.Face.texture_Details.texture_Applies (Which) := Now; - -- end texture_Applied_is; - -- - -- - -- - -- - -- overriding - -- procedure animate (Self : in out Item) - -- is - -- use type texture_Set.Animation_view; - -- begin - -- if Self.Face.texture_Details.Animation = null - -- then - -- return; - -- end if; - -- - -- texture_Set.animate (Self.Face.texture_Details.Animation.all, - -- Self.Face.texture_Details.texture_Applies); - -- end animate; - - - -------------------- --- to_GL_Geometries -- diff --git a/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.ads b/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.ads index 1a64f46..3715251 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.ads +++ b/3-mid/opengl/source/lean/model/opengl-model-polygon-lit_textured.ads @@ -15,69 +15,21 @@ is type View is access all Item'Class; - - -------- - --- Face - -- - - -- type Face_t is - -- record - -- texture_Details : texture_Set.Details; - -- end record; - - --------- --- Forge -- - -- function new_Polygon (vertex_Sites : in Vector_2_array; - -- Face : in lit_textured.Face_t) return View; - function new_Polygon (vertex_Sites : in Vector_2_array; texture_Details : in texture_Set.Details) return View; - -------------- --- Attributes -- - -- function Face (Self : in Item) return Face_t; - -- overriding - -- function texture_Details (Self : in Item) return texture_Set.Details; - overriding function to_GL_Geometries (Self : access Item; Textures : access Texture.name_Map_of_texture'Class; Fonts : in Font.font_id_Map_of_font) return Geometry.views; - ------------ - -- Texturing - -- - - -- overriding - -- function Fade (Self : in Item; Which : in texture_Set.texture_Id) return texture_Set.fade_Level; - -- - -- overriding - -- procedure Fade_is (Self : in out Item; Which : in texture_Set.texture_Id; - -- Now : in texture_Set.fade_Level); - -- - -- procedure Texture_is (Self : in out Item; Which : in texture_Set.texture_Id; - -- Now : in asset_Name); - -- - -- overriding - -- function texture_Count (Self : in Item) return Natural; - -- - -- - -- overriding - -- function texture_Applied (Self : in Item; Which : in texture_Set.texture_Id) return Boolean; - -- - -- overriding - -- procedure texture_Applied_is (Self : in out Item; Which : in texture_Set.texture_Id; - -- Now : in Boolean); - -- - -- overriding - -- procedure animate (Self : in out Item); - - private @@ -85,8 +37,6 @@ private record vertex_Sites : Vector_2_array (1 .. 8); vertex_Count : Positive; - - -- Face : lit_textured.Face_t; end record; diff --git a/3-mid/opengl/source/lean/model/opengl-model-texturing.adb b/3-mid/opengl/source/lean/model/opengl-model-texturing.adb index 2813f7d..4da61d7 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-texturing.adb +++ b/3-mid/opengl/source/lean/model/opengl-model-texturing.adb @@ -1,11 +1,8 @@ with - -- openGL.Model, GL.lean, GL.Binding, ada.Strings.fixed; --- with ada.Text_IO; - package body openGL.Model.texturing is diff --git a/3-mid/opengl/source/lean/model/opengl-model-texturing.ads b/3-mid/opengl/source/lean/model/opengl-model-texturing.ads index f975c96..0cc1db5 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-texturing.ads +++ b/3-mid/opengl/source/lean/model/opengl-model-texturing.ads @@ -4,13 +4,11 @@ with openGL.Program; --- private package openGL.Model.texturing -- -- Provides texturing support for models. -- is - --- Uniforms -- @@ -40,13 +38,11 @@ is texture_Set : in openGL.texture_Set.Item); - procedure create (Uniforms : out texturing.Uniforms; for_Program : in openGL.Program.view); - ------------- --- Mixin --- ------------- @@ -98,5 +94,4 @@ is end Mixin; - end openGL.Model.texturing;