Commit 21a52f93 authored by hybrid's avatar hybrid

Slightly reorder the members.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2799 dfc29bdd-3216-0410-991c-e03cc46cb475
parent ecd10720
...@@ -62,7 +62,7 @@ enum E_TEXTURE_CREATION_FLAG ...@@ -62,7 +62,7 @@ enum E_TEXTURE_CREATION_FLAG
ETCF_NO_ALPHA_CHANNEL = 0x00000020, ETCF_NO_ALPHA_CHANNEL = 0x00000020,
//! Allow the Driver to use Non-Power-2-Textures //! Allow the Driver to use Non-Power-2-Textures
/** BurningVideo can handle Non-Power-2 Textures in 2D (GUI), but not it 3D. */ /** BurningVideo can handle Non-Power-2 Textures in 2D (GUI), but not in 3D. */
ETCF_ALLOW_NON_POWER_2 = 0x00000040, ETCF_ALLOW_NON_POWER_2 = 0x00000040,
/** This flag is never used, it only forces the compiler to compile /** This flag is never used, it only forces the compiler to compile
...@@ -109,12 +109,11 @@ public: ...@@ -109,12 +109,11 @@ public:
//! Get original size of the texture. //! Get original size of the texture.
/** The texture is usually scaled, if it was created with an unoptimal /** The texture is usually scaled, if it was created with an unoptimal
size. For example if the size of the texture file it was loaded from size. For example if the size was not a power of two. This method
was not a power of two. This returns the size of the texture, it had returns the size of the texture it had before it was scaled. Can be
before it was scaled. Can be useful when drawing 2d images on the useful when drawing 2d images on the screen, which should have the
screen, which should have the exact size of the original texture. Use exact size of the original texture. Use ITexture::getSize() if you want
ITexture::getSize() if you want to know the real size it has now stored to know the real size it has now stored in the system.
in the system.
\return The original size of the texture. */ \return The original size of the texture. */
virtual const core::dimension2d<u32>& getOriginalSize() const = 0; virtual const core::dimension2d<u32>& getOriginalSize() const = 0;
......
...@@ -562,10 +562,10 @@ public: ...@@ -562,10 +562,10 @@ public:
private: private:
T* data; T* data;
TAlloc allocator;
u32 allocated; u32 allocated;
u32 used; u32 used;
eAllocStrategy strategy; TAlloc allocator;
eAllocStrategy strategy:4;
bool free_when_destroyed:1; bool free_when_destroyed:1;
bool is_sorted:1; bool is_sorted:1;
}; };
......
...@@ -384,10 +384,10 @@ public: ...@@ -384,10 +384,10 @@ public:
private: private:
irrAllocator<SKListNode> allocator;
SKListNode* First; SKListNode* First;
SKListNode* Last; SKListNode* Last;
u32 Size; u32 Size;
irrAllocator<SKListNode> allocator;
}; };
......
...@@ -1104,9 +1104,9 @@ private: ...@@ -1104,9 +1104,9 @@ private:
//--- member variables //--- member variables
T* array; T* array;
TAlloc allocator;
u32 allocated; u32 allocated;
u32 used; u32 used;
TAlloc allocator;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment