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

opengl.geometry: Add/use texturing support.

Browse Source
This commit is contained in:
Rod Kay
2023-05-05 03:13:07 +10:00
parent b9064c43c8
commit 2ac6d57a53
7 changed files with 254 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
3-mid/opengl/source/lean/geometry/opengl-geometry.adb
View File

@@ -1,12 +1,6 @@
with
openGL.Primitive.indexed,
openGL.Primitive.long_indexed,
openGL.Tasks,
GL.Binding,
GL.lean,
ada.Strings.fixed,
ada.unchecked_Deallocation;
@@ -50,6 +44,8 @@ is
end free_Primitives;
--------------
-- Attributes
--
@@ -98,34 +94,6 @@ is
-- procedure Texture_is (Self : in out Item'Class; Which : texture_ID; Now : in openGL.Texture.Object)
-- is
-- begin
-- Self.Textures.Textures (Which) := (0.0, Now);
-- Self.is_Transparent := Self.is_Transparent
-- or Now .is_Transparent;
--
-- if Natural (Which) > Self.Textures.Count
-- then
-- Self.Textures.Count := Natural (Which);
-- end if;
-- end Texture_is;
--
--
-- function Texture (Self : in Item'Class; Which : texture_ID) return openGL.Texture.Object
-- is
-- begin
-- return Self.Textures.Textures (Which).Object;
-- end Texture;
function Texture (Self : in Item) return openGL.Texture.Object
is
begin
@@ -134,71 +102,6 @@ is
end Texture;
-- procedure Texture_is (Self : in out Item'Class; Now : in openGL.Texture.Object)
-- is
-- begin
-- Self.Textures.Textures (1).Object := Now;
-- Self.is_Transparent := Self.is_Transparent
-- or Now .is_Transparent;
--
-- if Self.Textures.Count = 0
-- then
-- Self.Textures.Count := 1;
-- end if;
-- end Texture_is;
--
procedure Texture_is (in_Set : in out texture_Set; Which : texture_ID; Now : in openGL.Texture.Object)
is
begin
in_Set.Textures (Which) := (0.0,
Now,
textures_Uniform => <>,
fade_Uniform => <>);
in_Set.is_Transparent := in_Set.is_Transparent
or Now .is_Transparent;
if Natural (Which) > in_Set.Count
then
in_Set.Count := Natural (Which);
end if;
end Texture_is;
function Texture (in_Set : in texture_Set; Which : texture_ID) return openGL.Texture.Object
is
begin
return in_Set.Textures (Which).Object;
end Texture;
function Texture (in_Set : in texture_Set) return openGL.Texture.Object
is
begin
return in_Set.Textures (1).Object;
end Texture;
procedure Texture_is (in_Set : in out texture_Set; Now : in openGL.Texture.Object)
is
begin
in_Set.Textures (1).Object := Now;
in_Set.is_Transparent := in_Set.is_Transparent
or Now .is_Transparent;
if in_Set.Count = 0
then
in_Set.Count := 1;
end if;
end Texture_is;
procedure Program_is (Self : in out Item; Now : in openGL.Program.view)
is
@@ -249,6 +152,8 @@ is
end is_Transparent;
--------------
-- Operations
--
@@ -282,6 +187,8 @@ is
end render;
-----------
-- Normals
--
@@ -442,6 +349,8 @@ is
pragma Unreferenced (Facets_of);
-----------
-- Normals
--
@@ -561,129 +470,6 @@ is
-----------
-- Textures
--
procedure enable (the_Textures : in out texture_Set;
Program : in openGL.Program.view)
is
use GL,
GL.Binding,
openGL.Texture;
begin
Tasks.check;
if not the_Textures.initialised
then
for i in 1 .. the_Textures.Count
loop
declare
use ada.Strings,
ada.Strings.fixed;
Id : constant texture_Id := texture_Id (i);
begin
declare
uniform_Name : aliased constant String :="Textures[" & Trim (Natural'Image (i - 1), Left) & "]";
begin
the_Textures.Textures (Id).textures_Uniform := Program.uniform_Variable (Named => uniform_Name);
end;
declare
uniform_Name : constant String := "Fade[" & Trim (Natural'Image (i - 1), Left) & "]";
begin
the_Textures.Textures (Id).fade_Uniform := Program.uniform_Variable (Named => uniform_Name);
end;
end;
end loop;
the_Textures.Initialised := True;
end if;
for i in 1 .. the_Textures.Count
loop
declare
use GL.lean;
use type GL.GLint;
type texture_Units is array (texture_Id) of GLenum;
all_texture_Units : constant texture_Units := (GL_TEXTURE0,
GL_TEXTURE1,
GL_TEXTURE2,
GL_TEXTURE3,
GL_TEXTURE4,
GL_TEXTURE5,
GL_TEXTURE6,
GL_TEXTURE7,
GL_TEXTURE8,
GL_TEXTURE9,
GL_TEXTURE10,
GL_TEXTURE11,
GL_TEXTURE12,
GL_TEXTURE13,
GL_TEXTURE14,
GL_TEXTURE15,
GL_TEXTURE16,
GL_TEXTURE17,
GL_TEXTURE18,
GL_TEXTURE19,
GL_TEXTURE20,
GL_TEXTURE21,
GL_TEXTURE22,
GL_TEXTURE23,
GL_TEXTURE24,
GL_TEXTURE25,
GL_TEXTURE26,
GL_TEXTURE27,
GL_TEXTURE28,
GL_TEXTURE29,
GL_TEXTURE30,
GL_TEXTURE31);
Id : constant texture_Id := texture_Id (i);
begin
-- put_Line ("1-openGL.Program.lit.set_Uniforms:" & loc'Image);
glUniform1i (the_Textures.Textures (Id).textures_Uniform.gl_Variable, -- loc,
GLint (i) - 1);
-- glUniform1i (the_Textures.Textures (Id).textures_uniform_Location, -- loc,
-- GLint (i) - 1);
glActiveTexture (all_texture_Units (Id));
glBindTexture (GL_TEXTURE_2D,
the_Textures.Textures (Id).Object.Name);
end;
declare
use ada.Strings,
ada.Strings.fixed;
uniform_Name : constant String := "Fade[" & Trim (Natural'Image (i - 1), Left) & "]";
Uniform : constant openGL.Variable.uniform.float := Program.uniform_Variable (uniform_Name);
begin
Uniform.Value_is (Real (the_Textures.Textures (texture_Id (i)).Fade));
end;
end loop;
declare
the_texture_count_Uniform : constant openGL.Variable.uniform.int := Program.uniform_Variable ("texture_Count");
begin
the_texture_count_Uniform.Value_is (the_Textures.Count);
end;
end enable;
---------
-- Bounds
--
@@ -706,6 +492,8 @@ is
end get_Bounds;
---------------
-- Transparency
--