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

opengl: Cosmetics.

Browse Source
This commit is contained in:
Rod Kay
2023-11-10 19:24:40 +11:00
parent e7e0f6fc09
commit c9ecff7d86
7 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.ads
View File

@@ -1,5 +1,5 @@
with with
openGL.texture_Set; openGL.texture_Set;
private private
@@ -9,7 +9,7 @@ with
package openGL.Geometry.colored_textured package openGL.Geometry.colored_textured
-- --
-- Supports per-vertex site, color and texture. -- Supports 'per-vertex' site, color and texture.
-- --
is is
type Item is new openGL.Geometry.item with private; type Item is new openGL.Geometry.item with private;

2
3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.ads
View File

@@ -8,7 +8,7 @@ with
package openGL.Geometry.lit_colored_textured package openGL.Geometry.lit_colored_textured
-- --
-- Supports per-vertex site color, texture and lighting. -- Supports 'per-vertex' site, color, texture and lighting.
-- --
is is
type Item is new openGL.Geometry.item with private; type Item is new openGL.Geometry.item with private;

13
3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.ads
View File

@@ -11,7 +11,7 @@ with
package openGL.Geometry.lit_colored_textured_skinned package openGL.Geometry.lit_colored_textured_skinned
-- --
-- Supports per-vertex site color, texture, lighting and skinning. -- Supports 'per-vertex' site, color, texture, lighting and skinning.
-- --
is is
type Item is new openGL.Geometry.item with private; type Item is new openGL.Geometry.item with private;
@@ -27,15 +27,16 @@ is
type Vertex is type Vertex is
record record
Site : Vector_3; Site : Vector_3;
Normal : Vector_3; Normal : Vector_3;
Color : rgba_Color; Color : rgba_Color;
Coords : Coordinate_2D; Coords : Coordinate_2D;
Shine : Real; Shine : Real;
bone_Ids : Vector_4; bone_Ids : Vector_4;
bone_Weights : Vector_4; bone_Weights : Vector_4;
end record; end record;
pragma Convention (C, Vertex); pragma Convention (C, Vertex);
type Vertex_array is array (long_Index_t range <>) of aliased Vertex; type Vertex_array is array (long_Index_t range <>) of aliased Vertex;

2
3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.ads
View File

@@ -8,7 +8,7 @@ with
package openGL.Geometry.lit_textured package openGL.Geometry.lit_textured
-- --
-- Supports per-vertex site texture and lighting. -- Supports 'per-vertex' site, texture and lighting.
-- --
is is
type Item is new openGL.Geometry.item with private; type Item is new openGL.Geometry.item with private;

12
3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.ads
View File

@@ -9,11 +9,12 @@ with
package openGL.Geometry.lit_textured_skinned package openGL.Geometry.lit_textured_skinned
-- --
-- Supports per-vertex site, texture, lighting and skinning. -- Supports 'per-vertex' site, texture, lighting and skinning.
-- --
is is
type Item is new openGL.Geometry.item with private; type Item is new openGL.Geometry.item with private;
function new_Geometry return access Geometry.lit_textured_skinned.item'Class; function new_Geometry return access Geometry.lit_textured_skinned.item'Class;
procedure define_Program; procedure define_Program;
@@ -25,14 +26,15 @@ is
type Vertex is type Vertex is
record record
Site : Vector_3; Site : Vector_3;
Normal : Vector_3; Normal : Vector_3;
Coords : Coordinate_2D; Coords : Coordinate_2D;
Shine : Real; Shine : Real;
bone_Ids : Vector_4; bone_Ids : Vector_4;
bone_Weights : Vector_4; bone_Weights : Vector_4;
end record; end record;
pragma Convention (C, Vertex); pragma Convention (C, Vertex);
type Vertex_array is array (long_Index_t range <>) of aliased Vertex; type Vertex_array is array (long_Index_t range <>) of aliased Vertex;

3
3-mid/opengl/source/lean/geometry/opengl-geometry-textured.ads
View File

@@ -9,12 +9,13 @@ with
package openGL.Geometry.textured package openGL.Geometry.textured
-- --
-- Supports per-vertex site and texture. -- Supports 'per-vertex' site and texture.
-- --
is is
type Item is new openGL.Geometry.item with private; type Item is new openGL.Geometry.item with private;
type View is access all Item'Class; type View is access all Item'Class;
function new_Geometry return View; function new_Geometry return View;

4
3-mid/opengl/source/lean/model/opengl-model-hexagon-lit_textured.adb
View File

@@ -109,8 +109,8 @@ is
now => Self.Face.Fades (Id)); now => Self.Face.Fades (Id));
the_Geometry.Texture_is (which => Id, the_Geometry.Texture_is (which => Id,
now => Textures.fetch (Self.Face.Textures (i))); now => Textures.fetch (Self.Face.Textures (i)));
the_Geometry.is_Transparent (now => the_Geometry.Texture.is_Transparent); the_Geometry.is_Transparent (now => the_Geometry.Texture.is_Transparent);
end loop; end loop;
the_Geometry.is_Transparent (True); -- TODO: Do transparency properly. the_Geometry.is_Transparent (True); -- TODO: Do transparency properly.