Cosmetics.
This commit is contained in:
@@ -24,6 +24,7 @@ is
|
||||
Interfaces,
|
||||
System;
|
||||
|
||||
|
||||
-----------
|
||||
-- Globals
|
||||
--
|
||||
|
||||
@@ -15,11 +15,6 @@ is
|
||||
type Face is
|
||||
record
|
||||
texture_Details : texture_Set.Details;
|
||||
-- Fades : texture_Set.fade_Levels (texture_Set.texture_Id) := [others => 0.0];
|
||||
-- Textures : openGL.asset_Names (1 .. Positive (texture_Set.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex.
|
||||
-- texture_Count : Natural := 0;
|
||||
-- texture_Applies : texture_Set.texture_Apply_array := [others => True];
|
||||
-- Animation : texture_Set.Animation_view;
|
||||
end record;
|
||||
|
||||
|
||||
|
||||
@@ -20,27 +20,9 @@ is
|
||||
type Face is
|
||||
record
|
||||
texture_Details : texture_Set.Details;
|
||||
-- Fades : texture_Set.fade_Levels (texture_Set.texture_Id) := [others => 0.0];
|
||||
-- Textures : openGL.asset_Names (1 .. Positive (texture_Set.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex.
|
||||
-- texture_Count : Natural := 0;
|
||||
-- texture_Tiling : openGL.Real := 1.0; -- The number of times the texture should be wrapped.
|
||||
-- texture_Applies : texture_Set.texture_Apply_array := [others => True];
|
||||
-- Animation : texture_Set.Animation_view;
|
||||
end record;
|
||||
|
||||
|
||||
|
||||
-- type Face is
|
||||
-- record
|
||||
-- Fades : texture_Set.fade_Levels (texture_Set.texture_Id) := [others => 0.0];
|
||||
-- Textures : openGL.asset_Names (1 .. Positive (texture_Set.texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex.
|
||||
-- texture_Count : Natural := 0;
|
||||
-- texture_Applies : texture_Set.texture_Apply_array := [others => True];
|
||||
-- Animation : texture_Set.Animation_view;
|
||||
-- end record;
|
||||
|
||||
|
||||
|
||||
---------
|
||||
--- Forge
|
||||
--
|
||||
|
||||
@@ -62,17 +62,6 @@ is
|
||||
-----------
|
||||
--- Details
|
||||
--
|
||||
--
|
||||
-- type Details is
|
||||
-- record
|
||||
-- Fades : fade_Levels (texture_Id) := [others => 0.0];
|
||||
-- Textures : asset_Names (1 .. Positive (texture_Id'Last)) := [others => null_Asset]; -- The textures to be applied to the hex.
|
||||
-- texture_Count : Natural := 0;
|
||||
-- texture_Tiling : Real := 1.0; -- The number of times the texture should be wrapped.
|
||||
-- texture_Applies : texture_Apply_array := [others => True];
|
||||
-- Animation : Animation_view;
|
||||
-- end record;
|
||||
--
|
||||
|
||||
function to_Details (texture_Assets : in asset_Names;
|
||||
Animation : in Animation_view := null) return Details
|
||||
|
||||
@@ -45,8 +45,6 @@ is
|
||||
Fade : fade_Level := 0.0;
|
||||
Object : openGL.Texture.Object := openGL.Texture.null_Object;
|
||||
Applied : Boolean := True; -- Whether this texture is painted on or not.
|
||||
-- texture_Uniform : openGL.Variable.uniform.sampler2D;
|
||||
-- fade_Uniform : openGL.Variable.uniform.float;
|
||||
end record;
|
||||
|
||||
type fadeable_Textures is array (texture_Id range 1 .. max_Textures) of fadeable_Texture;
|
||||
|
||||
@@ -362,7 +362,7 @@ is
|
||||
|
||||
private
|
||||
|
||||
-- NB: Packing these arrays forces compiler to use the correct size for the element type, rather than the most efficient size.
|
||||
-- NB: Packing these arrays forces compiler to use the correct size for the element type, rather than the most efficient size. -- TODO: Use 'Size' aspect clauses, instead of 'Pack'.
|
||||
--
|
||||
pragma Pack (short_Indices);
|
||||
pragma Pack ( Indices);
|
||||
|
||||
@@ -69,7 +69,6 @@ is
|
||||
Mass : Real;
|
||||
Friction : Real;
|
||||
Restitution : Real; -- Bounce
|
||||
-- Site : Vector_3;
|
||||
|
||||
is_Tangible : Boolean := True;
|
||||
end record;
|
||||
@@ -89,7 +88,6 @@ is
|
||||
Mass : in Real := 0.0;
|
||||
Friction : in Real := 0.1;
|
||||
Restitution : in Real := 0.1;
|
||||
-- Site : in Vector_3 := Origin_3d;
|
||||
is_Tangible : in Boolean := True) return View;
|
||||
end Forge;
|
||||
|
||||
|
||||
@@ -6,7 +6,8 @@ is
|
||||
type Item is limited interface;
|
||||
type View is access all Item'Class;
|
||||
|
||||
procedure define (Self : in out Item) is abstract;
|
||||
|
||||
procedure define (Self : in out Item) is abstract;
|
||||
|
||||
procedure free (Self : in out View);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user