opengl: Revamp texturing.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
with
|
||||
openGL.Geometry;
|
||||
openGL.Geometry,
|
||||
openGL.Model.texturing;
|
||||
|
||||
|
||||
package openGL.Model.capsule.lit_textured
|
||||
@@ -7,7 +8,10 @@ package openGL.Model.capsule.lit_textured
|
||||
-- Models a lit and textured capsule.
|
||||
--
|
||||
is
|
||||
type Item is new Model.capsule.item with private;
|
||||
package textured_Model is new texturing.Mixin (openGL.Model.capsule.item);
|
||||
|
||||
type Item is new textured_Model.textured_item with private;
|
||||
-- type Item is new Model.capsule.item with private;
|
||||
type View is access all Item'Class;
|
||||
|
||||
|
||||
@@ -17,6 +21,7 @@ is
|
||||
|
||||
function new_Capsule (Radius : in Real;
|
||||
Height : in Real;
|
||||
texture_Details : in texture_Set.Details;
|
||||
Image : in asset_Name := null_Asset) return View;
|
||||
|
||||
--------------
|
||||
@@ -32,24 +37,25 @@ is
|
||||
-- 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 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;
|
||||
|
||||
|
||||
|
||||
private
|
||||
|
||||
type Item is new Model.capsule.item with
|
||||
-- type Item is new Model.capsule.item with
|
||||
type Item is new textured_Model.textured_item with
|
||||
record
|
||||
Radius : Real;
|
||||
Height : Real;
|
||||
|
||||
Reference in New Issue
Block a user