From 8ee3f7453bf7b0db5c7358e697e91714d825c87d Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 9 Jun 2019 21:12:25 +0800 Subject: *misc --- source/modules/asura-core/graphics/texture.h | 40 ++++++++++------------------ 1 file changed, 14 insertions(+), 26 deletions(-) (limited to 'source/modules/asura-core/graphics/texture.h') diff --git a/source/modules/asura-core/graphics/texture.h b/source/modules/asura-core/graphics/texture.h index 799227e..7cfddec 100644 --- a/source/modules/asura-core/graphics/texture.h +++ b/source/modules/asura-core/graphics/texture.h @@ -46,10 +46,10 @@ namespace AsuraEngine /// struct TextureFormat { - GLenum internalformat; // GPU内部格式 + GLenum internalformat; ///< GPU内部格式 - GLenum externalformat; // CPU外部格式 - GLenum type; // 外部格式每个channel数值类型 + GLenum externalformat; ///< CPU外部格式 + GLenum type; ///< 外部格式每个channel数值类型 }; /// @@ -81,42 +81,30 @@ namespace AsuraEngine protected: - //----------------------------------------------------------------------------// - - LUAX_DECL_ENUM(ColorFormat, 1); - LUAX_DECL_ENUM(FilterMode, 1); - LUAX_DECL_ENUM(WrapMode, 1); - - LUAX_DECL_METHOD(_SetFilterMode); - LUAX_DECL_METHOD(_SetWrapMode); - LUAX_DECL_METHOD(_GetFilterMode); - LUAX_DECL_METHOD(_GetWrapMode); - LUAX_DECL_METHOD(_IsGenMipmap); - - //----------------------------------------------------------------------------// - /// /// 转换color format为texture format。 /// TextureFormat ConvertColorFormat(const ColorFormat& colorformat); - //----------------------------------------------------------------------------// - - /// - /// OpenGL纹理名 - /// GLuint mTex; - FilterMode mMinFilter; FilterMode mMagFilter; - WrapMode mWrapMode; - bool mIsGenMipmap; + LUAX_DECL_ENUM(ColorFormat, 1); + LUAX_DECL_ENUM(FilterMode, 1); + LUAX_DECL_ENUM(WrapMode, 1); + + LUAX_DECL_METHOD(_SetFilterMode); + LUAX_DECL_METHOD(_SetWrapMode); + LUAX_DECL_METHOD(_GetFilterMode); + LUAX_DECL_METHOD(_GetWrapMode); + LUAX_DECL_METHOD(_IsGenMipmap); + }; - using Drawable = Texture; + typedef Texture Drawable; } } -- cgit v1.1-26-g67d0