diff options
Diffstat (limited to 'source/modules/asura-core/graphics/texture.h')
| -rw-r--r-- | source/modules/asura-core/graphics/texture.h | 40 | 
1 files changed, 14 insertions, 26 deletions
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;  	}  }  | 
