diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.ads index b183492..5793592 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-colored_textured.ads @@ -1,5 +1,5 @@ with -openGL.texture_Set; + openGL.texture_Set; private @@ -9,7 +9,7 @@ with package openGL.Geometry.colored_textured -- --- Supports per-vertex site, color and texture. +-- Supports 'per-vertex' site, color and texture. -- is type Item is new openGL.Geometry.item with private; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.ads index b7ccc7c..d36cc4f 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured.ads @@ -8,7 +8,7 @@ with package openGL.Geometry.lit_colored_textured -- --- Supports per-vertex site color, texture and lighting. +-- Supports 'per-vertex' site, color, texture and lighting. -- is type Item is new openGL.Geometry.item with private; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.ads index 2d8fe72..a39bb50 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_colored_textured_skinned.ads @@ -11,7 +11,7 @@ with 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 type Item is new openGL.Geometry.item with private; @@ -27,15 +27,16 @@ is type Vertex is record - Site : Vector_3; - Normal : Vector_3; - Color : rgba_Color; - Coords : Coordinate_2D; - Shine : Real; + Site : Vector_3; + Normal : Vector_3; + Color : rgba_Color; + Coords : Coordinate_2D; + Shine : Real; bone_Ids : Vector_4; bone_Weights : Vector_4; end record; + pragma Convention (C, Vertex); type Vertex_array is array (long_Index_t range <>) of aliased Vertex; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.ads index e593ef3..4ad0194 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured.ads @@ -8,7 +8,7 @@ with package openGL.Geometry.lit_textured -- --- Supports per-vertex site texture and lighting. +-- Supports 'per-vertex' site, texture and lighting. -- is type Item is new openGL.Geometry.item with private; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.ads index fa2a405..ea8f430 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-lit_textured_skinned.ads @@ -9,11 +9,12 @@ with package openGL.Geometry.lit_textured_skinned -- --- Supports per-vertex site, texture, lighting and skinning. +-- Supports 'per-vertex' site, texture, lighting and skinning. -- is type Item is new openGL.Geometry.item with private; + function new_Geometry return access Geometry.lit_textured_skinned.item'Class; procedure define_Program; @@ -25,14 +26,15 @@ is type Vertex is record - Site : Vector_3; - Normal : Vector_3; - Coords : Coordinate_2D; - Shine : Real; + Site : Vector_3; + Normal : Vector_3; + Coords : Coordinate_2D; + Shine : Real; bone_Ids : Vector_4; bone_Weights : Vector_4; end record; + pragma Convention (C, Vertex); type Vertex_array is array (long_Index_t range <>) of aliased Vertex; diff --git a/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.ads b/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.ads index d14f92b..6e9ccab 100644 --- a/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.ads +++ b/3-mid/opengl/source/lean/geometry/opengl-geometry-textured.ads @@ -9,12 +9,13 @@ with package openGL.Geometry.textured -- --- Supports per-vertex site and texture. +-- Supports 'per-vertex' site and texture. -- is type Item is new openGL.Geometry.item with private; type View is access all Item'Class; + function new_Geometry return View; diff --git a/3-mid/opengl/source/lean/model/opengl-model-hexagon-lit_textured.adb b/3-mid/opengl/source/lean/model/opengl-model-hexagon-lit_textured.adb index f2fc1cd..e88f70a 100644 --- a/3-mid/opengl/source/lean/model/opengl-model-hexagon-lit_textured.adb +++ b/3-mid/opengl/source/lean/model/opengl-model-hexagon-lit_textured.adb @@ -109,8 +109,8 @@ is now => Self.Face.Fades (Id)); the_Geometry.Texture_is (which => Id, - now => Textures.fetch (Self.Face.Textures (i))); - the_Geometry.is_Transparent (now => the_Geometry.Texture.is_Transparent); + now => Textures.fetch (Self.Face.Textures (i))); + the_Geometry.is_Transparent (now => the_Geometry.Texture.is_Transparent); end loop; the_Geometry.is_Transparent (True); -- TODO: Do transparency properly.